From 78cf428bd7663afa07a430204c76b158a66c3557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 28 Feb 2022 00:05:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/js/board/week.js    | 15 --------
 .../main/resources/templates/broad/week.html  | 34 +++++++++++++++----
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/board/week.js b/ruoyi-admin/src/main/resources/static/js/board/week.js
index bb1b9a3..5c82fb2 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/week.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/week.js
@@ -1,6 +1,5 @@
 $(() => {
     moduleTitle()
-    safe('#safe')
     // 公共请求地址
     let url = '/broad/zhou'
 
@@ -136,12 +135,6 @@ $(() => {
 
 
 })
-const today = () => {
-    const currentYear = new Date().getFullYear().toString();
-    const hasTimestamp = new Date() - new Date(currentYear);
-    const hasDays = Math.ceil(hasTimestamp / 86400000);
-    return hasDays
-}
 
 const curWeek = () => {
     let today = new Date();
@@ -169,14 +162,6 @@ const moduleTitle = () => {
     $('body').append(html)
 }
 
-const safe = (el) => {
-    const html = `
-    <span style="position: absolute;top: 66%;left: 84%;white-space:nowrap;color: #CBE6F7;font-size: 1.3vw;font-weight:600;transform: translateX(-50%);letter-spacing: 0.3vw">${new Date().getFullYear().toString()}年连续安全生产天数</span>
-    <span style="position: absolute;top: 74%;left: 84%;color: #08F580;font-size: 2.5vw;transform: translateX(-50%);letter-spacing: 0.3vw">${today()}<span style="font-size: 0.5vw">天</span> </span>
-    <span style="position: absolute;top: 89%;left: 84%;color: #CBE6F7;font-size: 1vw;transform: translateX(-50%);letter-spacing: 0.3vw">智能冷柜互联工厂</span>
-    `
-    $(el).html(html)
-}
 
 const Tips = (val1 = 0, val2 = 0, val3 = 0, el) => {
     const html = `
diff --git a/ruoyi-admin/src/main/resources/templates/broad/week.html b/ruoyi-admin/src/main/resources/templates/broad/week.html
index 435c405..8d51f2d 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/week.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/week.html
@@ -55,16 +55,38 @@
 
 <!--返回-->
 <div class="back" id="back">
-<div class="backLeft" id="backLeft"></div>
-<div class="backRight" id="backRight"></div>
+    <div class="backLeft" id="backLeft"></div>
+    <div class="backRight" id="backRight"></div>
 </div>
 </body>
 <script src="../../static/js/board/week.js" th:src="@{/js/board/week.js}"></script>
 <script>
+    $(() => {
+        const day = () => {
+            const today = () => {
+                const currentYear = new Date().getFullYear().toString();
+                console.log(currentYear)
+                const hasTimestamp = new Date() - new Date(currentYear);
+                const hasDays = Math.ceil(hasTimestamp / 86400000);
+                return hasDays
+            }
+            console.log(today())
+            const safe = (el) => {
+                const html = `
+    <span style="position: absolute;top: 66%;left: 84%;white-space:nowrap;color: #CBE6F7;font-size: 1.3vw;font-weight:600;transform: translateX(-50%);letter-spacing: 0.3vw">${new Date().getFullYear().toString()}年连续安全生产天数</span>
+    <span style="position: absolute;top: 74%;left: 84%;color: #08F580;font-size: 2.5vw;transform: translateX(-50%);letter-spacing: 0.3vw">${today()}<span style="font-size: 0.5vw">天</span> </span>
+    <span style="position: absolute;top: 89%;left: 84%;color: #CBE6F7;font-size: 1vw;transform: translateX(-50%);letter-spacing: 0.3vw">智能冷柜互联工厂</span>
+    `
+                $(el).html(html)
+            }
+            safe('#safe')
+        }
 
-    function flash() {
-        location.reload()
-    }
-    setCronTak(flash, "00 00 * * * * *");
+        function flash() {
+            location.reload()
+        }
+        day()
+        setCronTak(day, "0 * * * * * *");
+    })
 </script>
 </html>
\ No newline at end of file

From 5d6a630d0b5678c1a2090d81a0263c190d10ac60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 28 Feb 2022 00:05:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/broad/week.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/broad/week.html b/ruoyi-admin/src/main/resources/templates/broad/week.html
index 8d51f2d..00d42eb 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/week.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/week.html
@@ -65,12 +65,10 @@
         const day = () => {
             const today = () => {
                 const currentYear = new Date().getFullYear().toString();
-                console.log(currentYear)
                 const hasTimestamp = new Date() - new Date(currentYear);
                 const hasDays = Math.ceil(hasTimestamp / 86400000);
                 return hasDays
             }
-            console.log(today())
             const safe = (el) => {
                 const html = `
     <span style="position: absolute;top: 66%;left: 84%;white-space:nowrap;color: #CBE6F7;font-size: 1.3vw;font-weight:600;transform: translateX(-50%);letter-spacing: 0.3vw">${new Date().getFullYear().toString()}年连续安全生产天数</span>

From ade445078cce1702597de081d5dbd0a862380188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Sun, 7 Aug 2022 00:00:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/broad/week.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/broad/week.html b/ruoyi-admin/src/main/resources/templates/broad/week.html
index 00d42eb..d526441 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/week.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/week.html
@@ -65,10 +65,12 @@
         const day = () => {
             const today = () => {
                 const currentYear = new Date().getFullYear().toString();
-                const hasTimestamp = new Date() - new Date(currentYear);
+                const hasTimestamp = new Date() - new Date(currentYear) + (8*60*60*1000);
                 const hasDays = Math.ceil(hasTimestamp / 86400000);
                 return hasDays
             }
+            console.log(new Date())
+            console.log(today())
             const safe = (el) => {
                 const html = `
     <span style="position: absolute;top: 66%;left: 84%;white-space:nowrap;color: #CBE6F7;font-size: 1.3vw;font-weight:600;transform: translateX(-50%);letter-spacing: 0.3vw">${new Date().getFullYear().toString()}年连续安全生产天数</span>

From 97fde9ac88092e4054b06d1a5c446d661e313f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Sun, 7 Aug 2022 00:00:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/broad/week.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/broad/week.html b/ruoyi-admin/src/main/resources/templates/broad/week.html
index d526441..a4e7b96 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/week.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/week.html
@@ -69,8 +69,6 @@
                 const hasDays = Math.ceil(hasTimestamp / 86400000);
                 return hasDays
             }
-            console.log(new Date())
-            console.log(today())
             const safe = (el) => {
                 const html = `
     <span style="position: absolute;top: 66%;left: 84%;white-space:nowrap;color: #CBE6F7;font-size: 1.3vw;font-weight:600;transform: translateX(-50%);letter-spacing: 0.3vw">${new Date().getFullYear().toString()}年连续安全生产天数</span>