From 4e3ee989bbc93bae98c4e6081df241a5e2d22156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Sat, 23 Jul 2022 15:06:18 +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

---
 .../static/js/board/orderVisualization.js     | 16 +++++------
 .../main/resources/templates/broad/fp.html    | 27 ++++++++++---------
 2 files changed, 22 insertions(+), 21 deletions(-)

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 545abf6..2bea224 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js
@@ -133,7 +133,7 @@ $(() => {
 
     // 三日订单执行情况
     autoUpdate(url + "/selectOrderInfoBy3d", INTERVAL, data => {
-        console.log(data)
+        // console.log(data)
         horizontalRoundedBarChartWithBackgroundTwo({
             yNameOne: data.map(val => val.name),
             yData: data.map(val => val.rate),
@@ -142,7 +142,6 @@ $(() => {
     })
 
     autoUpdate(url + "/mtk_selectOrderInfoBy3dTatle", INTERVAL, data => {
-        console.log(data)
         total(data.find(val => val.name === '入库订单统计').qty, '#total')
         Tips(data.find(val => val.name === '订单数量').qty, data.find(val => val.name === '完成数量').qty, data.find(val => val.name === '清单率').qty, '#Tips')
     })
@@ -155,12 +154,13 @@ $(() => {
     // })
 
     // 生产效率
-    // autoUpdate(url + "/ ", INTERVAL, data => {
-    singleVerticalBarChart({
-        xName: ["1月", "2月", "3月", "4月", "5月", "6月", "7月"],
-        yData: [12, 20, 11, 30, 14, 80, 50],
-    }, document.getElementById("productionEfficiency"))
-    // })
+    autoUpdate(url + "/selectInstoreNumByday", INTERVAL, data => {
+        console.log(data)
+        singleVerticalBarChart({
+            xName: data.map(val => val.name),
+            yData: [12, 20, 11, 30, 14, 80, 50],
+        }, document.getElementById("productionEfficiency"))
+    })
     // 成品入库统计
     // autoUpdate(url + "/inStore3d", INTERVAL, data => {
     percentageRingDiagram([
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index 7701c99..20bb1f7 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -458,8 +458,20 @@
         }
     }
 
-    $(() => {
+    $(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 p = [totalNum, now, totalNum - now]
+
+            for (let i in p) {
+                updateSplitBlocks(p[i], selectors[i])
+            }
+        })
         // 订单执行 + 生产统计
         autoUpdate('/broad/fp/selectOrderExecution', INTERVAL, data => {
             orderInf.loadData(data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate == 0 ? value.rate : value.rate + '%'}`]), Object.keys(orderInfColumns))
@@ -477,17 +489,6 @@
             })
         })
 
-        // 当班计划/实际产量/当班差异
-        autoUpdate('/broad/fp/selectFpOrderInfo', INTERVAL, data => {
-            // let p = [data[1], data[0][2], data[0][3]]
-            let plan = data.find(val => val.name == '当班计划').qty
-            let now = data.find(val => val.name == '实际产量').qty
-            let p = [plan, now, plan - now]
-
-            for (let i in p) {
-                updateSplitBlocks(p[i], selectors[i])
-            }
-        })
         // 获取班次
         autoUpdate('/broad/fp/selectTeamGroups', INTERVAL, data => {
             classes = data[`班组`]
@@ -506,7 +507,7 @@
             }
             getTable(classes,dataOne)
             total(Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(4) + '%',
-                eval(data.map(val => val.plan_number).join('+')),
+                totalNum,
                 eval(data.map(val => val.qty).join('+')),
                 (Number(eval(data.map(val => val.qty).join('+')) / eval(data.map(val => val.plan_number).join('+'))) * 100).toFixed(2)+ '%',
                 eval(data.map(val => val.h1).join('+')),