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(null); // 类别 const category = ref([ { - name: t('views.dashboard.overview.resources.sysMem'), + name: t('views.dashboard.overview.resources.neCpu'), value: 1, }, { @@ -37,7 +37,11 @@ const category = ref([ 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(() => {});