From 4bc57297719d185fafe77025b79d96be0079b6f7 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Sun, 21 Apr 2024 13:47:15 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3450=20fix:=20asset=20info=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E6=89=80=E6=9C=89=E5=86=85=E5=AE=B9=E9=83=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=20=E5=B1=95=E7=A4=BA=E5=8E=9F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartAssetInfo.vue  | 14 +++++++++++++-
 .../src/components/chart/chart/chartMap.vue        |  4 ++--
 .../common/table/settings/agentTable.vue           |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue b/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue
index da3e63b76..ef3b53e14 100644
--- a/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue
+++ b/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue
@@ -24,8 +24,20 @@ export default {
     }
   },
   methods: {
+    // 数据全为空 展示原组件
     isEmpty (obj) {
-      return lodash.isEmpty(obj)
+      let flag = true // 是否为空
+      for (const key in obj) {
+        if (obj[key] && (!lodash.isEmpty(obj[key]) || obj[key].length)) {
+          if (key === 'cpu' && !obj[key].name) {
+            flag = true
+          } else {
+            flag = false
+            return false
+          }
+        }
+      }
+      return flag
     }
   },
   watch: {
diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue
index 4a3079953..07819f082 100644
--- a/nezha-fronted/src/components/chart/chart/chartMap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartMap.vue
@@ -31,7 +31,7 @@
               <div class="partition"></div>
               <div class="legend-value legend-value-agent">
                 <div class="map-asset">
-                  <div class="progress-title">{{$t('overall.agent')}} {{$t('config.agent.up')}}</div>
+                  <div class="progress-title">{{$t('overall.agent')}} {{$t('dashboard.agentUp')}}</div>
                   <div class="success-progress progress-box">
                     <div class="top-progress" :style="{width: (dcStat.agent.up / (dcStat.agent.up + dcStat.agent.down)) * 100 + '%'}"></div>
                     <div style="width: 100%" class="bottom-progress"></div>
@@ -39,7 +39,7 @@
                   <div class="success-progress progress-content">{{dcStat.agent.up}}</div>
                 </div>
                 <div class="map-asset">
-                  <div class="progress-title">{{$t('overall.agent')}} {{$t('asset.down')}}</div>
+                  <div class="progress-title">{{$t('overall.agent')}} {{$t('dashboard.agentDown')}}</div>
                   <div class="error-progress progress-box">
                     <div class="top-progress" :style="{width: (dcStat.agent.down / (dcStat.agent.up + dcStat.agent.down)) * 100 + '%'}"></div>
                     <div style="width: 100%" class="bottom-progress"></div>
diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue
index 6f7718632..b5b150a9d 100644
--- a/nezha-fronted/src/components/common/table/settings/agentTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue
@@ -48,7 +48,7 @@
             <div slot="reference" style="width: 80px" @mouseenter="labelHover(JSON.parse(scope.row.statusInfo), 'agent', true, $event)"
              @mouseleave="labelHover(JSON.parse(scope.row.statusInfo), 'agent', false)">
               <span :class="{'active-icon green-bg':scope.row[item.prop] == '1','active-icon red-bg':scope.row[item.prop] == '0' || scope.row[item.prop] == '-1' || scope.row[item.prop] == '-2'}"></span>
-              <span>{{scope.row[item.prop] == '1' ? 'UP' : 'Down'}}</span>
+              <span>{{scope.row[item.prop] == '1' ? 'Up' : 'Down'}}</span>
             </div>
           <!-- </el-popover> -->
         </span>