From 55962bf0084b5bcd7587c67f32df6379de1d8f4d Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Tue, 17 Nov 2020 17:14:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2alertmessage=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-list.vue        | 5 ++++-
 nezha-fronted/src/components/charts/line-chart-block.vue  | 2 +-
 .../src/components/common/alert/alertMessageTable.vue     | 1 +
 nezha-fronted/src/components/page/alert/config.vue        | 3 +++
 nezha-fronted/src/components/page/asset/asset.vue         | 8 ++++++--
 nezha-fronted/src/components/page/project/project.vue     | 3 +++
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 1297ecc5f..f5af8847c 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -336,7 +336,9 @@
                 this.dataTotalListBak.push(newItem);
               }
               this.dataList = this.dataTotalListBak;
-              this.showShadow=false;
+              this.$nextTick(()=>{
+                this.showShadow=false;
+              })
             }else {
               if(response.msg){
                 this.$message.error(response.msg);
@@ -700,6 +702,7 @@
               }
             });
           }
+
         });
       },
       loadChartData(scrollTop){
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 56a30e9fe..35e5d6c59 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -37,7 +37,7 @@
           <el-dropdown trigger="click" class="nz-chart-top" :key="'chartDropdown'+chartIndex"  v-clickoutside="clickos">
             <el-dropdown-menu style="display: none"></el-dropdown-menu>
             <span class="el-dropdown-link chart-title" @click.stop="dropdownMenuShow=!dropdownMenuShow">
-              <span class="chart-title-text">{{chartData.title}}-[{{chartData.id}}]</span>
+              <span class="chart-title-text">{{chartData.title}}</span>
               <span class="chart-title-icon" v-if="filter.from != 'alertRule'"><i class="nz-icon nz-icon-xialaxuanze  " :class="{'visible':caretShow,'hidden':!caretShow}"></i></span>
             </span>
             <ul v-if="filter.from != 'alertRule'" slot="dropdown" v-show="dropdownMenuShow"  :id="'dropdownUl'+chartIndex" :class="{'el-dropdown-menu nz-chart-dropdown':!isExplore,'el-dropdown-menu nz-chart-dropdown-one':isExplore}"    style="position: absolute; top: 30px; left: calc(50% - 79px); transform-origin: center top; z-index: 1000;" >
diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 21092582b..8f3a9ae0a 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -612,6 +612,7 @@
           if (valid) {
             this.$emit('deleteMessage',this.deleteBox,()=>{
               this.deleteBox.ids=[];
+              bus.$emit("alert-message-change")
             });
             this.deleteBox.show = false;
           }
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index d9b36baa7..aeb9663f8 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -514,6 +514,9 @@
         bus.$on("dc-list-change", () => {
           this.getTableData();
         });
+        bus.$on('alert-message-change',()=>{
+          this.getTableData();
+        })
       }
     },
     watch: {
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index caae8b701..ca39c273e 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -700,9 +700,13 @@
           }else{
             this.pageObj[column] = content;
           }
-          let isSame = this.checkSearchLabel(JSON.parse(JSON.stringify(this.pageObj)), oldPageObj);
-          isSame && this.getTableData();
+          // let isSame = this.checkSearchLabel(JSON.parse(JSON.stringify(this.pageObj)), oldPageObj);
+          // isSame && this.getTableData();
+          this.getTableData();
         });
+        bus.$on('alert-message-change',()=>{
+          this.getTableData()
+        })
       },
       dispatchEvent(event,param){
         this.$nextTick(()=>{
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 8b9852688..7b5e5b7dd 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -737,6 +737,9 @@
         bus.$on("endpoint-list-change",menu=>{
           this.getEndpointTableData();
         });
+        bus.$on('alert-message-change',()=>{
+          this.getEndpointTableData()
+        })
       },
       messageStyle(e){
         if(e.column.label=='Alerts'||e.column.label==this.$t("project.endpoint.alerts")){