diff --git a/imt-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/imt-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue index e139e8c..e9e76a4 100644 --- a/imt-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue +++ b/imt-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue @@ -130,7 +130,6 @@ export default { } // 高亮任务 canvas.addMarker(n.id, this.getResultCss(task.status)); - // 如果非通过,就不走后面的线条了 if (task.status !== 2) { return; @@ -203,10 +202,10 @@ export default { } }); } else if (n.$type === 'bpmn:EndEvent') { // 结束节点 - if (!this.processInstance || this.processInstance.result === 1) { + if (!this.processInstance || this.processInstance.status === 1) { return; } - canvas.addMarker(n.id, this.getResultCss(this.processInstance.result)); + canvas.addMarker(n.id, this.getResultCss(this.processInstance.status)); } else if (n.$type === 'bpmn:ServiceTask'){ //服务任务 if(activity.startTime>0 && activity.endTime===0){//进入执行,标识进行色 canvas.addMarker(n.id, this.getResultCss(1)); diff --git a/imt-ui/src/views/system/maintenance/maintenanceInfo/RemoteMaintenanceOrderForm.vue b/imt-ui/src/views/system/maintenance/maintenanceInfo/RemoteMaintenanceOrderForm.vue index 255876f..3abca6d 100644 --- a/imt-ui/src/views/system/maintenance/maintenanceInfo/RemoteMaintenanceOrderForm.vue +++ b/imt-ui/src/views/system/maintenance/maintenanceInfo/RemoteMaintenanceOrderForm.vue @@ -181,12 +181,12 @@ export default { const res = await MaintenanceOrderApi.getRemoteMaintenanceOrderRecord(id); this.formData = res.data; this.cascaderValue = this.changeDetSelect(this.formData.equipId,this.equipCascader); - this.title = "修改维修工单"; + this.dialogTitle = "修改维修工单"; } finally { this.formLoading = false; } } - this.title = "新增维修工单"; + this.dialogTitle = "新增维修工单"; }, /** 提交按钮 */ async submitForm() {