修改界面

ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js

@@ -21,10 +21,24 @@ $(() => {
         // LOSS(分类)
         $.post(url + "/selectLossInfo", {}, data => {
             data = JSON.parse(data)
-            LOSS(data.find(val => val.name == '1').qty)
+            let date = new Date()
+            let hour = date.getHours()
+            let minutes = date.getMinutes()
+            let LOSSOne = data.find(val => val.name == '1').qty
+            let LOSSTwo = data.find(val => val.name == '4').qty
+            // if (Number(`${hour}.${minutes}`)>15.3) {
+            //     console.log(1)
+            //     LOSSOne -= 60
+            //     LOSSTwo -= 2
+            // } else if (Number(`${hour}.${minutes}`)>9.3) {
+            //     console.log(2)
+            //     LOSSOne -= 30
+            //     LOSSTwo -= 1
+            // }
+            LOSS(LOSSOne)
             verticalBarChart({
                 xName: ["0-3分钟", "3-10分钟", ">10分钟"],
-                yData: [data.find(val => val.name == '2').qty, data.find(val => val.name == '3').qty, data.find(val => val.name == '4').qty],
+                yData: [data.find(val => val.name == '2').qty, data.find(val => val.name == '3').qty, LOSSTwo],
             }, document.getElementById("LOSSClassify"));
         })
         // 标准节拍

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

@@ -473,9 +473,11 @@
             }
         })
         // 订单执行 + 生产统计
-        autoUpdate('/broad/fp/selectOrderExecution', INTERVAL, data => {
+        autoUpdate('/broad/fp/selectOrderExecutionPlan', 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))
 
+        })
+        autoUpdate('/broad/fp/selectOrderExecution', INTERVAL, data => {
             modelChart.setOption({
                 xAxis: {
                     data: data.map(value => value.name),