diff --git a/src/utils/parse-utils.ts b/src/utils/parse-utils.ts index 49a89ddd..8e13fd43 100644 --- a/src/utils/parse-utils.ts +++ b/src/utils/parse-utils.ts @@ -192,17 +192,31 @@ export function parseSizeFromBits(bits: number | string): string { /** * 字节数转换单位 * @param byte 字节Byte大小 64009540 = 512.08 MB + * @param unit 指定单位 B / KB / MB / GB / TB / PB / EB / ZB / YB * @returns xx B / KB / MB / GB / TB / PB / EB / ZB / YB */ -export function parseSizeFromByte(byte: number | string): string { +export function parseSizeFromByte( + byte: number | string, + unit?: string +): string { byte = Number(byte) || 0; if (byte <= 0) return '0 B'; const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; - const unitIndex = Math.floor(Math.log2(byte) / 10); - const unti = units[unitIndex]; + let unitIndex = 0; + let unitStr = 'B'; + if (unit) { + const index = units.indexOf(unit); + if (index > -1) { + unitIndex = index; + unitStr = unit; + } + } else { + unitIndex = Math.floor(Math.log2(byte) / 10); + unitStr = units[unitIndex]; + } const value = byte / Math.pow(1000, unitIndex); if (unitIndex > 0) { - return `${value.toFixed(2)} ${unti}`; + return `${value.toFixed(2)} ${unitStr}`; } - return `${value} ${unti}`; + return `${value} ${unitStr}`; } diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue index 2bed47e6..ebd40147 100644 --- a/src/views/dashboard/smfCDR/index.vue +++ b/src/views/dashboard/smfCDR/index.vue @@ -22,6 +22,7 @@ import saveAs from 'file-saver'; import { listTenant } from '@/api/system/tenant'; import dayjs, { Dayjs } from 'dayjs'; import { useClipboard } from '@vueuse/core'; +import { parseSizeFromByte } from '@/utils/parse-utils'; const { copy } = useClipboard({ legacy: true }); const { t } = useI18n(); const ws = new WS(); @@ -172,7 +173,7 @@ let tableColumns = ref([ } } } - return dataVolumeUplink; + return parseSizeFromByte(dataVolumeUplink, 'MB'); }, }, { @@ -197,7 +198,7 @@ let tableColumns = ref([ } } } - return dataVolumeDownlink; + return parseSizeFromByte(dataVolumeDownlink, 'MB'); }, }, { @@ -222,7 +223,7 @@ let tableColumns = ref([ } } } - return dataTotalVolume; + return parseSizeFromByte(dataTotalVolume, 'MB'); }, }, { @@ -855,16 +856,16 @@ onBeforeUnmount(() => { -->
- Data Total Volume: - {{ udata.dataTotalVolume }} + Data Volume Uplink: + {{ parseSizeFromByte(udata.dataVolumeUplink, 'MB') }}
Data Volume Downlink: - {{ udata.dataVolumeDownlink }} + {{ parseSizeFromByte(udata.dataVolumeDownlink, 'MB') }}
- Data Volume Uplink: - {{ udata.dataVolumeUplink }} + Data Total Volume: + {{ parseSizeFromByte(udata.dataTotalVolume, 'MB') }}
- + {{ state.dataUsage[0] }}