From c3170c6e456e9c40f34fd663c8014181e4c910e8 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 2 Feb 2024 10:12:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BF=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=B0=E5=A2=9E=E7=A3=81=E7=9B=98=E7=99=BE?=
 =?UTF-8?q?=E5=88=86=E6=AF=94=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts                     |  5 ++--
 src/i18n/locales/zh-CN.ts                     |  1 +
 .../overview/components/NeResources/index.vue | 29 +++++++++++++++----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index d0eeb3c4..233c1580 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -515,8 +515,9 @@ export default {
         },
         resources: {
           title: "Resource Summary",
-          sysMem: "Memory",
-          sysCpu: "CPU",
+          sysMem: "SYS Mem",
+          sysCpu: "SYS CPU",
+          sysDisk: "SYS Disk",
           neCpu: "NE CPU",
         },
         topology: {
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 462d6cde..c70bce29 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -517,6 +517,7 @@ export default {
           title: "资源情况",
           sysMem: "系统内存",
           sysCpu: "系统CPU",
+          sysDisk: "系统磁盘",
           neCpu: "网元CPU",
         },
         topology: {
diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue
index 6d562412..ceaadcf3 100644
--- a/src/views/dashboard/overview/components/NeResources/index.vue
+++ b/src/views/dashboard/overview/components/NeResources/index.vue
@@ -29,7 +29,7 @@ const neResourcesChart = ref<any>(null);
 // 类别
 const category = ref<any>([
   {
-    name: t('views.dashboard.overview.resources.sysMem'),
+    name: t('views.dashboard.overview.resources.neCpu'),
     value: 1,
   },
   {
@@ -37,7 +37,11 @@ const category = ref<any>([
     value: 1,
   },
   {
-    name: t('views.dashboard.overview.resources.neCpu'),
+    name: t('views.dashboard.overview.resources.sysDisk'),
+    value: 1,
+  },
+  {
+    name: t('views.dashboard.overview.resources.sysMem'),
     value: 1,
   },
 ]);
@@ -242,6 +246,7 @@ function fnChangeData(data: any[], itemID: string) {
   // console.log(info.neState.cpu.nfCpuUsage);
   // console.log(info.neState.cpu.sysCpuUsage);
   // console.log(info.neState.mem.sysMemUsage);
+  console.log(info.neState.disk);
   let sysCpuUsage = 0;
   let nfCpuUsage = 0;
   if (info.neState.cpu) {
@@ -275,9 +280,20 @@ function fnChangeData(data: any[], itemID: string) {
     sysMemUsage = men;
   }
 
-  category.value[0].value = sysMemUsage;
+  let sysDiskUsage = 0;
+  if (info.neState.disk && Array.isArray(info.neState.disk.partitionInfo)) {
+    let disks: any[] = info.neState.disk.partitionInfo;
+    disks = disks.sort((a, b) => +b.used - +a.used);
+    if (disks.length > 0) {
+      const { total, used } = disks[0];
+      sysDiskUsage = +((used / total) * 100).toFixed(2);
+    }
+  }
+
+  category.value[0].value = nfCpuUsage;
   category.value[1].value = sysCpuUsage;
-  category.value[2].value = nfCpuUsage;
+  category.value[2].value = sysDiskUsage;
+  category.value[3].value = sysMemUsage;
   neResourcesChart.value.setOption({
     series: [
       {
@@ -289,6 +305,9 @@ function fnChangeData(data: any[], itemID: string) {
       {
         data: category.value,
       },
+      {
+        data: category.value,
+      },
     ],
   });
 }
@@ -341,8 +360,6 @@ onMounted(() => {
     handleRanderChart(neResourcesDom.value, optionData);
   });
 });
-
-onBeforeUnmount(() => {});
 </script>
 
 <template>