From 1455ea838f73ead58f01e26dbd5ceef14fce1c23 Mon Sep 17 00:00:00 2001 From: hi2hi Date: Wed, 4 Dec 2024 02:04:39 +0000 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E4=BF=AE=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BB=8E?= =?UTF-8?q?symbol=E6=9B=B4=E6=94=B9=E4=B8=BAunit=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/date.js | 2 +- src/utils/host.js | 12 +++--- .../server-detail/server-info-box.vue | 4 +- .../components/server/server-real-time.vue | 2 +- src/views/composable/server-real-time.js | 42 +++++++++---------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/utils/date.js b/src/utils/date.js index 7b588be..b491edd 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -63,7 +63,7 @@ export const duration2 = (startDate, endDate) => { hours: Math.floor(diff / hour) % 24, minutes: Math.floor(diff / minute) % 60, seconds: Math.floor(diff / second) % 60, - $symbol: { + $unit: { day: '天', hour: '小时', minute: '分钟', diff --git a/src/utils/host.js b/src/utils/host.js index ec29027..cfb500b 100644 --- a/src/utils/host.js +++ b/src/utils/host.js @@ -142,24 +142,24 @@ export function calcTransfer(bytes) { const stats = calcBinary(bytes); const result = { value: '', - symbol: '', + unit: '', stats, }; if (stats.t > 1) { result.value = (stats.t).toFixed(2) * 1; - result.symbol = 'T'; + result.unit = 'T'; } else if (stats.g > 1) { result.value = (stats.g).toFixed(2) * 1; - result.symbol = 'G'; + result.unit = 'G'; } else if (stats.m > 1) { result.value = (stats.m).toFixed(1) * 1; - result.symbol = 'M'; + result.unit = 'M'; } else if (stats.p > 0) { result.value = (stats.p).toFixed(1) * 1; - result.symbol = 'P'; + result.unit = 'P'; } else { result.value = (stats.k).toFixed(1) * 1; - result.symbol = 'K'; + result.unit = 'K'; } return result; } diff --git a/src/views/components/server-detail/server-info-box.vue b/src/views/components/server-detail/server-info-box.vue index 878877d..205b3c6 100644 --- a/src/views/components/server-detail/server-info-box.vue +++ b/src/views/components/server-detail/server-info-box.vue @@ -72,11 +72,11 @@ 入网 - {{ transfer?.in?.value }}{{ transfer?.in?.symbol }} + {{ transfer?.in?.value }}{{ transfer?.in?.unit }} 出网 - {{ transfer?.out?.value }}{{ transfer?.out?.symbol }} + {{ transfer?.out?.value }}{{ transfer?.out?.unit }} diff --git a/src/views/components/server/server-real-time.vue b/src/views/components/server/server-real-time.vue index 6172273..3612d04 100644 --- a/src/views/components/server/server-real-time.vue +++ b/src/views/components/server/server-real-time.vue @@ -8,7 +8,7 @@ >
{{ item?.value || '-' }} - {{ item?.value ? item?.symbol : '' }} + {{ item?.value ? item?.unit : '' }}
{{ item.label }} diff --git a/src/views/composable/server-real-time.js b/src/views/composable/server-real-time.js index 57a79b0..e01cdbe 100644 --- a/src/views/composable/server-real-time.js +++ b/src/views/composable/server-real-time.js @@ -25,24 +25,24 @@ export default (params) => { if (data.days > 0) { return { value: data.days, - symbol: data.$symbol.day, + unit: data.$unit.day, }; } if (data.hours > 0) { return { value: data.hours, - symbol: data.$symbol.hour, + unit: data.$unit.hour, }; } if (data.minutes > 0) { return { value: data.minutes, - symbol: data.$symbol.minute, + unit: data.$unit.minute, }; } return { value: data.seconds, - symbol: data.$symbol.second, + unit: data.$unit.second, }; } return null; @@ -70,7 +70,7 @@ export default (params) => { const result = { value: 0, - symbol: '', + unit: '', statType: '', statTypeLabel: '', stats, @@ -108,16 +108,16 @@ export default (params) => { const ruleStats = hostUtils.calcBinary(ruleStat); if (ruleStats.t > 1) { result.value = (ruleStats.t).toFixed(2) * 1; - result.symbol = 'T'; + result.unit = 'T'; } else if (ruleStats.g > 1) { result.value = (ruleStats.g).toFixed(2) * 1; - result.symbol = 'G'; + result.unit = 'G'; } else if (ruleStats.m > 1) { result.value = (ruleStats.m).toFixed(1) * 1; - result.symbol = 'M'; + result.unit = 'M'; } else { result.value = (ruleStats.k).toFixed(1) * 1; - result.symbol = 'K'; + result.unit = 'K'; } return result; }); @@ -129,17 +129,17 @@ export default (params) => { const inSpeed = hostUtils.calcBinary(props.info?.State?.NetInSpeed || 0); const result = { value: 0, - symbol: '', + unit: '', }; if (inSpeed.g > 1) { result.value = (inSpeed.g).toFixed(1) * 1; - result.symbol = 'G'; + result.unit = 'G'; } else if (inSpeed.m > 1) { result.value = (inSpeed.m).toFixed(1) * 1; - result.symbol = 'M'; + result.unit = 'M'; } else { result.value = (inSpeed.k).toFixed(1) * 1; - result.symbol = 'K'; + result.unit = 'K'; } return result; }); @@ -151,17 +151,17 @@ export default (params) => { const outSpeed = hostUtils.calcBinary(props.info?.State?.NetOutSpeed || 0); const result = { value: 0, - symbol: '', + unit: '', }; if (outSpeed.g > 1) { result.value = (outSpeed.g).toFixed(1) * 1; - result.symbol = 'G'; + result.unit = 'G'; } else if (outSpeed.m > 1) { result.value = (outSpeed.m).toFixed(1) * 1; - result.symbol = 'M'; + result.unit = 'M'; } else { result.value = (outSpeed.k).toFixed(1) * 1; - result.symbol = 'K'; + result.unit = 'K'; } return result; }); @@ -173,28 +173,28 @@ export default (params) => { key, label: '在线', value: duration.value?.value, - symbol: duration.value?.symbol, + unit: duration.value?.unit, }; case 'transfer': return { key, label: `${transfer.value.statTypeLabel}流量`, value: transfer.value?.value, - symbol: transfer.value?.symbol, + unit: transfer.value?.unit, }; case 'inSpeed': return { key, label: '入网', value: netInSpeed.value?.value, - symbol: netInSpeed.value?.symbol, + unit: netInSpeed.value?.unit, }; case 'outSpeed': return { key, label: '出网', value: netOutSpeed.value?.value, - symbol: netOutSpeed.value?.symbol, + unit: netOutSpeed.value?.unit, }; default: }