diff --git a/package.json b/package.json index 4b39013..d11ae86 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nazhua", - "version": "0.3.7", + "version": "0.3.8", "type": "module", "scripts": { "dev": "vite", diff --git a/src/data/code-maps.js b/src/data/code-maps.js index 415a729..2fb7839 100644 --- a/src/data/code-maps.js +++ b/src/data/code-maps.js @@ -231,6 +231,7 @@ export const countryCodeMapping = { DE: 'FRA', NL: 'AMS', UK: 'LON', + GB: 'LON', AU: 'SYD', US: 'LAX', }; diff --git a/src/layout/components/header.vue b/src/layout/components/header.vue index 5280029..4ac4e9a 100644 --- a/src/layout/components/header.vue +++ b/src/layout/components/header.vue @@ -177,7 +177,7 @@ const serverStat = computed(() => { } const calcInTransfer = hostUtils.calcBinary(transfer.in); if (calcInTransfer.t > 1) { - transfer.inData.value = (calcInTransfer.g).toFixed(1) * 1; + transfer.inData.value = (calcInTransfer.t).toFixed(1) * 1; transfer.inData.unit = 'T'; } else if (calcInTransfer.g > 1) { transfer.inData.value = (calcInTransfer.g).toFixed(1) * 1; @@ -191,7 +191,7 @@ const serverStat = computed(() => { } const calcOutTransfer = hostUtils.calcBinary(transfer.out); if (calcOutTransfer.t > 1) { - transfer.outData.value = (calcOutTransfer.g).toFixed(1) * 1; + transfer.outData.value = (calcOutTransfer.t).toFixed(1) * 1; transfer.outData.unit = 'T'; } else if (calcOutTransfer.g > 1) { transfer.outData.value = (calcOutTransfer.g).toFixed(1) * 1; @@ -204,7 +204,10 @@ const serverStat = computed(() => { transfer.outData.unit = 'K'; } const calcNetInSpeed = hostUtils.calcBinary(netSpeed.in); - if (calcNetInSpeed.g > 1) { + if (calcNetInSpeed.t > 1) { + netSpeed.inData.value = (calcNetInSpeed.t).toFixed(1) * 1; + netSpeed.inData.unit = 'T'; + } else if (calcNetInSpeed.g > 1) { netSpeed.inData.value = (calcNetInSpeed.g).toFixed(1) * 1; netSpeed.inData.unit = 'G'; } else if (calcNetInSpeed.m > 1) { @@ -215,7 +218,10 @@ const serverStat = computed(() => { netSpeed.inData.unit = 'K'; } const calcNetOutSpeed = hostUtils.calcBinary(netSpeed.out); - if (calcNetOutSpeed.g > 1) { + if (calcNetOutSpeed.t > 1) { + netSpeed.outData.value = (calcNetOutSpeed.t).toFixed(1) * 1; + netSpeed.outData.unit = 'T'; + } else if (calcNetOutSpeed.g > 1) { netSpeed.outData.value = (calcNetOutSpeed.g).toFixed(1) * 1; netSpeed.outData.unit = 'G'; } else if (calcNetOutSpeed.m > 1) { diff --git a/src/views/components/server/server-status-donut.vue b/src/views/components/server/server-status-donut.vue index d7a9d3e..16f111b 100644 --- a/src/views/components/server/server-status-donut.vue +++ b/src/views/components/server/server-status-donut.vue @@ -10,7 +10,10 @@ :item-colors="colors" >