From 6a903b7fdf42b0bb128fb9b9a1553aa19d5af770 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 7 Feb 2024 22:30:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AE=B9=E5=99=A8?=
=?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=8D=95=E4=BD=8D=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#3857)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Refs #3853
---
frontend/src/components/v-charts/components/Line.vue | 7 ++++++-
frontend/src/utils/util.ts | 8 ++++++++
frontend/src/views/container/container/monitor/index.vue | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/frontend/src/components/v-charts/components/Line.vue b/frontend/src/components/v-charts/components/Line.vue
index 628cb28b7..d8c90d22a 100644
--- a/frontend/src/components/v-charts/components/Line.vue
+++ b/frontend/src/components/v-charts/components/Line.vue
@@ -5,7 +5,7 @@
import { onMounted, nextTick, watch, onBeforeUnmount } from 'vue';
import * as echarts from 'echarts';
import { GlobalStore } from '@/store';
-import { computeSizeFromKBs, computeSizeFromMB } from '@/utils/util';
+import { computeSizeFromKBs, computeSizeFromKB, computeSizeFromMB } from '@/utils/util';
const globalStore = GlobalStore();
const props = defineProps({
id: {
@@ -141,6 +141,11 @@ function initChart() {
res += item.marker + ' ' + item.seriesName + ':' + computeSizeFromKBs(item.data) + '
';
}
break;
+ case 'KB':
+ for (const item of datas) {
+ res += item.marker + ' ' + item.seriesName + ':' + computeSizeFromKB(item.data) + '
';
+ }
+ break;
case 'MB':
for (const item of datas) {
res += item.marker + ' ' + item.seriesName + ':' + computeSizeFromMB(item.data) + '
';
diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.ts
index 7752694bb..0e39ff048 100644
--- a/frontend/src/utils/util.ts
+++ b/frontend/src/utils/util.ts
@@ -166,6 +166,14 @@ export function computeSizeFromMB(size: number): string {
return (size / Math.pow(num, 3)).toFixed(2) + ' TB';
}
+export function computeSizeFromKB(size: number): string {
+ const num = 1024.0;
+ if (size < num) return size + ' KB';
+ if (size < Math.pow(num, 2)) return (size / num).toFixed(2) + ' MB';
+ if (size < Math.pow(num, 3)) return (size / Math.pow(num, 2)).toFixed(2) + ' GB';
+ return (size / Math.pow(num, 3)).toFixed(2) + ' TB';
+}
+
export function computeSizeFromKBs(size: number): string {
const num = 1024.0;
if (size < num) return size + ' KB/s';
diff --git a/frontend/src/views/container/container/monitor/index.vue b/frontend/src/views/container/container/monitor/index.vue
index 875ab550f..70f56df22 100644
--- a/frontend/src/views/container/container/monitor/index.vue
+++ b/frontend/src/views/container/container/monitor/index.vue
@@ -215,7 +215,7 @@ const loadData = async () => {
data: netRxDatas.value,
},
],
- formatStr: 'KB/s',
+ formatStr: 'KB',
};
};
const handleClose = async () => {