From fbde688ddd8085f6ae5dd9c9145f35a94fda4ad3 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Tue, 21 Apr 2020 18:48:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AEassetPi?=
 =?UTF-8?q?ngSwitch=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/asset/asset.vue        |  4 ++--
 .../src/components/page/config/promServer.vue  |  2 +-
 .../src/components/page/config/system.vue      | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 4568f9238..181a42de0 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -1012,9 +1012,9 @@
       let localStorageTitle = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path);
       this.tablelable = localStorageTitle ? JSON.parse(localStorageTitle) : this.tableTitle;
       // this.assetPingSwit
+
       if (this.assetPingSwitch == 'off') {
-        console.log(this.assetPingSwitch)
-        console.log(this.tablelable)
+
         for (let i in this.tablelable) {
           let label = this.tablelable[i];
 
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index 9ac4eb860..645df195b 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -63,7 +63,7 @@
           <el-table-column :resizable="false" v-for="(item, index) in tablelable" v-if="item.show" :width="item.width"
                            :key="`col-${index}`" :label="item.label">
             <template slot-scope="scope" :column="item">
-              <span v-if="item.prop == 'idc'" >{{scope.row[item.prop].name}}</span>
+              <span v-if="item.prop == 'idc'" >{{scope.row[item.prop]?scope.row[item.prop].name:'-'}}</span>
 
               <span v-else-if="item.prop == 'type'">
                   {{scope.row[item.prop] == '1' ? 'Global' : ''}}
diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue
index 0429a0e4a..e5e339075 100644
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -362,6 +362,14 @@
                 for(let key in sets){
                   this[type][key]=sets[key];
                 }
+                if(type ==  'basic'){
+                  localStorage.setItem('nz-sys-name',this.basic.system_name);
+                  localStorage.setItem('nz-sys-timezone',this.basic.timezone);
+                  localStorage.setItem('nz-sys-asset-ping-switch',this.basic.asset_ping_switch);
+                  localStorage.setItem('nz-sys-default-cabinet-usize',this.basic.default_cabinet_usize);
+                }else if(type == 'terminal'){
+                  localStorage.setItem('nz-sys-max-terminal-num',this.terminal.max_terminal_num);
+                }
                 if(type == 'email'){
                   this.$refs.emailForm.clearValidate();
                 }
@@ -383,16 +391,8 @@
                   if(response.code == 200){
                     this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")});
                     this.resetForm(formName);
-                    setTimeout(()=>{
+                    setTimeout(()=> {
                       this.querySetInfo(type);
-                      if(type ==  'basic'){
-                        localStorage.setItem('nz-sys-name',this.basic.system_name);
-                        localStorage.setItem('nz-sys-timezone',this.basic.timezone);
-                        localStorage.setItem('nz-sys-asset-ping-switch',this.basic.asset_ping_switch);
-                        localStorage.setItem('nz-sys-default-cabinet-usize',this.basic.default_cabinet_usize);
-                      }else if(type == 'terminal'){
-                        localStorage.setItem('nz-sys-max-terminal-num',this.terminal.max_terminal_num);
-                      }
                     },200)
                   }else{
                     this.$message.error(response.msg);