From dcd973ef164a6a08a46f8fc97c9d2510ddd2ba60 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 27 Mar 2020 17:38:54 +0800
Subject: [PATCH] =?UTF-8?q?perf:=E4=BF=AE=E6=94=B9promserver=20=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=82=AC=E6=B5=AE=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/en.js      | 2 ++
 nezha-fronted/src/components/page/config/promServer.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 424c95826..9326db09b 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -263,6 +263,8 @@ const en = {
     asset: 'Assets',//'资产'
     EditAsset:'Edit asset',//'编辑资产'
     pingActive: 'active',//可ping通
+    assetStatPre:'Last reply:',
+    assetStatDown:'Never',
     pingInactive:'inactive',
     createAssetTab:{
       title:'New asset',//'新增资产'
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index 7d1924afa..86ab52f18 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -53,7 +53,7 @@
                 {{scope.row[item.prop] == '2' ? 'Per-Datacenter' : ''}}
             </span>
             <span v-else-if="item.prop == 'status'">
-              <el-popover placement="right" width="50" trigger="hover" :content="(scope.row[item.prop] == '1'?$t('overall.available'):$t('overall.unavailable'))+'['+(scope.row.checkTime&&scope.row.checkTime!=''?(new Date(scope.row.checkTime).getHours()+':'+new Date(scope.row.checkTime).getMinutes()):'--')+']'">
+              <el-popover placement="right" width="200" trigger="hover" :content="$t('asset.assetStatPre')+(scope.row.checkTime?scope.row.checkTime:$t('asset.assetStatDown'))">
                 <div slot="reference" style="width: 20px">
                   <div :class="{'active-icon green':scope.row[item.prop] == '1','active-icon red':scope.row[item.prop] == '0' || scope.row[item.prop] == '-1' || scope.row[item.prop] == '-2'}"></div>
                 </div>