diff --git a/productionboard/src/main/resources/static/css/foamBox/style.css b/productionboard/src/main/resources/static/css/foamBox/style.css index 6b81da4..8b5c2bd 100644 --- a/productionboard/src/main/resources/static/css/foamBox/style.css +++ b/productionboard/src/main/resources/static/css/foamBox/style.css @@ -119,7 +119,7 @@ body { position: absolute; width: 23%; height: 19%; - top: 46%; + top: 47%; left: 73%; } diff --git a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class index d3b75bb..cb6d6e5 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/entity/FoamBoxDevice/FoamBoxLineRunStatus.class b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxLineRunStatus.class new file mode 100644 index 0000000..344cb3e Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxLineRunStatus.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxMachineRunStatus.class b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxMachineRunStatus.class new file mode 100644 index 0000000..3bf64a5 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxMachineRunStatus.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class b/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class new file mode 100644 index 0000000..31a7954 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/FoamBoxMachineRunStatusMapper.class b/productionboard/target/classes/com/productionboard/mapper/FoamBoxMachineRunStatusMapper.class new file mode 100644 index 0000000..7e1ca4a Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/FoamBoxMachineRunStatusMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class new file mode 100644 index 0000000..6103fd4 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class new file mode 100644 index 0000000..510460c Binary files /dev/null and b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/css/foamBox/style.css b/productionboard/target/classes/static/css/foamBox/style.css index 6b81da4..8b5c2bd 100644 --- a/productionboard/target/classes/static/css/foamBox/style.css +++ b/productionboard/target/classes/static/css/foamBox/style.css @@ -119,7 +119,7 @@ body { position: absolute; width: 23%; height: 19%; - top: 46%; + top: 47%; left: 73%; } diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index b17ecc5..1bed0f4 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -7,7 +7,7 @@ $(() => { }); //设备运行状态 - $.getJSON(`/foamBox/getRunStatusJson?id=${ids}`, function (result) { + $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) { deviceStatus(result); }); diff --git a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 5a6cf5f..a206802 100644 --- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -7,20 +7,24 @@ C:\Users\ADMIN\Desktop\ C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesTeamStatisticsMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\FoamBoxMachineRunStatusMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialProductionStatisticsMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\FoamBoxDevice\FoamBoxLineRunStatus.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDevicePrameterValueMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDeviceDataInformationMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IFoamBoxDeviceInfoService.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\FoamBoxDeviceInfoServiceImpl.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java @@ -35,6 +39,7 @@ C:\Users\ADMIN\Desktop\ C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\MesProductionDataServiceImpl.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\FoamBoxLineRunStatusMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.java @@ -47,5 +52,6 @@ C:\Users\ADMIN\Desktop\ C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellLossStatisticsMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesHourProdutionStatisticsMapper.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\FoamBoxDevice\FoamBoxMachineRunStatus.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellLossStatistics.java C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar index 12284a6..edb8529 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar differ diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original index 751a43a..e2cffad 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