From 883302872614a2d862149f713018ae9c27c9c81b 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, 3 Apr 2023 09:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E9=99=85=E4=BA=A7?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/broad/fp.html       | 12 +++++++-----
 .../src/main/resources/templates/broad/month.html    |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index 217fc63..087f17b 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -361,6 +361,7 @@
     //夹具生产计划切换
     let tableData = []
     let classes = 0
+    let totalNum = 0
     let dayClass = ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '7:30', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30']
     let nightClass = ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '19:30', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30']
     let tableWidth = ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"]
@@ -462,14 +463,13 @@
     }
 
     $(async () => {
-        let totalNum = 0
         area()
         // 当班计划/实际产量/当班差异
         await autoUpdate('/broad/fp/selectFpOrderInfo', INTERVAL, data => {
             // let p = [data[1], data[0][2], data[0][3]]
             totalNum = data.find(val => val.name == '当班计划').qty
-            // let now = data.find(val => val.name == '实际产量').qty
-            let now = practical
+            let now = data.find(val => val.name == '实际产量').qty
+            // let now = practical
             let p = [totalNum, now, totalNum - now]
             console.log(p)
             for (let i in p) {
@@ -556,8 +556,10 @@
             }
             getTable(classes, dataOne)
             practical = eval(data.map(val => val.qty).join('+'))
-            updateSplitBlocks(1600 - practical, selectors[2])
-            updateSplitBlocks(eval(data.map(val => val.qty).join('+')), selectors[1])
+          console.log(selectors)
+          console.log(practical)
+            // updateSplitBlocks(1600 - practical, selectors[2])
+            // updateSplitBlocks(eval(data.map(val => val.qty).join('+')), selectors[1])
             total(
                 Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(2) + '%',
                 totalNum,
diff --git a/ruoyi-admin/src/main/resources/templates/broad/month.html b/ruoyi-admin/src/main/resources/templates/broad/month.html
index 7153f42..bebf270 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/month.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/month.html
@@ -92,7 +92,7 @@ $(() => {
         safeTitle('#safeTitle')
     }
     day()
-    setCronTak(day, "0 * * * * * *");
+    setCronTak(day, "0 0/30 * * * * *");
 })
 </script>
 </html>
\ No newline at end of file