Merge remote-tracking branch 'gitee/master'

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

@@ -70,11 +70,11 @@ $(() => {
         $.post("/broad/zz/selectLossInfo", {}, data => {
             data = JSON.parse(data)
             let LOSSOne = data.find(val => val.name == '1').qty
-            let LOSSTwo = data.find(val => val.name == '4').qty
+            LOSSOne = LOSSOne > 0 ? LOSSOne : 0
             LOSS(LOSSOne)
             verticalBarChart({
                 xName: ["0-3分钟", "3-10分钟", ">10分钟"],
-                yData: [data.find(val => val.name == '2').qty, data.find(val => val.name == '3').qty, LOSSTwo],
+                yData: [data.find(val => val.name == '2').qty, data.find(val => val.name == '3').qty, data.find(val => val.name == '4').qty],
             }, document.getElementById("statisticOfAttribute"));
         })
         // 标准节拍

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

@@ -471,9 +471,8 @@
             // 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) {
-                console.log(i)
                 updateSplitBlocks(p[i], selectors[i])
             }
         })
@@ -538,7 +537,13 @@
             classes = data[`班组`]
         })
         // 生产统计数据
-        autoUpdate( classes == 0 ?'/broad/fp/selectOrderExecutionDay' : '/broad/fp/selectStationHourInfo', INTERVAL, data => {
+        const isDay = () => {
+            let nowTime = new Date()
+            let nowHour = parseFloat(`${parseInt(nowTime.toLocaleTimeString().split(':')[0])}.${parseInt(nowTime.toLocaleTimeString().split(':')[1])}`)
+            console.log(nowHour < 19.3 && nowHour > 7.3)
+            return nowHour < 19.3 && nowHour > 7.3
+        }
+        autoUpdate(isDay() ? '/broad/fp/selectStationHourInfoDay' : '/broad/fp/selectStationHourInfo', INTERVAL, data => {
             tableData = data
             let dataOne = []
             if (isFirst) {
@@ -550,6 +555,8 @@
                 times++
             }
             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])
             total(
                 Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(2) + '%',