修改数据请求

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

@@ -242,7 +242,7 @@
 
 
 <div class="my-transition">
-    <div id="bottom-left" ></div>
+    <div id="bottom-left"></div>
 </div>
 
 <!--<div class="my-transition2">-->
@@ -396,7 +396,7 @@
     }
 
     // 生产统计数据
-    const planInfo = new AutoScrollTable(document.getElementById("bottom-left"), ['1','2','3','4','5'], {
+    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%"],
     })
 
@@ -419,12 +419,12 @@
 
     $(() => {
         // 订单执行 + 生产统计
-        autoUpdate('/system/FoamerMes/getOrderInfo2', INTERVAL, data => {
-            orderInf.loadData(data.map(value => [value.plan_code, value.plan_number, value.actual_number, value.plan_number - value.actual_number, value.day]), Object.keys(orderInfColumns))
+        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]), Object.keys(orderInfColumns))
 
             modelChart.setOption({
                 xAxis: {
-                    data: data.map(value => value.plan_code),
+                    data: data.map(value => value.name),
                 },
                 series: [
                     {
@@ -447,7 +447,7 @@
         }
 
         // 当班计划/实际产量/当班差异
-        autoUpdate('/system/FoamerMes/getHeader', INTERVAL, data => {
+        autoUpdate('/broad/fp//getHeader', INTERVAL, data => {
             // let p = [data[1], data[0][2], data[0][3]]
             let p = [data.plannedProduction, data.actualProduction, data.plannedProduction - data.actualProduction]
 
@@ -456,8 +456,8 @@
             }
         })
 
-        // 生产统计数据
-        autoUpdate('/system/FoamerMes/getPlanHourInfo', INTERVAL, data => {
+        // selectStationHourInfo
+        autoUpdate('/broad/fp//getPlanHourInfo', INTERVAL, data => {
             // orderInf.loadData(data, Object.keys(orderInfColumns))
             // let consolidatedRow = ["", "合计", ""]
             //
@@ -486,7 +486,7 @@
 
             // data.push(consolidatedRow)
 
-            planInfo.loadData(data, 19, {
+            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]), 19, {
                 includeHead: true,
             })
             //data.map(value => [value.orderType, value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${(value.actualProduction / value.plannedProduction * 100).toFixed(2)}%`]
@@ -527,18 +527,31 @@
         })
 
 
-        // 右侧压力
-        autoUpdate('/system/FoamerMes/getHeader', INTERVAL, data => {
-            multipleVerticalBarChart(null,document.getElementById("top-right"))
+        // 右侧压力 + 右侧温度
+        autoUpdate('/broad/fp//selectDeviceStation', INTERVAL, data => {
+            // 右侧压力
+            multipleVerticalBarChart(
+                {
+                xName: data.map(value => value.station_no),
+                yDataOne: data.map(value => value.pol_yl),
+                yDataOneName: "pol压力",
+                yDataTwo:data.map(value => value.so_yl),
+                yDataTwoName: "so压力",
+            }, document.getElementById("top-right"))
+            // 右侧温度
+            multipleVerticalBarChart(
+                {
+                    xName: data.map(value => value.station_no),
+                    yDataOne: data.map(value => value.pol_wd),
+                    yDataOneName: "pol温度",
+                    yDataTwo:data.map(value => value.so_wd),
+                    yDataTwoName: "so温度",
+                }, document.getElementById("mid-right"))
         })
 
-        // 右侧温度
-        autoUpdate('/system/FoamerMes/getHeader', INTERVAL, data => {
-            multipleVerticalBarChart(null,document.getElementById("mid-right"))
-        })
 
         // 预装箱体库存
-        autoUpdate('/system/FoamerMes/getInventoryInfo', INTERVAL, data => {
+        autoUpdate('/broad/fp/getInventoryInfo', INTERVAL, data => {
             repertoryChart.setOption({
                 xAxis: {
                     data: data.map(value => value.plan_code),
@@ -556,7 +569,7 @@
         })
 
         // 发泡线 - 运行状态
-        autoUpdate('/system/FoamerMes/getDeviceInfo', INTERVAL, data => {
+        autoUpdate('/broad/fp/getDeviceInfo', INTERVAL, data => {
             console.log(data)
             updateStatus("status-a", data.status)
             updateStatus("status-b", data.status2)
@@ -565,7 +578,7 @@
         })
 
         // 发泡机 - 运行状态
-        autoUpdate('/system/FoamerMes/getFoamDeviceInfo?deviceId=' + "HF202009858", INTERVAL, data => {
+        autoUpdate('/broad/fp/getFoamDeviceInfo?deviceId=' + "HF202009858", INTERVAL, data => {
             updateStatus("status-sys1", data.status)
             updateStatus("status-sys2", data.status2)
         })
@@ -750,6 +763,7 @@
             },
         },
     })
+
     function resize() {
         orderInf.resize()
         planInfo.resize()