diff --git a/imt-ui/src/views/system/alarm/alarmdata/index.vue b/imt-ui/src/views/system/alarm/alarmdata/index.vue index 2d8c36d..f7ced1b 100644 --- a/imt-ui/src/views/system/alarm/alarmdata/index.vue +++ b/imt-ui/src/views/system/alarm/alarmdata/index.vue @@ -369,7 +369,6 @@ @click="handelPatrolPlan" > 点检方案提交 - - - - - {{ detailForm.customerName }} - - - - - {{ detailForm.modelName }} - - - - - {{ detailForm.equipNo }} - - - - - {{ detailForm.nameKey }} - - - - - {{ detailForm.content }} - - - - - {{ detailForm.alarmValue }} - - - - - {{ parseTime(detailForm.firstAlarmTime) }} - - - - - {{ parseTime(detailForm.lastAlarmTime) }} - - - - -
- - - + + + + + {{ detailForm.customerName }} + + + + + {{ detailForm.modelName }} + + + + + {{ detailForm.equipNo }} + + + + + {{ detailForm.nameKey }} + + + + + {{ detailForm.content }} + + + + + {{ detailForm.alarmValue }} + + + + + {{ parseTime(detailForm.firstAlarmTime) }} + + + + + {{ parseTime(detailForm.lastAlarmTime) }} + + + + +
+ + + + @@ -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 { }, }; - +