From cc585221c1548b69fddd225522769f100983bccd Mon Sep 17 00:00:00 2001
From: hi2hi <code@hi2hi.cc>
Date: Thu, 5 Dec 2024 18:03:38 +0000
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E8=87=B3=200.3.8=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=E4=BB=A5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9B=B4=E9=AB=98=E7=9A=84=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                   |  2 +-
 src/data/code-maps.js                          |  1 +
 src/layout/components/header.vue               | 14 ++++++++++----
 .../components/server/server-status-donut.vue  |  6 +++++-
 src/views/composable/server-info.js            |  6 +++++-
 src/views/composable/server-status.js          | 18 +++++++++++++++---
 6 files changed, 37 insertions(+), 10 deletions(-)

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"
       >
         <template #default>
-          <div class="chart-donut-label">
+          <div
+            class="chart-donut-label"
+            :title="`${(used).toFixed(1) * 1}%`"
+          >
             <div class="server-status-val-text">
               <span>{{ valText }}</span>
             </div>
@@ -100,6 +103,7 @@ defineProps({
     flex-direction: column;
     align-items: center;
     justify-content: center;
+    cursor: pointer;
   }
 
   .server-status-val-text {
diff --git a/src/views/composable/server-info.js b/src/views/composable/server-info.js
index 165b412..831ae5a 100644
--- a/src/views/composable/server-info.js
+++ b/src/views/composable/server-info.js
@@ -32,7 +32,11 @@ export default (params) => {
       }
     }
     if (distInfo) {
-      text.push(`${Math.ceil(distInfo.g)}G`);
+      if (distInfo.g > 900) {
+        text.push(`${Math.round(distInfo.t)}T`);
+      } else {
+        text.push(`${Math.ceil(distInfo.g)}G`);
+      }
     }
     return text.join('');
   });
diff --git a/src/views/composable/server-status.js b/src/views/composable/server-status.js
index 34801c8..d6bd2b6 100644
--- a/src/views/composable/server-status.js
+++ b/src/views/composable/server-status.js
@@ -77,6 +77,12 @@ export default (params) => {
         };
       case 'mem':
       {
+        let usedVal;
+        if (useMemAndTotalMem.value.used.g >= 10 && useMemAndTotalMem.value.total.g >= 10) {
+          usedVal = `${(useMemAndTotalMem.value.used.g).toFixed(1) * 1}G`;
+        } else {
+          usedVal = `${Math.ceil(useMemAndTotalMem.value.used.m)}M`;
+        }
         let contentVal;
         if (useMemAndTotalMem.value.total.g > 4) {
           contentVal = `${(useMemAndTotalMem.value.total.g).toFixed(1) * 1}G`;
@@ -90,7 +96,7 @@ export default (params) => {
             used: '#0aa344',
             total: 'rgba(255, 255, 255, 0.2)',
           },
-          valText: `${Math.ceil(useMemAndTotalMem.value.used.m)}M`,
+          valText: usedVal,
           label: '内存',
           content: {
             default: `运行内存${contentVal}`,
@@ -103,6 +109,12 @@ export default (params) => {
         if (!useSwapAndTotalSwap.value) {
           return null;
         }
+        let usedVal;
+        if (useSwapAndTotalSwap.value.used.g >= 10 && useSwapAndTotalSwap.value.total.g >= 10) {
+          usedVal = `${(useSwapAndTotalSwap.value.used.g).toFixed(1) * 1}G`;
+        } else {
+          usedVal = `${Math.ceil(useSwapAndTotalSwap.value.used.m)}M`;
+        }
         let contentVal;
         if (useSwapAndTotalSwap.value.total.g > 4) {
           contentVal = `${(useSwapAndTotalSwap.value.total.g).toFixed(1) * 1}G`;
@@ -116,7 +128,7 @@ export default (params) => {
             used: '#ff8c00',
             total: 'rgba(255, 255, 255, 0.2)',
           },
-          valText: `${Math.ceil(useSwapAndTotalSwap.value.used.m)}M`,
+          valText: usedVal,
           label: '交换',
           content: {
             default: `交换内存${contentVal}`,
@@ -127,7 +139,7 @@ export default (params) => {
       case 'disk':
       {
         let contentValue;
-        if (useDiskAndTotalDisk.value.total.t >= 2) {
+        if (useDiskAndTotalDisk.value.total.t >= 1) {
           contentValue = `${(useDiskAndTotalDisk.value.total.t).toFixed(1) * 1}T`;
         } else {
           contentValue = `${Math.ceil(useDiskAndTotalDisk.value.total.g)}G`;