From 3c1fc98c5e12ae577383aa7c2a88e77f9272acd3 Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Tue, 5 Nov 2024 14:40:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99?= =?UTF-8?q?=E3=80=81=E7=BD=91=E5=85=B3=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E7=82=B9=E6=A3=80=E6=96=B9=E6=A1=88=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/system/alarm/alarmrules/index.vue | 195 ++++++++++-------- imt-ui/src/views/system/gatewayinfo/index.vue | 4 +- .../src/views/system/inspectionPlan/index.vue | 4 +- 3 files changed, 115 insertions(+), 88 deletions(-) diff --git a/imt-ui/src/views/system/alarm/alarmrules/index.vue b/imt-ui/src/views/system/alarm/alarmrules/index.vue index a953897..9bd63ad 100644 --- a/imt-ui/src/views/system/alarm/alarmrules/index.vue +++ b/imt-ui/src/views/system/alarm/alarmrules/index.vue @@ -502,90 +502,110 @@ width="40%" :close-on-click-modal="false" > - - - - {{ detailForm.customerName }} - - - - - {{ detailForm.equipNo }} - - - - - {{ detailForm.alarmName }} - - - - - {{ detailForm.alarmInfoUnit }} - - - - - {{ detailForm.referenceCon }} - - - - - {{ detailForm.referenceName }} - - - - - {{ detailForm.alertUpperBound }} - - - - - {{ detailForm.alertLowerBound }} - - - - -
- - - - {{ detailForm.remark }} - - + + + + + + {{ detailForm.customerName }} + + + + + {{ detailForm.equipNo }} + + + + + + + {{ detailForm.alarmName }} + + + + + {{ detailForm.alarmInfoUnit }} + + + + + + {{ detailForm.referenceCon }} + + + + + {{ detailForm.referenceName }} + + + + + + {{ detailForm.alertUpperBound }} + + + + + {{ detailForm.alertLowerBound }} + + + + + +
+ + + + + {{ detailForm.remark }} + + +
@@ -769,3 +789,10 @@ export default { }, }; + diff --git a/imt-ui/src/views/system/gatewayinfo/index.vue b/imt-ui/src/views/system/gatewayinfo/index.vue index 56d4710..fce9dbf 100644 --- a/imt-ui/src/views/system/gatewayinfo/index.vue +++ b/imt-ui/src/views/system/gatewayinfo/index.vue @@ -80,7 +80,7 @@ >新增 - 导出 + >导出 --> From a44dc9d16eee18b88d26c5dd7d516a95417c72ec Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Tue, 5 Nov 2024 15:12:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=EF=BC=8C=E8=AE=BE=E5=A4=87=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E6=8A=A5=E8=AD=A6=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/controller/equip/vo/EquipInfoPageReqVO.java | 3 +++ .../inspur/module/system/dal/mysql/equip/EquipInfoMapper.java | 1 + 2 files changed, 4 insertions(+) diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java index 8c8a98f..7ba154f 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java @@ -19,6 +19,9 @@ public class EquipInfoPageReqVO extends PageParam { @Schema(description = "机床设备编号") private String equipNo; + @Schema(description = "机床设备名称") + private String equipName; + @Schema(description = "机床状态") private Integer status; diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java index 3681afa..10588be 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java @@ -27,6 +27,7 @@ public interface EquipInfoMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(EquipInfoDO::getModelId, reqVO.getModelId()) .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId()) + .likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName()) .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo()) .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus()) .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId) From 69176e8fa0724096d937ad502bfe25b3aed29384 Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Tue, 5 Nov 2024 15:13:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=EF=BC=8C=E8=AE=BE=E5=A4=87=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E6=8A=A5=E8=AD=A6=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/alarm/equiptrendalarm/index.vue | 80 ++++++++++++++++--- 1 file changed, 70 insertions(+), 10 deletions(-) diff --git a/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue b/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue index bb95e75..4ed90c3 100644 --- a/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue +++ b/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue @@ -11,6 +11,54 @@ style="text-align:right" > + + + + + + + + + + + + + - @@ -71,7 +119,7 @@ end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" /> - + --> @@ -526,9 +527,18 @@ style="height:500px" >
- - - + + + @@ -629,9 +639,9 @@ export default { datetimeRange: [], showOrderSubmit: false, cardOptions: [], - showPatrolPlanSubmit:false, - showExclusivePatrolPlanSubmit:false, - showMaintanenceSubmit:false, + showPatrolPlanSubmit: false, + showExclusivePatrolPlanSubmit: false, + showMaintanenceSubmit: false, inspectionId: null, }; }, @@ -651,22 +661,24 @@ export default { this.showExclusivePatrolPlanSubmit = false; this.showMaintanenceSubmit = false; this.inspectionId = null; - if (flag === "0"){ + if (flag === "0") { this.$store.dispatch("tagsView/delView", this.$router.currentRoute); //跳转到前一个页面 this.$router.push("/alarm/equipalarm"); - }else { - inspectionInfoApi.isSubmitInspection(this.$route.query.equipAlarmId).then(res=>{ - if (res.data === null){ - this.showPatrolPlanSubmit = true; - }else if (res.data.status === 1 && !res.data.isExclusive){ - this.inspectionId = res.data.inspectionId; - this.showExclusivePatrolPlanSubmit = true; - }else if (res.data.status === 1 && res.data.isExclusive){ - this.inspectionId = res.data.inspectionId; - this.showMaintanenceSubmit =true; - } - }) + } else { + inspectionInfoApi + .isSubmitInspection(this.$route.query.equipAlarmId) + .then((res) => { + if (res.data === null) { + this.showPatrolPlanSubmit = true; + } else if (res.data.status === 1 && !res.data.isExclusive) { + this.inspectionId = res.data.inspectionId; + this.showExclusivePatrolPlanSubmit = true; + } else if (res.data.status === 1 && res.data.isExclusive) { + this.inspectionId = res.data.inspectionId; + this.showMaintanenceSubmit = true; + } + }); } }, cardChange(e) { @@ -790,7 +802,7 @@ export default { /** * 定制化点检方案提交 */ - handelExclusivePatrolPlan(){ + handelExclusivePatrolPlan() { this.$refs.submitExclusivePatrolPlanForm.open(this.inspectionId); }, /** diff --git a/imt-ui/src/views/system/alarm/alarmrules/index.vue b/imt-ui/src/views/system/alarm/alarmrules/index.vue index 9bd63ad..f49028d 100644 --- a/imt-ui/src/views/system/alarm/alarmrules/index.vue +++ b/imt-ui/src/views/system/alarm/alarmrules/index.vue @@ -789,10 +789,4 @@ export default { }, }; - + From d67a1de321dc17ad88f2689ec05a712ffd0e1a64 Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Wed, 6 Nov 2024 15:04:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AA=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/dal/mysql/alarm/EquipAlarmDataMapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/EquipAlarmDataMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/EquipAlarmDataMapper.java index a834873..497fdeb 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/EquipAlarmDataMapper.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/alarm/EquipAlarmDataMapper.java @@ -116,6 +116,7 @@ public interface EquipAlarmDataMapper extends BaseMapperX { .leftJoin(ComponentInfoDO.class, ComponentInfoDO::getComponentId, EquipAlarmDataDO::getComponentId) .eq(EquipAlarmDataDO::getEquipId, equipId) .eq(EquipAlarmDataDO::getAlarmType, alarmType) + .eq(EquipAlarmDataDO::getStatus, 0) ); }