diff --git a/productionboard/src/main/resources/static/css/aluminumTank/style.css b/productionboard/src/main/resources/static/css/aluminumTank/style.css index ea5bd5f..3c4d776 100644 --- a/productionboard/src/main/resources/static/css/aluminumTank/style.css +++ b/productionboard/src/main/resources/static/css/aluminumTank/style.css @@ -8,7 +8,7 @@ body { } .statisticalOutputByModel{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 45.5%; height: 32%; @@ -17,7 +17,7 @@ body { } .inventoryStatistics{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 45.5%; height: 32%; @@ -26,7 +26,7 @@ body { } .hourlyOutputStatistics{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 93%; height: 32%; diff --git a/productionboard/src/main/resources/static/css/foamBox/style.css b/productionboard/src/main/resources/static/css/foamBox/style.css index 63b4cc1..d524091 100644 --- a/productionboard/src/main/resources/static/css/foamBox/style.css +++ b/productionboard/src/main/resources/static/css/foamBox/style.css @@ -8,7 +8,7 @@ body { background-size: 100% 100%; } -.theCurrentTeam{ +.theCurrentTeam { display: none; } @@ -32,8 +32,8 @@ body { left: 59%; } -.inventoryStatistics{ - border: 1px solid red; +.inventoryStatistics { + border: 0px solid red; position: absolute; width: 23.5%; height: 23.3%; @@ -41,8 +41,8 @@ body { left: 3.5%; } -.statisticalOutputByModel{ - border: 1px solid red; +.statisticalOutputByModel { + border: 0px solid red; position: absolute; width: 23.5%; height: 49%; @@ -50,8 +50,8 @@ body { left: 3.5%; } -.hourlyOutputStatistics{ - border: 1px solid red; +.hourlyOutputStatistics { + border: 0px solid red; position: absolute; width: 68%; height: 20%; @@ -59,11 +59,30 @@ body { right: 3.5%; } -.foamingParameters{ - border: 1px solid red; +.foamingParameters { + border: 0px solid red; position: absolute; width: 23.5%; height: 23.3%; top: 14.5%; right: 3.5%; +} + +.deviceRunStatus { + /*position: absolute; + width: 38%; + height: 10%; + top: 25.5%; + left: 33%; + border: 1px solid red; + color: white; + font-size: 12px;*/ + position: absolute; + width: 40%; + height: 10%; + top: 25.5%; + left: 30.2%; + border: 0px solid red; + color: white; + font-size: 12px; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/tankShell/style.css b/productionboard/src/main/resources/static/css/tankShell/style.css index d16202c..e84e37e 100644 --- a/productionboard/src/main/resources/static/css/tankShell/style.css +++ b/productionboard/src/main/resources/static/css/tankShell/style.css @@ -8,7 +8,7 @@ body { } .statisticalOutputByModel{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 45.5%; height: 32%; @@ -17,7 +17,7 @@ body { } .inventoryStatistics{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 45.5%; height: 32%; @@ -26,7 +26,7 @@ body { } .hourlyOutputStatistics{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 93%; height: 32%; diff --git a/productionboard/src/main/resources/static/img/foamBox/deviceclose.png b/productionboard/src/main/resources/static/img/foamBox/deviceclose.png new file mode 100644 index 0000000..b9b3347 Binary files /dev/null and b/productionboard/src/main/resources/static/img/foamBox/deviceclose.png differ diff --git a/productionboard/src/main/resources/static/img/foamBox/deviceopen.png b/productionboard/src/main/resources/static/img/foamBox/deviceopen.png new file mode 100644 index 0000000..be08fba Binary files /dev/null and b/productionboard/src/main/resources/static/img/foamBox/deviceopen.png differ diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index 6de5e61..af0acdb 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -2,6 +2,10 @@ $(()=>{ //班组计划统计 onDutyPlan(1234,1202,33); + //设备运行状态 + let statusArray = [0,0,0,0,1,0]; + deviceStatus(statusArray); + //库存统计 $.getJSON('/foamBox/getInventoryStatistics', function (result) { threeDimensionalCylindrical(result,document.getElementById("inventoryStatistics")); @@ -17,4 +21,19 @@ $(()=>{ //发泡参数 multipleBrokenLineAreaDiagram(null,document.getElementById("foamingParameters")); -}) \ No newline at end of file +}) + +const deviceStatus = (statusArray) => { + let info = ` + + + + + + + + +
`; + + $("#deviceRunStatus").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 3f84325..0ee7600 100644 --- a/productionboard/src/main/resources/templates/foamBox/index.html +++ b/productionboard/src/main/resources/templates/foamBox/index.html @@ -24,6 +24,21 @@
+ + + +
\ No newline at end of file diff --git a/productionboard/src/main/resources/templates/index.html b/productionboard/src/main/resources/templates/index.html index ab98c61..0939fbd 100644 --- a/productionboard/src/main/resources/templates/index.html +++ b/productionboard/src/main/resources/templates/index.html @@ -5,6 +5,15 @@ 澳柯玛可视化看板 - +

#吸附内胆

+

/adsorptionTank

+

#铝内胆

+

/aluminumTank

+

#吸附内胆预装

+

/preassemble

+

#箱壳

+

/tankShell

+

#发泡

+

/foamBox

\ No newline at end of file diff --git a/productionboard/target/classes/static/css/tankShell/style.css b/productionboard/target/classes/static/css/tankShell/style.css index d16202c..e84e37e 100644 --- a/productionboard/target/classes/static/css/tankShell/style.css +++ b/productionboard/target/classes/static/css/tankShell/style.css @@ -8,7 +8,7 @@ body { } .statisticalOutputByModel{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 45.5%; height: 32%; @@ -17,7 +17,7 @@ body { } .inventoryStatistics{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 45.5%; height: 32%; @@ -26,7 +26,7 @@ body { } .hourlyOutputStatistics{ - border: 1px solid red; + border: 0px solid red; position: absolute; width: 93%; height: 32%; diff --git a/productionboard/target/classes/templates/index.html b/productionboard/target/classes/templates/index.html index ab98c61..0939fbd 100644 --- a/productionboard/target/classes/templates/index.html +++ b/productionboard/target/classes/templates/index.html @@ -5,6 +5,15 @@ 澳柯玛可视化看板 - +

#吸附内胆

+

/adsorptionTank

+

#铝内胆

+

/aluminumTank

+

#吸附内胆预装

+

/preassemble

+

#箱壳

+

/tankShell

+

#发泡

+

/foamBox

\ No newline at end of file