From 405c9ab66b991249e888bbc304a39bc22c10dc14 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Thu, 16 Jan 2020 15:48:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DelementSet=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/elementSet.vue      | 19 ++++++++++++++++--
 .../src/components/page/alert/config.vue      |  3 ++-
 .../src/components/page/alert/list.vue        |  3 ++-
 .../components/page/asset/accountConfig.vue   |  2 +-
 .../src/components/page/asset/asset.vue       | 20 +++++++++----------
 .../src/components/page/config/account.vue    | 16 +++++++++++++--
 .../src/components/page/config/promServer.vue |  5 +++--
 .../src/components/page/project/project.vue   |  3 ++-
 8 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue
index f283ee354..8bb0fc10d 100644
--- a/nezha-fronted/src/components/common/elementSet.vue
+++ b/nezha-fronted/src/components/common/elementSet.vue
@@ -45,17 +45,32 @@
 
 <script>
 export default {
-  props: ["dropCol"],
+  props: ["dropCol","tableTitle"],
   data() {
     return {
       other: this.$t("overall.other"),
       event_positiony: 0,
       event_positionx: 0,
       eventfixedVal: {},
-      dropColRes: JSON.parse(JSON.stringify(this.dropCol))
+      dropColRes: JSON.parse(JSON.stringify(this.dropCol)),
+      titles: JSON.parse(JSON.stringify(this.tableTitle))
     };
   },
   mounted() {},
+  created() {
+    let localStorageTitle=JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path));
+    if(localStorageTitle){
+      for(let title of this.titles){
+        for(let lsTitle of localStorageTitle){
+          if(lsTitle.prop === title.prop){
+            lsTitle.label=title.label;
+          }
+        }
+      }
+      localStorage.setItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path,JSON.stringify(localStorageTitle))
+    }
+
+  },
   watch: {
     dropCol: {
       immediate: true,
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index 579ec1539..bd504eeef 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -6,7 +6,7 @@
     display: inline-block;
     font-size: 12px;
     margin-right:6px;
-  } 
+  }
 </style>
 <template>
     <div class="config">
@@ -83,6 +83,7 @@
         <asset-edit-unit :edit-unit-show='viewAsset' @refreshData="getTableData" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit>
         <element-set
           v-clickoutside="elementsetHide"
+          :table-title="tableTitle"
           :dropCol="dropCol"
           @tablelable="tablelabelEmit"
           ref="elementset"
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index 24bc29fba..1d551a221 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -30,7 +30,7 @@
                   :label="item.label"
                 >
                     <template slot="header" slot-scope="scope">
-                        <span v-if="index==0"  class='nav-tabel-header'> 
+                        <span v-if="index==0"  class='nav-tabel-header'>
                             <span @click.stop="elementsetShow('shezhi',$event)" class="nz-table-gear">
                                 <i class="nz-icon nz-icon-gear"></i>
                             </span>
@@ -78,6 +78,7 @@
       <asset-edit-unit :edit-unit-show='viewAssetState' @refreshData="getAlertList" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit>
       <element-set
         v-clickoutside="elementsetHide"
+        :table-title="tableTitle"
         :dropCol="dropCol"
         @tablelable="tablelabelEmit"
         ref="elementset"
