diff --git a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java index 5911402..5ac2cc8 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java @@ -53,7 +53,7 @@ public class AdsorptionTankController { mesTeamStatistics.setClassName("白班"); int planAmount = Integer.parseInt(mesTeamStatistics.getPlanAmount() == null ? "0" : mesTeamStatistics.getPlanAmount()); int actualAmount= Integer.parseInt(mesTeamStatistics.getActualAmount() == null ? "0" : mesTeamStatistics.getActualAmount()); - mesTeamStatistics.setDifferenceAmount((planAmount - actualAmount)+""); + mesTeamStatistics.setDifferenceAmount(Math.abs(planAmount - actualAmount)+""); return JSONArray.toJSONString(mesTeamStatistics); } return JSONArray.toJSONString(new MesTeamStatistics()); @@ -109,51 +109,51 @@ public class AdsorptionTankController { * @date 2022/4/20 10:15 * @return java.lang.String */ - @GetMapping("/getStatisticalOutputByModel") - @ResponseBody - public String getStatisticalOutputByModel() { - String info = - "{\n" - + "\t\"datas\":[\n" - + " {\"ranking\": 1,\"station\":\"SC227\",\"value\": 199999},\n" - + " {\"ranking\": 2,\"station\":\"SC228\",\"value\": 104970},\n" - + " {\"ranking\": 3,\"station\":\"SC229\",\"value\": 29034},\n" - + " {\"ranking\": 4,\"station\":\"SC223\",\"value\": 23489},\n" - + " {\"ranking\": 5,\"station\":\"SC224\",\"value\": 18203}\n" - + " ],\n" - + "\t\"plan\":[290000, 290000, 290000, 290000, 290000, 290000]\n" - + "}"; - return info; - } - - /** - * 库存 统计 - * - * @author WenJY - * @date 2022/4/20 10:16 - * @return java.lang.String - */ - @GetMapping("/getInventoryStatistics") - @ResponseBody - public String getInventoryStatistics() { - String info = - "{\n" - + "\t\"datas\":[\n" - + " {\n" - + " \"name\": \"SC528\",\n" - + " \"value\": 175.17\n" - + " },\n" - + " {\n" - + " \"name\": \"SC529\",\n" - + " \"value\": 148.35\n" - + " },\n" - + " {\n" - + " \"name\": \"SC327\",\n" - + " \"value\": 95.36\n" - + " }\n" - + " ]\n" - + "}"; - return info; - } +// @GetMapping("/getStatisticalOutputByModel") +// @ResponseBody +// public String getStatisticalOutputByModel() { +// String info = +// "{\n" +// + "\t\"datas\":[\n" +// + " {\"ranking\": 1,\"station\":\"SC227\",\"value\": 199999},\n" +// + " {\"ranking\": 2,\"station\":\"SC228\",\"value\": 104970},\n" +// + " {\"ranking\": 3,\"station\":\"SC229\",\"value\": 29034},\n" +// + " {\"ranking\": 4,\"station\":\"SC223\",\"value\": 23489},\n" +// + " {\"ranking\": 5,\"station\":\"SC224\",\"value\": 18203}\n" +// + " ],\n" +// + "\t\"plan\":[290000, 290000, 290000, 290000, 290000, 290000]\n" +// + "}"; +// return info; +// } +// +// /** +// * 库存 统计 +// * +// * @author WenJY +// * @date 2022/4/20 10:16 +// * @return java.lang.String +// */ +// @GetMapping("/getInventoryStatistics") +// @ResponseBody +// public String getInventoryStatistics() { +// String info = +// "{\n" +// + "\t\"datas\":[\n" +// + " {\n" +// + " \"name\": \"SC528\",\n" +// + " \"value\": 175.17\n" +// + " },\n" +// + " {\n" +// + " \"name\": \"SC529\",\n" +// + " \"value\": 148.35\n" +// + " },\n" +// + " {\n" +// + " \"name\": \"SC327\",\n" +// + " \"value\": 95.36\n" +// + " }\n" +// + " ]\n" +// + "}"; +// return info; +// } } diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java index 8878111..4b86b03 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java @@ -17,6 +17,7 @@ import java.util.List; /** * 铝内胆可视化看板 + * * @author WenJY * @date 2022年04月20日 14:40 */ @@ -30,22 +31,22 @@ public class AluminumTtankController { private String prefix = "aluminumTank/index"; @GetMapping() - public String index() - { + public String index() { return prefix; } /** * 班组统计 + * + * @return java.lang.String * @author WenJY * @date 2022-06-09 16:38 - * @return java.lang.String */ @GetMapping("/getTeamStatisticsJson") @ResponseBody - public String getTeamStatisticsJson(){ + public String getTeamStatisticsJson() { List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1006"); - if(mesTeamStatisticsList.size()>0){ + if (mesTeamStatisticsList.size() > 0) { return JSONArray.toJSONString(mesTeamStatisticsList.get(0)); } return JSONArray.toJSONString(new MesTeamStatistics()); @@ -53,16 +54,17 @@ public class AluminumTtankController { /** * 通过工位号获取MES小时产量 + * + * @return java.lang.String * @author WenJY * @date 2022-06-09 16:54 - * @return java.lang.String */ @GetMapping("/getHourProdutionJson") @ResponseBody - public String getHourProdutionStatisticsJson(){ + public String getHourProdutionStatisticsJson() { List mesHourProdutionStatisticsList = iMesProductionDataService.getMesHourProdutionStatisticsList("1006"); - if(mesHourProdutionStatisticsList.size()>0){ + if (mesHourProdutionStatisticsList.size() > 0) { return JSONArray.toJSONString(mesHourProdutionStatisticsList); } return JSONArray.toJSONString(new ArrayList()); @@ -70,13 +72,14 @@ public class AluminumTtankController { /** * 通过工位号获取MES物料产量 + * + * @return java.lang.String * @author WenJY * @date 2022-06-09 17:06 - * @return java.lang.String */ @GetMapping("/getMaterialProdutionJson") @ResponseBody - public String getMaterialProdutionStatisticsJson(){ + public String getMaterialProdutionStatisticsJson() { List mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1006"); @@ -86,34 +89,28 @@ public class AluminumTtankController { /** * 获取MES物料库存 - * @author WenJY - * @date 2022-06-09 17:18 + * * @return java.lang.String * L001 内胆库存 * U001 箱壳库存 + * @author WenJY + * @date 2022-06-09 17:18 */ @GetMapping("/getMaterialStoreJson") @ResponseBody - public String getMesMaterialStoreStatisticsJson(){ - List list=new ArrayList(2); - list.add("L001"); - list.add("U001"); + public String getMesMaterialStoreStatisticsJson() { List mesMaterialStoreStatisticsList - =new ArrayList<>(); - mesMaterialStoreStatisticsList.addAll( iMesProductionDataService.getMesMaterialStoreStatisticsList("1006")); -// mesMaterialStoreStatisticsList.addAll( iMesProductionDataService.getMesMaterialStoreStatisticsList("U001")); -// = iMesProductionDataService.getMesMaterialStoreStatisticsListByList(list); + = iMesProductionDataService.getMesMaterialStoreStatisticsList("1006"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } - /** * 根据型号统计产量 * + * @return java.lang.String * @author WenJY * @date 2022/4/20 10:15 - * @return java.lang.String */ @GetMapping("/getStatisticalOutputByModel") @ResponseBody @@ -135,9 +132,9 @@ public class AluminumTtankController { /** * 库存 统计 * + * @return java.lang.String * @author WenJY * @date 2022/4/20 10:16 - * @return java.lang.String */ @GetMapping("/getInventoryStatistics") @ResponseBody diff --git a/productionboard/src/main/resources/static/js/aluminumTank/index.js b/productionboard/src/main/resources/static/js/aluminumTank/index.js index f2dffd7..b4e6179 100644 --- a/productionboard/src/main/resources/static/js/aluminumTank/index.js +++ b/productionboard/src/main/resources/static/js/aluminumTank/index.js @@ -1,7 +1,8 @@ $(()=>{ //班组统计 $.getJSON('/aluminumTank/getTeamStatisticsJson', function (result) { - storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,) + console.log(result.planAmount+' 数据'+ result.actualAmount, result.differenceAmount) + storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,) }); //按型号统计产量 diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class index 6c73e62..5140929 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 9264861..93b5e6a 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 1e94fcd..a33f608 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 df193fd..33f4f17 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/TankShellController.class b/productionboard/target/classes/com/productionboard/controller/TankShellController.class index a64f12f..6d71eee 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/MesTeamStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class index ef8ad20..e18d73f 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesTeamStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumDeviceDataInformationMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumDeviceDataInformationMapper.class index 3cd6bf5..63530bf 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/AluminumDeviceDataInformationMapper.class and b/productionboard/target/classes/com/productionboard/mapper/AluminumDeviceDataInformationMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumLossStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumLossStatisticsMapper.class index 86de681..28ea1c7 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/AluminumLossStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/AluminumLossStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumOeeStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumOeeStatisticsMapper.class index 8626205..cb40759 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/AluminumOeeStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/AluminumOeeStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumThisMonthEnergyMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumThisMonthEnergyMapper.class index 415d895..0db638d 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/AluminumThisMonthEnergyMapper.class and b/productionboard/target/classes/com/productionboard/mapper/AluminumThisMonthEnergyMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/AluminumYesterdayEnergyMapper.class b/productionboard/target/classes/com/productionboard/mapper/AluminumYesterdayEnergyMapper.class index e7345ca..606782c 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/AluminumYesterdayEnergyMapper.class and b/productionboard/target/classes/com/productionboard/mapper/AluminumYesterdayEnergyMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class b/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class index 31a7954..f8648c7 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class 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 index 7e1ca4a..95ea417 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/FoamBoxMachineRunStatusMapper.class and b/productionboard/target/classes/com/productionboard/mapper/FoamBoxMachineRunStatusMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/FoamBoxMouldTemperatureMapper.class b/productionboard/target/classes/com/productionboard/mapper/FoamBoxMouldTemperatureMapper.class index 5d782b9..a3fa473 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/FoamBoxMouldTemperatureMapper.class and b/productionboard/target/classes/com/productionboard/mapper/FoamBoxMouldTemperatureMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/FoamBoxParamTemperatureMapper.class b/productionboard/target/classes/com/productionboard/mapper/FoamBoxParamTemperatureMapper.class index cfdd3e1..9a673e9 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/FoamBoxParamTemperatureMapper.class and b/productionboard/target/classes/com/productionboard/mapper/FoamBoxParamTemperatureMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class index 2f68b62..c1c5712 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesHourProdutionStatisticsMapper.class 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 index a6823e1..29cbb69 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesMaterialProductionStatisticsMapper.class 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 index 4a95c83..d2fe201 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.class 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 index 1262924..77f7d44 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/MesTeamStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class index bb45aae..66bb26a 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class and b/productionboard/target/classes/com/productionboard/mapper/TankShellDeviceDataInformationMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.class index 24dbea5..4ef01b3 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.class and b/productionboard/target/classes/com/productionboard/mapper/TankShellDevicePrameterValueMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellEnergyConsumptionMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellEnergyConsumptionMapper.class index 8614d3f..8807354 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/TankShellEnergyConsumptionMapper.class and b/productionboard/target/classes/com/productionboard/mapper/TankShellEnergyConsumptionMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.class index dd74f49..e89ac1e 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellOeeStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellOeeStatisticsMapper.class index dcc842b..5262c16 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/TankShellOeeStatisticsMapper.class and b/productionboard/target/classes/com/productionboard/mapper/TankShellOeeStatisticsMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class index 8669652..ab9d10c 100644 Binary files a/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class and b/productionboard/target/classes/com/productionboard/mapper/TankShellThisMonthEnergyMapper.class differ diff --git a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class index 9f88eb8..6031c07 100644 Binary files a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class and b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class index 7f3d9b6..60fd12d 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$1.class b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$1.class index f4b2ef5..5ecce21 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$1.class and b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$1.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$2.class b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$2.class index 859f213..30b5495 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$2.class and b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl$2.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 6a4e4e5..4dc9519 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/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index 7577f4b..7cfc6c1 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class index f69e746..f20fea2 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js index 4618190..07e3562 100644 --- a/productionboard/target/classes/static/js/aluminumLiner/index.js +++ b/productionboard/target/classes/static/js/aluminumLiner/index.js @@ -39,13 +39,11 @@ $(() => { dataType: 'JSON', success: function (res) { let Res = {} - console.log(res) Res.data=res.map(val => { return [val.spe,val.oq,val.aq,val.cha,val.round,] }) Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度'] - console.log(Res) dynamicTable({ el: '#productionPlan', rowNum: 5, @@ -62,7 +60,6 @@ $(() => { }); }, error: function (e) { - console.log(e) } }); tableAnimation('#productionPlan') diff --git a/productionboard/target/classes/static/js/aluminumTank/index.js b/productionboard/target/classes/static/js/aluminumTank/index.js index 133dc3b..b4e6179 100644 --- a/productionboard/target/classes/static/js/aluminumTank/index.js +++ b/productionboard/target/classes/static/js/aluminumTank/index.js @@ -1,7 +1,8 @@ $(()=>{ //班组统计 $.getJSON('/aluminumTank/getTeamStatisticsJson', function (result) { - storageStatistics(result.className, result.planAmount, result.actualAmount, result.differenceAmount,) + console.log(result.planAmount+' 数据'+ result.actualAmount, result.differenceAmount) + storageStatistics('白班', result.planAmount, result.actualAmount, result.differenceAmount,) }); //按型号统计产量 @@ -16,6 +17,7 @@ $(()=>{ //库存统计 $.getJSON('/aluminumTank/getMaterialStoreJson', function (result) { + console.log(result) multipleThreeDimensionalCylindrical(result,document.getElementById("inventoryStatistics")); }); }) diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index b67df25..80ab7ca 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -55,7 +55,6 @@ const horizontalBarChart = (res, ids) => { let values = []; - function dataFormat(data) { let arr = []; data.forEach(function (item, i) { @@ -174,10 +173,9 @@ const horizontalBarChart = (res, ids) => { fontSize: 12, color: "#A8A6AB", textBorderWidth: 2, - position:'insideTopLeft', + position: 'insideTopLeft', padding: [-20, 0, 0, 0], - formatter:function (params) { - console.log(dataFormat(xValue)[params[`dataIndex`]]) + formatter: function (params) { return dataFormat(xValue)[params[`dataIndex`]].value } }, @@ -566,7 +564,6 @@ const threeDimensionalCylindrical = (res, ids) => { //多个折线面积图 const multipleBrokenLineAreaDiagram = (res, ids) => { let mycharts = echarts.init(ids); - console.log(res); let option = { tooltip: { @@ -1172,15 +1169,15 @@ const bluePolygonHistogram = (res, ids) => { //多个立体柱状图 const multipleThreeDimensionalCylindrical = (res, ids) => { let mycharts = echarts.init(ids); - const xValue = res.map(val => val.materialName) - const lineStoreAmount = res.map(val => val.lineStoreAmount) - const hullStoreAmount = res.map(val => val.hullStoreAmount) + const xValue = res.map(val => val.materialName?.split(',')[0] || ' ') + const lineStoreAmount = res.map(val => val.lineStoreAmount) || [] + const hullStoreAmount = res.map(val => val.hullStoreAmount || '0') let lineColor = "#406A92"; let labelColor = "#fff"; let fontSize = "12"; let lineWidth = 1; let isDataZoom = xValue.length > 3 - let stepSize = 20 + let stepSize = 1 / (xValue.length / 3) * 100 // hullStoreAmount.forEach((val, index) => { // if (val == 0) { // hullStoreAmount[index] = 0 @@ -1228,6 +1225,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { lineHeight: 20, }, axisLabel: { + interval:0, color: labelColor, fontSize: fontSize, margin: 30, @@ -1519,7 +1517,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { }; if (isDataZoom) { option.dataZoom.push({ - show:false, + show: false, type: 'slider', start: 0, end: stepSize, @@ -1710,8 +1708,9 @@ const inventory = (res, ids) => { let barBottomColor = [ "rgba(2,195,241,0.1)", ]; - const xAxisData = res.map(val => val.materialName) + const xAxisData = res.map(val => val.materialName?.split(',')[0] ) const seriesData1 = res.map(val => val.lineStoreAmount) + console.log(xAxisData,seriesData1) // Res.forEach((item) => { // xAxisData.push(item.name); // seriesData1.push(item.value); @@ -2378,8 +2377,8 @@ const energyConsumption = (res, ids) => { return value + ' °C'; } }, - lineStyle:{ - color:'#45b685' + lineStyle: { + color: '#45b685' }, data: yAxisDataTwo, }, diff --git a/productionboard/target/classes/static/js/common/scrollTable.js b/productionboard/target/classes/static/js/common/scrollTable.js index 9520df9..2f47b3a 100644 --- a/productionboard/target/classes/static/js/common/scrollTable.js +++ b/productionboard/target/classes/static/js/common/scrollTable.js @@ -213,7 +213,6 @@ let dynamicTable = resource => { } else { for (let i = 0; i < colWidth.length; i++) { let emptyUnitColWidth = emptyUnit(colWidth[i]); - console.log(emptyUnitColWidth) $(`${ele}>.table>.thead>.tr>.th:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`); $(`${ele}>.table>.tbody>.tr>.td:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`); } diff --git a/productionboard/target/classes/static/js/common/synthetic.js b/productionboard/target/classes/static/js/common/synthetic.js index 4947541..ef92502 100644 --- a/productionboard/target/classes/static/js/common/synthetic.js +++ b/productionboard/target/classes/static/js/common/synthetic.js @@ -13,7 +13,6 @@ const dataInformationFunction = (statusArray) => { $("#dataInformation").append(info); } const synthetic = (statusArray,param={a:0,b:0}) => { - console.log(statusArray); let info = `
${statusArray[0] || 0}