diff --git a/src/utils/parse-utils.ts b/src/utils/parse-utils.ts index ada8afec..3df76e1e 100644 --- a/src/utils/parse-utils.ts +++ b/src/utils/parse-utils.ts @@ -177,25 +177,6 @@ export function parseSizeFromKbs(sizeByte: number, timeInterval: number): any { return [(realBit / 1000 / 1000).toFixed(2), ' Mbits/sec']; } -/** - * 位数据转换单位 - * @param bits 位Bit大小 64009540 = 512.08 MB - * @returns xx B / KB / MB / GB / TB / PB / EB / ZB / YB - */ -export function parseSizeFromBits(bits: number | string): string { - bits = Number(bits) || 0; - if (bits <= 0) return '0 B'; - bits = bits * 8; - const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; - const unitIndex = Math.floor(Math.log2(bits) / 10); - const value = bits / Math.pow(1000, unitIndex); - const unti = units[unitIndex]; - if (unitIndex > 0) { - return `${value.toFixed(2)} ${unti}`; - } - return `${value} ${unti}`; -} - /** * 字节数转换单位 * @param byte 字节Byte大小 64009540 = 512.08 MB diff --git a/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts b/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts index edc1335b..16c3f6d2 100644 --- a/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts +++ b/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts @@ -1,5 +1,5 @@ import { parseDateToStr } from '@/utils/date-utils'; -import { parseSizeFromBits, parseSizeFromKbs } from '@/utils/parse-utils'; +import { parseSizeFromByte, parseSizeFromKbs } from '@/utils/parse-utils'; import { ref } from 'vue'; type FDType = { @@ -81,9 +81,9 @@ export function upfTFParse(day: string, data: Record) { let { up, down } = data; upfTotalFlow.value[day] = { up: up, - upFrom: parseSizeFromBits(up), + upFrom: parseSizeFromByte(up), down: down, - downFrom: parseSizeFromBits(down), + downFrom: parseSizeFromByte(down), requestFlag: false, }; } diff --git a/src/views/dashboard/overview2/hooks/useUPFTotalFlow.ts b/src/views/dashboard/overview2/hooks/useUPFTotalFlow.ts index 4366405d..c90af755 100644 --- a/src/views/dashboard/overview2/hooks/useUPFTotalFlow.ts +++ b/src/views/dashboard/overview2/hooks/useUPFTotalFlow.ts @@ -1,5 +1,5 @@ import { parseDateToStr } from '@/utils/date-utils'; -import { parseSizeFromBits, parseSizeFromKbs } from '@/utils/parse-utils'; +import { parseSizeFromByte, parseSizeFromKbs } from '@/utils/parse-utils'; import { ref } from 'vue'; type FDType = { @@ -79,9 +79,9 @@ export function upfTFParse(day: string, data: Record) { let { up, down } = data; upfTotalFlow.value[day] = { up: up, - upFrom: parseSizeFromBits(up), + upFrom: parseSizeFromByte(up), down: down, - downFrom: parseSizeFromBits(down), + downFrom: parseSizeFromByte(down), requestFlag: false, }; }