diff --git a/nezha-fronted/src/components/page/asset/accountConfig.vue b/nezha-fronted/src/components/page/asset/accountConfig.vue
index aa1f81a43..5bd9dd8e2 100644
--- a/nezha-fronted/src/components/page/asset/accountConfig.vue
+++ b/nezha-fronted/src/components/page/asset/accountConfig.vue
@@ -104,7 +104,7 @@ export default {
             { validator: validataUser, trigger: 'blur'}
           ],
           port:[
-            { validator: validatePort, trigger: 'change'}
+            { validator: validatePort, trigger: 'change',required:true}
           ],
           file:[
             { validator: validateFile, trigger: 'change'}
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 4d78ed718..602d8bf7c 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -63,7 +63,7 @@
             <div v-if="item.prop=='ID'">
               <span>{{scope.row.id}}</span>
             </div>
-            <div v-if="item.prop=='资产类型'">
+            <div v-if="item.prop=='assetType'">
               <span>{{scope.row.model.type.value}}</span>
             </div>
             <div v-if="item.prop=='SN'">
@@ -110,7 +110,7 @@
             <div v-if="item.prop=='vendor'">
               <span>{{scope.row.model.vendor.value}}</span>
             </div>
-            <div v-if="item.prop=='购买日期'">
+            <div v-if="item.prop=='purchaseDate'">
               <span>{{scope.row.purchaseDate}}</span>
             </div>
             <div v-if="item.prop=='principal'">
@@ -145,7 +145,8 @@
                      ref="assetEditUnit"></asset-edit-unit>
     <element-set
       v-clickoutside="elementsetHide"
-      :dropCol="dropCol"
+      :drop-col="dropCol"
+      :table-title="tableTitle"
       @tablelable="tablelabelEmit"
       ref="elementset"
     ></element-set>
@@ -198,7 +199,7 @@
             width: 90
           }, {
             label: this.$t("asset.tableTitle.assetType"),
-            prop: '资产类型',
+            prop: 'assetType',
             show: true,
           }, {
             label: this.$t("asset.tableTitle.device"),
@@ -239,7 +240,7 @@
             show: true,
           }, {
             label: this.$t("asset.tableTitle.procurementDate"),
-            prop: '购买日期',
+            prop: 'purchaseDate',
             show: true,
           }, {
             label: this.$t("asset.tableTitle.principal"),
@@ -648,12 +649,9 @@
 
       this.getUserData();
       this.getIDCOptionData();
-      this.tablelable = 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;
-      this.dropCol = 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;
+      let localStorageTitle=localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path);
+      this.tablelable = localStorageTitle ? JSON.parse(localStorageTitle) : this.tableTitle;
+      this.dropCol = localStorageTitle ? JSON.parse(localStorageTitle) : this.tableTitle;
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index d05cc904f..c2c5ba09e 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -6,7 +6,7 @@
     display: inline-block;
     font-size: 12px;
     margin-right:6px;
-  } 
+  }
 </style>
 <template>
     <div class="account">
@@ -141,6 +141,7 @@
         <element-set
             v-clickoutside="elementsetHide"
             :dropCol="dropCol"
+            :table-title="tableTitle"
             @tablelable="tablelabelEmit"
             ref="elementset"
         ></element-set>
@@ -337,6 +338,17 @@ export default {
       this.rightBox.title = this.$t("config.account.createAccount");
       this.rightBox.show = true;
     },
+    tabSave:function(){
+      this.$put('sys/user/update', this.user).then(response => {
+        if (response.code === 200) {
+          this.rightBox.show = false;
+          this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
+        } else {
+          this.$message.error(response.msg);
+        }
+        this.getTableData();
+      });
+    },
     save: function() {
       this.$refs.accountForm.validate((valid) => {
         if(valid){
@@ -376,7 +388,7 @@ export default {
     },
     statusChange: function(user) {
       this.user = user;
-      this.save();
+      this.tabSave();
     },
     jumpTo(data,id) {
       this.$store.state.assetData.moduleData = data;
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index f06b09440..b4912d645 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -6,7 +6,7 @@
     display: inline-block;
     font-size: 12px;
     margin-right:6px;
-  } 
+  }
 </style>
 <template>
     <div class="prom">
@@ -136,6 +136,7 @@
         </transition>
         <element-set
           v-clickoutside="elementsetHide"
+          :table-title="tableTitle"
           :dropCol="dropCol"
           @tablelable="tablelabelEmit"
           ref="elementset"
@@ -178,7 +179,7 @@ export default {
           {required:true,message:this.$t('validate.required'),trigger:'change'}
         ],
         host:[
-          { validator: checkHost, trigger: 'blur'}
+          { validator: checkHost, trigger: 'blur',required:true}
         ],
         port:[
           {required:true,message:this.$t('validate.required'),trigger:'blur'},
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index bea8fb14d..e4a4091cb 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -116,6 +116,7 @@
     <asset-edit-unit :edit-unit-show='viewAssetState' @refreshData="getEndpointTableData" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit>
     <element-set
       v-clickoutside="elementsetHide"
+      :table-title="endpointTableTitle"
       :dropCol="dropCol"
       @tablelable="tablelabelEmit"
       ref="elementset"
@@ -566,7 +567,7 @@
     display: inline-block;
     font-size: 12px;
     margin-right:6px;
-  } 
+  }
   /* start--param*/
   .param-btn {
     float: right;