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

审批流程图高亮修改

Browse Source
This commit is contained in:
xusd 2024-09-13 18:21:20 +08:00
parent 9ca9049c96
commit 3131c5c0ef
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imt-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
View File

@ -130,7 +130,6 @@ export default {
} }
// 高亮任务 // 高亮任务
canvas.addMarker(n.id, this.getResultCss(task.status)); canvas.addMarker(n.id, this.getResultCss(task.status));
// 如果非通过，就不走后面的线条了 // 如果非通过，就不走后面的线条了
if (task.status !== 2) { if (task.status !== 2) {
return; return;
@ -203,10 +202,10 @@ export default {
} }
}); });
} else if (n.$type === 'bpmn:EndEvent') { // 结束节点 } else if (n.$type === 'bpmn:EndEvent') { // 结束节点
if (!this.processInstance || this.processInstance.result === 1) { if (!this.processInstance || this.processInstance.status === 1) {
return; 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'){ //服务任务 } else if (n.$type === 'bpmn:ServiceTask'){ //服务任务
if(activity.startTime>0 && activity.endTime===0){//进入执行，标识进行色 if(activity.startTime>0 && activity.endTime===0){//进入执行，标识进行色
canvas.addMarker(n.id, this.getResultCss(1)); canvas.addMarker(n.id, this.getResultCss(1));

4
imt-ui/src/views/system/maintenance/maintenanceInfo/RemoteMaintenanceOrderForm.vue
View File

@ -181,12 +181,12 @@ export default {
const res = await MaintenanceOrderApi.getRemoteMaintenanceOrderRecord(id); const res = await MaintenanceOrderApi.getRemoteMaintenanceOrderRecord(id);
this.formData = res.data; this.formData = res.data;
this.cascaderValue = this.changeDetSelect(this.formData.equipId,this.equipCascader); this.cascaderValue = this.changeDetSelect(this.formData.equipId,this.equipCascader);
this.title = "修改维修工单"; this.dialogTitle = "修改维修工单";
} finally { } finally {
this.formLoading = false; this.formLoading = false;
} }
} }
this.title = "新增维修工单"; this.dialogTitle = "新增维修工单";
}, },
/** 提交按钮 */ /** 提交按钮 */
async submitForm() { async submitForm() {