From 48312bf25467b93ec01781c679651fb7531b9244 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Tue, 13 Oct 2020 14:25:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:alertMessage=E5=90=8E=E5=8F=B0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99&project-chart=E5=88=B7=E6=96=B0=E5=9B=BE=E8=A1=A8lege?=
 =?UTF-8?q?nd=E4=BE=9D=E7=84=B6=E4=B8=BA=E7=81=B0=E8=89=B2=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/common/alert/alertMessageTable.vue | 1 +
 nezha-fronted/src/components/common/leftMenu.vue                | 1 -
 .../src/components/common/project/popData/lineChart.vue         | 2 ++
 nezha-fronted/src/components/page/alert/list.vue                | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index c53335886..6847dcf7f 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -381,6 +381,7 @@
     methods: {
       labelsSort:function(obj){
         let buildIn=['asset','endpoint','module','project','datacenter']
+        if(typeof obj == "string") obj=JSON.parse(obj)
         let labels=JSON.parse(JSON.stringify(obj));
         let result=[];
         for(let key of buildIn){
diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue
index 32bb2ff5a..d1fbc33fc 100644
--- a/nezha-fronted/src/components/common/leftMenu.vue
+++ b/nezha-fronted/src/components/common/leftMenu.vue
@@ -241,7 +241,6 @@
           immediate: true,
           deep: true,
           handler(n, o) {
-            console.log(n)
             bus.$emit("current-project-change", n); //告知project.vue
           },
         },
diff --git a/nezha-fronted/src/components/common/project/popData/lineChart.vue b/nezha-fronted/src/components/common/project/popData/lineChart.vue
index d68d9e346..c6056a549 100644
--- a/nezha-fronted/src/components/common/project/popData/lineChart.vue
+++ b/nezha-fronted/src/components/common/project/popData/lineChart.vue
@@ -760,6 +760,7 @@
         if (chartSite === 'local') { // 本地显示
           if(legend){
             this.legendList = [];
+            this.isGrey=[];
             legend.forEach((item, i) => {
               const legend = {
                 name:item.name,
@@ -873,6 +874,7 @@
           // eslint-disable-next-line
           if(legend){
             this.screenLegendList = [];
+            this.isGreyScreen=[]
             legend.forEach((item, i) => {
               const legend = {
                 name:item.name,
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index 5a63c74ad..1441ba29f 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -315,6 +315,7 @@
     methods: {
       labelsSort:function(obj){
         let buildIn=['asset','endpoint','module','project','datacenter']
+        console.log(obj)
         let labels=JSON.parse(JSON.stringify(obj));
         let result=[];
         for(let key of buildIn){