From 7a44b8351f95a485db49a2632e80522a409d3aeb Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Thu, 31 Oct 2024 14:02:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=B7=B3=E8=BD=AC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- imt-ui/src/views/system/notify/my/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imt-ui/src/views/system/notify/my/index.vue b/imt-ui/src/views/system/notify/my/index.vue index 8f75e3e..d1d5699 100644 --- a/imt-ui/src/views/system/notify/my/index.vue +++ b/imt-ui/src/views/system/notify/my/index.vue @@ -108,6 +108,7 @@ label="发送时间" align="center" prop="createTime" + sortable width="180" > From 1edca208be9052dd6932fb8453bbea187425f316 Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Thu, 31 Oct 2024 14:03:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=B7=B3=E8=BD=AC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/maintenance/maintenanceInfo/index.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue b/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue index 7287080..c38681f 100644 --- a/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue +++ b/imt-ui/src/views/system/maintenance/maintenanceInfo/index.vue @@ -521,7 +521,11 @@ export default { }; }, created() { - this.getList(); + if (this.$route.query.orderId) { + this.getQueryData(); + } else { + this.getList(); + } this.initSelection(); }, methods: { @@ -637,6 +641,16 @@ export default { this.loading = false; } }, + /**跳转查询 */ + async getQueryData() { + this.loading = true; + const res = await RemoteMaintenanceOrderApi.getRemoteMaintenanceOrder( + this.$route.query.orderId + ); + this.list = [res.data]; + this.total = this.list.length; + this.loading = false; + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNo = 1; From 05d1931c2fad1737862a0ea1e99c665dd77f3534 Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Thu, 31 Oct 2024 17:52:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=82=B9=E6=A3=80?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=EF=BC=9B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=80=9A=E8=BF=87=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=92=8C=E5=8F=82=E6=95=B0=E6=9D=A5=E8=B5=8B=E5=80=BC=EF=BC=9B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=8F=82=E6=95=B0=E8=A1=A8=E5=90=8D=EF=BC=9B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B6=8B=E5=8A=BF=E6=8A=A5=E8=AD=A6=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=80=9A=E8=BF=87=E8=8E=B7=E5=8F=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E5=8F=82=E6=95=B0=E5=90=8D=E5=92=8C=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E6=9D=A5=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=AD=A6=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=AF=8F=E6=97=A5=E5=B7=AE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/job/TrendAlarmDataTimeoutJob.java | 68 ++++++--- .../api/alarm/dto/AlarmRulesRespDTO.java | 5 +- .../admin/alarm/vo/AlarmRulesRespVO.java | 8 + .../admin/alarm/vo/AlarmRulesSaveReqVO.java | 2 + .../dal/dataobject/alarm/AlarmRulesDO.java | 4 + .../dal/dataobject/alarm/AlarmRulesDTO.java | 5 + .../dal/mysql/alarm/AlarmRulesMapper.java | 1 + .../inspection/InspectionInfoServiceImpl.java | 20 +++ .../MaintenanceOrderServiceImpl.java | 2 - .../alarm/alarmrules/AlarmRulesForm.vue | 142 +++++++++++++----- imt-ui/src/views/system/notify/my/index.vue | 13 ++ 11 files changed, 206 insertions(+), 64 deletions(-) diff --git a/imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/job/TrendAlarmDataTimeoutJob.java b/imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/job/TrendAlarmDataTimeoutJob.java index 52bc822..612ac39 100644 --- a/imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/job/TrendAlarmDataTimeoutJob.java +++ b/imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/job/TrendAlarmDataTimeoutJob.java @@ -2,23 +2,26 @@ package com.inspur.module.data.job; import com.inspur.framework.common.util.date.DateUtils; import com.inspur.framework.quartz.core.handler.JobHandler; -import com.inspur.framework.tenant.core.job.TenantJob; +import com.inspur.framework.tenant.core.aop.TenantIgnore; import com.inspur.module.data.service.InfluxDBService; import com.inspur.module.system.api.alarm.AlarmRulesApi; import com.inspur.module.system.api.alarm.dto.AlarmRulesRespDTO; +import com.inspur.module.system.dal.dataobject.equip.EquipInfoDO; +import com.inspur.module.system.service.equip.EquipInfoService; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 趋势报警定时任务 @@ -37,28 +40,53 @@ public class TrendAlarmDataTimeoutJob implements JobHandler { @Resource private AlarmRulesApi alarmRulesApi; + @Resource + private EquipInfoService equipInfoService; + @Override + @TenantIgnore public String execute(String param) throws Exception { - String equid = "2e3d0190e63eda526da89d6c751f08f3";//TODO 固定 + List equipInfoList = equipInfoService.getAllEquipInfoList(); + if(equipInfoList.isEmpty()){ + return "没有可用设备！"; + } +// String equid = "2e3d0190e63eda526da89d6c751f08f3";//TODO 固定 +// ZoneId zoneId = ZoneId.systemDefault(); +// LocalDateTime now = LocalDateTime.now(zoneId); +// LocalDateTime onedayBefore = now.minusDays(1); + LocalDate today = LocalDate.now(); + LocalDate yesterday = today.minusDays(1); + LocalDateTime startOfYesterday = yesterday.atStartOfDay(); + LocalDateTime endOfYesterday = LocalDateTime.of(yesterday, LocalTime.MAX); + String beginTime = DateUtils.localDateTimeToUTC(startOfYesterday); + String endTime = DateUtils.localDateTimeToUTC(endOfYesterday); //读取并计算需要过滤的数据：如温度差 - ZoneId zoneId = ZoneId.systemDefault(); - LocalDateTime now = LocalDateTime.now(zoneId); - LocalDateTime onedayBefore = now.minusDays(1); - String beginTime = DateUtils.localDateTimeToUTC(onedayBefore); - String endTime = DateUtils.localDateTimeToUTC(now); - //TODO 最好是从数据库中读取（需要趋势报警的参数名，参数值等） - Map diffDataMap = new HashMap<>(); - Map diffDataMap1= selectDiffDataByColumnNameandDate(null, "gateway_channel_temp_data", "x_bear_temp", beginTime, endTime); - Map diffDataMap2 = selectDiffDataByColumnNameandDate(null, "gateway_channel_vibr_data", "x_entropy", beginTime, endTime); - diffDataMap.putAll(diffDataMap1); - diffDataMap.putAll(diffDataMap2); + for (EquipInfoDO equipInfoDO : equipInfoList) { + String equid = equipInfoDO.getEquipId(); + List rules = alarmRulesApi.selectAlarmRulesListByCatch(equid); + if(rules != null && rules.size() > 0){//预警规则过滤 + rules = rules.stream().filter(ruleData->ruleData.getType() == 1).collect(Collectors.toList()); + Map diffDataMap = new HashMap<>(); + rules.forEach(ruleData->{ + Map dataMap = selectDiffDataByColumnNameandDate(equid, ruleData.getTableName(), ruleData.getAlarmNameKey().substring(0,ruleData.getAlarmNameKey().lastIndexOf("_")), beginTime, endTime); + diffDataMap.putAll(dataMap); + }); + int alarmNum = alarmRulesApi.trendAlarmRulesFilter(diffDataMap, rules); + logger.info("本次趋势报警产生预警{}条",alarmNum); + } + } +// Map diffDataMap = new HashMap<>(); +// Map diffDataMap1= selectDiffDataByColumnNameandDate(null, "gateway_channel_temp_data", "x_bear_temp", beginTime, endTime); +// Map diffDataMap2 = selectDiffDataByColumnNameandDate(null, "gateway_channel_vibr_data", "x_entropy", beginTime, endTime); +// diffDataMap.putAll(diffDataMap1); +// diffDataMap.putAll(diffDataMap2); // logger.info("查询设备数据差值：" + diffDataMap.get("x_bear_temp_diff")); // logger.info("查询设备数据差值：" + diffDataMap.get("x_entropy_diff")); - List rules = alarmRulesApi.selectAlarmRulesListByCatch(equid); - if(rules != null && rules.size() > 0){//预警规则过滤 - int alarmNum = alarmRulesApi.trendAlarmRulesFilter(diffDataMap, rules); - logger.info("本次产生预警{}条",alarmNum); - } +// List rules = alarmRulesApi.selectAlarmRulesListByCatch(equid); +// if(rules != null && rules.size() > 0){//预警规则过滤 +// int alarmNum = alarmRulesApi.trendAlarmRulesFilter(diffDataMap, rules); +// logger.info("本次趋势报警产生预警{}条",alarmNum); +// } return "success"; } diff --git a/imt-server/imt-module-system/imt-module-system-api/src/main/java/com/inspur/module/system/api/alarm/dto/AlarmRulesRespDTO.java b/imt-server/imt-module-system/imt-module-system-api/src/main/java/com/inspur/module/system/api/alarm/dto/AlarmRulesRespDTO.java index c6fb7f2..150ad08 100644 --- a/imt-server/imt-module-system/imt-module-system-api/src/main/java/com/inspur/module/system/api/alarm/dto/AlarmRulesRespDTO.java +++ b/imt-server/imt-module-system/imt-module-system-api/src/main/java/com/inspur/module/system/api/alarm/dto/AlarmRulesRespDTO.java @@ -74,5 +74,8 @@ public class AlarmRulesRespDTO { * 排序 */ private Integer sort; - + /** + * 表名 + */ + private String tableName; } diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesRespVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesRespVO.java index f6b5df9..1424a7b 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesRespVO.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesRespVO.java @@ -84,6 +84,10 @@ public class AlarmRulesRespVO { @ExcelProperty("设备型号") private String equipNo; + @Schema(description = "设备名称") + @ExcelProperty("设备名称") + private String equipName; + @Schema(description = "客户名称") @ExcelProperty("客户名称") private String customerName; @@ -91,4 +95,8 @@ public class AlarmRulesRespVO { @Schema(description = "组件名称") @ExcelProperty("组件名称") private String componentName; + + @Schema(description = "表名") + @ExcelProperty("表名") + private String tableName; } \ No newline at end of file diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesSaveReqVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesSaveReqVO.java index d54200d..9d4dfa6 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesSaveReqVO.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/admin/alarm/vo/AlarmRulesSaveReqVO.java @@ -62,4 +62,6 @@ public class AlarmRulesSaveReqVO { @Schema(description = "排序") private Integer sort; + @Schema(description = "influxdb表名") + private String tableName; } \ No newline at end of file diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDO.java index 081be56..7e6c34b 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDO.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDO.java @@ -93,4 +93,8 @@ public class AlarmRulesDO extends BaseDO { * 租户编号 */ private Long tenantId; + /** + * 表名 + */ + private String tableName; } \ No newline at end of file diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDTO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDTO.java index 91538e7..684e7a2 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDTO.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/dataobject/alarm/AlarmRulesDTO.java @@ -103,4 +103,9 @@ public class AlarmRulesDTO { * 组件名 */ private String componentName; + + /** + * 表名 + */ + private String tableName; } diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/AlarmRulesMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/AlarmRulesMapper.java index e2c3784..51d1266 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/AlarmRulesMapper.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/AlarmRulesMapper.java @@ -83,6 +83,7 @@ public interface AlarmRulesMapper extends BaseMapperX { return selectJoinOne(AlarmRulesDTO.class,new MPJLambdaWrapperX() .selectAll(AlarmRulesDO.class) .selectAs(EquipInfoDO::getEquipNo, AlarmRulesDTO::getEquipNo) + .selectAs(EquipInfoDO::getEquipName, AlarmRulesDTO::getEquipName) .selectAs(ModelInfoDO::getModelName, AlarmRulesDTO::getModelName) .selectAs(CustomerInfoDO::getCustomerName, AlarmRulesDTO::getCustomerName) .leftJoin(EquipInfoDO.class, EquipInfoDO::getEquipId, AlarmRulesDO::getEquipId) diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/inspection/InspectionInfoServiceImpl.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/inspection/InspectionInfoServiceImpl.java index 1e6db16..0d9011c 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/inspection/InspectionInfoServiceImpl.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/inspection/InspectionInfoServiceImpl.java @@ -8,15 +8,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.inspur.framework.common.exception.ServiceException; import com.inspur.framework.common.pojo.PageResult; +import com.inspur.framework.security.core.util.SecurityFrameworkUtils; import com.inspur.framework.tenant.core.aop.TenantIgnore; +import com.inspur.module.system.constant.NoticeType; import com.inspur.module.system.controller.inspection.vo.*; import com.inspur.module.system.dal.dataobject.baseData.CustomerInfoDO; import com.inspur.module.system.dal.dataobject.inspection.InspectionInfoDO; import com.inspur.module.system.dal.dataobject.maintenance.MaintenanceOrderDO; +import com.inspur.module.system.dal.dataobject.notify.NotifyMessageDO; import com.inspur.module.system.dal.mysql.inspection.InspectionInfoMapper; import com.inspur.module.system.service.alarm.AlarmDataService; import com.inspur.module.system.service.baseData.CustomerInfoService; import com.inspur.module.system.service.maintenance.MaintenanceOrderService; +import com.inspur.module.system.service.notify.NotifyMessageService; import org.aspectj.weaver.ast.Var; import org.springframework.stereotype.Service; @@ -56,6 +60,9 @@ public class InspectionInfoServiceImpl implements InspectionInfoService { @Resource private AlarmDataService alarmDataService; + @Resource + private NotifyMessageService notifyMessageService; + @Override @TenantIgnore public String createInspectionInfo(InspectionInfoSaveReqVO createReqVO) { @@ -71,6 +78,19 @@ public class InspectionInfoServiceImpl implements InspectionInfoService { inspectionInfo.setInspectionNo("DJGD" + DateUtil.format(new Date(),"yyyyMMddHHmmss") + RandomUtil.randomInt(1, 10)); inspectionInfo.setStatus(0); inspectionInfoMapper.insert(inspectionInfo); + + //消息推送 + NotifyMessageDO noticeMessageDO = new NotifyMessageDO() + .setOrderId(inspectionInfo.getInspectionId()) + .setTitle("新增点检工单通知") + .setContent("您有一个新的点检工单，请及时处理！") + .setType(NoticeType.INSPECTION_ORDER) + .setReadStatus(false) + .setUserId(SecurityFrameworkUtils.getLoginUserId()) + .setTemplateNickname(SecurityFrameworkUtils.getLoginUserNickname()) + .setTenantId(inspectionInfo.getTenantId()); + notifyMessageService.createNotifyMessage(noticeMessageDO); + // 返回 return inspectionInfo.getInspectionId(); } diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java index 2207ae3..5a93b5d 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderServiceImpl.java @@ -155,8 +155,6 @@ public class MaintenanceOrderServiceImpl implements MaintenanceOrderService { maintenanceOrderMapper.updateById(new MaintenanceOrderDO().setMaintenanceOrderId(remoteMaintenanceOrder.getMaintenanceOrderId()).setProcessInstanceId(processInstanceId)); } //消息推送 -// NoticeSaveReqVO noticeSaveReqVO = new NoticeSaveReqVO(null, "维修工单", NoticeType.MAINTENANCE_ORDER,"您有一个新的维修工单，请及时处理！", 0, remoteMaintenanceOrder.getTenantId(), remoteMaintenanceOrder.getMaintenanceOrderId()); -// noticeService.createNotice(noticeSaveReqVO); NotifyMessageDO noticeMessageDO = new NotifyMessageDO(); noticeMessageDO.setOrderId(remoteMaintenanceOrder.getMaintenanceOrderId()); noticeMessageDO.setTitle("新增维修工单通知"); diff --git a/imt-ui/src/views/system/alarm/alarmrules/AlarmRulesForm.vue b/imt-ui/src/views/system/alarm/alarmrules/AlarmRulesForm.vue index 0c9ac0b..c8666d9 100644 --- a/imt-ui/src/views/system/alarm/alarmrules/AlarmRulesForm.vue +++ b/imt-ui/src/views/system/alarm/alarmrules/AlarmRulesForm.vue @@ -15,15 +15,73 @@ v-loading="formLoading" label-width="100px" > + + + + + + + 选择机床 + + + + + + + + 选择组件 + - + /> --> +
+ +
+
{{ this.selectedNameKey }} 修改
 @@ -67,44 +125,6 @@ - - - - - - - 选择机床 - - - - - - - - 选择组件 - { + // e.children = null; + // treeData.push(e); + // }); + // this.options = treeData; + }, /** 报警上限值校验 */ validateUpper(rule, value, callback) { if ( @@ -471,9 +525,11 @@ export default { }, /** 获取选中设备 */ getEqu(data) { - console.log("-->>选择的设备是", data); + // console.log("-->>选择的设备是", data); this.formData.equipId = data.equipId; this.formData.equipNo = data.equipNo; + this.formData.equipName = data.equipName; + this.getParamsTree(data.equipId); // this.form.equipOrder = data.equipOrder; // this.form.equipName = data.equipName; // this.form.equipId = data.id; @@ -502,6 +558,8 @@ export default { try { const res = await AlarmRulesApi.getAlarmRules(id); this.formData = res.data; + this.selectedNameKey = res.data.alarmNameKey; + this.dialogTitle = "修改机床报警规则"; } finally { this.formLoading = false; @@ -555,7 +613,9 @@ export default { sort: undefined, equipName: undefined, componentName: undefined, + tableName: undefined, }; + this.selectedNameKey = null; this.resetForm("formRef"); }, }, diff --git a/imt-ui/src/views/system/notify/my/index.vue b/imt-ui/src/views/system/notify/my/index.vue index d1d5699..1fcec67 100644 --- a/imt-ui/src/views/system/notify/my/index.vue +++ b/imt-ui/src/views/system/notify/my/index.vue @@ -199,6 +199,13 @@ icon="el-icon-tickets" @click="handle2MaintenanceOrder(scope.row.orderId)" >维修工单 + 点检工单 @@ -300,6 +307,12 @@ export default { query: { orderId: orderId }, }); }, + handle2InspectionOrder(orderId) { + this.$router.push({ + path: "/maintenance/inspection-info", + query: { orderId: orderId }, + }); + }, }, };