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] =?UTF-8?q?fix:Asset=20Info=20=E5=9B=BE=E8=A1=A8=20Feature?=
 =?UTF-8?q?=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',//'新增资产'