Compare commits
No commits in common. "d67a1de321dc17ad88f2689ec05a712ffd0e1a64" and "b593befb475eb0d14b80bcb27583144bed42348c" have entirely different histories.
d67a1de321
...
b593befb47
@ -116,7 +116,6 @@ public interface EquipAlarmDataMapper extends BaseMapperX<EquipAlarmDataDO> {
|
|||||||
.leftJoin(ComponentInfoDO.class, ComponentInfoDO::getComponentId, EquipAlarmDataDO::getComponentId)
|
.leftJoin(ComponentInfoDO.class, ComponentInfoDO::getComponentId, EquipAlarmDataDO::getComponentId)
|
||||||
.eq(EquipAlarmDataDO::getEquipId, equipId)
|
.eq(EquipAlarmDataDO::getEquipId, equipId)
|
||||||
.eq(EquipAlarmDataDO::getAlarmType, alarmType)
|
.eq(EquipAlarmDataDO::getAlarmType, alarmType)
|
||||||
.eq(EquipAlarmDataDO::getStatus, 0)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -369,6 +369,7 @@
|
|||||||
@click="handelPatrolPlan"
|
@click="handelPatrolPlan"
|
||||||
>
|
>
|
||||||
点检方案提交</el-button>
|
点检方案提交</el-button>
|
||||||
|
<el-button
|
||||||
<el-button
|
<el-button
|
||||||
v-if="showExclusivePatrolPlanSubmit"
|
v-if="showExclusivePatrolPlanSubmit"
|
||||||
type="success"
|
type="success"
|
||||||
@ -396,86 +397,84 @@
|
|||||||
width="40%"
|
width="40%"
|
||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
>
|
>
|
||||||
<el-card class="box-card">
|
<el-form
|
||||||
<el-form
|
:model="detailForm"
|
||||||
:model="detailForm"
|
v-loading="detailLoading"
|
||||||
v-loading="detailLoading"
|
label-width="100px"
|
||||||
label-width="110px"
|
>
|
||||||
>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="客户名称"
|
||||||
label="客户名称："
|
prop="customerName"
|
||||||
prop="customerName"
|
>
|
||||||
>
|
{{ detailForm.customerName }}
|
||||||
{{ detailForm.customerName }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="机床型号"
|
||||||
label="机床型号："
|
prop="equipNo"
|
||||||
prop="equipNo"
|
>
|
||||||
>
|
{{ detailForm.modelName }}
|
||||||
{{ detailForm.modelName }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="设备编号"
|
||||||
label="设备编号："
|
prop="equipNo"
|
||||||
prop="equipNo"
|
>
|
||||||
>
|
{{ detailForm.equipNo }}
|
||||||
{{ detailForm.equipNo }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="规则参数"
|
||||||
label="规则参数："
|
prop="nameKey"
|
||||||
prop="nameKey"
|
>
|
||||||
>
|
{{ detailForm.nameKey }}
|
||||||
{{ detailForm.nameKey }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="报警内容"
|
||||||
label="报警内容："
|
prop="content"
|
||||||
prop="content"
|
>
|
||||||
>
|
{{ detailForm.content }}
|
||||||
{{ detailForm.content }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="报警值"
|
||||||
label="报警值："
|
prop="alarmValue"
|
||||||
prop="alarmValue"
|
>
|
||||||
>
|
{{ detailForm.alarmValue }}
|
||||||
{{ detailForm.alarmValue }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="首次报警时间"
|
||||||
label="首次报警时间："
|
prop="firstAlarmTime"
|
||||||
prop="firstAlarmTime"
|
>
|
||||||
>
|
{{ parseTime(detailForm.firstAlarmTime) }}
|
||||||
{{ parseTime(detailForm.firstAlarmTime) }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="12">
|
||||||
<el-col :span="12">
|
<el-form-item
|
||||||
<el-form-item
|
label="最新报警时间"
|
||||||
label="最新报警时间："
|
prop="lastAlarmTime"
|
||||||
prop="lastAlarmTime"
|
>
|
||||||
>
|
{{ parseTime(detailForm.lastAlarmTime) }}
|
||||||
{{ parseTime(detailForm.lastAlarmTime) }}
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
<el-col :span="24">
|
||||||
<el-col :span="24">
|
<el-form-item
|
||||||
<el-form-item
|
label="可能故障原因"
|
||||||
label="可能故障原因："
|
prop="reasonDescription"
|
||||||
prop="reasonDescription"
|
>
|
||||||
>
|
<div v-html="detailForm.reasonDescription" />
|
||||||
<div v-html="detailForm.reasonDescription" />
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
</el-col>
|
</el-form>
|
||||||
</el-form>
|
|
||||||
</el-card>
|
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!--报警参数趋势查询弹窗-->
|
<!--报警参数趋势查询弹窗-->
|
||||||
@ -527,18 +526,9 @@
|
|||||||
style="height:500px"
|
style="height:500px"
|
||||||
></div>
|
></div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<alarm-submit-maintenance-patrol-plan-form
|
<alarm-submit-maintenance-patrol-plan-form ref="submitPatrolPlanForm" @child-event="showSubmitButton"/>
|
||||||
ref="submitPatrolPlanForm"
|
<alarm-submit-maintenance-exclusive-patrol-plan-form ref="submitExclusivePatrolPlanForm" @child-event="showSubmitButton"/>
|
||||||
@child-event="showSubmitButton"
|
<alarm-submit-maintenance-order-form ref="submitOrderForm" @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>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -639,9 +629,9 @@ export default {
|
|||||||
datetimeRange: [],
|
datetimeRange: [],
|
||||||
showOrderSubmit: false,
|
showOrderSubmit: false,
|
||||||
cardOptions: [],
|
cardOptions: [],
|
||||||
showPatrolPlanSubmit: false,
|
showPatrolPlanSubmit:false,
|
||||||
showExclusivePatrolPlanSubmit: false,
|
showExclusivePatrolPlanSubmit:false,
|
||||||
showMaintanenceSubmit: false,
|
showMaintanenceSubmit:false,
|
||||||
inspectionId: null,
|
inspectionId: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -661,24 +651,22 @@ export default {
|
|||||||
this.showExclusivePatrolPlanSubmit = false;
|
this.showExclusivePatrolPlanSubmit = false;
|
||||||
this.showMaintanenceSubmit = false;
|
this.showMaintanenceSubmit = false;
|
||||||
this.inspectionId = null;
|
this.inspectionId = null;
|
||||||
if (flag === "0") {
|
if (flag === "0"){
|
||||||
this.$store.dispatch("tagsView/delView", this.$router.currentRoute);
|
this.$store.dispatch("tagsView/delView", this.$router.currentRoute);
|
||||||
//跳转到前一个页面
|
//跳转到前一个页面
|
||||||
this.$router.push("/alarm/equipalarm");
|
this.$router.push("/alarm/equipalarm");
|
||||||
} else {
|
}else {
|
||||||
inspectionInfoApi
|
inspectionInfoApi.isSubmitInspection(this.$route.query.equipAlarmId).then(res=>{
|
||||||
.isSubmitInspection(this.$route.query.equipAlarmId)
|
if (res.data === null){
|
||||||
.then((res) => {
|
this.showPatrolPlanSubmit = true;
|
||||||
if (res.data === null) {
|
}else if (res.data.status === 1 && !res.data.isExclusive){
|
||||||
this.showPatrolPlanSubmit = true;
|
this.inspectionId = res.data.inspectionId;
|
||||||
} else if (res.data.status === 1 && !res.data.isExclusive) {
|
this.showExclusivePatrolPlanSubmit = true;
|
||||||
this.inspectionId = res.data.inspectionId;
|
}else if (res.data.status === 1 && res.data.isExclusive){
|
||||||
this.showExclusivePatrolPlanSubmit = true;
|
this.inspectionId = res.data.inspectionId;
|
||||||
} else if (res.data.status === 1 && res.data.isExclusive) {
|
this.showMaintanenceSubmit =true;
|
||||||
this.inspectionId = res.data.inspectionId;
|
}
|
||||||
this.showMaintanenceSubmit = true;
|
})
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
cardChange(e) {
|
cardChange(e) {
|
||||||
@ -802,7 +790,7 @@ export default {
|
|||||||
/**
|
/**
|
||||||
* 定制化点检方案提交
|
* 定制化点检方案提交
|
||||||
*/
|
*/
|
||||||
handelExclusivePatrolPlan() {
|
handelExclusivePatrolPlan(){
|
||||||
this.$refs.submitExclusivePatrolPlanForm.open(this.inspectionId);
|
this.$refs.submitExclusivePatrolPlanForm.open(this.inspectionId);
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -789,4 +789,10 @@ export default {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
<style scoped>
|
||||||
|
.form-item-border {
|
||||||
|
border-bottom: 1px solid #e4e7ed; /* 你可以调整颜色和宽度 */
|
||||||
|
padding-bottom: 10px; /* 可选：增加底部间距 */
|
||||||
|
margin-bottom: 10px; /* 可选：增加外边距 */
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user