修改数据请求

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

@@ -44,14 +44,11 @@ $(() => {
             }
 
         }), document.getElementById("distributionOfBadTypesInProductionLineByDay"));
-        barChartAndLineChart(data.map(val => {
+        barChartAndLineChart({
-            return {
                 xName: data.map(val => val.name),
                 yDataTwo: data.map(val => val.qty),
-                yDataTwoName: "质量",
+                yDataTwoName: "质量"
-            }
+        }, document.getElementById("statisticOfAttribute"));
-
-        }), document.getElementById("statisticOfAttribute"));
     })
 
 })

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

@@ -387,11 +387,11 @@
 
     // 生产统计数据
     // const planInfo = new AutoScrollTable(document.getElementById("bottom-left"), ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:00','9:00','10:00','11:00','12:00','13:00','14:00','15:00','16:00','17:00','18:00','19:00'], {
-    //     width: ["5%", null, "7%", "5%", "5%", "5%", "8%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"],
+    //     width: ["5%", null, "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
     // })
 
     // const planInfo2 = new AutoScrollTable(document.getElementById("bottom-left-2"), [], {
-    //     width: ["5%", null, "7%", "5%", "5%", "5%", "8%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"],
+    //     width: ["5%", null, "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"],
     // })
 
     // 切换中心运行状态
@@ -463,7 +463,7 @@
                 headerBGC: 'rgba(8,36,75,0.2)',
                 oddRowBGC: 'rgba(8,36,75,0.2)',
                 evenRowBGC: 'rgba(6,25,57,0.2)',
-                colWidth: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"]
+                colWidth: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"]
             });
             // orderInf.loadData(data, Object.keys(orderInfColumns))
             // let consolidatedRow = ["", "合计", ""]
@@ -496,6 +496,7 @@
             // planInfo.loadData(data.map(value => [value.station_no, value.name, '正常', '0', value.plan_number,value.qty,`${value.rate}%`,value.h1,value.h2,value.h3,value.h4,value.h5,value.h6,value.h7,value.h8,value.h9,value.h10,value.h11,value.h12]), Object.keys( ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:00','9:00','10:00','11:00','12:00','13:00','14:00','15:00','16:00','17:00','18:00','19:00']))
             //data.map(value => [value.orderType, value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${(value.actualProduction / value.plannedProduction * 100).toFixed(2)}%`]
         })
+        tableAnimation('#bottom-left')
 
         // autoUpdate('/system/FoamerMes/getPlanHourInfo2', INTERVAL, data => {
         //     // orderInf.loadData(data, Object.keys(orderInfColumns))