From 7b6cb346432657cd5064cc57d189f5f6e258a868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 10 Jun 2022 11:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/js/foamBox/index.js | 27 +++++++++++--------
 .../resources/templates/foamBox/index.html    | 18 ++++++-------
 .../target/classes/static/js/foamBox/index.js | 27 +++++++++++--------
 .../classes/templates/foamBox/index.html      | 18 ++++++-------
 4 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js
index 3b14a3d..41ce396 100644
--- a/productionboard/src/main/resources/static/js/foamBox/index.js
+++ b/productionboard/src/main/resources/static/js/foamBox/index.js
@@ -1,23 +1,28 @@
 $(() => {
     //班组计划统计
-    onDutyPlan(1234, 1202, 33);
+    // onDutyPlan(1234, 1202, 33);
+    $.getJSON('/foamBox/getTeamStatisticsJson', function (result) {
+        onDutyPlan( result.planAmount, result.actualAmount, result.differenceAmount,)
+    });
 
     //设备运行状态
     let statusArray = [0, 0, 0, 0, 1, 0];
     deviceStatus(statusArray);
 
     //库存统计
-    $.getJSON('/foamBox/getInventoryStatistics', function (result) {
+    $.getJSON('/foamBox/getMaterialStoreJson', function (result) {
         threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics"));
     });
 
     //按型号统计产量
-    $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) {
+    $.getJSON('/foamBox/getMaterialProdutionJson', function (result) {
         horizontalBarChart(result, document.getElementById("statisticalOutputByModel"));
     });
 
     //小时产量
-    brokenLineAreaDiagram(null, document.getElementById("hourlyOutputStatistics"));
+    $.getJSON('/foamBox/getHourProdutionJson', function (result) {
+        brokenLineAreaDiagram(result, document.getElementById("hourlyOutputStatistics"));
+    });
 
     //发泡参数
     multipleBrokenLineAreaDiagram(null, document.getElementById("foamingParameters"));
@@ -125,15 +130,15 @@ $(() => {
 const deviceStatus = (statusArray) => {
     let info = `<table style="width: 100%;height:100%;">
             <tr style="width: 100%;">
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[1] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[2] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[3] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/${statusArray[4] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/${statusArray[5] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[1] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[2] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[3] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/${statusArray[4] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/${statusArray[5] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
             </tr>
         </table>`;
 
-    $("#deviceRunStatus").append(info);
+    $(".foamingLineRunStatus table tr").append(info);
 
 }
\ No newline at end of file
diff --git a/productionboard/src/main/resources/templates/foamBox/index.html b/productionboard/src/main/resources/templates/foamBox/index.html
index 402322e..fb2b052 100644
--- a/productionboard/src/main/resources/templates/foamBox/index.html
+++ b/productionboard/src/main/resources/templates/foamBox/index.html
@@ -68,15 +68,15 @@
         },
     });
 
-    let info = `
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:right;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                `;
-    $(".foamingLineRunStatus table tr").append(info);
+    // let info = `
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:right;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             `;
+    // $(".foamingLineRunStatus table tr").append(info);
 </script>
 
 </html>
\ No newline at end of file
diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js
index 3b14a3d..41ce396 100644
--- a/productionboard/target/classes/static/js/foamBox/index.js
+++ b/productionboard/target/classes/static/js/foamBox/index.js
@@ -1,23 +1,28 @@
 $(() => {
     //班组计划统计
-    onDutyPlan(1234, 1202, 33);
+    // onDutyPlan(1234, 1202, 33);
+    $.getJSON('/foamBox/getTeamStatisticsJson', function (result) {
+        onDutyPlan( result.planAmount, result.actualAmount, result.differenceAmount,)
+    });
 
     //设备运行状态
     let statusArray = [0, 0, 0, 0, 1, 0];
     deviceStatus(statusArray);
 
     //库存统计
-    $.getJSON('/foamBox/getInventoryStatistics', function (result) {
+    $.getJSON('/foamBox/getMaterialStoreJson', function (result) {
         threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics"));
     });
 
     //按型号统计产量
-    $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) {
+    $.getJSON('/foamBox/getMaterialProdutionJson', function (result) {
         horizontalBarChart(result, document.getElementById("statisticalOutputByModel"));
     });
 
     //小时产量
-    brokenLineAreaDiagram(null, document.getElementById("hourlyOutputStatistics"));
+    $.getJSON('/foamBox/getHourProdutionJson', function (result) {
+        brokenLineAreaDiagram(result, document.getElementById("hourlyOutputStatistics"));
+    });
 
     //发泡参数
     multipleBrokenLineAreaDiagram(null, document.getElementById("foamingParameters"));
@@ -125,15 +130,15 @@ $(() => {
 const deviceStatus = (statusArray) => {
     let info = `<table style="width: 100%;height:100%;">
             <tr style="width: 100%;">
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[1] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[2] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[3] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/${statusArray[4] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/${statusArray[5] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="40%" height="50%"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[1] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[2] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/${statusArray[3] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/${statusArray[4] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/${statusArray[5] == 0 ? "deviceopen.png" : "deviceclose.png"}" style="width: 30px;height: 30px;"/></td>
             </tr>
         </table>`;
 
-    $("#deviceRunStatus").append(info);
+    $(".foamingLineRunStatus table tr").append(info);
 
 }
\ No newline at end of file
diff --git a/productionboard/target/classes/templates/foamBox/index.html b/productionboard/target/classes/templates/foamBox/index.html
index 402322e..fb2b052 100644
--- a/productionboard/target/classes/templates/foamBox/index.html
+++ b/productionboard/target/classes/templates/foamBox/index.html
@@ -68,15 +68,15 @@
         },
     });
 
-    let info = `
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                <td style="border:0px solid red;text-align:right;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
-                `;
-    $(".foamingLineRunStatus table tr").append(info);
+    // let info = `
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             <td style="border:0px solid red;text-align:right;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
+    //             `;
+    // $(".foamingLineRunStatus table tr").append(info);
 </script>
 
 </html>
\ No newline at end of file