diff --git a/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class b/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class index 04fc076..96d2a47 100644 Binary files a/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class and b/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class differ diff --git a/deviceboard/target/classes/com/deviceboard/controller/TestController.class b/deviceboard/target/classes/com/deviceboard/controller/TestController.class index c23c3fa..899066d 100644 Binary files a/deviceboard/target/classes/com/deviceboard/controller/TestController.class and b/deviceboard/target/classes/com/deviceboard/controller/TestController.class differ diff --git a/productionboard/src/main/resources/application.yml b/productionboard/src/main/resources/application.yml index ecbea09..6f73b0b 100644 --- a/productionboard/src/main/resources/application.yml +++ b/productionboard/src/main/resources/application.yml @@ -12,4 +12,4 @@ mybatis-plus: mapper-locations: classpath*:/mapper/**Mapper.xml server: - port: 6066 + port: 6069 diff --git a/productionboard/src/main/resources/static/css/aluminumLiner/style.css b/productionboard/src/main/resources/static/css/aluminumLiner/style.css index 7b4dfa4..b7637dc 100644 --- a/productionboard/src/main/resources/static/css/aluminumLiner/style.css +++ b/productionboard/src/main/resources/static/css/aluminumLiner/style.css @@ -7,6 +7,16 @@ body { background-size: 100% 100%; } + +.dataInformation{ + border: 1px solid red; + position: absolute; + width: 24%; + height: 22%; + top: 14%; + left: 3.3%; +} + .OEEStatistics { border: 0px solid red; position: absolute; diff --git a/productionboard/src/main/resources/static/js/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js index 05f62e8..75e11eb 100644 --- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js +++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js @@ -1,5 +1,10 @@ $(() => { - // onDutyPlan(1234, 1202, 33); + + const statusArray = [0, 0, 0, 0, 0]; + const syntheticDate = [0, 0, 0, 0, 0]; + dataInformationFunction(statusArray); + synthetic(syntheticDate) + //设备OEE统计 OEEStatistics(null, document.getElementById("OEEStatistics")); diff --git a/productionboard/src/main/resources/static/js/common/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js new file mode 100644 index 0000000..89cc680 --- /dev/null +++ b/productionboard/src/main/resources/static/js/common/synthetic.js @@ -0,0 +1,45 @@ + +const dataInformationFunction = (statusArray) => { + let info = ` + + + + + + + + + +
${statusArray[0] == 0 ? `运行正常` : `运行异常`}389kW
4563kW·h2
`; + + $("#dataInformation").append(info); +} +const synthetic = (statusArray) => { + let info = ` + + + + + + + +
123123123123
+ + + + + + + + + + + + +
123123123123
+ 123213 + 123213 + `; + + $("#synthetic").append(info); +} diff --git a/productionboard/src/main/resources/templates/aluminumLiner/index.html b/productionboard/src/main/resources/templates/aluminumLiner/index.html index 11a49ae..01cbd92 100644 --- a/productionboard/src/main/resources/templates/aluminumLiner/index.html +++ b/productionboard/src/main/resources/templates/aluminumLiner/index.html @@ -5,17 +5,18 @@ 铝内胆数据监控平台 - - - + +
+
+
@@ -34,6 +35,7 @@
+ \ No newline at end of file diff --git a/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class b/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class index 55869ba..1628716 100644 Binary files a/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class and b/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class differ diff --git a/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class b/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class index 9be2d0f..1a06db5 100644 Binary files a/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class and b/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class differ diff --git a/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class b/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class index 46506c5..81fe0ea 100644 Binary files a/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class and b/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class differ diff --git a/productionboard/target/classes/com/productionboard/common/CodeGenerator.class b/productionboard/target/classes/com/productionboard/common/CodeGenerator.class index e01b95e..0c7b6b1 100644 Binary files a/productionboard/target/classes/com/productionboard/common/CodeGenerator.class and b/productionboard/target/classes/com/productionboard/common/CodeGenerator.class differ diff --git a/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class b/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class index 1bed637..09ad92a 100644 Binary files a/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class and b/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class index ed2c5a8..1cd24e5 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class and b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class index 9c0bc1e..ea5463e 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class and b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class index dcb2778..2bdbd27 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class and b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class index 02d576c..7d1850e 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class and b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index 2b4b644..9583ddf 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class and b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/StorageController.class b/productionboard/target/classes/com/productionboard/controller/StorageController.class index 6e63d3b..19b5249 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/StorageController.class and b/productionboard/target/classes/com/productionboard/controller/StorageController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellController.class b/productionboard/target/classes/com/productionboard/controller/TankShellController.class index 7829198..b4ac589 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/TankShellController.class and b/productionboard/target/classes/com/productionboard/controller/TankShellController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class new file mode 100644 index 0000000..60b92d4 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class b/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class index 5c0ff56..6b151b5 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class and b/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class b/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class index 416ca7e..fec48c6 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class and b/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class b/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class index 27cb1e5..f5c014b 100644 Binary files a/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class and b/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class index da7596f..2ec7207 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/css/aluminumLiner/style.css b/productionboard/target/classes/static/css/aluminumLiner/style.css index 7b4dfa4..b7637dc 100644 --- a/productionboard/target/classes/static/css/aluminumLiner/style.css +++ b/productionboard/target/classes/static/css/aluminumLiner/style.css @@ -7,6 +7,16 @@ body { background-size: 100% 100%; } + +.dataInformation{ + border: 1px solid red; + position: absolute; + width: 24%; + height: 22%; + top: 14%; + left: 3.3%; +} + .OEEStatistics { border: 0px solid red; position: absolute; diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css new file mode 100644 index 0000000..0c17a6e --- /dev/null +++ b/productionboard/target/classes/static/css/tankShell/device.css @@ -0,0 +1,118 @@ +body { + background-color: aquamarine; + background: url(../../img/tankShell/tankShellDeviceBackground.jpg); + background-position: center center; + background-repeat: no-repeat; + background-attachment: fixed; + background-size: 100% 100%; +} + +.dataInformation { + border: 0px solid red; + position: absolute; + width: 24%; + height: 22%; + top: 14%; + left: 3.3%; +} + +.energyProductionStatistics { + border: 0px solid red; + position: absolute; + width: 42%; + height: 6%; + top: 9%; + left: 29%; +} + +.runParamStatistics { + border: 0px solid red; + position: absolute; + width: 42%; + height: 7.5%; + top: 25%; + left: 29%; +} + +.runParamStatistics div { + border: 0px solid red; + position: absolute; + top: 4%; + width: 13%; + height: 96%; + color: blueviolet; + display: flex; + justify-content: center; + align-items: center; +} + +.lossParam{ + border: 0px solid yellowgreen; + position: absolute; + width: 8.8%; + height: 4.5%; + top: 12.5%; + right: 6%; + display: flex; + justify-content: center; + align-items: center; + color: #8FB7D1; +} + +.meterParam{ + border: 0px solid yellowgreen; + position: absolute; + width: 8.8%; + height: 4.5%; + top: 27.4%; + right: 6%; + display: flex; + justify-content: center; + align-items: center; + color:#A5E3B1; +} + +.theEnergyConsumptionContrast { + border: 1px solid red; + position: absolute; + width: 24.1%; + height: 21%; + top: 44%; + left: 3.3%; +} + +.lossStatistics { + border: 1px solid yellowgreen; + position: absolute; + width: 24%; + height: 21%; + top: 44%; + right: 3.3%; +} + +.deviceInfoTable { + border: 1px solid #6ACBFE; + position: absolute; + width: 33%; + height: 21%; + bottom: 5%; + left: 3.3%; +} + +.oeeStatistics { + border: 1px solid cornflowerblue; + position: absolute; + width: 33%; + height: 21%; + bottom: 5%; + left: 38%; +} + +.faultRank { + border: 1px solid bisque; + position: absolute; + width: 24%; + height: 21%; + bottom: 5%; + right: 3.3%; +} \ No newline at end of file diff --git a/productionboard/target/classes/static/img/tankShell/tankShellDeviceBackground.jpg b/productionboard/target/classes/static/img/tankShell/tankShellDeviceBackground.jpg new file mode 100644 index 0000000..4afc1a3 Binary files /dev/null and b/productionboard/target/classes/static/img/tankShell/tankShellDeviceBackground.jpg differ diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js index 05f62e8..75e11eb 100644 --- a/productionboard/target/classes/static/js/aluminumLiner/index.js +++ b/productionboard/target/classes/static/js/aluminumLiner/index.js @@ -1,5 +1,10 @@ $(() => { - // onDutyPlan(1234, 1202, 33); + + const statusArray = [0, 0, 0, 0, 0]; + const syntheticDate = [0, 0, 0, 0, 0]; + dataInformationFunction(statusArray); + synthetic(syntheticDate) + //设备OEE统计 OEEStatistics(null, document.getElementById("OEEStatistics")); diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index b8705cd..e4c39cb 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -2188,7 +2188,7 @@ const equipmentFailure = (res, ids) => { }); let option = { grid: { - top:'1%', + top: '1%', left: '6%', right: '6%', bottom: '3%', diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js new file mode 100644 index 0000000..89cc680 --- /dev/null +++ b/productionboard/target/classes/static/js/common/synthetic.js @@ -0,0 +1,45 @@ + +const dataInformationFunction = (statusArray) => { + let info = ` + + + + + + + + + +
${statusArray[0] == 0 ? `运行正常` : `运行异常`}389kW
4563kW·h2
`; + + $("#dataInformation").append(info); +} +const synthetic = (statusArray) => { + let info = ` + + + + + + + +
123123123123
+ + + + + + + + + + + + +
123123123123
+ 123213 + 123213 + `; + + $("#synthetic").append(info); +} diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js new file mode 100644 index 0000000..6fc6661 --- /dev/null +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -0,0 +1,55 @@ +$(() => { + /*数据信息*/ + const statusArray = [0, 0, 0, 0, 0]; + dataInformationFunction(statusArray); + + energyProductionStatisticsFunction(statusArray); + + runParamStatisticsFunction(statusArray); + + $("#lossParam").text(123.87); + + $("#meterParam").text(123.65); +}) + +/*数据信息*/ +const dataInformationFunction = (statusArray) => { + let info = ` + + + + + + + + + +
${statusArray[0] == 0 ? `运行正常` : `运行异常`}389kW
4563kW·h2
`; + + $("#dataInformation").append(info); +} + +/*能耗产量统计*/ +const energyProductionStatisticsFunction = (statusArray) => { + let info = ` + + + + + + +
6867568675
`; + + $("#energyProductionStatistics").append(info); +} + +const runParamStatisticsFunction = (statusArray) => { + let info = ` +
68
+
685
+
685
+
685
+ `; + + $("#runParamStatistics").append(info); +} \ No newline at end of file diff --git a/productionboard/target/classes/templates/aluminumLiner/index.html b/productionboard/target/classes/templates/aluminumLiner/index.html index 11a49ae..01cbd92 100644 --- a/productionboard/target/classes/templates/aluminumLiner/index.html +++ b/productionboard/target/classes/templates/aluminumLiner/index.html @@ -5,17 +5,18 @@ 铝内胆数据监控平台 - - - + +
+
+
@@ -34,6 +35,7 @@
+ \ No newline at end of file diff --git a/productionboard/target/classes/templates/tankShell/device.html b/productionboard/target/classes/templates/tankShell/device.html new file mode 100644 index 0000000..8c15b52 --- /dev/null +++ b/productionboard/target/classes/templates/tankShell/device.html @@ -0,0 +1,38 @@ + + + + + 箱壳成型数据监控平台 + + + + + + + + +
+ +
+ +
+ + +
+ + +
+ + +
+ +
+ +
+ +
+ +
+ + + \ No newline at end of file