TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报警规则和报警处理界面优化

Browse Source
This commit is contained in:
zhangjunwen 2024-11-06 09:01:43 +08:00
parent b593befb47
commit b3e2b4cb1c
2 changed files with 112 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
imt-ui/src/views/system/alarm/alarmdata/index.vue
View File

@ -369,7 +369,6 @@
@click="handelPatrolPlan"
>
点检方案提交</el-button>
<el-button
<el-button
v-if="showExclusivePatrolPlanSubmit"
type="success"
@ -397,84 +396,86 @@
width="40%"
:close-on-click-modal="false"
>
<el-form
:model="detailForm"
v-loading="detailLoading"
label-width="100px"
>
<el-col :span="12">
<el-form-item
label="客户名称"
prop="customerName"
>
{{ detailForm.customerName }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="机床型号"
prop="equipNo"
>
{{ detailForm.modelName }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="设备编号"
prop="equipNo"
>
{{ detailForm.equipNo }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="规则参数"
prop="nameKey"
>
{{ detailForm.nameKey }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="报警内容"
prop="content"
>
{{ detailForm.content }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="报警值"
prop="alarmValue"
>
{{ detailForm.alarmValue }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="首次报警时间"
prop="firstAlarmTime"
>
{{ parseTime(detailForm.firstAlarmTime) }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="最新报警时间"
prop="lastAlarmTime"
>
{{ parseTime(detailForm.lastAlarmTime) }}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="可能故障原因"
prop="reasonDescription"
>
<div v-html="detailForm.reasonDescription" />
</el-form-item>
</el-col>
</el-form>
<el-card class="box-card">
<el-form
:model="detailForm"
v-loading="detailLoading"
label-width="110px"
>
<el-col :span="12">
<el-form-item
label="客户名称："
prop="customerName"
>
{{ detailForm.customerName }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="机床型号："
prop="equipNo"
>
{{ detailForm.modelName }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="设备编号："
prop="equipNo"
>
{{ detailForm.equipNo }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="规则参数："
prop="nameKey"
>
{{ detailForm.nameKey }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="报警内容："
prop="content"
>
{{ detailForm.content }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="报警值："
prop="alarmValue"
>
{{ detailForm.alarmValue }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="首次报警时间："
prop="firstAlarmTime"
>
{{ parseTime(detailForm.firstAlarmTime) }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="最新报警时间："
prop="lastAlarmTime"
>
{{ parseTime(detailForm.lastAlarmTime) }}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="可能故障原因："
prop="reasonDescription"
>
<div v-html="detailForm.reasonDescription" />
</el-form-item>
</el-col>
</el-form>
</el-card>
</el-dialog>
<!--报警参数趋势查询弹窗-->
@ -526,9 +527,18 @@
style="height:500px"
></div>
</el-dialog>
<alarm-submit-maintenance-patrol-plan-form ref="submitPatrolPlanForm" @child-event="showSubmitButton"/>
<alarm-submit-maintenance-exclusive-patrol-plan-form ref="submitExclusivePatrolPlanForm" @child-event="showSubmitButton"/>
<alarm-submit-maintenance-order-form ref="submitOrderForm" @child-event="showSubmitButton" />
<alarm-submit-maintenance-patrol-plan-form
ref="submitPatrolPlanForm"
@child-event="showSubmitButton"
/>
<alarm-submit-maintenance-exclusive-patrol-plan-form
ref="submitExclusivePatrolPlanForm"
@child-event="showSubmitButton"
/>
<alarm-submit-maintenance-order-form
ref="submitOrderForm"
@child-event="showSubmitButton"
/>
</div>
</template>
@ -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);
},
/**

8
imt-ui/src/views/system/alarm/alarmrules/index.vue
View File

@ -789,10 +789,4 @@ export default {
},
};
</script>
<style scoped>
.form-item-border {
border-bottom: 1px solid #e4e7ed; /* 你可以调整颜色和宽度 */
padding-bottom: 10px; /* 可选：增加底部间距 */
margin-bottom: 10px; /* 可选：增加外边距 */
}
</style>