修改单位字段名称,从symbol更改为unit,以提高代码一致性

This commit is contained in:
hi2hi 2024-12-04 02:04:39 +00:00
parent 747df55ba9
commit 1455ea838f
5 changed files with 31 additions and 31 deletions

View File

@ -63,7 +63,7 @@ export const duration2 = (startDate, endDate) => {
hours: Math.floor(diff / hour) % 24, hours: Math.floor(diff / hour) % 24,
minutes: Math.floor(diff / minute) % 60, minutes: Math.floor(diff / minute) % 60,
seconds: Math.floor(diff / second) % 60, seconds: Math.floor(diff / second) % 60,
$symbol: { $unit: {
day: '天', day: '天',
hour: '小时', hour: '小时',
minute: '分钟', minute: '分钟',

View File

@ -142,24 +142,24 @@ export function calcTransfer(bytes) {
const stats = calcBinary(bytes); const stats = calcBinary(bytes);
const result = { const result = {
value: '', value: '',
symbol: '', unit: '',
stats, stats,
}; };
if (stats.t > 1) { if (stats.t > 1) {
result.value = (stats.t).toFixed(2) * 1; result.value = (stats.t).toFixed(2) * 1;
result.symbol = 'T'; result.unit = 'T';
} else if (stats.g > 1) { } else if (stats.g > 1) {
result.value = (stats.g).toFixed(2) * 1; result.value = (stats.g).toFixed(2) * 1;
result.symbol = 'G'; result.unit = 'G';
} else if (stats.m > 1) { } else if (stats.m > 1) {
result.value = (stats.m).toFixed(1) * 1; result.value = (stats.m).toFixed(1) * 1;
result.symbol = 'M'; result.unit = 'M';
} else if (stats.p > 0) { } else if (stats.p > 0) {
result.value = (stats.p).toFixed(1) * 1; result.value = (stats.p).toFixed(1) * 1;
result.symbol = 'P'; result.unit = 'P';
} else { } else {
result.value = (stats.k).toFixed(1) * 1; result.value = (stats.k).toFixed(1) * 1;
result.symbol = 'K'; result.unit = 'K';
} }
return result; return result;
} }

View File

@ -72,11 +72,11 @@
<span class="server-info-item-group"> <span class="server-info-item-group">
<span class="server-info-item transfer--in"> <span class="server-info-item transfer--in">
<span class="server-info-item-label">入网</span> <span class="server-info-item-label">入网</span>
<span class="server-info-item-value">{{ transfer?.in?.value }}{{ transfer?.in?.symbol }}</span> <span class="server-info-item-value">{{ transfer?.in?.value }}{{ transfer?.in?.unit }}</span>
</span> </span>
<span class="server-info-item transfer--out"> <span class="server-info-item transfer--out">
<span class="server-info-item-label">出网</span> <span class="server-info-item-label">出网</span>
<span class="server-info-item-value">{{ transfer?.out?.value }}{{ transfer?.out?.symbol }}</span> <span class="server-info-item-value">{{ transfer?.out?.value }}{{ transfer?.out?.unit }}</span>
</span> </span>
</span> </span>
</div> </div>

View File

@ -8,7 +8,7 @@
> >
<div class="item-content"> <div class="item-content">
<span class="item-value">{{ item?.value || '-' }}</span> <span class="item-value">{{ item?.value || '-' }}</span>
<span class="item-symbol item-text">{{ item?.value ? item?.symbol : '' }}</span> <span class="item-unit item-text">{{ item?.value ? item?.unit : '' }}</span>
</div> </div>
<span class="item-label">{{ item.label }}</span> <span class="item-label">{{ item.label }}</span>
</div> </div>

View File

@ -25,24 +25,24 @@ export default (params) => {
if (data.days > 0) { if (data.days > 0) {
return { return {
value: data.days, value: data.days,
symbol: data.$symbol.day, unit: data.$unit.day,
}; };
} }
if (data.hours > 0) { if (data.hours > 0) {
return { return {
value: data.hours, value: data.hours,
symbol: data.$symbol.hour, unit: data.$unit.hour,
}; };
} }
if (data.minutes > 0) { if (data.minutes > 0) {
return { return {
value: data.minutes, value: data.minutes,
symbol: data.$symbol.minute, unit: data.$unit.minute,
}; };
} }
return { return {
value: data.seconds, value: data.seconds,
symbol: data.$symbol.second, unit: data.$unit.second,
}; };
} }
return null; return null;
@ -70,7 +70,7 @@ export default (params) => {
const result = { const result = {
value: 0, value: 0,
symbol: '', unit: '',
statType: '', statType: '',
statTypeLabel: '', statTypeLabel: '',
stats, stats,
@ -108,16 +108,16 @@ export default (params) => {
const ruleStats = hostUtils.calcBinary(ruleStat); const ruleStats = hostUtils.calcBinary(ruleStat);
if (ruleStats.t > 1) { if (ruleStats.t > 1) {
result.value = (ruleStats.t).toFixed(2) * 1; result.value = (ruleStats.t).toFixed(2) * 1;
result.symbol = 'T'; result.unit = 'T';
} else if (ruleStats.g > 1) { } else if (ruleStats.g > 1) {
result.value = (ruleStats.g).toFixed(2) * 1; result.value = (ruleStats.g).toFixed(2) * 1;
result.symbol = 'G'; result.unit = 'G';
} else if (ruleStats.m > 1) { } else if (ruleStats.m > 1) {
result.value = (ruleStats.m).toFixed(1) * 1; result.value = (ruleStats.m).toFixed(1) * 1;
result.symbol = 'M'; result.unit = 'M';
} else { } else {
result.value = (ruleStats.k).toFixed(1) * 1; result.value = (ruleStats.k).toFixed(1) * 1;
result.symbol = 'K'; result.unit = 'K';
} }
return result; return result;
}); });
@ -129,17 +129,17 @@ export default (params) => {
const inSpeed = hostUtils.calcBinary(props.info?.State?.NetInSpeed || 0); const inSpeed = hostUtils.calcBinary(props.info?.State?.NetInSpeed || 0);
const result = { const result = {
value: 0, value: 0,
symbol: '', unit: '',
}; };
if (inSpeed.g > 1) { if (inSpeed.g > 1) {
result.value = (inSpeed.g).toFixed(1) * 1; result.value = (inSpeed.g).toFixed(1) * 1;
result.symbol = 'G'; result.unit = 'G';
} else if (inSpeed.m > 1) { } else if (inSpeed.m > 1) {
result.value = (inSpeed.m).toFixed(1) * 1; result.value = (inSpeed.m).toFixed(1) * 1;
result.symbol = 'M'; result.unit = 'M';
} else { } else {
result.value = (inSpeed.k).toFixed(1) * 1; result.value = (inSpeed.k).toFixed(1) * 1;
result.symbol = 'K'; result.unit = 'K';
} }
return result; return result;
}); });
@ -151,17 +151,17 @@ export default (params) => {
const outSpeed = hostUtils.calcBinary(props.info?.State?.NetOutSpeed || 0); const outSpeed = hostUtils.calcBinary(props.info?.State?.NetOutSpeed || 0);
const result = { const result = {
value: 0, value: 0,
symbol: '', unit: '',
}; };
if (outSpeed.g > 1) { if (outSpeed.g > 1) {
result.value = (outSpeed.g).toFixed(1) * 1; result.value = (outSpeed.g).toFixed(1) * 1;
result.symbol = 'G'; result.unit = 'G';
} else if (outSpeed.m > 1) { } else if (outSpeed.m > 1) {
result.value = (outSpeed.m).toFixed(1) * 1; result.value = (outSpeed.m).toFixed(1) * 1;
result.symbol = 'M'; result.unit = 'M';
} else { } else {
result.value = (outSpeed.k).toFixed(1) * 1; result.value = (outSpeed.k).toFixed(1) * 1;
result.symbol = 'K'; result.unit = 'K';
} }
return result; return result;
}); });
@ -173,28 +173,28 @@ export default (params) => {
key, key,
label: '在线', label: '在线',
value: duration.value?.value, value: duration.value?.value,
symbol: duration.value?.symbol, unit: duration.value?.unit,
}; };
case 'transfer': case 'transfer':
return { return {
key, key,
label: `${transfer.value.statTypeLabel}流量`, label: `${transfer.value.statTypeLabel}流量`,
value: transfer.value?.value, value: transfer.value?.value,
symbol: transfer.value?.symbol, unit: transfer.value?.unit,
}; };
case 'inSpeed': case 'inSpeed':
return { return {
key, key,
label: '入网', label: '入网',
value: netInSpeed.value?.value, value: netInSpeed.value?.value,
symbol: netInSpeed.value?.symbol, unit: netInSpeed.value?.unit,
}; };
case 'outSpeed': case 'outSpeed':
return { return {
key, key,
label: '出网', label: '出网',
value: netOutSpeed.value?.value, value: netOutSpeed.value?.value,
symbol: netOutSpeed.value?.symbol, unit: netOutSpeed.value?.unit,
}; };
default: default:
} }