From de5fe9f1c652aa7ca0a46803da738b3d14524177 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sun, 25 Apr 2021 16:28:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3asset=E3=80=82tab?=
 =?UTF-8?q?leTitle=20=E5=88=A0=E9=99=A4=E5=90=8E=E7=9A=84=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-detail.vue    | 32 ++++++++---------
 .../src/components/charts/chart-list.vue      |  4 ---
 .../components/common/bottomBox/bottomBox.vue |  2 +-
 .../common/bottomBox/tabs/alertMessageTab.vue |  8 ++---
 .../common/bottomBox/tabs/assetTab.vue        |  2 +-
 .../bottomBox/tabs/endpointQueryTab.vue       |  2 +-
 .../common/bottomBox/tabs/endpointTab.vue     |  8 ++---
 .../common/bottomBox/tabs/panelTab.vue        |  8 ++---
 .../src/components/common/language/cn.js      |  1 +
 .../src/components/common/language/en.js      |  1 +
 .../src/components/common/pickTime.vue        |  5 ++-
 .../common/project/popData/assetTable.vue     | 14 ++++----
 .../common/project/popData/endpointTable.vue  |  2 +-
 .../common/rightBox/addEndpointBox.vue        | 36 +++++++++----------
 .../rightBox/asset/assetBatchEditBox.vue      |  2 +-
 .../common/table/settings/chartTmplTable.vue  | 16 ++++++++-
 .../common/table/settings/moduleTable.vue     |  5 ++-
 .../src/components/page/asset/asset.vue       |  2 +-
 18 files changed, 84 insertions(+), 66 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue
