diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue index b17ec354..a50a6a20 100644 --- a/src/views/dashboard/overview/components/NeResources/index.vue +++ b/src/views/dashboard/overview/components/NeResources/index.vue @@ -251,36 +251,27 @@ function fnChangeData(data: any[], itemID: string) { let nfCpuUsage = 0; if (info.neState.cpu) { nfCpuUsage = info.neState.cpu.nfCpuUsage; + const nfCpu = +(info.neState.cpu.nfCpuUsage / 100); + nfCpuUsage = +nfCpu.toFixed(2); if (nfCpuUsage > 100) { - const nfCpu = +(info.neState.cpu.nfCpuUsage / 100); - if (nfCpu > 100) { - nfCpuUsage = 100; - } else { - nfCpuUsage = +nfCpu.toFixed(2); - } + nfCpuUsage = 100; } sysCpuUsage = info.neState.cpu.sysCpuUsage; + let sysCpu = +(info.neState.cpu.sysCpuUsage / 100); + sysCpuUsage = +sysCpu.toFixed(2); if (sysCpuUsage > 100) { - const sysCpu = +(info.neState.cpu.sysCpuUsage / 100); - if (sysCpu > 100) { - sysCpuUsage = 100; - } else { - sysCpuUsage = +sysCpu.toFixed(2); - } + sysCpuUsage = 100; } } let sysMemUsage = 0; if (info.neState.mem) { - let men = info.neState.mem.sysMemUsage; - if (men > 100) { - men = +(men / 100).toFixed(2); + const men = info.neState.mem.sysMemUsage; + sysMemUsage = +(men / 100).toFixed(2); + if (sysMemUsage > 100) { + sysMemUsage = 100; } - if (men > 100) { - men = 100; - } - sysMemUsage = men; } let sysDiskUsage = 0; diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index e1fb16d8..198ab8fb 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -390,33 +390,27 @@ function parseResouresUsage(neState: Record) { let nfCpuUsage = 0; if (neState.cpu) { nfCpuUsage = neState.cpu.nfCpuUsage; + const nfCpu = +(nfCpuUsage / 100); + nfCpuUsage = +nfCpu.toFixed(2); if (nfCpuUsage > 100) { - const nfCpu = +(neState.cpu.nfCpuUsage / 100); - if (nfCpu > 100) { - nfCpuUsage = 100; - } else { - nfCpuUsage = +nfCpu.toFixed(2); - } + nfCpuUsage = 100; } sysCpuUsage = neState.cpu.sysCpuUsage; + const sysCpu = +(sysCpuUsage / 100); + sysCpuUsage = +sysCpu.toFixed(2); if (sysCpuUsage > 100) { - const sysCpu = +(neState.cpu.sysCpuUsage / 100); - if (sysCpu > 100) { - sysCpuUsage = 100; - } else { - sysCpuUsage = +sysCpu.toFixed(2); - } + sysCpuUsage = 100; } } let sysMemUsage = 0; if (neState.mem) { - let men = neState.mem.sysMemUsage; - if (men > 100) { - men = +(men / 100).toFixed(2); + const men = neState.mem.sysMemUsage; + sysMemUsage = +(men / 100).toFixed(2); + if (sysMemUsage > 100) { + sysMemUsage = 100; } - sysMemUsage = men; } let sysDiskUsage = 0;