From 3131c5c0ef5e2651e7a2737358473998e3aaf301 Mon Sep 17 00:00:00 2001
From: xusd <xu13181496959@163.com>
Date: Fri, 13 Sep 2024 18:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpmnProcessDesigner/package/designer/ProcessViewer.vue   | 5 ++---
 .../maintenanceInfo/RemoteMaintenanceOrderForm.vue           | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

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() {