Merge remote-tracking branch 'origin/master'

productionboard/src/main/resources/static/css/foamBox/style.css

@@ -33,11 +33,6 @@ body {
 }
 
 .foamingLineRunStatus {
-    position: absolute;
-    width: 40%;
-    height: 27%;
-    top: 12%;
-    left: 30%;
 }
 
 .inventoryStatistics {

productionboard/src/main/resources/static/js/aluminumLiner/index.js

@@ -41,7 +41,7 @@ $(() => {
             let Res = {}
 
             Res.data=res.map(val => {
-                return [val.spe,val.oq,val.aq,val.cha,val.round,]
+                return [val["spe"],val["oq"],val["aq"],val["cha"],val.round,]
             })
             Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度']
             dynamicTable({
@@ -51,7 +51,7 @@ $(() => {
                 header: Res.header,
                 data: Res.data,
                 index: false,
-                fontColor: '#B4B7BF ',
+                fontColor: '#B4B7BF',
                 indexBGC: '#86F3FF',
                 headerBGC: 'rgba(8,36,75,0.2)',
                 oddRowBGC: 'rgba(8,36,75,0.2)',

productionboard/src/main/resources/static/js/common/echarts.common.js

@@ -1226,7 +1226,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {
                 color: "#fff",
                 fontSize: fontSize,
             },
-            data: ["内胆库", "箱壳库"],
+            data: ["箱壳库", "内胆库"],
         },
         xAxis: [
             {

productionboard/src/main/resources/static/js/foamBox/index.js

@@ -119,16 +119,14 @@ $(() => {
 })
 
 const deviceStatus = (statusArray) => {
-    let info = `<table style="width: 100%;height:100%;">
+    let info = `
-            <tr style="width: 100%;">
+               <img src="../../img/foamBox/${statusArray[0] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="position: absolute;transform: translate(-50%,-50%);top:30%;left:34%;width: 2vw;"/>
-                <td style="position:absolute;top:-7%;left:8%;height:50%;width:10%;border:0px solid red;text-align:left;"><img src="../../img/foamBox/${statusArray[0] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="width: 2vw;"/></td>
+               <img src="../../img/foamBox/${statusArray[1] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="position: absolute;transform: translate(-50%,-50%);top:30%;left:40%;width: 2vw;"/>
-                <td style="position:absolute;top:-7%;left:23%;height:50%;width:10%;border:0px solid red;text-align:left;"><img src="../../img/foamBox/${statusArray[1] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="width: 2vw;"/></td>
+               <img src="../../img/foamBox/${statusArray[2] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="position: absolute;transform: translate(-50%,-50%);top:30%;left:45%;width: 2vw;"/>
-                <td style="position:absolute;top:-7%;left:38%;height:50%;width:10%;border:0px solid red;text-align:left;"><img src="../../img/foamBox/${statusArray[2] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="width: 2vw;"/></td>
+               <img src="../../img/foamBox/${statusArray[3] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="position: absolute;transform: translate(-50%,-50%);top:30%;left:51%;width: 2vw;"/>
-                <td style="position:absolute;top:-7%;left:52%;height:50%;width:10%;border:0px solid red;text-align:left;"><img src="../../img/foamBox/${statusArray[3] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="width: 2vw;"/></td>
+               <img src="../../img/foamBox/${statusArray[4] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="position: absolute;transform: translate(-50%,-50%);top:30%;left:60%;width: 2vw;"/>
-                <td style="position:absolute;top:-7%;left:75%;height:50%;width:10%;border:0px solid red;text-align:left;"><img src="../../img/foamBox/${statusArray[4] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="width: 2vw;"/></td>
+               <img src="../../img/foamBox/${statusArray[5] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="position: absolute;transform: translate(-50%,-50%);top:30%;left:68%;width: 2vw;"/>
-                <td style="position:absolute;top:-7%;left:93%;height:50%;width:10%;border:0px solid red;text-align:left;"><img src="../../img/foamBox/${statusArray[5] == 1 ? "deviceopen.png" : "deviceclose.png"}" style="width: 2vw;"/></td>
+`;
-            </tr>
-        </table>`;
 
     $(".foamingLineRunStatus table tr").append(info);