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 () => {