diff --git a/app/wails/frontend/src/components/system/network/NetworkSumRateChart.vue b/app/wails/frontend/src/components/system/network/NetworkSumRateChart.vue index 13578ee..582138e 100644 --- a/app/wails/frontend/src/components/system/network/NetworkSumRateChart.vue +++ b/app/wails/frontend/src/components/system/network/NetworkSumRateChart.vue @@ -72,7 +72,7 @@ const chart = reactive({ overflow: 'truncate', ellipsis: '...', width: 85, - formatter(value,index){ + formatter(value){ return `${bytesToSizeWithUnit(value)}/s` } }, diff --git a/app/wails/frontend/src/utils/file/file.ts b/app/wails/frontend/src/utils/file/file.ts index 98db650..4a8d86d 100644 --- a/app/wails/frontend/src/utils/file/file.ts +++ b/app/wails/frontend/src/utils/file/file.ts @@ -69,7 +69,7 @@ export function convertToFileSizeWithUnit(anySize:string, defaultUnit:FileUnitTy } export function bytesToSizeWithUnit(byteSize?:number){ - if(byteSize == null){ + if(byteSize == null || byteSize < 0){ return `0${FileUnit.B.unit}` } @@ -78,7 +78,7 @@ export function bytesToSizeWithUnit(byteSize?:number){ if(targetUnitIndex > 0){ targetUnit = Object.values(FileUnit)[targetUnitIndex - 1] } else { - targetUnit = Object.values(FileUnit)[targetUnitIndex] + targetUnit = Object.values(FileUnit)[0] } return `${calcSize(byteSize,targetUnit)} ${targetUnit.unit}` } diff --git a/app/wails/frontend/src/utils/system/network.ts b/app/wails/frontend/src/utils/system/network.ts index 7330aad..7756d04 100644 --- a/app/wails/frontend/src/utils/system/network.ts +++ b/app/wails/frontend/src/utils/system/network.ts @@ -10,10 +10,13 @@ let network = reactive({ }, sumCounter: { rate: { - recv: 0, - sent: 0, + recv: -1, + sent: -1, + }, + data: { + bytesRecv: -1, + bytesSent: -1 }, - data: {}, interval: undefined } }) @@ -23,8 +26,14 @@ function loopNetworkSumCounter(){ clearInterval(network.sumCounter.interval) function loop(){ GetNetworkCounter(true).then(result=> { - network.sumCounter.rate.recv = result[0].bytesRecv - (network.sumCounter.data.bytesRecv || 0) - network.sumCounter.rate.sent = result[0].bytesSent - (network.sumCounter.data.bytesSent || 0) + let recv = result[0].bytesRecv || 0 + let sent = result[0].bytesSent || 0 + + network.sumCounter.data.bytesRecv = network.sumCounter.data.bytesRecv == -1?recv:network.sumCounter.data.bytesRecv + network.sumCounter.data.bytesSent = network.sumCounter.data.bytesSent == -1?sent:network.sumCounter.data.bytesSent + + network.sumCounter.rate.recv = recv - network.sumCounter.data.bytesRecv + network.sumCounter.rate.sent = sent - network.sumCounter.data.bytesSent network.sumCounter.data = result[0] })