From 55ddecce484426cf0f37404052d962a96fac72bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Wed, 3 Aug 2022 14:28:40 +0800
Subject: [PATCH] =?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/month.js   |  7 ------
 .../static/js/board/orderVisualization.js     | 15 -----------
 .../main/resources/templates/broad/month.html | 21 ++++++++++++++++
 .../templates/broad/orderVisualization.html   | 25 ++++++++++++++++++-
 4 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/board/month.js b/ruoyi-admin/src/main/resources/static/js/board/month.js
index d703e7a..c13483b 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/month.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/month.js
@@ -133,12 +133,6 @@ const curWeek = () => {
     let d = Math.ceil((today.valueOf() - firstDayOfYear.valueOf()) / 86400000);
     return Math.ceil((d / 7) + 1);
 }
-const today = () => {
-    const currentYear = new Date().getFullYear().toString();
-    const hasTimestamp = new Date() - new Date(currentYear);
-    const hasDays = Math.ceil(hasTimestamp / 86400000);
-    return hasDays
-}
 
 const moduleTitle = () => {
     // <span style="position: absolute;top: 2.9%;left: 50%;color: #fff;font-size: 1.1vw;transform: translateX(-50%);letter-spacing: 0.3vw">智能冷柜中央管控平台</span>
@@ -151,7 +145,6 @@ const moduleTitle = () => {
     <span style="position: absolute;top: 57.8%;left: 27.6%;color: #CFD2D0;font-size: 1.0vw">单台能耗</span>
     <span style="position: absolute;top: 57.8%;left: 68%;color: #CFD2D0;font-size: 1.0vw">质量分析</span>
     <span style="position: absolute;top: 57.8%;left: 92%;color: #CFD2D0;font-size: 1.0vw">数字化安全</span>
-    <span style="position: absolute;top: 63%;left: 87%;color: #CFD2D0;transform:translateX(-50%);font-size: 1.4vw;white-space:nowrap;">${new Date().getFullYear()} 年连续安全生产 <span style="color: #26af26">${today()} </span>天</span>
     <span style="position: absolute;top: 72.5%;left: 87%;color: #CFD2D0;transform:translateX(-50%);font-size: 1vw;white-space:nowrap;">隐患排查治理体系</span>
     `
     $('body').append(html)
diff --git a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
index 13b3e72..e8c4829 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
@@ -1,6 +1,5 @@
 $(() => {
     moduleTitle()
-    safe('#safe')
     importData('#importData')
     top3Data('#top3Data')
     // 公共请求地址
@@ -288,12 +287,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();
@@ -321,14 +314,6 @@ const moduleTitle = () => {
     $('body').append(html)
 }
 
-const safe = (el) => {
-    const html = `
-    <span style="position: absolute;top: 66%;left: 16%;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: 16%;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: 16%;color: #CBE6F7;font-size: 1vw;transform: translateX(-50%);letter-spacing: 0.3vw">智能冷柜互联工厂</span>
-    `
-    $(el).html(html)
-}
 
 const card = (val = {
     top: 1,
diff --git a/ruoyi-admin/src/main/resources/templates/broad/month.html b/ruoyi-admin/src/main/resources/templates/broad/month.html
index a4f0c74..7153f42 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/month.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/month.html
@@ -26,6 +26,7 @@
     <script src="../../static/js/data-merger.js" th:src="@{/js/data-merger.js}"></script>
     <script src="../../static/js/vmc.slide.js" th:src="@{/js/vmc.slide.js}"></script>
     <script src="../../static/js/vmc.slide.effects.js" th:src="@{/js/vmc.slide.effects.js}"></script>
+    <script src="../../static/js/cron.min.js" th:src="@{/js/cron.min.js}"></script>
 
 </head>
 <body style="display:flex;">
@@ -70,8 +71,28 @@
 <!--<span style="position: absolute;transform: translateX(-50%);top: 7.9%;left: 71.1%;font-size: 0.8vw;font-weight: 800;color: red;">感动用户</span>-->
 <!--亮点产品-->
 <div id="slide" class="slide"></div>
+<div class="safeTitle" id="safeTitle"></div>
 </body>
 <script src="../../static/js/board/month.js" th:src="@{/js/board/month.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 safeTitle = (el) => {
+            const html = `
+    <span style="position: absolute;top: 63%;left: 87%;color: #CFD2D0;transform:translateX(-50%);font-size: 1.4vw;white-space:nowrap;">${new Date().getFullYear()} 年连续安全生产 <span style="color: #26af26">${today()} </span>天</span>
+    `
+            $(el).html(html)
+        }
+        safeTitle('#safeTitle')
+    }
+    day()
+    setCronTak(day, "0 * * * * * *");
+})
 </script>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html b/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html
index 12cfe8f..d23b0f0 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html
@@ -6,7 +6,8 @@
           name="viewport">
     <title> 清单/6S/安全看板</title>
     <meta content="箱壳成型数据监控平台" name="description">
-    <link href="../../static/css/board/orderVisualization.css" rel="stylesheet" th:href="@{/css/board/orderVisualization.css}"/>
+    <link href="../../static/css/board/orderVisualization.css" rel="stylesheet"
+          th:href="@{/css/board/orderVisualization.css}"/>
     <link href="../../static/css/materialdesignicons.min.css" rel="stylesheet"
           th:href="@{/css/materialdesignicons.min.css}"/>
     <link href="../../static/css/autoscroll-table.css" rel="stylesheet" th:href="@{/css/autoscroll-table.css}">
@@ -23,6 +24,7 @@
     <script src="../../static/js/update-split-blocks.js" th:src="@{/js/update-split-blocks.js}"></script>
     <script src="../../static/js/auto-update.js" th:src="@{/js/auto-update.js}"></script>
     <script src="../../static/js/data-merger.js" th:src="@{/js/data-merger.js}"></script>
+    <script src="../../static/js/cron.min.js" th:src="@{/js/cron.min.js}"></script>
 
 </head>
 <body style="display:flex;">
@@ -54,5 +56,26 @@
 </body>
 <script src="../../static/js/board/orderVisualization.js" th:src="@{/js/board/orderVisualization.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: 16%;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: 16%;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: 16%;color: #CBE6F7;font-size: 1vw;transform: translateX(-50%);letter-spacing: 0.3vw">智能冷柜互联工厂</span>
+    `
+                $(el).html(html)
+            }
+            safe('#safe')
+        }
+        day()
+        setCronTak(day, "0 * * * * * *");
+    })
 </script>
 </html>
\ No newline at end of file