From 8048fba3214ed9d697b2dcf3adb0f4d797df1922 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Wed, 5 Aug 2020 09:54:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9loading=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=20=E4=BB=A5=E5=8F=8A=E8=A1=A8=E5=A4=B4=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-alert-list.vue    |  9 +--------
 .../components/common/alert/alertMessageTable.vue | 15 +++++++++++++--
 .../common/bottomBox/tabs/alertMessageTab.vue     |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

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 @@
         </div>
         <div class="mt-10 table-container" v-cloak  v-show="firstShow || isPreview">
           <alertMessageTable
-            :tableData="storedScreanTableData"
+            :tableData="storedTableData"
             :loading="loadingTable"
             :tableHeight="tableHeight"
             :tableId="''"
@@ -105,13 +105,6 @@
           </div>
           <chart ref="messageChart" name="alertMessageChart" :unit="chartUnit" ></chart>
         </el-dialog>
-        <element-set
-          path="/alertList"
-          :table-title="tableTitle"
-          :dropCol="dropCol"
-          @tablelable="tablelabelEmit"
-          ref="elementset"
-        ></element-set>
       </div>
       <span class="vue-resizable-handle" @mousedown="startResize" v-if="!isPreview && data.resizable"></span>
     </div>
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);