From cdb6ab245c83091d1ed342334eddb476acdfbad4 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 17 Jul 2020 16:53:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=B8=8B?=
 =?UTF-8?q?=E6=BB=91=E6=A1=86=E6=80=A7=E8=83=BD=EF=BC=88=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/js/tools.js       |  2 +-
 .../src/components/common/popBox/selectArea.vue       | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 2b9370976..ec257913e 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -241,7 +241,7 @@ export const bottomBoxWindow = {
           vm.mainResizeShow = true;
         }
       }
-      if(parseInt(subListDom.offsetHeight) <= 100){
+      if(parseInt(subListDom.style.height) <= 100){
         if (vm.subResizeShow) {
           vm.subResizeShow = false;
         }
diff --git a/nezha-fronted/src/components/common/popBox/selectArea.vue b/nezha-fronted/src/components/common/popBox/selectArea.vue
index cb921ec74..81d6923fe 100644
--- a/nezha-fronted/src/components/common/popBox/selectArea.vue
+++ b/nezha-fronted/src/components/common/popBox/selectArea.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-popover :placement="placement" width="487" ref="selectAreaPopBox" v-model="popBox.show" popper-class="nz-pop nz-pop-select-area" transition="slide">
+  <el-popover :placement="placement" width="698" ref="selectAreaPopBox" v-model="popBox.show" popper-class="nz-pop nz-pop-select-area" transition="slide">
     <div>
       <div class="pop-item-wider">
         <el-scrollbar class="select-area-tree">
@@ -36,14 +36,7 @@
         currentArea: {type: Number}
       },
       mounted() {
-        /*this.$nextTick(() => {
-          console.info(this.$refs)
-          this.$refs.areaTree.setCurrentKey(this.currentArea);
-        });*/
-        setTimeout(() => {
-          console.info(this.$refs)
-          this.$refs.areaTree.setCurrentKey(this.currentArea);
-        }, 100);
+        this.$refs.areaTree.setCurrentKey(this.currentArea);
       },
       data(){
         return {

From eaf6ecc304348f824270da1c743b4640e6b8fe93 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 17 Jul 2020 17:09:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BA=8C=E7=BA=A7panel=20=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E5=88=A0=E9=99=A4=E5=90=8E=E5=88=B7=E6=96=B0panel=20b?=
 =?UTF-8?q?ug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index 6d60cd415..ab08186d4 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -244,7 +244,7 @@
                   break;
                 }
               }
-              this.getTableData(this.obj.id); //删除相关图表后，刷新面板数据
+              // this.getTableData(this.obj.id); //删除相关图表后，刷新面板数据
             } else {
               console.error(response.msg);
               this.$message.error(response.msg);

From 3ee0050ce5df0bcf266c6c4c27cd2e2e9ddb2271 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 17 Jul 2020 18:15:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:Asset=20Info=20=E5=9B=BE=E8=A1=A8=20Fea?=
 =?UTF-8?q?ture=20->=20Attribute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-detail.vue | 2 +-
 nezha-fronted/src/components/charts/chart-list.vue   | 6 +++---
 nezha-fronted/src/components/common/language/cn.js   | 2 +-
 nezha-fronted/src/components/common/language/en.js   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue
index 50b64e3c5..e3a5b5df8 100644
--- a/nezha-fronted/src/components/charts/chart-detail.vue
+++ b/nezha-fronted/src/components/charts/chart-detail.vue
@@ -67,7 +67,7 @@
                       </div>
                     </div>
                     <!-- endpoint-detail、asset、model的assetInfo的feature-->
-                    <div class="content-item" v-if="(data.from == 'endpoint' || data.from == 'asset' || data.from == 'model') && data.type == 'assetInfo' && item.type == 'feature'">
+                    <div class="content-item" v-if="(data.from == 'endpoint' || data.from == 'asset' || data.from == 'model') && data.type == 'assetInfo' && item.type == 'attribute'">
                       <div class="content-item-key item-tip" :id="`key-${index}-${i}`">
                         <span class="content-text">{{key}}</span>
                         <div class="item-tip-hide item-tip-key el-popover" :class="itemTip(`key-${index}`, key, i, ready)">{{key}}</div>
diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index e43d6f55c..2046dc51a 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -1298,10 +1298,10 @@
                   type: 'basic',
                   data: response.data.Basic
                 });
-                response.data.Feature && detail.push({
+                response.data.Attribute && detail.push({
                   title: vm.$t('asset.createAssetTab.featureTitle'),
-                  type: 'feature',
-                  data: response.data.Feature
+                  type: 'attribute',
+                  data: response.data.Attribute
                 });
               }();
             }
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index b71a71322..c4046fb34 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -458,7 +458,7 @@ const cn = {
       reLoginPwdIntroduce: "请指定密码提示以便RELOGIN登录过程可自动运行",
       exporter: "Exporter",
       basicTitle:'基础信息',
-      featureTitle:'特征'
+      featureTitle:'属性'
     },
     editAssetTab: {
       title: "新增资产",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 7c489f98e..3b2682692 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -472,7 +472,7 @@ const en = {
       sshKeyWasConfig:'SSH-KEY configured',//'SSH-KEY已配置'
       exporter:'Exporter',
       basicTitle:'Basic info',
-      featureTitle:'Feature',
+      featureTitle:'Attribute',
     },
     editAssetTab:{
       title:'New asset',//'新增资产'