diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index 5503aaaa1..82a5bbc26 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -42,7 +42,7 @@
-
diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index 3bac1805f..db6169242 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -795,11 +795,22 @@ showSubList(n) { this.$bottomBoxWindow.showSubListWatch(vm, n); }, + // loading(n){ + // + // }, + loading:{ + handler:function(n,o){ + console.log(n); + this.tools.loading=n; + }, + immediate: true, + deep:true, + } }, mounted() { //初始化表头 - this.tools.customTableTitle = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) - ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + this.tools.customTableTitle = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + '/alertList') + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + '/alertList')) : this.tableTitle; //是否存在分页缓存 let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index 87d60c713..3903ff72f 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -468,7 +468,6 @@ this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize); setTimeout(() => { this.$get('alert/message', this.searchLabel).then(response => { - this.loading = false; if (response.code == 200) { this.tableData = response.data.list; this.tableData.forEach((item) => { @@ -494,6 +493,7 @@ }); }); this.pageObj.total = response.data.total; + this.loading = false; } }); }, 1000);