From b4ab263c6c1f2bd6c59a329d676c35b28858a43d Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 28 Aug 2020 16:28:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=ADassetpi?=
 =?UTF-8?q?ng=E5=90=8E=E4=BE=9D=E7=84=B6=E5=AD=98=E5=9C=A8ping=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/elementSet.vue      |  2 +-
 .../src/components/common/leftMenu.vue        | 11 +++++--
 .../src/components/page/asset/asset.vue       | 29 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue
index 0f1d31900..ec02d5365 100644
--- a/nezha-fronted/src/components/common/elementSet.vue
+++ b/nezha-fronted/src/components/common/elementSet.vue
@@ -91,7 +91,7 @@ export default {
     //单选
     handler(val, index) {
       if (!this.allowedAll&&!val.allowed && (index == 0 || index == 1 || val.NotSet)) {
-        this.custom[index].show = true;
+        // this.custom[index].show = true;
       } else {
         this.custom[index].show = !this.custom[index].show;
       }
diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue
index efdb7e305..3bce9cf6f 100644
--- a/nezha-fronted/src/components/common/leftMenu.vue
+++ b/nezha-fronted/src/components/common/leftMenu.vue
@@ -88,7 +88,7 @@
                   </el-checkbox>
                 </el-checkbox-group>
               </el-collapse-item>
-              <el-collapse-item name="ping" :title="$t('asset.left.ping')">
+              <el-collapse-item name="ping" :title="$t('asset.left.ping')" v-if="assetPingSwitch">
                 <el-checkbox-group v-model="pingCheckList" size="small" @change="changePingCheckBox">
                   <el-checkbox class="sidebar-info-item" :class="{'sidebar-info-item-active': indOf(pingCheckList, item.key)}" v-for="(item, index) in pingData" :key="index" :label="item.value">
                     <div class="sidebar-info-item-txt">
@@ -159,6 +159,7 @@
           vendorCheckList: [],
           pingData: [],
           pingCheckList: [],
+          assetPingSwitch:true,
         }
       },
       computed: {
@@ -216,9 +217,11 @@
           }
         }
       },
+      created() {
+        this.initEvent(); //注册监听事件
+      },
       mounted() {
         Promise.all([this.getProjectList(), this.getModuleList(), this.getLeftMenuList()]).then(response => {
-          this.initEvent(); //注册监听事件
           setTimeout(() => {
             this.ready = true;
           }, 300);
@@ -385,6 +388,10 @@
           bus.$on('asset-property-change',()=>{
             this.getLeftMenuList();
           })
+
+          bus.$on('asset-ping-switch-change',(isOpen)=>{
+            this.assetPingSwitch = isOpen
+          })
         },
         // 获取asset左侧菜单数据
         getLeftMenuList(){
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 82e3b1f77..68f1414a2 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -376,6 +376,16 @@
           }
         }
       },
+      'tools.customTableTitle':{
+        deep:true,
+        immediate:true,
+        handler(n,o){
+          let pingTitle=n.find(item=>{return item.prop=='pingStatus'})
+          if(pingTitle){
+            this.dispatchEvent('asset-ping-switch-change',pingTitle.show)
+          }
+        }
+      }
     },
     methods: {
       fullScreen() {
@@ -627,6 +637,11 @@
           this.pageObj[column] = content;
           this.getTableData();
         });
+      },
+      dispatchEvent(event,param){
+        this.$nextTick(()=>{
+          bus.$emit(event,param)
+        })
       }
     },
 
@@ -635,11 +650,23 @@
       let tableTitle = 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.tableTitle;
+
       if (this.assetPingSwitch == 'off') {
+        this.dispatchEvent('asset-ping-switch-change',false)
         for (let i in tableTitle) {
           let label = tableTitle[i];
           if (label.prop == 'pingStatus') {
-            tableTitle.splice(i, 1);
+            label.show=false;
+            label.NotSet=true;
+            break;
+          }
+        }
+      }else{
+        for (let i in tableTitle) {
+          let label = tableTitle[i];
+          if (label.prop == 'pingStatus') {
+            label.show=true;
+            label.NotSet=false;
             break;
           }
         }