Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

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>

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
                 });
               }();
             }

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);

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;
         }

nezha-fronted/src/components/common/language/cn.js

@@ -458,7 +458,7 @@ const cn = {
       reLoginPwdIntroduce: "请指定密码提示以便RELOGIN登录过程可自动运行",
       exporter: "Exporter",
       basicTitle:'基础信息',
-      featureTitle:'特征'
+      featureTitle:'属性'
     },
     editAssetTab: {
       title: "新增资产",

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',//'新增资产'

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 {