fix: 看板系统资源新增磁盘百分比显示

This commit is contained in:
TsMask
2024-02-02 10:12:18 +08:00
parent 1f7bca33f2
commit c3170c6e45
3 changed files with 27 additions and 8 deletions

View File

@@ -515,8 +515,9 @@ export default {
}, },
resources: { resources: {
title: "Resource Summary", title: "Resource Summary",
sysMem: "Memory", sysMem: "SYS Mem",
sysCpu: "CPU", sysCpu: "SYS CPU",
sysDisk: "SYS Disk",
neCpu: "NE CPU", neCpu: "NE CPU",
}, },
topology: { topology: {

View File

@@ -517,6 +517,7 @@ export default {
title: "资源情况", title: "资源情况",
sysMem: "系统内存", sysMem: "系统内存",
sysCpu: "系统CPU", sysCpu: "系统CPU",
sysDisk: "系统磁盘",
neCpu: "网元CPU", neCpu: "网元CPU",
}, },
topology: { topology: {

View File

@@ -29,7 +29,7 @@ const neResourcesChart = ref<any>(null);
// 类别 // 类别
const category = ref<any>([ const category = ref<any>([
{ {
name: t('views.dashboard.overview.resources.sysMem'), name: t('views.dashboard.overview.resources.neCpu'),
value: 1, value: 1,
}, },
{ {
@@ -37,7 +37,11 @@ const category = ref<any>([
value: 1, 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, value: 1,
}, },
]); ]);
@@ -242,6 +246,7 @@ function fnChangeData(data: any[], itemID: string) {
// console.log(info.neState.cpu.nfCpuUsage); // console.log(info.neState.cpu.nfCpuUsage);
// console.log(info.neState.cpu.sysCpuUsage); // console.log(info.neState.cpu.sysCpuUsage);
// console.log(info.neState.mem.sysMemUsage); // console.log(info.neState.mem.sysMemUsage);
console.log(info.neState.disk);
let sysCpuUsage = 0; let sysCpuUsage = 0;
let nfCpuUsage = 0; let nfCpuUsage = 0;
if (info.neState.cpu) { if (info.neState.cpu) {
@@ -275,9 +280,20 @@ function fnChangeData(data: any[], itemID: string) {
sysMemUsage = men; 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[1].value = sysCpuUsage;
category.value[2].value = nfCpuUsage; category.value[2].value = sysDiskUsage;
category.value[3].value = sysMemUsage;
neResourcesChart.value.setOption({ neResourcesChart.value.setOption({
series: [ series: [
{ {
@@ -289,6 +305,9 @@ function fnChangeData(data: any[], itemID: string) {
{ {
data: category.value, data: category.value,
}, },
{
data: category.value,
},
], ],
}); });
} }
@@ -341,8 +360,6 @@ onMounted(() => {
handleRanderChart(neResourcesDom.value, optionData); handleRanderChart(neResourcesDom.value, optionData);
}); });
}); });
onBeforeUnmount(() => {});
</script> </script>
<template> <template>