index d07a35dfb..3054b35ee 100644
--- a/nezha-fronted/src/components/charts/chart-detail.vue
+++ b/nezha-fronted/src/components/charts/chart-detail.vue
@@ -319,23 +319,23 @@ export default {
       oldSearchTime: [],
 
       assetKey: {
-        host: this.$t('asset.tableTitle.host'),
+        host: this.$t('asset.host'),
         id: 'Id',
-        assetType: this.$t('asset.tableTitle.assetType'),
-        sn: this.$t('asset.tableTitle.device'),
-        state: this.$t('asset.tableTitle.assetState'),
-        pingRtt: this.$t('asset.tableTitle.assetPing'),
-        dataCenter: this.$t('asset.tableTitle.dataCenter'),
-        cabinet: this.$t('asset.tableTitle.cabinet'),
-        model: this.$t('asset.tableTitle.model'),
-        vendor: this.$t('asset.tableTitle.vendor'),
-        purchaseDate: this.$t('asset.tableTitle.procurementDate'),
-        principal: this.$t('asset.tableTitle.principal'),
-        tel: this.$t('asset.tableTitle.principalTel'),
-        pingStatus: this.$t('asset.tableTitle.assetPing'),
-        pingLastReply: this.$t('asset.tableTitle.lastReply'),
-        endpoint: this.$t('asset.tableTitle.modules'),
-        alert: this.$t('asset.tableTitle.alerts'),
+        assetType: this.$t('asset.assetType'),
+        sn: this.$t('asset.device'),
+        state: this.$t('asset.assetState'),
+        pingRtt: this.$t('asset.assetPing'),
+        dataCenter: this.$t('asset.dataCenter'),
+        cabinet: this.$t('asset.cabinet'),
+        model: this.$t('asset.model'),
+        vendor: this.$t('asset.vendor'),
+        purchaseDate: this.$t('asset.procurementDate'),
+        principal: this.$t('asset.principal'),
+        tel: this.$t('asset.principalTel'),
+        pingStatus: this.$t('asset.assetPing'),
+        pingLastReply: this.$t('asset.lastReply'),
+        endpoint: this.$t('asset.modules'),
+        alert: this.$t('asset.alerts'),
         tags: this.$t('overall.tag')
       },
       projectKey: {
diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 0e320c972..6252aeb86 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -288,7 +288,6 @@ export default {
   },
   watch: {
     panelDataList (n) {
-      console.log(n)
       this.getData(this.filter)
     }
   },
@@ -672,7 +671,6 @@ export default {
         return
       }
       if (param.from == this.$CONSTANTS.fromRoute.chartTemp) {
-        console.log(this.panelDataList)
         this.dataList = this.panelDataList
         this.$nextTick(() => {
           this.dataList.forEach((item, index) => {
@@ -762,7 +760,6 @@ export default {
       })
     },
     loadChartData (scrollTop) {
-      console.log(scrollTop)
       if (this.dataList.length > 0) {
         this.dataList.forEach((item, index) => {
           if (!item.isLoaded) {
@@ -1751,7 +1748,6 @@ export default {
     },
     // 懒加载，判断网页区域，加载可见区的prom数据
     handleElementInViewport (ele, scrollTop, item, index, isSearch) {
-      console.log(ele, scrollTop, item, index)
       /*
         网页被卷去的高：document.body.scrollTop
         网页正文全文高：document.body.scrollHeight
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index b1972669a..d201561ed 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -122,7 +122,7 @@ export default {
         },
         module: {
           moduleTabTitle: [
-            { prop: 'endpoint', name: this.$t('asset.tableTitle.endpoint') },
+            { prop: 'endpoint', name: this.$t('asset.endpoint') },
             { prop: 'moduleAlertMessage', name: 'Alerts' },
             { prop: 'panel', name: 'Detail' }
           ]
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
index 58151e96a..db493664b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -3,8 +3,8 @@
     <div class="sub-top-tools">
       <div class="sub-list-tabs" v-if="from===fromRoute.module">
         <div class="sub-list-tab-title">{{obj.name}}</div>
-        <div @click="changeTab('endpoint')" class="sub-list-tab" id="endpoint-tab-change-endpoint">{{$t("asset.tableTitle.modules")}}</div>
-        <div class="sub-list-tab sub-list-tab-active" >{{$t("asset.tableTitle.alerts")}}</div>
+        <div @click="changeTab('endpoint')" class="sub-list-tab" id="endpoint-tab-change-endpoint">{{$t("asset.modules")}}</div>
+        <div class="sub-list-tab sub-list-tab-active" >{{$t("asset.alerts")}}</div>
       </div>
       <div class="sub-list-tabs" v-else>
         <div class="sub-list-tab-title">
@@ -13,8 +13,8 @@
           <template v-if="from == $CONSTANTS.fromRoute.endpoint"><div class="sub-list-tab-title">{{$t("project.endpoint.endpointId")}}: {{obj ? obj.id : ''}}</div></template>
         </div><div :id="from+'-change-panelordetail'"
         @click="changeTab(from == $CONSTANTS.fromRoute.asset || from == $CONSTANTS.fromRoute.rule || from == $CONSTANTS.fromRoute.endpoint? 'panel' : 'detail')" class="sub-list-tab">{{$t("overall.detail")}}</div><div
-        class="sub-list-tab sub-list-tab-active">{{$t("asset.tableTitle.alerts")}}</div><div v-if="from == $CONSTANTS.fromRoute.asset" :id="from+'-change-modules'"
-        @click="changeTab('endpoint')" class="sub-list-tab" v-has="'asset_endpoint_view'">{{$t("asset.tableTitle.modules")}}</div>
+        class="sub-list-tab sub-list-tab-active">{{$t("asset.alerts")}}</div><div v-if="from == $CONSTANTS.fromRoute.asset" :id="from+'-change-modules'"
+        @click="changeTab('endpoint')" class="sub-list-tab" v-has="'asset_endpoint_view'">{{$t("asset.modules")}}</div>
         <div @click="changeTab('endpointQuery')" class="sub-list-tab" v-has="'project_endpoint_query_chart_view'" v-if="from == $CONSTANTS.fromRoute.endpoint" :id="from+'-change-endpoint'">{{$t("overall.query")}}</div>
       </div>
       <div class="top-tool-right">
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index d592839cb..8968c79d8 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -98,7 +98,7 @@ export default {
           disabled: false
         }, {
           id: 23,
-          name: this.$t('asset.tableTitle.cabinet'),
+          name: this.$t('asset.cabinet'),
           type: 'input',
           label: 'cabinetName',
           disabled: false
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
index 2982b1950..891063900 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
@@ -22,7 +22,7 @@
       <div class="sub-list-tabs">
         <div class="sub-list-tab-title">{{$t("project.endpoint.endpointId")}}: {{currentEndpoint ? currentEndpoint.id : ''}}</div><div
         class="sub-list-tab" @click="changeTab('panel')" id="endpoint-query-changepanel">{{$t("overall.detail")}}</div>
-        <div class="sub-list-tab" @click="changeTab('alertMessage')" id="endpoint-query-alertMessage">{{$t("asset.tableTitle.alerts")}}</div>
+        <div class="sub-list-tab" @click="changeTab('alertMessage')" id="endpoint-query-alertMessage">{{$t("asset.alerts")}}</div>
         <div class="sub-list-tab sub-list-tab-active">{{$t("overall.query")}}</div>
       </div>
       <div class="top-tool-right">
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
index bb00172e6..f3730dc9f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
@@ -4,13 +4,13 @@
       <div class="sub-list-tabs" v-if="from===fromRoute.asset">
         <div class="sub-list-tab-title">{{obj.host}}</div>
         <div class="sub-list-tab" @click="changeTab('panel')" id="endpoint-tab-change-panel">{{$t("overall.detail")}}</div>
-        <div @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'asset_alerts_view'" id="endpoint-tab-change-alertmsg">{{$t("asset.tableTitle.alerts")}}</div>
-        <div class="sub-list-tab sub-list-tab-active">{{$t("asset.tableTitle.modules")}}</div>
+        <div @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'asset_alerts_view'" id="endpoint-tab-change-alertmsg">{{$t("asset.alerts")}}</div>
+        <div class="sub-list-tab sub-list-tab-active">{{$t("asset.modules")}}</div>
       </div>
       <div class="sub-list-tabs" v-if="from===fromRoute.module">
         <div class="sub-list-tab-title">{{obj.name}}</div>
-        <div class="sub-list-tab sub-list-tab-active">{{$t("asset.tableTitle.modules")}}</div>
-        <div @click="changeTab('alertMessage')" class="sub-list-tab" id="endpoint-tab-change-alertmsg">{{$t("asset.tableTitle.alerts")}}</div>
+        <div class="sub-list-tab sub-list-tab-active">{{$t("asset.modules")}}</div>
+        <div @click="changeTab('alertMessage')" class="sub-list-tab" id="endpoint-tab-change-alertmsg">{{$t("asset.alerts")}}</div>
       </div>
       <div class="top-tool-right">
         <div class="top-tool-search">
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index 2a185d4ff..b5d6918b5 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -10,14 +10,14 @@
           <template v-else-if="from == $CONSTANTS.fromRoute.endpoint">{{$t("project.endpoint.endpointId")}}: {{obj.id}}</template>
         </div><div class="sub-list-tab sub-list-tab-active" v-if="from == $CONSTANTS.fromRoute.model">{{$t("dashboard.panel.title")}}</div><template v-if="from == $CONSTANTS.fromRoute.asset"><div
           class="sub-list-tab sub-list-tab-active">{{$t("overall.detail")}}</div><div
-          @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'asset_alerts_view'" id="panel-tab-change-asset-alertmsg">{{$t("asset.tableTitle.alerts")}}</div><div
-          @click="changeTab('endpoint')" class="sub-list-tab" v-has="'asset_endpoint_view'" id="panel-tab-change-endpoint">{{$t("asset.tableTitle.modules")}}</div>
+          @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'asset_alerts_view'" id="panel-tab-change-asset-alertmsg">{{$t("asset.alerts")}}</div><div
+          @click="changeTab('endpoint')" class="sub-list-tab" v-has="'asset_endpoint_view'" id="panel-tab-change-endpoint">{{$t("asset.modules")}}</div>
         </template><template v-if="from == $CONSTANTS.fromRoute.rule"><div
           class="sub-list-tab sub-list-tab-active">{{$t("overall.detail")}}</div><div
-          @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'rule_alerts_view'" id="panel-tab-change-rule-alertmsg">{{$t("asset.tableTitle.alerts")}}</div>
+          @click="changeTab('alertMessage')" class="sub-list-tab" v-has="'rule_alerts_view'" id="panel-tab-change-rule-alertmsg">{{$t("asset.alerts")}}</div>
         </template><template v-if="from == $CONSTANTS.fromRoute.endpoint"><div
           class="sub-list-tab sub-list-tab-active">{{$t("overall.detail")}}</div><div
-          @click="changeTab('alertMessage')" class="sub-list-tab " v-has="'project_endpoint_alerts_view'">{{$t("asset.tableTitle.alerts")}}</div><div
+          @click="changeTab('alertMessage')" class="sub-list-tab " v-has="'project_endpoint_alerts_view'">{{$t("asset.alerts")}}</div><div
           @click="changeTab('endpointQuery')" class="sub-list-tab" v-has="'project_endpoint_query_chart_view'">{{$t("overall.query")}}</div>
         </template>
       </div>
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index f0e16b1a9..aa2286d27 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -545,6 +545,7 @@ const cn = {
     principal: '负责人',
     tel: '电话',
     featureTitle: '属性',
+    endpoint: 'Endpoint',
     endpointUpNum: '代表正常的数量',
     endpointNum: '代表总的数量',
     active: '存活', // "存活",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index c1fbe19a6..f25ed0a2c 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -552,6 +552,7 @@ const en = {
     principal: 'Administrator', // '负责人'
     tel: 'Telephone', // '电话'
     featureTitle: 'Attribute',
+    endpoint: 'Endpoint',
     endpointUpNum: 'It\'s a normal number',
     endpointNum: 'Represents the total quantity',
     active: 'Alive', // "存活",
diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue
index 0be120aa2..2ee8b2805 100644
--- a/nezha-fronted/src/components/common/pickTime.vue
+++ b/nezha-fronted/src/components/common/pickTime.vue
@@ -9,6 +9,7 @@
         <span class="nz-btn nz-btn-text" ><slot name="added-text"></slot></span>
       </button>
       <button id="browser-go" class="top-tool-btn top-tool-btn--dropdown" @mouseenter="dropdownHandler(true)" @mouseleave="dropdownHandler(false)">
+        <span class="select-refresh-time" v-if="interval !== -1">{{interLabel}}</span>
         <i class="nz-icon nz-icon-arrow-down" style="font-size: 12px;"></i>
         <transition name="el-zoom-in-top">
           <ul v-show="dropdownShow" class="el-dropdown-menu el-popper el-dropdown-menu--mini nz-dropdown">
@@ -85,7 +86,8 @@ export default {
       intervalTimer: null,
       interval: -1,
       unit: 2,
-      dropdownShow: false
+      dropdownShow: false,
+      interLabel: ''
     }
   },
   created () {
@@ -96,6 +98,7 @@ export default {
     selectInterval (val) {
       this.visible = false
       this.interval = val.value
+      this.interLabel = val.value
       console.info(this.interval, val)
       if (!this.showTimePicker && val && val.value != -1) {
         this.intervalTimer = setInterval(() => {
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index 917943f08..76a3bb474 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -151,32 +151,32 @@ export default {
       mainTableHeight: '100%',
       tableTitle: [
         {
-          label: this.$t('asset.tableTitle.host'),
+          label: this.$t('asset.host'),
           prop: 'HOST',
           show: true,
           width: 130,
           fixed: 'left'
         },
         {
-          label: this.$t('asset.tableTitle.device'),
+          label: this.$t('asset.device'),
           prop: 'SN',
           show: true,
           width: 130
         },
         {
-          label: this.$t('asset.tableTitle.assetType'),
+          label: this.$t('asset.assetType'),
           prop: 'assetType',
           show: true
         }, {
-          label: this.$t('asset.tableTitle.assetState'),
+          label: this.$t('asset.assetState'),
           prop: 'state',
           show: true
         }, {
-          label: this.$t('asset.tableTitle.assetPing'),
+          label: this.$t('asset.assetPing'),
           prop: 'pingStatus',
           show: true
         }, {
-          label: this.$t('asset.tableTitle.alerts'),
+          label: this.$t('asset.alerts'),
           prop: 'Alert',
           show: true,
           width: 100
@@ -287,7 +287,7 @@ export default {
       this.esc(false)
     },
     messageStyle (e) {
-      if (e.column.label == 'Alerts' || e.column.label == this.$t('asset.tableTitle.alerts')) {
+      if (e.column.label == 'Alerts' || e.column.label == this.$t('asset.alerts')) {
         if (e.row.alertNum > 0) {
           return 'danger'
         } else {
diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
index a92de3799..05bafcf18 100644
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -261,7 +261,7 @@ export default {
       this.esc(false)
     },
     messageStyle (e) {
-      if (e.column.label == 'Alerts' || e.column.label == this.$t('asset.tableTitle.alerts')) {
+      if (e.column.label == 'Alerts' || e.column.label == this.$t('asset.alerts')) {
         if (e.row.alertNum > 0) {
           return 'danger'
         } else {
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index 15b469efa..847c3415b 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -310,50 +310,50 @@ export default {
       assetListHalf: false,
       assetTableTitle: [
         {
-          label: this.$t('asset.tableTitle.name'),
+          label: this.$t('asset.name'),
           prop: 'name',
           show: false,
           allowed: true,
           minWidth: '200'
         },
         {
-          label: this.$t('asset.tableTitle.sn'),
+          label: this.$t('asset.sn'),
           prop: 'sn',
           show: true,
           minWidth: '200'
         },
         {
-          label: this.$t('asset.tableTitle.manageIp'),
+          label: this.$t('asset.manageIp'),
           prop: 'manageIp',
           show: true,
           minWidth: '200'
         }, {
-          label: this.$t('asset.tableTitle.brand'),
+          label: this.$t('asset.brand'),
           prop: 'brand',
           show: true,
           minWidth: '100'
         }, {
-          label: this.$t('asset.tableTitle.model'),
+          label: this.$t('asset.model'),
           prop: 'model',
           show: true,
           minWidth: '100'
         }, {
-          label: this.$t('asset.tableTitle.dc'),
+          label: this.$t('asset.dc'),
           prop: 'dc',
           show: true,
           minWidth: '100'
         }, {
-          label: this.$t('asset.tableTitle.cabinet'),
+          label: this.$t('asset.cabinet'),
           prop: 'cabinet',
           show: true,
           minWidth: '100'
         }, {
-          label: this.$t('asset.tableTitle.type'),
+          label: this.$t('asset.type'),
           prop: 'type',
           show: true,
           minWidth: '100'
         }, {
-          label: this.$t('asset.tableTitle.state'),
+          label: this.$t('asset.state'),
           prop: 'state',
           show: true,
           minWidth: '100'
@@ -371,63 +371,63 @@ export default {
         zheze_none: true,
         searchLabelList: [{
           id: 10,
-          name: this.$t('asset.tableTitle.sn'),
+          name: this.$t('asset.sn'),
           type: 'input',
           label: 'sn',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.name'),
+          name: this.$t('asset.name'),
           type: 'input',
           label: 'name',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.manageIp'),
+          name: this.$t('asset.manageIp'),
           type: 'input',
           label: 'manageIp',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.brand'),
+          name: this.$t('asset.brand'),
           type: 'input',
           label: 'brand',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.model'),
+          name: this.$t('asset.model'),
           type: 'input',
           label: 'model',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.dc'),
+          name: this.$t('asset.dc'),
           type: 'input',
           label: 'dc',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.cabinet'),
+          name: this.$t('asset.cabinet'),
           type: 'input',
           label: 'cabinet',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.type'),
+          name: this.$t('asset.type'),
           type: 'input',
           label: 'type',
           disabled: false
         },
         {
           id: 11,
-          name: this.$t('asset.tableTitle.state'),
+          name: this.$t('asset.state'),
           type: 'input',
           label: 'state',
           disabled: false
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
index 03baca0ac..5bfa5154c 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
@@ -302,7 +302,7 @@ export default {
               disabled: false
             }, {
               id: 23,
-              name: this.$t('asset.tableTitle.cabinet'),
+              name: this.$t('asset.cabinet'),
               type: 'input',
               label: 'cabinetName',
               disabled: false
diff --git a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
index e4543a11c..2de77da13 100644
--- a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
@@ -34,7 +34,7 @@
       </template>
       <template slot-scope="scope" :column="item">
         <span v-if="item.prop==='varType'">{{scope.row[item.prop]===1?'Asset':'endpoint'}}</span>
-        <span v-else-if="item.prop==='type'" :class="'asd'">{{scope.row[item.prop]}}</span>
+        <span v-else-if="item.prop==='type'" :class="typeIcon(scope.row)">{{scope.row[item.prop]}}</span>
         <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop] || '-'}}</span>
         <template v-else>-</template>
       </template>
@@ -92,6 +92,20 @@ export default {
         }
       ]
     }
+  },
+  methods: {
+    typeIcon (row) {
+      let str = 'nz-icon'
+      switch (row.type) {
+        case 'line':
+          str += 'nz-icon-multitext'
+          break
+        default :
+          str += 'nz-icon-multitext'
+          break
+      }
+      return str
+    }
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index c8c296478..9547edf49 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -44,7 +44,7 @@
         </template>
         <template v-else-if="item.prop === 'endpointNum'">
           <span class="endpoint-num"  @click="showBottomBox('endpoint', scope.row)">
-             <i class="nz-icon nz-icon-endpoint" :class="scope.row[item.prop]>0?'colorEF7458':'colorEF7458'"/>
+             <i class="nz-icon nz-icon-overview-endpoint color969dea"/>
           {{scope.row[item.prop]}}
           </span>
         </template>
@@ -146,6 +146,9 @@ export default {
   .color23BF9A{
     color: #23BF9A;
   }
+  .color969dea{
+    color: #969dea;
+  }
   .endpoint-num, .alert-num{
     cursor: pointer;
   }
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 1cde5cd54..7e7828f2b 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -170,7 +170,7 @@ export default {
           disabled: false
         }, {
           id: 23,
-          name: this.$t('asset.tableTitle.cabinet'),
+          name: this.$t('asset.cabinet'),
           type: 'input',
           label: 'cabinetName',
           disabled: false