From e18da8390d0d4e579d78042afb00db629ef303f1 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 30 Nov 2020 15:28:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:endpoint=E4=BA=8C=E7=BA=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0Project=E3=80=81module=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4&asset=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0endpoint?=
 =?UTF-8?q?=E5=81=9C=E7=94=A8=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/endpointTab.vue          | 14 ++++++++++++++
 nezha-fronted/src/components/common/language/en.js |  2 +-
 nezha-fronted/src/components/page/asset/asset.vue  |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
index d0b35d8bc..bddc1d43f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
@@ -277,6 +277,20 @@
             label:'endpointState',
             disabled:false,
             readonly:true,
+          },{
+            id:34,
+            name:this.$t('project.project.project'),
+            // name: this.$t('asset.asset'),
+            type:'input',
+            label:'projectName',
+            disabled:false,
+          },{
+            id:35,
+            name:this.$t('project.module.module'),
+            // name: this.$t('asset.asset'),
+            type:'input',
+            label:'moduleName',
+            disabled:false,
           }],
         },
         endpointSearchLabel: { //搜索参数
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 6c489295b..4b685d9ee 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -548,7 +548,7 @@ const en = {
     },
     active:"Alive",// "存活",
     total:"Total",// "总数",
-    down: "Down"
+    down: "Down",
   },
   config: {
     config: 'Settings',//"设置"
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 81fc9ad46..a98efcd20 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -102,9 +102,9 @@
           <template v-if="item.prop=='Module'">
             <el-tooltip placement="right" effect="light">
               <div slot="content">
-                {{$t('asset.down')}} / {{$t('asset.total')}}
+                {{$t('asset.down')}} / {{$t('asset.suspended')}} / {{$t('asset.total')}}
               </div>
-              <span class="link" @click="showEndpoint(scope.row)" style="padding: 2px 8px">{{scope.row.endpointDownNum}}/{{scope.row.endpointNum}}</span>
+              <span class="link" @click="showEndpoint(scope.row)" style="padding: 2px 8px">{{scope.row.endpointDownNum}}/{{scope.row.endpointSuspendedNum}}/{{scope.row.endpointNum}}</span>
             </el-tooltip>
           </template>
           <template v-if="item.prop=='Alert'">