diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar index 0dccda3..7e77415 100644 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar differ diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original index 824c0e1..cbb7574 100644 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original differ diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index a91ed74..27a8835 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -2260,7 +2260,6 @@ const equipmentFailure = (res, ids) => { } // 设备产量能耗对比 - const energyConsumption = (res, ids) => { let mycharts = echarts.init(ids); let xAxisData = res.xValueArray;// x diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index de03917..e2136f1 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -1,16 +1,15 @@ $(() => { //班组计划统计 - // onDutyPlan(1234, 1202, 33); $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { - onDutyPlan( result.planAmount, result.actualAmount, result.differenceAmount,) + onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,) }); //设备运行状态 $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) { deviceStatus(result); }); - + //库存统计 $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) { @@ -115,7 +114,7 @@ $(() => { mycharts.setOption(option); $(window).resize(mycharts.resize); } - + $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) { temperature(result, document.getElementById("temperatureOne")); }); @@ -128,7 +127,7 @@ $(() => { $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) { temperature(result, document.getElementById("temperatureFour")); }); - + }) diff --git a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class new file mode 100644 index 0000000..b1ebfdd Binary files /dev/null and b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxParamTemperature.class b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxParamTemperature.class new file mode 100644 index 0000000..bec0a01 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxParamTemperature.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/FoamBoxParamTemperatureMapper.class b/productionboard/target/classes/com/productionboard/mapper/FoamBoxParamTemperatureMapper.class new file mode 100644 index 0000000..cfdd3e1 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/FoamBoxParamTemperatureMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class b/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class index 6103fd4..45efc1a 100644 Binary files a/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class 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 index 510460c..9c2fde4 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index a91ed74..27a8835 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -2260,7 +2260,6 @@ const equipmentFailure = (res, ids) => { } // 设备产量能耗对比 - const energyConsumption = (res, ids) => { let mycharts = echarts.init(ids); let xAxisData = res.xValueArray;// x diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index de03917..e2136f1 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -1,16 +1,15 @@ $(() => { //班组计划统计 - // onDutyPlan(1234, 1202, 33); $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { - onDutyPlan( result.planAmount, result.actualAmount, result.differenceAmount,) + onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,) }); //设备运行状态 $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) { deviceStatus(result); }); - + //库存统计 $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) { @@ -115,7 +114,7 @@ $(() => { mycharts.setOption(option); $(window).resize(mycharts.resize); } - + $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) { temperature(result, document.getElementById("temperatureOne")); }); @@ -128,7 +127,7 @@ $(() => { $.getJSON('/foamBox/getStatisticalOutputByModel', function (result) { temperature(result, document.getElementById("temperatureFour")); }); - + }) diff --git a/productionboard/target/maven-archiver/pom.properties b/productionboard/target/maven-archiver/pom.properties new file mode 100644 index 0000000..b6195d1 --- /dev/null +++ b/productionboard/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=productionboard +groupId=com.scada +version=0.0.1-SNAPSHOT diff --git a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index ac4138b..970b8d9 100644 --- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -15,7 +15,9 @@ com\productionboard\config\MybatisPlusConfig.class com\productionboard\mapper\FoamBoxLineRunStatusMapper.class com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class com\productionboard\service\IFoamBoxDeviceInfoService.class +com\productionboard\entity\FoamBoxDevice\FoamBoxParamTemperature.class com\productionboard\mapper\FoamBoxMachineRunStatusMapper.class +com\productionboard\mapper\FoamBoxParamTemperatureMapper.class com\productionboard\controller\AluminumLinerkController.class com\productionboard\controller\PreassembleController.class com\productionboard\entity\FoamBoxDevice\FoamBoxMachineRunStatus.class 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 new file mode 100644 index 0000000..397e705 --- /dev/null +++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,59 @@ +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java +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 +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialStoreStatisticsMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\FoamBoxDevice\FoamBoxParamTemperature.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellThisMonthEnergyMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IMesProductionDataService.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesHourProdutionStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java +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 +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesTeamStatistics.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java +C:\Users\ADMIN\Desktop\½ļ (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java +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\mapper\FoamBoxParamTemperatureMapper.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 new file mode 100644 index 0000000..569e0ed Binary files /dev/null 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 new file mode 100644 index 0000000..3f2d648 Binary files /dev/null and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