From 25a7564a85b678b748c42258204e5dbc9c143d6a Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 30 Sep 2022 11:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=93=9D=E5=86=85?= =?UTF-8?q?=E8=83=86=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdsorptionTankController.java | 5 +- .../controller/AluminumLinerkController.java | 51 +++++++----------- .../controller/AluminumTtankController.java | 14 +++-- .../controller/PreassembleController.java | 4 +- .../controller/TankShellController.java | 36 +++++-------- .../com/productionboard/controller/test.java | 19 +++++++ .../entity/MesProduction/DeviceFault.java | 35 ++++++++++++ .../entity/MesProduction/PlanInfo.java | 42 +++++++++++++++ .../mapper/DeviceFaultMapper.java | 17 ++++++ .../mapper/PlanInfoMapper.java | 17 ++++++ .../service/IMesProductionDataService.java | 9 ++-- .../impl/MesProductionDataServiceImpl.java | 31 +++++++---- .../static/js/aluminumLiner/index.js | 12 +++-- .../static/js/common/echarts.common.js | 47 ++++------------ .../controller/AdsorptionTankController.class | Bin 3846 -> 3860 bytes .../controller/AluminumLinerkController.class | Bin 6311 -> 6524 bytes .../controller/AluminumTtankController.class | Bin 3911 -> 3948 bytes .../controller/PreassembleController.class | Bin 3903 -> 3913 bytes .../controller/TankShellController.class | Bin 3893 -> 3389 bytes .../service/IMesProductionDataService.class | Bin 930 -> 1216 bytes .../impl/MesProductionDataServiceImpl.class | Bin 4147 -> 5223 bytes .../classes/static/js/aluminumLiner/index.js | 10 ++-- .../static/js/common/echarts.common.js | 47 ++++------------ 23 files changed, 238 insertions(+), 158 deletions(-) create mode 100644 productionboard/src/main/java/com/productionboard/controller/test.java create mode 100644 productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java create mode 100644 productionboard/src/main/java/com/productionboard/entity/MesProduction/PlanInfo.java create mode 100644 productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java create mode 100644 productionboard/src/main/java/com/productionboard/mapper/PlanInfoMapper.java diff --git a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java index 7d0c91e..4519f2c 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AdsorptionTankController.java @@ -78,7 +78,8 @@ public class AdsorptionTankController { @ResponseBody public String getMaterialProdutionStatisticsJson(){ - List mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1001"); + List mesMaterialProductionStatisticsList = + iMesProductionDataService.getMesMaterialProductionStatisticsList("1001"); return JSONArray.toJSONString(mesMaterialProductionStatisticsList); } @@ -92,7 +93,7 @@ public class AdsorptionTankController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1001"); + List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java index 58d5807..1b34772 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java @@ -5,7 +5,12 @@ import com.alibaba.fastjson.JSONObject; import com.productionboard.entity.AluminumDevice.AluminumDeviceDataInformation; import com.productionboard.entity.AluminumDevice.AluminumLossStatistics; import com.productionboard.entity.AluminumDevice.AluminumOeeStatistics; +import com.productionboard.entity.MesProduction.DeviceFault; +import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; +import com.productionboard.entity.MesProduction.PlanInfo; +import com.productionboard.mapper.PlanInfoMapper; import com.productionboard.service.IAluminumDeviceInfoService; +import com.productionboard.service.IMesProductionDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -26,10 +31,12 @@ import java.util.List; public class AluminumLinerkController { private String prefix = "aluminumLiner/index"; - + @Autowired + private IMesProductionDataService iMesProductionDataService; @Autowired private IAluminumDeviceInfoService aluminumDeviceInfoService; + private SimpleDateFormat hourFormat = new SimpleDateFormat("HH"); @GetMapping() @@ -124,18 +131,8 @@ public class AluminumLinerkController { @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; + List list=iMesProductionDataService.selectDeviceFaultByType("铝内胆"); + return JSONArray.toJSONString(list); } /** @@ -148,24 +145,16 @@ public class AluminumLinerkController { @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; + List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); + return JSONArray.toJSONString(mesMaterialStoreStatisticsList); + + } + @GetMapping("/getProductionPlan") + @ResponseBody + public String getProductionPlan() { + List PlanInfos = iMesProductionDataService.getProductionPlan(); + return JSONArray.toJSONString(PlanInfos); + } } diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java index 37e523c..4d9b9c4 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java @@ -44,7 +44,7 @@ public class AluminumTtankController { @GetMapping("/getTeamStatisticsJson") @ResponseBody public String getTeamStatisticsJson(){ - List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1002"); + List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("铝内胆"); if(mesTeamStatisticsList.size()>0){ return JSONArray.toJSONString(mesTeamStatisticsList.get(0)); } @@ -60,7 +60,8 @@ public class AluminumTtankController { @GetMapping("/getHourProdutionJson") @ResponseBody public String getHourProdutionStatisticsJson(){ - List mesHourProdutionStatisticsList = iMesProductionDataService.getMesHourProdutionStatisticsList("1002"); + List mesHourProdutionStatisticsList = + iMesProductionDataService.getMesHourProdutionStatisticsList("铝内胆"); if(mesHourProdutionStatisticsList.size()>0){ return JSONArray.toJSONString(mesHourProdutionStatisticsList); } @@ -77,7 +78,8 @@ public class AluminumTtankController { @ResponseBody public String getMaterialProdutionStatisticsJson(){ - List mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1002"); + List mesMaterialProductionStatisticsList = + iMesProductionDataService.getMesMaterialProductionStatisticsList("1006"); return JSONArray.toJSONString(mesMaterialProductionStatisticsList); } @@ -87,11 +89,15 @@ public class AluminumTtankController { * @author WenJY * @date 2022-06-09 17:18 * @return java.lang.String + * L001 内胆库存 + * U001 箱壳库存 */ @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1002"); + List mesMaterialStoreStatisticsList = + + iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java index 5c00eeb..815c5db 100644 --- a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java +++ b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java @@ -44,7 +44,7 @@ public class PreassembleController { @GetMapping("/getTeamStatisticsJson") @ResponseBody public String getTeamStatisticsJson(){ - List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1002"); + List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1001"); if(mesTeamStatisticsList.size()>0){ return JSONArray.toJSONString(mesTeamStatisticsList.get(0)); } @@ -77,7 +77,7 @@ public class PreassembleController { @ResponseBody public String getMaterialProdutionStatisticsJson(){ - List mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1002"); + List mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1001"); return JSONArray.toJSONString(mesMaterialProductionStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/controller/TankShellController.java b/productionboard/src/main/java/com/productionboard/controller/TankShellController.java index 2d5e9bb..e26f58f 100644 --- a/productionboard/src/main/java/com/productionboard/controller/TankShellController.java +++ b/productionboard/src/main/java/com/productionboard/controller/TankShellController.java @@ -2,10 +2,7 @@ package com.productionboard.controller; import com.alibaba.fastjson.JSONArray; import com.productionboard.entity.BasicScadaDeviceinfo; -import com.productionboard.entity.MesProduction.MesHourProdutionStatistics; -import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics; -import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; -import com.productionboard.entity.MesProduction.MesTeamStatistics; +import com.productionboard.entity.MesProduction.*; import com.productionboard.service.IMesProductionDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -45,7 +42,7 @@ public class TankShellController { @GetMapping("/getTeamStatisticsJson") @ResponseBody public String getTeamStatisticsJson(){ - List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1002"); + List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1006"); if(mesTeamStatisticsList.size()>0){ return JSONArray.toJSONString(mesTeamStatisticsList.get(0)); } @@ -61,7 +58,7 @@ public class TankShellController { @GetMapping("/getHourProdutionJson") @ResponseBody public String getHourProdutionStatisticsJson(){ - List mesHourProdutionStatisticsList = iMesProductionDataService.getMesHourProdutionStatisticsList("1002"); + List mesHourProdutionStatisticsList = iMesProductionDataService.getMesHourProdutionStatisticsList("箱壳"); if(mesHourProdutionStatisticsList.size()>0){ return JSONArray.toJSONString(mesHourProdutionStatisticsList); } @@ -69,7 +66,7 @@ public class TankShellController { } /** - * 通过工位号获取MES物料产量 + * 通过工位号获取MES物料产量 按类型统计箱壳 * @author WenJY * @date 2022-06-09 17:06 * @return java.lang.String @@ -78,7 +75,8 @@ public class TankShellController { @ResponseBody public String getMaterialProdutionStatisticsJson(){ - List mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1002"); + List mesMaterialProductionStatisticsList = + iMesProductionDataService.getMesMaterialProductionStatisticsList("1006"); return JSONArray.toJSONString(mesMaterialProductionStatisticsList); } @@ -103,22 +101,12 @@ public class TankShellController { * @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; - } +// @GetMapping("/getStatisticalOutputByModel") +// @ResponseBody +// public String getStatisticalOutputByModel() { +// List list=iMesProductionDataService.selectDeviceFaultByType("铝内胆"); +// return JSONArray.toJSONString(list); +// } /** * 库存 统计 diff --git a/productionboard/src/main/java/com/productionboard/controller/test.java b/productionboard/src/main/java/com/productionboard/controller/test.java new file mode 100644 index 0000000..5c2b67a --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/controller/test.java @@ -0,0 +1,19 @@ +package com.productionboard.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author wanghao + * @date 2022/9/29 11:48 + */ +@Controller() +@RequestMapping("/index") +public class test { + + @GetMapping() + private String index(){ + return "/index"; + } +} diff --git a/productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java b/productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java new file mode 100644 index 0000000..fdbcaa2 --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/entity/MesProduction/DeviceFault.java @@ -0,0 +1,35 @@ +package com.productionboard.entity.MesProduction; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 设备故障统计 + * @author WenJY + * @date 2022年06月09日 17:10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("SCADA_DEVICE_FAULT") +public class DeviceFault implements Serializable { + + /** 名称 */ + @TableField("STATION") + private String station; + + /** 数量 */ + @TableField("VALUE") + private String value; + + /** 类型 */ + @TableField("TYPE") + private String hullStoreAmount; + + +} diff --git a/productionboard/src/main/java/com/productionboard/entity/MesProduction/PlanInfo.java b/productionboard/src/main/java/com/productionboard/entity/MesProduction/PlanInfo.java new file mode 100644 index 0000000..861d1e9 --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/entity/MesProduction/PlanInfo.java @@ -0,0 +1,42 @@ +package com.productionboard.entity.MesProduction; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 计划清空 + * @author WenJY + * @date 2022年06月09日 17:10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("SCADA_PLAN_INFO") +public class PlanInfo implements Serializable { + + /** 物料名称 */ + @TableField("SPE") + private String spe; + + /** 内胆库库存 */ + @TableField("OQ") + private String oq; + + /** 箱壳库库存 */ + @TableField("AQ") + private String aq; + + /** 工位编号 */ + @TableField("ROUND") + private String round; + @TableField("CHA") + private String cha; + + + +} diff --git a/productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java b/productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java new file mode 100644 index 0000000..62e8bb4 --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/mapper/DeviceFaultMapper.java @@ -0,0 +1,17 @@ +package com.productionboard.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.productionboard.entity.MesProduction.DeviceFault; +import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** + * MES物料库存统计 + * @author WenJY + * @date 2022年06月09日 17:14 + */ +@Mapper +@Repository +public interface DeviceFaultMapper extends BaseMapper{ +} diff --git a/productionboard/src/main/java/com/productionboard/mapper/PlanInfoMapper.java b/productionboard/src/main/java/com/productionboard/mapper/PlanInfoMapper.java new file mode 100644 index 0000000..61d5515 --- /dev/null +++ b/productionboard/src/main/java/com/productionboard/mapper/PlanInfoMapper.java @@ -0,0 +1,17 @@ +package com.productionboard.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.productionboard.entity.MesProduction.DeviceFault; +import com.productionboard.entity.MesProduction.PlanInfo; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** + * MES物料库存统计 + * @author WenJY + * @date 2022年06月09日 17:14 + */ +@Mapper +@Repository +public interface PlanInfoMapper extends BaseMapper{ +} diff --git a/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java b/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java index cec6210..b856ed6 100644 --- a/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java +++ b/productionboard/src/main/java/com/productionboard/service/IMesProductionDataService.java @@ -1,9 +1,6 @@ package com.productionboard.service; -import com.productionboard.entity.MesProduction.MesHourProdutionStatistics; -import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics; -import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; -import com.productionboard.entity.MesProduction.MesTeamStatistics; +import com.productionboard.entity.MesProduction.*; import com.productionboard.mapper.MesHourProdutionStatisticsMapper; import java.util.List; @@ -50,4 +47,8 @@ public interface IMesProductionDataService { * @return java.util.List */ List getMesMaterialStoreStatisticsList(String locationNumber); + + List selectDeviceFaultByType(String type); + + List getProductionPlan(); } diff --git a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java index f8d1c32..b487858 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -1,14 +1,8 @@ package com.productionboard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.productionboard.entity.MesProduction.MesHourProdutionStatistics; -import com.productionboard.entity.MesProduction.MesMaterialProductionStatistics; -import com.productionboard.entity.MesProduction.MesMaterialStoreStatistics; -import com.productionboard.entity.MesProduction.MesTeamStatistics; -import com.productionboard.mapper.MesHourProdutionStatisticsMapper; -import com.productionboard.mapper.MesMaterialProductionStatisticsMapper; -import com.productionboard.mapper.MesMaterialStoreStatisticsMapper; -import com.productionboard.mapper.MesTeamStatisticsMapper; +import com.productionboard.entity.MesProduction.*; +import com.productionboard.mapper.*; import com.productionboard.service.IMesProductionDataService; import org.apache.ibatis.annotations.Select; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +28,10 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { @Autowired private MesMaterialStoreStatisticsMapper materialStoreStatisticsMapper; + @Autowired + private DeviceFaultMapper deviceFaultMapper; + @Autowired + private PlanInfoMapper planInfoMapper; /** * 通过工位号获取工位信息 * @author WenJY @@ -60,7 +58,7 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { @Select("") public List getMesHourProdutionStatisticsList(String locationNumber) { QueryWrapper wrapper = new QueryWrapper(); -// wrapper.eq("POSIONID",locationNumber); + wrapper.eq("POSIONID",locationNumber); List mesHourProdutionStatistics = hourProdutionStatisticsMapper.selectList(wrapper); return mesHourProdutionStatistics; } @@ -90,8 +88,21 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { @Override public List getMesMaterialStoreStatisticsList(String locationNumber) { QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.eq("POSIONID",locationNumber); + wrapper.eq("POSIONID",locationNumber); List mesMaterialStoreStatistics = materialStoreStatisticsMapper.selectList(wrapper); return mesMaterialStoreStatistics; } + + @Override + public List selectDeviceFaultByType(String type) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("TYPE",type); + return deviceFaultMapper.selectList(wrapper); + } + + @Override + public List getProductionPlan() { + QueryWrapper wrapper = new QueryWrapper<>(); + return planInfoMapper.selectList(wrapper); + } } diff --git a/productionboard/src/main/resources/static/js/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js index 4e6b8d5..ba73f92 100644 --- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js +++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js @@ -27,19 +27,20 @@ $(() => { }); //库存情况 - $.getJSON('/tankShell/getInventoryStatistics', function (result) { + $.getJSON('/aluminumLiner/getInventoryStatistics', function (result) { inventory(result, document.getElementById("inventory")); }); //生产计划 $.ajax({ - url: '/storage/getProductionPlan', - type: 'GET', + url: '/aluminumLiner/getProductionPlan', + type: 'get', dataType: 'JSON', success: function (res) { let Res = res - Res.data.forEach(val => { + console.log("生产计划"+res) + res.data.forEach(val => { val[0] = 'sc-228NE' val[1] = '431' val[2] = '0' @@ -71,7 +72,8 @@ $(() => { //设备故障排名 - $.getJSON('/tankShell/getStatisticalOutputByModel', function (result) { + $.getJSON('/aluminumLiner/getStatisticalOutputByModel', function (result) { + equipmentFailure(result, document.getElementById("equipmentFailure")); }); 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 ed22707..9113034 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -1702,45 +1702,20 @@ const OEEStatistics = (res, ids) => { const inventory = (res, ids) => { let mycharts = echarts.init(ids); - let xAxisData = []; - let seriesData1 = []; + let sum = 0; let barTopColor = ["#02c3f1"]; let barBottomColor = [ "rgba(2,195,241,0.1)", ]; - let Res = - { - datas: [ - { - name: 'SC-279', - value: 2 - }, - { - name: 'SC-606', - value: 6 - }, - { - name: 'SC-387NE', - value: 31 - }, - { - name: 'SC-329', - value: 2 - }, - { - name: 'SC-279', - value: 9 - }, - ] - } - - Res.datas.forEach((item) => { - xAxisData.push(item.name); - seriesData1.push(item.value); - sum += item.value; - }); + const xAxisData = res.map(val => val.materialName) + const seriesData1 = res.map(val => val.lineStoreAmount) + // Res.forEach((item) => { + // xAxisData.push(item.name); + // seriesData1.push(item.value); + // sum += item.value; + // }); let option = { grid: { @@ -2157,12 +2132,12 @@ const loss = (res, ids) => { //设备故障排名 const equipmentFailure = (res, ids) => { let mycharts = echarts.init(ids); - - + // console.log("设备故障排名1"+res) let stationData = []; let values = []; - res.datas.forEach(function (it, index) { + res.forEach(function (it, index) { + stationData.push(it.station); values.push(it.value); }); diff --git a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class index f0dd4fd91cafc3c58d8cfde8b4d261d7d7cbb9ee..1ead10a66827c50624475de833fca3d4475c56f2 100644 GIT binary patch delta 1067 zcmZ{i+fEZv6o&sj({_gG7VTKU6BWVZRHYRaQ4WelQR@M$Xl;>JiiVgJBVOoL?|6Zl z_yk_*g#-=gg%9BKn0RB1|DKtalD28G_N=wnTHn9A_G;{XEc@%sN1(lh&&6@ERcAP{Q95JSfFBa0zl)B{UFdqFT}IkjS|Guq)$1t z2k8wnSMUrw8xW4IeS^N{Cil=&GeA$^3J`R@LjS^u z2Gv2qfnyETLBF~tt)KS-N4!qe-{BF_Q%%b5ImPR8`EkEO@;u630>^o$w0Myd{5r`9 z2m6a&1CBek&Dwt6#B&fUIEB+L=Zw$!DEk(+CY)fWl&jGrM(V^MC)-X`kp%lH{o5Hy zpK-SSugq7S9kGhybV8?{=KnE6R;CSWu!%LuciD<{-e+B?vvQnQZ7aeB1nkc5*r_2M z-$X}6Z9{jr;q9|P1;sWBhME)%;bKb#!@hz`bp@l$QwoCiu5^6s2~<34nHt_TP;2i% zXU%0k%vMv5_>9pOj7THHL#z_2yZNGl6-Obj%5q@m$~qUg}s7 zsG!(O{4PM^sP zAdWCj;RIKLr$7`5oaC&ahkg~^T&K8`XWGC|guZj3GR+YI`hCfoo4kY2%P0kXUZKy- zl%mau$k+@P)qyOvFOxe*&AeT%(+*3zJLYL?xU@%GdSp-JHFv9}UA4?!HN@Dv zu%&IFT}3hZ3lZ7JM#yfY^Ab}em~KIk-A9mR$ASoQF2R-71P45V2H+=HAVH-CL4F@W z9#;biuDJx)J%S;|$!FKBgT>^(|6`&dy>H2|>QmkML?Pzf;O`B(<)Eu^GeG0eZVf5% gkrH16Bnto27_v1~46}fW5%0BcaX(5b=YNfD1Cv2pYXATM diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class index 150759ec467f5e5f7d95cd6b1f7384068becce28..1c7ab655b1448588d34daec240088bc891d7c042 100644 GIT binary patch delta 2510 zcmZ`(dt4M%6#nku?kvLy%K|2-APS-gt`cBInUHUn)G*O7ZG#clmR;N(5K3Fk#GXDH z?WI=sva$@tK(y>#W|sD{r#&o7`?r6sU+2s&>yq-voVn-TbHDSQbH96ckGoJ5I`;3O zBLIr=mx3`^X+ujq3ehU#4jb-N&=0HFU(M#O1cb0A0c&wLn{{mNk+EJuf8N-}{|#*J zWpf`d->={SJjnYVVzbdfskZXMHg+G85qeZX239&C@C4`BZo`fQ?8K8cJjMT~+3b?> zjDq2uz46HFV-LX_igj>ya=oTgZ4t(EsB(dL{>|_$ z^#=u}FzT4zs6ERjMTheegpM4mOUj&ps|8Zr-lhhRuc^W1@o534$5*GdsBmJevC)>3 zKLM|)7>}z|l%P~byNZ3-FJrHY4jfSNIyzN!p;KU*Q7#u5iSdKx9YnW^Lu?MSc>{0C zIHKY$yscsm%2m9B{Q~w1zh4jP0e54irZ4l?1(U3J*N*p+WV~-jqlypkp^A@iRK>^G zZ>)|_FFj_*Cp>>##W)mE6V4ku&$g{Ux2{dbrz$?f34wmDv17-nIEfP~>Nro9k)4=s zY_eDlry8I8xr#5C!k73;#n&j8aZ1HE_*TVt_+G^i_>uKeE~gp;q~RS~)eFLU8b1l7 z8FLd;t@9Pq^v_0n;-0ud{9-IlS|v(2cw*n;imLF6pyt(T^%(h7w9ad7Bz@)>Yx<{^ znyPNnJzghkg@lz&ht{_^!h)J)HvObEv15>ZzOetQ;tc*!;phG>gU48#Tq4dHUCHOg zd1IHuHLH*w1<>7+_%F5AZ7}28$x+<36#N#38aiTR1kxiWM>lqr^qL^g%mj%QwRo_ z8%d^M8m7`GC{n_7>XC#Qw9fT}*Jjda7R}foE?}k%SIBIhg90mPsj>zlh#P1-vn93D zJeOTe9#^PP*|u(^3H-nI*)g>%F}3$bo*O~FF^X*DrWKhza8OM^4e?xr6x>25;x-`% z5CtG7T44sN%nC2o#WVAWUbL<(s_Qak-4sbaKbpLYuqmr?Dy_uikU<9tG!O?r9B9NK ztUw-GP=MBG-$5D->p~$`)g~7Q24ew@B#I38J#z60B-?K@)fCq<9U0E-j+bAG$RZxLnXi_k=k=Jz7+ForMe zLQZ9YBX@KsMsy;ty1+4#hNF0xU(k&d3Dx^3H2gvgpgcf;E?$u2ts|45Mxfc`IFuku z3DeXNMbT(EZl_9ZbPK$sM+rWfjhC>%ZpU&v>=M6`Ovw-fQ$zWkpu`0+*}^(l3_F&@ zbfHHFBq2($f)X&SMKC1Yg8(@a(d$uyPJR;wg&&1xoF!i&|2O=J-;s_@z4HWU9X Mco+u4qsQ?0f6`vZLjV8( delta 2468 zcmb7ES#(oX6x}av`oimjrm1D9Leo$vZ9|6)q!Y7Pz#_`f0<~(CsUx(*HC~C7Zg0|z+(4R6MWZg&n^Z8GDpwqe*G$`&$XwlwEzk%q&}Gd*|w?u`R34 zXiy9K&ZzTk8GZx|w>CPX9A2YdD=zcnMIF`f>6nZP6))*{8M{^N((wvj)$tnk=y)A_ z6f_#Y=lG1O;rYgCEi3T`_UhOt!<#a^h5aht*6|MB)iEFSI^M%>1FFElS(ENr6{rnWr92aYn-1z9>ROxT>Z`5t2mS*yFx1hX?&uHH zT#{^psRW052GTsMYkXDyUNg%!FD2U$2~&<%GU4ZSU*5k>>s2t2RD7`D33rdBph)5A z46he?sdvyv)dm|a@k7Ci>X2niSH#-9C>n(vY?Npb^DYB575<=Qyqs`;DF(~K#5zx| zHdx`GVwqCXi2#MhS$koHf=tO##W5WpNr4~72^}A!Ud1OmPU2G?pW$;IU*JmxA>*WS zg|WppzVBT2fRgbQzBZ!6M`bl@d_ul4#*EnSD8(rSb0#&hsb&~69Cjl&$Jci@XQ$%) zR>yZZt>aedk5=4hY|9NQKO4t$|I9q2V1iNQ8fBbx`9h_9tAGsHz*gqWCJoFtq>}S2 z{;SMAb~gVS*KB-_L1S88X<`cZM$i|0crtMn?L`Q2rSk+Z8a1fpUqKz}88^szC0Amz zmmNaJ0Zwd?AOZwTOmnuUoX^u}pk2XKE6{KBH2%nIH93?K8DyxD-B|LQK&;6O9ALnD z2AV}4d`++r4JJex*-qxkX_(G1zzr!d4UL$AnFLzM{aMt*hS{`BK1tivoXz2m1IhsA ztGFg%3gzO#2AUdMp~Ns3^LRutA(Lr~WRjuAv>iu~uV85IbJKFy(sCah`Px+ECQAon zdcM!pz{Q+^CFHpjd1&TSzrqYT(#){f%CG(mnN3DayS=TJhXNwNtrO8O-%O|fmZ*iK~(xox{^Y*YCK{WWtlLCEcCf}O8F zX^a*UN;bq`h-E2=<%CEiFZu$;xQj7%5@X;0#8@F1PE9(POr(Xn8AV#IkZGCs2=Yk&AkQYdY$WWQuVe8>SR(5&4xQ||sL9BkjA>p2 z5AoXCa1*n3u#j%XEsPN6?l2n`Ih|;8!fBJ2B}Hi-G7_8ux#cWyl?*2Kqof~`(!i54 zx4?;IX%gh7YJsi(ptrZjRhsIfM~yl|Ft}n?6Y?K$hAC5-=pX!{D3jI VhZ|Bg_cERPa6cYM%^t=h{{k3Jl$rnl diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class index 85f4c74ce0794d6852015191f46377541d0c67fc..18b4c8fdddae0987517eae283b5775be15cfb085 100644 GIT binary patch delta 1175 zcmb7@OHUJF6o%iKUZ$OX3awB95sC^bMLQKlt=58~c&VsZuV`zrRV&a$4T*^{T^LE! zOm?q!leCM3^IcH8kc75+EeERi%8Nd)` zb%ZhQ!!bWvaa=AZd^j0E8m9u7z-hUh(Qy`&8qVp^F)rUS8qVujBLgqU`$Zov$^Ehq zSA3Y#a8<*#H`$!3WEYp!SFVYT=u!~M&(6=4%JXxXe0e5TDi?|m1U8^kU_IIt_`jJi zzbriY`glP@PT)H78nOb@xFJwLQNvAvTez(tVcu0*%#^#${OoOZm5?`oc*9KKjvL0X zz#ZgyP8&vCUi(os%^C$ugd z{WD_rjNW4x9@VK<$IQi$gPiY1m8Kkxkp>biRf%GRlD5V(YP|SQjZsTO<-Ewh#Nk@M N$9O+NDtiKt{st9PZwdea delta 1131 zcmb7?%Tg0T6o&tvNtlqdmn2FEYD7&G6EqiZh#*QkhBhye$$u~=AuTCUW#zdNz|{b*8Mtm> zTp(V1`KEK>SxFNUi{G@jy1ogUt%q%~Y#dz@8_^-)%ja?h0~LuIs2Z4%n8cLCO_&Cz zC2rxiK);pu^;)mBwJC`^s0u_Mn2*iuqxsrQwm3U$J}uYg<|Xc;Dsd0h#U5kOSC6tH zK;uUp2*hZ$aqqOf1mGT^O(d>cXdPy(;2uhUgh)rU56~Cv-~`toFM&9GNMI{Z(g{U3 zw$T#Ujvb6p&tz!{3l=G66lmjARnKEXoj1F5r z<7P;{vJ<-)-NQS@;&^uRl%|J;{YJNej9qqwxk=viRv_lE2YYRutVjI9`Y8)_#Ta3I zzz|;>X4{HvQpx6Z)Ki{%9Jzngl_%e*-ql*Y;HvNQ)GMT8Z|exNU%rU{GuCM+XFj1_ z^-i~Y=X8IRTw@J9VUNep8E)=|@*E(K>TPrV2VH_g%>;D@dIalNA($k=)G7phD+u~H zQmqL3U4kPX!5~E4{=xo8xSUy@8K>?UcHv2b>eAfkOc~%mYNavgY8-9Ua3vxuC7xqk b$E*L;7_v1qHS2u2==J&-?GmY+c{~0WHJN3e diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index cd4196e1b0afd4ef5626dcf61a60d14edb8325b0..925cfd8a7c504f7870aedf032af67e70dd888530 100644 GIT binary patch delta 1168 zcmZ`%+foxj5IwV-xXEU~N{Aq+5YeC}XaMoTO@b(*Mn$}0fEXldsAy?|x2O1^Uy$`g`k-*7VOmpT7a<#e#_)81vwq7eS0G zbKZjsK3qh?hfBDu%oP(8xN2b1gsHIC)b(`(H%!!HOgT4|x#hua52g&H#Ild)GcP4tuuGy5O#-g&uC8taGZM2%8JL#1i?qZX z?irYu$l$&}f9a_RmR@Teoi@Hl;sH_u4GZb#>DaTyY%VsE&!=A{vV}#7he%0eky`N@ z1Fm9_T>=_E(m`M+y=^?3ttfTy^w6hN+E#jf#0s9i$Qnc>pnZhCY=PToOE4&p+zcDCEe-jEjNjX;N8siez6(N>Df zrlQJdwD_Y=hGfM9I7sv%r(ihZEtzooRB1H{>~)6ntFFDc`5Y6Zo~)qsmnq#iRz;~I$5}}Y``>|_a0YU+ zJdmU_5dX$N{AwUh??v5e-d>1VDoAaipzl8gedw>LV8Br@SXMAZoO%*>AdrY|?vNra z0y*e-QNg;gNII{FxY@P3Jmqi<*WhTV<^bN1;$2OOk*zu67Kg@FP)mQhJnK>VXQ;|v Hz_Wh=6CiK( delta 1166 zcmZ{j+fNfg6vn^Zwr<%@F>MhGLPexrsM;31Ac&$! znZ_p*AAQDPqG%$|`ZpQlH@n-V4Q)1=IdkTm`F>~S?C;QeDEsH%k6!=|SxFF4)iGSJt^gL<#PVfVlf{rJYLGb5a>d;z&3O$aK>Y?Aq{DP+sJ5`7sz5k z;0|&c76tBNNx|s**B#XfXR!KFZ4V3Nkx>wMn0uCsK3y&pqsdY!_cB!|FALm5M&Ld& zs{w7y84a*JK;=g%DA>-`7S2J#O9swvu8GO9xBAM{QwhY*<~fy5C#~fAZ#D>j+s)l8WeGZ!B2I0zCeuh zai$L&$8{QE5$iZX-yZDcQTrGzIZe-gT7&eky1(et5HV`^Gk1VH2hvc=IEX`xP^eL> z=B)`)L73$@{jN0#6{*M?GzFjFj(kVk%1?ObzM);3%$7FnyusU**q@(1C2b=b3|T| ze5c0iI%*LdGYP5%Z+~60WGS-HLS$r<$Ow)%)flxj#_TG`87KR~<@co`8x3YwRw=@P z=XI*JE^{#F1fQW<9pje9$tD{9%^Ghg@u7u8qLoI%&`{Y9@{dT`w|R=|Nm7{&c=|ts CB5j@k diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellController.class b/productionboard/target/classes/com/productionboard/controller/TankShellController.class index b237e2740faed0a4af8d280b465db014156abadb..13c2d4a469a426a89ec3de06576cef67ac10b1f2 100644 GIT binary patch delta 1001 zcmZ{iOHUI~7>3`|&a~5+p`;ZHtyt=%RT;76B8pNJ#d`&@YN7-Ui71Vvn&?7TO-$UV zyV)mxuM}E_m%Pw#eSnE zBTA+E;ITkw-hQig*_-N8t{b}r+Mmr;AC(v87Z>xD>izlWCQ{gCB7sf;rN2-ZwqJ(s zL-aow`zY4WlYyIVB#TWSD$EGfqVyvfdD@yLZFMc5ci~GWkv2`-YLm7ZC8wL ztA{q78DO+Rdxj^IUckT}?By=75BnLBwwH~>pp2I_L2rhu8>@P;4aF=y0y!`5r!iWS zd2uQLeatyR(meC~of-*8-|}jh=)nOTWd0$qzH8~F#iB)n_=QXuhn@GunVY4jZwBHi z>*g6DP;ixbenmfDS3|b<1C+Q~M_T|TtB$b15;SWak>$^b-d;nyJTgO}euK40)-kf4 z;{Ov!=+JYXLjx!4CPb_v|liX{S|D1PL+8R!oy8EXc4TN4eE2#~h6Sf0rzF+V8_S?`N3d H4$0X+;5B1B literal 3893 zcmb_e+j7%Z6y35DY#ebjBqcy;FbNHD8aciYCtOMrZb_X4;xv?o6lD7(2xQ5Xs z$Wz~W>^IPvb|~#kKcL^lbh?ft%aW04I@F$#bk4r5y|lH@{_F4G|0JS3Jxb6qx*n$+ z`{^j%Zv>vCsG5RJ( z_XHYLmY8|l&}+@ArRdr<*^{TIgnY5nflDnx)j) zx?(C7mCb6JZpqxgDNwPb8{3lEFcfWj%aH5rsct-xDooZ)X-lqJy0I(Co`E#mwDhNn z!D?{3uVJt)<(WXq(qnl?mQ-2WmdY0Q#HE)MO|h;B6dgUkE>O?BUPBUxN{YsooAnAa z)?{Ge#(Gs&*JVTDYj?B9dZYkcJ~ZX3u33hzs?3nqWbH}$5mVK9Zx5k+6|KgA>)7b| zFl71Al%KMSRDq#C+ndZW<+;<`EnT2fJn!yW1CTCgJNPEh zqC7P;jZe5;s3cKFkyhCah4-D~A-!XQ_c4Lep&x>YVqv<4k5&qFoA3@A)=pO0_f2N{ zT1rB)S`AF3lXMFG(c6&hCMMD#oe-&?2EfZ?CXR~MkE#5C{)4e-0av)g2r;_gpHv*s{9xrEWmT!j6&cf*X+6foAuX0y zmhDedAkotK${D%@I_F2=dht8KikTuaZNx-Q0}22 z`V3E^ql(oTtOQEYS!i%K5?0(z@7OOCeT|0*aR)p$(Xh|B*EMb-8-`q<5zo<&u;fA0 zaMY9ReM|cyR7$_4m_R?#!F2R3#Uu0^?SK6TCGNeUKK=;x9y?qTccKh%PJ)0eLgnqy z1CC2Kw1~ZP^f|(gLYwF0?3~Bb7^Z!iw4qI&b_AV3mDvj(Bi-!DtW;-zfkNf1yFHF1P@ux&t`e1;7IUc-RF%@jU=V zRB;%985h7s55Q&U@#^YL9x0{UW$I*Irzk!11#OjT6egGOg2F;vc0*hV36Xq1#7l&D c^&dlgX@`i=Rp5@GT3STUVLcB}PGMgA2kCLv`v3p{ diff --git a/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class b/productionboard/target/classes/com/productionboard/service/IMesProductionDataService.class index 200ce879c34e24b8419af1ab05b6f2f711bad50d..3b792d256ca0aa3a823c30aede33c183a98d5c29 100644 GIT binary patch delta 194 zcmZ3)et=Wp)W2Q(7#J8#7$n&l#Mv1nHVVvSQW7st%}GrzaY-%9Oip!6EX^r#stlT`;CkA!H#DbY8|KEkEsFYU%YLC{bzwT%y2!bfy{(Cz3EJ(l zYrQsXJx{e~H?6Y0B*92sjcBJ@pnVWEo%$~ng{#|!D0ntJhZ~K|v@kN?Qit>;u#};{ zdZUq6o&-ihr&E7lUVmle^n0RQaD!M*L;;_zm#31RQbCw==DHPV7>m-dv`d)NJ0}g( zaHkct4UeoSXuo6Sbp^-LhN&-QAS=zG8h|Dd=s4bz=9jZI^%I;00y*gLPg zn^t~F$i0H;Nmg`aj15z`Wt;5D?jeW=#xUfQsLB4}v*`@O)7*e>kK-u#d?9pu+N; zzu$mlAE(?dP2Cxm#jF(#S&R*_R;oH(S58gHx<|oqXa(=^Y}PHw2yVY#eU?h%B0g1+ zl6Q#rtVa~YmliW~iwkqJNxVQIi4!=fqL_pUD~U50R8dOeBb-(7GKr6IP6h8R?aNP= z?j~^_Ln@pkF5nXttoWwFZZmtXCRv763%|we7LOPO*P>L;HCs&uG5sa)LbVL`HKzRi z+^b0|Jr&B;b}6_LW;gm`rl8wTWq%Ky9o{={gX%Pd{a$oSO>c-zj`841aVy%5U|*_I zvU*wvDp~*tRMed#!R+w}05v;8AU+Zy9%Pj-iy_{)2UvJ~h)&+sNn5_3;$^;*?P<0# z$=-%OGP$9TtZwKdwHx|K^SVBj-^@WiFVUjLmbDN%M&CmD!-Mb{pArzzk6}KOz5qrr z$}a_D7)P5o`8T%h>^u86Vo%wt$15zB+?B}`=PsZz9c1 delta 983 zcmaiy+fEZv6o$W<(oRdKrS#+hi+Dm>0gIv*k&}X2u?GbYNEJ3!>Y;dhAB0(a+pdptA@G9s>6MUHHUSJGg3OQXes)0 zyI4D(^zf*HnS}I?>+Lpw!HBp}ev(u8$kgA(Cbx%GiHi~@2}&(SUg}fcxtv$ew9cV< zr#YkZLD7$LR$C0|86zvToD|afYWB{xd*kX&sOPtI*bFht8|b_s`q(x*yj95%q`qQr z?BXlsJ`)`OLdd2(@ktFI1~aM%^BS=zGnYCLQ*Fdl8!^&COh|mH3(@p0sGgu;niqR9 zPJ0&?73n2Cmp8FqaYb37W!|5`PV-8lD$BfzEU9*o9c1227nw2ks>qD7GtBk^yC#S^ z58}V(xiT-(%e { }); //库存情况 - $.getJSON('/tankShell/getInventoryStatistics', function (result) { + $.getJSON('/aluminumLiner/getInventoryStatistics', function (result) { inventory(result, document.getElementById("inventory")); }); //生产计划 $.ajax({ - url: '/storage/getProductionPlan', - type: 'GET', + url: '/aluminumLiner/getProductionPlan', + type: 'get', dataType: 'JSON', success: function (res) { let Res = res + console.log("生产计划"+res) Res.data.forEach(val => { val[0] = 'sc-228NE' val[1] = '431' @@ -71,7 +72,8 @@ $(() => { //设备故障排名 - $.getJSON('/tankShell/getStatisticalOutputByModel', function (result) { + $.getJSON('/aluminumLiner/getStatisticalOutputByModel', function (result) { + equipmentFailure(result, document.getElementById("equipmentFailure")); }); diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index ed22707..9113034 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -1702,45 +1702,20 @@ const OEEStatistics = (res, ids) => { const inventory = (res, ids) => { let mycharts = echarts.init(ids); - let xAxisData = []; - let seriesData1 = []; + let sum = 0; let barTopColor = ["#02c3f1"]; let barBottomColor = [ "rgba(2,195,241,0.1)", ]; - let Res = - { - datas: [ - { - name: 'SC-279', - value: 2 - }, - { - name: 'SC-606', - value: 6 - }, - { - name: 'SC-387NE', - value: 31 - }, - { - name: 'SC-329', - value: 2 - }, - { - name: 'SC-279', - value: 9 - }, - ] - } - - Res.datas.forEach((item) => { - xAxisData.push(item.name); - seriesData1.push(item.value); - sum += item.value; - }); + const xAxisData = res.map(val => val.materialName) + const seriesData1 = res.map(val => val.lineStoreAmount) + // Res.forEach((item) => { + // xAxisData.push(item.name); + // seriesData1.push(item.value); + // sum += item.value; + // }); let option = { grid: { @@ -2157,12 +2132,12 @@ const loss = (res, ids) => { //设备故障排名 const equipmentFailure = (res, ids) => { let mycharts = echarts.init(ids); - - + // console.log("设备故障排名1"+res) let stationData = []; let values = []; - res.datas.forEach(function (it, index) { + res.forEach(function (it, index) { + stationData.push(it.station); values.push(it.value); });