From 7057df592a45e651b80cd1d3a500ac6fd951b7b9 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Sun, 21 May 2023 14:11:44 +0800
Subject: [PATCH] 'install_moment'

---
 package-lock.json                    | 14 ++++++++++++++
 package.json                         |  1 +
 src/components/boxes/KilnRuntime.vue |  6 +++---
 src/components/layout/Header.vue     | 10 +++++++---
 yarn.lock                            |  5 +++++
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index df3e38f..a00998a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "core-js": "^3.8.3",
         "echarts": "^5.4.2",
+        "moment": "^2.29.4",
         "normalize.css": "^8.0.1",
         "vue": "^2.6.14",
         "vue-router": "^3.5.1",
@@ -7011,6 +7012,14 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
@@ -15415,6 +15424,11 @@
       "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==",
       "dev": true
     },
+    "moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+    },
     "mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
diff --git a/package.json b/package.json
index 57cf67d..0609330 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "core-js": "^3.8.3",
     "echarts": "^5.4.2",
+    "moment": "^2.29.4",
     "normalize.css": "^8.0.1",
     "vue": "^2.6.14",
     "vue-router": "^3.5.1",
diff --git a/src/components/boxes/KilnRuntime.vue b/src/components/boxes/KilnRuntime.vue
index 7fb9791..48ae70e 100644
--- a/src/components/boxes/KilnRuntime.vue
+++ b/src/components/boxes/KilnRuntime.vue
@@ -28,7 +28,7 @@ export default {
   props: {},
   data() {
     return {
-      time: "   天  时",
+      time: "   天",
     };
   },
   mounted() {
@@ -37,12 +37,12 @@ export default {
   },
   methods: {
     getRuntime() {
-      const diff = Date.now() - new Date("2023-5-13 10:00:00");
+      const diff = Date.now() - new Date("2023-5-7 8:00:00");
       const days = parseInt(diff / 1000 / 60 / 60 / 24);
       const hours = parseInt(
         (diff - days * 24 * 60 * 60 * 1000) / 1000 / 60 / 60
       );
-      this.time = `${days}天${hours}时`;
+      this.time = `${days}天`;
     },
   },
 };
diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index 241000a..4bc7292 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -8,18 +8,20 @@
     </div>
     <span class="header--wing absolute company"></span>
     <span class="header--wing absolute datetime">
-      {{ date }} {{ week }} {{ time }}
+      {{ moment(today).format('YYYY.M.D dddd HH:mm:ss') }}
     </span>
   </header>
 </template>
 
 <script>
+import moment from 'moment'
 export default {
   name: "Header",
   data() {
     return {
       today: new Date(),
       time: "00:00:00",
+      moment
     };
   },
   computed: {
@@ -39,9 +41,11 @@ export default {
     },
   },
   mounted() {
-    this.time = this.getTime().join(":");
+    moment.locale('zh-cn')
+    // this.time = this.getTime().join(":");
     setInterval(() => {
-      this.time = this.getTime().join(":");
+      this.today = new Date()
+      // this.time = this.getTime().join(":");
     }, 1000);
   },
   methods: {
diff --git a/yarn.lock b/yarn.lock
index a2bf485..03f5605 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3756,6 +3756,11 @@
   "resolved" "https://registry.npmmirror.com/module-alias/-/module-alias-2.2.2.tgz"
   "version" "2.2.2"
 
+"moment@^2.29.4":
+  "integrity" "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+  "resolved" "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz"
+  "version" "2.29.4"
+
 "mrmime@^1.0.0":
   "integrity" "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw=="
   "resolved" "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz"