Merge remote-tracking branch 'gitee/master'

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 = `

ruoyi-admin/src/main/resources/templates/broad/week.html

@@ -55,16 +55,36 @@
 
 <!--返回-->
 <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();
+                const hasTimestamp = new Date() - new Date(currentYear) + (8*60*60*1000);
+                const hasDays = Math.ceil(hasTimestamp / 86400000);
+                return hasDays
+            }
+            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 * * * * *");
+        day()
+        setCronTak(day, "0 * * * * * *");
+    })
 </script>
 </html>