diff --git a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/bigscreen/OverallDashboardController.java b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/bigscreen/OverallDashboardController.java new file mode 100644 index 0000000..acf0a4d --- /dev/null +++ b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/bigscreen/OverallDashboardController.java @@ -0,0 +1,55 @@ +package com.inspur.web.controller.bigscreen; + +import com.inspur.bigscreen.service.IOverallDashboardService; +import com.inspur.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author zhangjunwen + * @create 2024/7/17 + */ +@RestController +@RequestMapping("/bigscreen/overall") +public class OverallDashboardController { + + @Autowired + private IOverallDashboardService overallDashboardService; + + @GetMapping("/countCompanyEquipNum") + public AjaxResult countCompanyEquipNum() { + return AjaxResult.success(overallDashboardService.countCompanyEquipNum()); + } + + @GetMapping("/countWeeklyEquipNum") + public AjaxResult countWeeklyEquipNum() { + return AjaxResult.success(overallDashboardService.countWeeklyEquipNum()); + } + + @GetMapping("/countMaintenanceNum") + public AjaxResult countMaintenanceNum() { + return AjaxResult.success(overallDashboardService.countMaintenanceNum()); + } + + @GetMapping("/countWeeklyMaintenanceNum") + public AjaxResult countWeeklyMaintenanceNum() { + return AjaxResult.success(overallDashboardService.countWeeklyMaintenanceNum()); + } + + @GetMapping("/countCompanyDeptNumByIndustry") + public AjaxResult countCompanyDeptNumByIndustry() { + return AjaxResult.success(overallDashboardService.countCompanyDeptNumByIndustry()); + } + + @GetMapping("/countEquipNumByStatus") + public AjaxResult countEquipNumByStatus() { + return AjaxResult.success(overallDashboardService.countEquipNumByStatus()); + } + + @GetMapping("/countCompanyDetails") + public AjaxResult countCompanyDetails() { + return AjaxResult.success(overallDashboardService.countCompanyDetails()); + } +} diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/constant/DeptIndustryCode.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/constant/DeptIndustryCode.java new file mode 100644 index 0000000..ba94074 --- /dev/null +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/constant/DeptIndustryCode.java @@ -0,0 +1,24 @@ +package com.inspur.bigscreen.constant; + +/** + * @Author zhangjunwen + * @create 2024/7/17 + */ +public class DeptIndustryCode { + + /** + * 造纸 + */ + public static final String PAPER = "0"; + + /** + * 炼金 + */ + public static final String ALCHEMY = "1"; + + /** + * 其他 + */ + public static final String OTHER = "2"; + +} diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/dto/OverallDashboardDTO.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/dto/OverallDashboardDTO.java new file mode 100644 index 0000000..a60a16a --- /dev/null +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/dto/OverallDashboardDTO.java @@ -0,0 +1,46 @@ +package com.inspur.bigscreen.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.ibatis.annotations.ConstructorArgs; + +import java.util.List; + +/** + * @Author zhangjunwen + * @create 2024/7/17 + */ +@Data +@AllArgsConstructor +public class OverallDashboardDTO { + + private Long deptId; + + private String deptName; + + private Integer type; + + private Integer data; + + private Integer status; + + private String time; + + private List x; + + private List y; + + private Integer lineNum; + + private Integer equipNum; + + private Integer alarmNum; + + public OverallDashboardDTO() {} + + public OverallDashboardDTO(Integer status, Integer data) { + this.status = status; + this.data = data; + } +} diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/mapper/OverallDashboardMapper.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/mapper/OverallDashboardMapper.java new file mode 100644 index 0000000..58d7720 --- /dev/null +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/mapper/OverallDashboardMapper.java @@ -0,0 +1,20 @@ +package com.inspur.bigscreen.mapper; + +import com.inspur.bigscreen.dto.OverallDashboardDTO; + +/** + * @Author zhangjunwen + * @create 2024/7/17 + */ +public interface OverallDashboardMapper { + + /** + * 统计各个公司设备总数 + */ + public OverallDashboardDTO countCompanyEquipNum(Long deptId); + + /** + * 根据公司id统计维修单数量 + */ + public OverallDashboardDTO countMaintenanceNum(Long deptId); +} diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/IOverallDashboardService.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/IOverallDashboardService.java new file mode 100644 index 0000000..194c0b7 --- /dev/null +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/IOverallDashboardService.java @@ -0,0 +1,47 @@ +package com.inspur.bigscreen.service; + +import com.inspur.bigscreen.dto.OverallDashboardDTO; + +import java.util.List; + +/** + * @Author zhangjunwen + * @create 2024/7/17 + */ +public interface IOverallDashboardService { + + /** + * 查询各个公司的设备（轴承）数量 + */ + public List countCompanyEquipNum(); + + /** + * 查询一周内总共的各个状态设备数及故障率 + */ + public List countWeeklyEquipNum(); + + /** + * 查询各个公司维修单数量 + */ + public List countMaintenanceNum(); + + /** + * 统计半年各个公司维修单数量 + */ + public List countWeeklyMaintenanceNum(); + + /** + * 统计各个行业公司数量 + */ + public List countCompanyDeptNumByIndustry(); + + /** + * 统计该公司各个状态设备数量 + */ + public List countEquipNumByStatus(); + + /** + * 查询各个企业相关展示信息，产线数、设备数，告警数量 + */ + public List countCompanyDetails(); +} diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/CompanyDashboardService.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/CompanyDashboardServiceImpl.java similarity index 97% rename from zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/CompanyDashboardService.java rename to zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/CompanyDashboardServiceImpl.java index b2aed93..867d09d 100644 --- a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/CompanyDashboardService.java +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/CompanyDashboardServiceImpl.java @@ -2,11 +2,8 @@ package com.inspur.bigscreen.service.impl; import com.inspur.bigscreen.constant.EquipInfoStatus; import com.inspur.bigscreen.dto.CompanyDashboardDTO; -import com.inspur.bigscreen.dto.CompanyDashboardDTO; -import com.inspur.bigscreen.dto.CompanyDashboardDTO; import com.inspur.bigscreen.mapper.CompanyDashboardMapper; import com.inspur.bigscreen.service.ICompanyDashboardService; -import com.inspur.bigscreen.service.IFactoryDashboardService; import com.inspur.common.core.domain.entity.SysDept; import com.inspur.industrial.domain.IpcAlarmRecord; import com.inspur.industrial.service.IIpcAlarmRecordService; @@ -14,7 +11,6 @@ import com.inspur.spareparts.mapper.IpcSparePartsInboundMapper; import com.inspur.spareparts.mapper.IpcSparePartsInfoMapper; import com.inspur.spareparts.mapper.IpcSparePartsOutboundMapper; import com.inspur.system.mapper.SysDeptMapper; -import com.inspur.system.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +25,7 @@ import java.util.stream.Collectors; * @create 2024/7/15 */ @Service -public class CompanyDashboardService implements ICompanyDashboardService { +public class CompanyDashboardServiceImpl implements ICompanyDashboardService { @Autowired private CompanyDashboardMapper companyDashboardMapper; diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/FactoryDashboardService.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/FactoryDashboardServiceImpl.java similarity index 99% rename from zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/FactoryDashboardService.java rename to zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/FactoryDashboardServiceImpl.java index 137d9a2..381dbe9 100644 --- a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/FactoryDashboardService.java +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/FactoryDashboardServiceImpl.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * @create 2024/7/11 */ @Service -public class FactoryDashboardService implements IFactoryDashboardService { +public class FactoryDashboardServiceImpl implements IFactoryDashboardService { @Autowired private FactoryDashboardMapper factoryDashboardMapper; diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/OverallDashboardServiceImpl.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/OverallDashboardServiceImpl.java new file mode 100644 index 0000000..2fc8f1c --- /dev/null +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/bigscreen/service/impl/OverallDashboardServiceImpl.java @@ -0,0 +1,284 @@ +package com.inspur.bigscreen.service.impl; + +import com.inspur.bigscreen.constant.DeptIndustryCode; +import com.inspur.bigscreen.constant.EquipInfoStatus; +import com.inspur.bigscreen.dto.CompanyDashboardDTO; +import com.inspur.bigscreen.dto.OverallDashboardDTO; +import com.inspur.bigscreen.mapper.CompanyDashboardMapper; +import com.inspur.bigscreen.mapper.OverallDashboardMapper; +import com.inspur.bigscreen.service.ICompanyDashboardService; +import com.inspur.bigscreen.service.IOverallDashboardService; +import com.inspur.common.core.domain.entity.SysDept; +import com.inspur.system.mapper.SysDeptMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author zhangjunwen + * @create 2024/7/17 + */ +@Service +public class OverallDashboardServiceImpl implements IOverallDashboardService { + + @Autowired + private SysDeptMapper sysDeptMapper; + + @Autowired + private ICompanyDashboardService companyDashboardService; + + @Autowired + private OverallDashboardMapper overallDashboardMapper; + + @Autowired + private CompanyDashboardMapper companyDashboardMapper; + + /** + * 查询各个公司的设备（轴承）数量 + */ + @Override + public List countCompanyEquipNum(){ + List companyDepts = getCompanyDept(); + List resultList = new ArrayList<>(); + for (SysDept companyDept : companyDepts) { + OverallDashboardDTO data = overallDashboardMapper.countCompanyEquipNum(companyDept.getDeptId()); + data.setDeptId(companyDept.getDeptId()); + data.setDeptName(companyDept.getDeptName()); + resultList.add(data); + } + return resultList; + } + + /** + * 查询一周内总共的各个状态设备数及故障率 + */ + @Override + public List countWeeklyEquipNum(){ + List resultList = new ArrayList<>(); + List companyDashboardDTOList1 = companyDashboardMapper.countWeeklyEquipRunningNumByCompanyDeptId(100L, EquipInfoStatus.RUNNING); + List companyDashboardDTOList2 = companyDashboardMapper.countWeeklyEquipRunningNumByCompanyDeptId(100L,EquipInfoStatus.MAINTENANCE); + List companyDashboardDTOList3 = companyDashboardMapper.countWeeklyEquipRunningNumByCompanyDeptId(100L,EquipInfoStatus.STOP); + resultList.add(convertCompanyData(companyDashboardDTOList1,EquipInfoStatus.RUNNING)); + resultList.add(convertCompanyData(companyDashboardDTOList2,EquipInfoStatus.MAINTENANCE)); + resultList.add(convertCompanyData(companyDashboardDTOList3,EquipInfoStatus.STOP)); + return resultList; + } + + /** + * 查询各个公司维修单数量 + */ + @Override + public List countMaintenanceNum(){ + List companyDepts = getCompanyDept(); + List resultList = new ArrayList<>(); + for (SysDept companyDept : companyDepts) { + OverallDashboardDTO data = overallDashboardMapper.countMaintenanceNum(companyDept.getDeptId()); + data.setDeptId(companyDept.getDeptId()); + data.setDeptName(companyDept.getDeptName()); + resultList.add(data); + } + return resultList; + } + + /** + * 统计半年各个公司维修单数量 + */ + @Override + public List countWeeklyMaintenanceNum(){ + List companyDepts = getCompanyDept(); + List resultList = new ArrayList<>(); + for (SysDept companyDept : companyDepts) { + OverallDashboardDTO data = getMatenanceDataByHalfYear(companyDept.getDeptId()); + data.setDeptId(companyDept.getDeptId()); + data.setDeptName(companyDept.getDeptName()); + resultList.add(data); + } + return resultList; + } + + /** + * 统计各个行业公司数量 + */ + public List countCompanyDeptNumByIndustry(){ + + List companyDepts = getCompanyDept(); + long paperNum = companyDepts.stream().filter(dept -> dept.getIndustryCode().equals(DeptIndustryCode.PAPER)).count(); + long alchemyNum = companyDepts.stream().filter(dept -> dept.getIndustryCode().equals(DeptIndustryCode.ALCHEMY)).count(); + long otherNum = companyDepts.stream().filter(dept -> dept.getIndustryCode().equals(DeptIndustryCode.OTHER)).count(); + + return Arrays.asList( + new OverallDashboardDTO(Integer.valueOf(DeptIndustryCode.PAPER),(int)paperNum), + new OverallDashboardDTO(Integer.valueOf(DeptIndustryCode.ALCHEMY),(int)alchemyNum), + new OverallDashboardDTO(Integer.valueOf(DeptIndustryCode.OTHER),(int)otherNum) + ); + + } + + /** + * 统计该公司各个状态设备数量 + */ + public List countEquipNumByStatus(){ + List companyDashboardDTOList =companyDashboardService.countEquipNumByStatus(100L); + return companyDashboardDTOList.stream().map(companyDashboardDTO -> { + OverallDashboardDTO data = new OverallDashboardDTO(); + data.setStatus(companyDashboardDTO.getStatus()); + data.setData(companyDashboardDTO.getData()); + return data; + }).collect(Collectors.toList()); + + } + + /** + * 查询各个企业相关展示信息，产线数、设备数，告警数量 + */ + public List countCompanyDetails(){ + List companyDepts = getCompanyDept(); + List resultList = new ArrayList<>(); + for (SysDept companyDept : companyDepts) { + OverallDashboardDTO data = new OverallDashboardDTO(); + //查询该公司产线数 + List childDepts = sysDeptMapper.selectChildrenDeptById(companyDept.getDeptId()); + List lineDepts = childDepts.stream().filter(dept -> dept.getAncestors().split(",").length == 4).collect(Collectors.toList()); + int lineNum = lineDepts.size(); + //查询设备数 + int equipNum = overallDashboardMapper.countCompanyEquipNum(companyDept.getDeptId()).getData(); + //查询报警数 + List alarmList = companyDashboardService.countAlarmNumByCompanyId(companyDept.getDeptId()); + int alarmNum = alarmList.stream().mapToInt(CompanyDashboardDTO::getData).sum(); + data.setDeptId(companyDept.getDeptId()); + data.setDeptName(companyDept.getDeptName()); + data.setLineNum(lineNum); + data.setEquipNum(equipNum); + data.setAlarmNum(alarmNum); + resultList.add(data); + } + return resultList; + } + + /** + * 查询系统重公司部门 + */ + private List getCompanyDept(){ + SysDept query = new SysDept(); + query.setParentId(100L); + return sysDeptMapper.selectDeptList(query); + } + + /** + * 将查询的公司数据转全局数据 + */ + private OverallDashboardDTO convertCompanyData(List companyList,Integer status){ + OverallDashboardDTO result = new OverallDashboardDTO(); + List timeList = new ArrayList<>(); + List dataList = new ArrayList<>(); + for (CompanyDashboardDTO companyDashboardDTO : companyList) { + timeList.add(companyDashboardDTO.getTime()); + dataList.add(companyDashboardDTO.getData()); + } + Collections.reverse(timeList); + Collections.reverse(dataList); + result.setStatus(status); + result.setX(timeList); + result.setY(dataList); + return result; + } + + /** + * 获取当前时间半年内的时间并查询数据 + */ + private OverallDashboardDTO getMatenanceDataByHalfYear(Long deptId){ + OverallDashboardDTO returnData = new OverallDashboardDTO(); + List timeList = new ArrayList<>(); + List dataList = new ArrayList<>(); + List halfYearDate = getHalfYearDate(); + //修改日期年月日 + for (Date date : halfYearDate) { + CompanyDashboardDTO factoryData = companyDashboardMapper.countMaintenanceRecordNumByCompanyDeptId(date,deptId); + String time = factoryData.getTime(); + timeList.add(time.substring(0,time.lastIndexOf("-"))); + dataList.add(factoryData.getData()); + } + Collections.reverse(timeList); + Collections.reverse(dataList); + returnData.setX(timeList); + returnData.setY(dataList); + return returnData; + } + +// /** +// * 获取当前时间半年内的保养数据 +// */ +// private CompanyDashboardDTO getUpkeepDataByHalfYear(Long deptId){ +// CompanyDashboardDTO returnData = new CompanyDashboardDTO(); +// List timeList = new ArrayList<>(); +// List dataList = new ArrayList<>(); +// List halfYearDate = getHalfYearDate(); +// //修改日期年月日 +// for (Date date : halfYearDate) { +// CompanyDashboardDTO factoryData = companyDashboardMapper.countUpkeepRecordNumByCompanyDeptId(date,deptId); +// String time = factoryData.getTime(); +// timeList.add(time.substring(0,time.lastIndexOf("-"))); +// dataList.add(factoryData.getData()); +// } +// Collections.reverse(timeList); +// Collections.reverse(dataList); +// returnData.setX(timeList); +// returnData.setY(dataList); +// return returnData; +// } +// +// /** +// * 获取半年内巡检工单数量 +// */ +// private List getPatrolRecordNumByHalfYear(Long deptId){ +// CompanyDashboardDTO returnData1 = new CompanyDashboardDTO(); +// CompanyDashboardDTO returnData2 = new CompanyDashboardDTO(); +// List timeList1 = new ArrayList<>(); +// List timeList2 = new ArrayList<>(); +// List dataList1 = new ArrayList<>(); +// List dataList2 = new ArrayList<>(); +// List halfYearDate = getHalfYearDate(); +// //修改日期年月日 +// for (Date date : halfYearDate) { +// List factoryData = companyDashboardMapper.countPatrolRecordNumByCompanyDeptId(date,deptId); +// returnData1.setType(factoryData.get(0).getType()); +// String time1 = factoryData.get(0).getTime(); +// timeList1.add(time1.substring(0,time1.lastIndexOf("-"))); +// dataList1.add(factoryData.get(0).getData()); +// returnData2.setType(factoryData.get(1).getType()); +// String time2 = factoryData.get(1).getTime(); +// timeList2.add(time2.substring(0,time2.lastIndexOf("-"))); +// dataList2.add(factoryData.get(1).getData()); +// } +// Collections.reverse(timeList1); +// Collections.reverse(timeList2); +// Collections.reverse(dataList1); +// Collections.reverse(dataList2); +// returnData1.setX(timeList1); +// returnData1.setY(dataList1); +// returnData2.setX(timeList2); +// returnData2.setY(dataList2); +// return Arrays.asList(returnData1,returnData2); +// } + + /** + * 获取当前时间内半年月份 + */ + private List getHalfYearDate(){ + LocalDate currentDate = LocalDate.now(); + List halfYearDate = new ArrayList<>(); + + // 遍历当前日期之后的6个月（包括当前月份） + for (int i = 0; i < 6; i++) { + LocalDate firstDayOfMonth = currentDate.withDayOfMonth(1); + Date date = Date.from(firstDayOfMonth.atStartOfDay(ZoneId.systemDefault()).toInstant()); + halfYearDate.add(date); + currentDate = currentDate.minusMonths(1L); + } + return halfYearDate; + } +} diff --git a/zfipc-server/zfipc-system/src/main/resources/mapper/bigscreen/CompanyDashboardMapper.xml b/zfipc-server/zfipc-system/src/main/resources/mapper/bigscreen/CompanyDashboardMapper.xml index 504720b..56f6dba 100644 --- a/zfipc-server/zfipc-system/src/main/resources/mapper/bigscreen/CompanyDashboardMapper.xml +++ b/zfipc-server/zfipc-system/src/main/resources/mapper/bigscreen/CompanyDashboardMapper.xml @@ -39,7 +39,7 @@ ipc_equip_info where dept_id in - (select dept_id from sys_dept where FIND_IN_SET(#{deptId}, ancestors)) + (select dept_id from sys_dept where FIND_IN_SET(#{deptId}, ancestors) or dept_id = #{deptId}) and status = #{status} @@ -129,7 +129,7 @@ + select count(1) as data + from ipc_equip_info + where dept_id in + (select dept_id from sys_dept where FIND_IN_SET(#{deptId}, ancestors) or dept_id = #{deptId}) + + + + + \ No newline at end of file diff --git a/zfipc-ui/src/api/bigscreen/overall.js b/zfipc-ui/src/api/bigscreen/overall.js new file mode 100644 index 0000000..4a95488 --- /dev/null +++ b/zfipc-ui/src/api/bigscreen/overall.js @@ -0,0 +1,57 @@ +import request from "@/utils/request"; + +// 统计各个公司的设备数 +export function getCompanyEquipNum() { + return request({ + url: "/bigscreen/overall/countCompanyEquipNum", + method: "get", + }); +} + +// 统计各个设备数量 +export function getWeeklyEquipNum() { + return request({ + url: "/bigscreen/overall/countWeeklyEquipNum", + method: "get", + }); +} + +// 统计各个公司维修数量 +export function getMaintenanceNum() { + return request({ + url: "/bigscreen/overall/countMaintenanceNum", + method: "get", + }); +} + +// 统计半年内各个公司维修数量 +export function getWeeklyMaintenanceNum() { + return request({ + url: "/bigscreen/overall/countWeeklyMaintenanceNum", + method: "get", + }); +} + +// 统计各个行业接入企业数量 +export function getCompanyDeptNumByIndustry() { + return request({ + url: "/bigscreen/overall/countCompanyDeptNumByIndustry", + method: "get", + }); +} + +// 统计各个不同状态设备数量 +export function getEquipNumByStatus() { + return request({ + url: "/bigscreen/overall/countEquipNumByStatus", + method: "get", + }); +} + +// 统计各个公司相关统计信息 +export function getCompanyDetails() { + return request({ + url: "/bigscreen/overall/countCompanyDetails", + method: "get", + }); +} diff --git a/zfipc-ui/src/views/eqmanagement/eqcategory/index.vue b/zfipc-ui/src/views/eqmanagement/eqcategory/index.vue index c55ef4c..b3baa76 100644 --- a/zfipc-ui/src/views/eqmanagement/eqcategory/index.vue +++ b/zfipc-ui/src/views/eqmanagement/eqcategory/index.vue @@ -468,6 +468,15 @@ import { getWeeklyAlarmNumByCompany, getSparePartsNumByCompany, } from "@/api/bigscreen/company"; +import { + getCompanyEquipNum, + getWeeklyEquipNum, + getMaintenanceNum, + getWeeklyMaintenanceNum, + getCompanyDeptNumByIndustry, + getEquipNumByStatus, + getCompanyDetails, +} from "@/api/bigscreen/overall"; export default { name: "Category", components: { @@ -595,7 +604,7 @@ export default { this.getList(); this.getDeptTree(); //测试 - getSparePartsNumByCompany(101).then((response) => { + getCompanyDetails().then((response) => { console.log("data:", response.data); }); },