From d90c62380de46d2391c407e02a18b097d73a00a0 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 15 Oct 2020 17:12:55 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9asset=20endpoint?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/cn.js          |  4 +++-
 .../src/components/common/language/en.js          |  2 ++
 nezha-fronted/src/components/page/asset/asset.vue | 15 ++++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 03923a0a1..c8975a501 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -524,7 +524,9 @@ const cn = {
     notInStock: "出库",
     principal: "负责人",
     tel: "电话",
-    featureTitle: "属性"
+    featureTitle: "属性",
+    endpointUpNum:'代表正常的数量',
+    endpointNum:'代表总的数量',
   },
   config: {
     config: "设置",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 5577a0702..a551e7835 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -437,6 +437,8 @@ const en = {
       ping:'Ping',
     },
     featureTitle:'Attribute',
+    endpointUpNum:'It\'s a normal number',
+    endpointNum:'Represents the total quantity',
     editAssetTab:{
       title:'New asset',//'新增资产'
       sn:'SN',//SN
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 1d5678ab7..9f808b8a6 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -90,7 +90,13 @@
             </el-popover>
           </div>
           <template v-if="item.prop=='Module'">
-            <span class="link" @click="showEndpoint(scope.row)">{{scope.row.endpointNum}}</span>
+            <el-tooltip placement="right" effect="light">
+              <div slot="content">
+                {{scope.row.endpointNum-scope.row.endpointDownNum}}&nbsp;{{$t('asset.endpointUpNum')}}<br/>
+                {{scope.row.endpointNum}}&nbsp;{{$t('asset.endpointNum')}}
+              </div>
+              <span class="link" @click="showEndpoint(scope.row)" style="padding: 2px 8px">{{scope.row.endpointNum-scope.row.endpointDownNum}}/{{scope.row.endpointNum}}</span>
+            </el-tooltip>
           </template>
           <template v-if="item.prop=='Alert'">
             <el-tooltip :content="scope.row.alertNum+' '+$t('overall.active')" placement="top" effect="light" :disabled=" scope.row.alertNum < 99">
@@ -474,6 +480,13 @@
             return 'success';
           }
         }
+        if(e.column.label == 'Module' || e.column.label == this.$t("asset.tableTitle.modules")){
+          if (e.row.endpointDownNum > 0) {
+            return 'danger';
+          } else {
+            return 'success';
+          }
+        }
         return '';
       },
       edit(asset) {