diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index f3c23a6a2..466de3f34 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -2,3 +2,18 @@ font-family: 'NotoSans'; /*字体名称*/ src: url('font/NotoSansSC-6.ttf'); } +.el-loading-spinner .circular{ + width: 42px; + height: 42px; + animation: loading-rotate 2s linear infinite; + display: none; +} +.el-loading-mask .el-loading-spinner{ + background: url(../img/loading.gif) no-repeat; + background-size: 48px 48px; + width: 200px; + height: 200px; + position: relative; + top: 50%; + left: 48.5%; +} diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index b3dba8895..dd6afff5b 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1777,3 +1777,4 @@ li{ .transparent-pop{ //防止popover的提示框挡住页面元素无法操作 pointer-events: none; } + diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 37d1ccfc2..eb9f13ade 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -1197,8 +1197,8 @@ this.dropdownMenuShow=false; this.clearChart(); this.$refs['localLoading'+this.chartIndex].startLoading(); - this.firstShow = false; - this.$emit('on-refresh-data', this.data.id); + /*this.firstShow = false; + this.$emit('on-refresh-data', this.data.id);*/ }, initDialog(){ //此时初始化,才能获得screenShowArea对象,否则此对象为undefined,无法初始化图表 diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index 2814def01..7887a8e73 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -28,7 +28,6 @@ { + this.loading = false; if (response.code == 200) { - this.loading = false; this.tableData = response.data.list; this.tableData.forEach((item) => { item.labels = JSON.parse(item.labels); diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue index 4c20bc986..7419e0594 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue @@ -187,8 +187,8 @@ this.$set(this.searchLabel, "pageNo", 1); this.$set(this.searchLabel, "pageSize", -1); this.$get("/cabinet", this.searchLabel).then(response => { + this.loading = false; if (response.code == 200) { - this.loading = false; this.tableData = response.data.list; } }); diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index b3653c20f..693268767 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -21,7 +21,7 @@
{ + this.loading = false; if (response.code === 200) { this.tableData = response.data.list; this.$emit("reload"); diff --git a/nezha-fronted/src/components/common/loading.vue b/nezha-fronted/src/components/common/loading.vue index 8a38fc4a1..fc3f8418b 100644 --- a/nezha-fronted/src/components/common/loading.vue +++ b/nezha-fronted/src/components/common/loading.vue @@ -6,8 +6,8 @@ diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 028597814..4fb68b6a7 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -37,7 +37,8 @@ ref="alertRuleTable" tooltip-effect="light" :height="mainTableHeight" - v-scrollBar:el-table + v-scrollBar:el-table="'large'" + v-loading="loading" :cell-class-name="messageStyle" style="width: 100%;"> { + this.loading = false; if (response.code == 200) { this.tableData = response.data.list; this.pageObj.total = response.data.total; diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index bed4e3fa1..2b0f556b4 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -42,7 +42,8 @@ ref="alertListTable" tooltip-effect="light" :height="mainTableHeight" - v-scrollBar:el-table + v-scrollBar:el-table="'large'" + v-loading="loading" :cell-class-name="labelsClassName" @selection-change="selectChange" style="width: 100%;"> @@ -187,6 +188,7 @@ data() { vm = this; return { + loading: false, /*二级列表相关*/ tabList: [], //二级列表的标签 tabDetailList: [], //多个详情 @@ -392,7 +394,9 @@ getAlertList: function () { this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo); this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize); + this.loading = true; this.$get('alert/message', this.searchLabel).then(response => { + this.loading = false; if (response.code == 200) { this.tableData = response.data.list; this.tableData.forEach((item) => { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index fca526395..1e749031b 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -115,9 +115,10 @@ :height="mainTableHeight" style="width: 100%;" :data="tableData" - v-scrollBar:el-table + v-scrollBar:el-table="'large'" v-show="mainResizeShow" border + v-loading="loading" tooltip-effect="light" ref="assetTable" > @@ -283,6 +284,7 @@ data() { vm = this; return { + loading: false, /*二级页面相关*/ assetDetail: [], //asset详情 alertMsgAsset: {}, //告警信息对应的asset对象 @@ -630,7 +632,9 @@ }, getAssetData(data, flushRightBoxDc) { this.searchLabel = Object.assign(this.searchLabel, this.pageObj); + this.loading = true; this.$get('asset', this.searchLabel).then(response => { + this.loading = false; if (response.code === 200) { this.tableData = response.data.list; this.pageObj.total = response.data.total diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index 14a53f7cb..b1bf9e8ee 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -57,7 +57,8 @@ v-show="mainResizeShow" ref="accountTable" :height="mainTableHeight" - v-scrollBar:el-table + v-loading="loading" + v-scrollBar:el-table="'large'" style="width: 100%;"> { + this.loading = false; if (response.code === 200) { for (let i = 0; i < response.data.list.length; i++) { response.data.list[i].status = response.data.list[i].status + ""; diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 99f46a15f..80f7f1ca8 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -56,9 +56,10 @@ border tooltip-effect="light" v-show="mainResizeShow" - v-scrollBar:el-table + v-scrollBar:el-table="'large'" :height="mainTableHeight" ref="dcTable" + v-loading="loading" :cell-class-name="assetStatClassName" style="width: 100%;"> { + this.loading = false; if (response.code === 200) { this.tableData = response.data.list; this.pageObj.total = response.data.total diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index 059b732c8..741be35f7 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -54,7 +54,7 @@ - +