diff --git a/productionboard/src/main/resources/static/css/tankShell/device.css b/productionboard/src/main/resources/static/css/tankShell/device.css index 9cc25d6..e73d8f6 100644 --- a/productionboard/src/main/resources/static/css/tankShell/device.css +++ b/productionboard/src/main/resources/static/css/tankShell/device.css @@ -60,7 +60,7 @@ body { display: flex; justify-content: center; align-items: center; - color: #8FB7D1; + color: red; font-size: 175% !important; } @@ -74,7 +74,7 @@ body { display: flex; justify-content: center; align-items: center; - color: #A5E3B1; + color: #63F659; font-size: 175% !important; } 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 59949e4..51a96a9 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -2332,13 +2332,13 @@ const energyConsumption = (res, ids) => { type: 'value', name: '产量(t)', min: 0, - max: 40, - interval: 10, + // max: 40, + // interval: 10, axisLabel: { formatter: '{value} ml' }, splitLine: { - show: true, + show: false, lineStyle: { color: "rgb(217,217,217,0.5)", type: "dashed" //虚线 @@ -2353,13 +2353,13 @@ const energyConsumption = (res, ids) => { type: 'value', name: '能耗(kw·h)', min: 0, - max: 20, - interval: 5, + // max: 20, + // interval: 5, axisLabel: { formatter: '{value} °C' }, splitLine: { - show: true, + show: false, lineStyle: { color: "rgb(217,217,217,0.5)", type: "dashed" //虚线 diff --git a/productionboard/src/main/resources/static/js/common/scrollTable.js b/productionboard/src/main/resources/static/js/common/scrollTable.js index 3f861aa..3831c1d 100644 --- a/productionboard/src/main/resources/static/js/common/scrollTable.js +++ b/productionboard/src/main/resources/static/js/common/scrollTable.js @@ -109,7 +109,7 @@ let dynamicTable = resource => { background: evenRowBGC }; const th_tdCSS = { - color:'skyblue', + color:'#59B2F6', margin: 'auto', whiteSpace: 'nowrap', overflow: "hidden", diff --git a/productionboard/src/main/resources/static/js/common/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js index 452727b..74fed55 100644 --- a/productionboard/src/main/resources/static/js/common/synthetic.js +++ b/productionboard/src/main/resources/static/js/common/synthetic.js @@ -7,7 +7,7 @@ const dataInformationFunction = (statusArray) => { ${statusArray[2]}kW·h - ${statusArray[3]} + ${statusArray[3]} `; $("#dataInformation").append(info); @@ -36,8 +36,8 @@ const synthetic = (statusArray) => { - ${statusArray[8] || 0} - ${statusArray[9] || 0} + ${statusArray[8] || 0} + ${statusArray[9] || 0} `; $("#synthetic").append(info); } diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 4d73d1a..219e8fd 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -113,7 +113,7 @@ const dataInformationFunction = (statusArray) => { ${res.deviceEnergy}kW·h - 2 + 2 `; diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class index a14f7f6..b2c9cc1 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/AluminumTtankController.class b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class index 85f4c74..a5e04f0 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 5ce13a4..6c7a0fa 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 cd4196e..226c541 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/TankShellController.class b/productionboard/target/classes/com/productionboard/controller/TankShellController.class index b237e27..5aa04e7 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/entity/MesProduction/MesHourProdutionStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesHourProdutionStatistics.class new file mode 100644 index 0000000..4cb9880 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesHourProdutionStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class new file mode 100644 index 0000000..f970c2b Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class new file mode 100644 index 0000000..44615c4 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class new file mode 100644 index 0000000..815c989 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class new file mode 100644 index 0000000..8839703 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class new file mode 100644 index 0000000..f680f05 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class new file mode 100644 index 0000000..5b711b2 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class new file mode 100644 index 0000000..b266a07 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class new file mode 100644 index 0000000..e42f6cf Binary files /dev/null and b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class new file mode 100644 index 0000000..75d074d Binary files /dev/null and b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class differ diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css index 9cc25d6..e73d8f6 100644 --- a/productionboard/target/classes/static/css/tankShell/device.css +++ b/productionboard/target/classes/static/css/tankShell/device.css @@ -60,7 +60,7 @@ body { display: flex; justify-content: center; align-items: center; - color: #8FB7D1; + color: red; font-size: 175% !important; } @@ -74,7 +74,7 @@ body { display: flex; justify-content: center; align-items: center; - color: #A5E3B1; + color: #63F659; font-size: 175% !important; } diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 59949e4..51a96a9 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -2332,13 +2332,13 @@ const energyConsumption = (res, ids) => { type: 'value', name: '产量(t)', min: 0, - max: 40, - interval: 10, + // max: 40, + // interval: 10, axisLabel: { formatter: '{value} ml' }, splitLine: { - show: true, + show: false, lineStyle: { color: "rgb(217,217,217,0.5)", type: "dashed" //虚线 @@ -2353,13 +2353,13 @@ const energyConsumption = (res, ids) => { type: 'value', name: '能耗(kw·h)', min: 0, - max: 20, - interval: 5, + // max: 20, + // interval: 5, axisLabel: { formatter: '{value} °C' }, splitLine: { - show: true, + show: false, lineStyle: { color: "rgb(217,217,217,0.5)", type: "dashed" //虚线 diff --git a/productionboard/target/classes/static/js/common/scrollTable.js b/productionboard/target/classes/static/js/common/scrollTable.js index 3f861aa..3831c1d 100644 --- a/productionboard/target/classes/static/js/common/scrollTable.js +++ b/productionboard/target/classes/static/js/common/scrollTable.js @@ -109,7 +109,7 @@ let dynamicTable = resource => { background: evenRowBGC }; const th_tdCSS = { - color:'skyblue', + color:'#59B2F6', margin: 'auto', whiteSpace: 'nowrap', overflow: "hidden", diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js index 452727b..74fed55 100644 --- a/productionboard/target/classes/static/js/common/synthetic.js +++ b/productionboard/target/classes/static/js/common/synthetic.js @@ -7,7 +7,7 @@ const dataInformationFunction = (statusArray) => { ${statusArray[2]}kW·h - ${statusArray[3]} + ${statusArray[3]} `; $("#dataInformation").append(info); @@ -36,8 +36,8 @@ const synthetic = (statusArray) => { - ${statusArray[8] || 0} - ${statusArray[9] || 0} + ${statusArray[8] || 0} + ${statusArray[9] || 0} `; $("#synthetic").append(info); } diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index 4d73d1a..219e8fd 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -113,7 +113,7 @@ const dataInformationFunction = (statusArray) => { ${res.deviceEnergy}kW·h - 2 + 2 `;