From b27110075f38873695dee28fd67e4c1fe1e707a4 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Thu, 10 Mar 2022 17:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN/index.ts  |  1 +
 src/pages/TopToolBar.vue | 32 ++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index d0a7149..cd9c8b7 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -394,4 +394,5 @@ export default {
   "win lower": "置底",
   "clean screen": "清屏",
   "CN/EN switch": "中英文切换",
+  DD: "天",
 };
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 5df1792..647fc40 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -340,11 +340,30 @@ export default defineComponent({
       () => $store.state.current_running_plan.trim() != ""
     );
 
-    const get_time_text = (s: number) => {
-      const hh = (s / 3600).toFixed(0);
-      const mm = ((s % 3600) / 60).toFixed(0);
-      const ss = ((s % 3600) % 60).toFixed(0);
-      return hh + $t.t("HH") + mm + $t.t("MM") + ss + $t.t("SS");
+    const get_time_text = (s: number, show_ss: boolean = true) => {
+      console.log(s);
+      var time = "";
+      var second = s % 60;
+      var minute = parseInt((parseInt(s.toString()) / 60).toString()) % 60;
+      if (show_ss) {
+        time = second + $t.t("SS");
+      }
+      if (minute >= 1) {
+        time = minute + $t.t("MM") + time;
+      }
+      var hour = parseInt((parseInt((s / 60).toString()) / 60).toString()) % 24;
+      if (hour >= 1) {
+        time = hour + $t.t("HH") + time;
+      }
+      var day = parseInt(
+        (
+          parseInt((parseInt((s / 60).toString()) / 60).toString()) / 24
+        ).toString()
+      );
+      if (day >= 1) {
+        time = day + $t.t("DD") + time;
+      }
+      return time;
     };
 
     return {
@@ -469,7 +488,8 @@ export default defineComponent({
           ).toFixed(0)} % <br />
           ${$t.t("server run time")} :  ${get_time_text(server_run_time)} <br />
           ${$t.t("server all run time")} :  ${get_time_text(
-            server_all_run_time
+            server_all_run_time,
+            false
           )} <br />
           ${$t.t("current server system time")} : ${$date.formatDate(
             new Date(current_system_time),