From 64be23a0ebf1ddb38dc9eca7155a3fed6c13730b Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Wed, 15 May 2024 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85=E5=A4=84?=
 =?UTF-8?q?=E7=BD=AE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/event/EventDetailDialog/index.vue   | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
index 4d5485ae..2117b40d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
     <div class="EventDetail" :style="{
-    height: activeName == '-1' || activeName == '0' ? '380px' : '598px',
+    height: activeName == '-1' || activeName == '0' ? '380px' : '698px',
   }">
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
@@ -63,6 +63,13 @@ import Button from "@screen/components/Buttons/Button.vue";
 import request from "@/utils/request";
 import { Message } from "element-ui";
 var moment = require("moment");
+import {
+  getProcessNode,
+  getProcessList,
+  postProcess,
+  postCompleteEvent,
+  postNoSkipClear,
+} from "@/api/commandDispatch";
 
 export default {
   name: "EventDetail",
@@ -134,12 +141,7 @@ export default {
       }
 
       let directionFlg = true;
-
-      request({
-        url: `/system/process/list`,
-        method: "get",
-        params: { eventId: this.formData.id },
-      }).then((rows) => {
+      getProcessList(this.formData.id).then((rows) => {
         console.log('rows', rows)
         // if (result.code != 200) return Message.error(result?.msg);
         // const rows = result.rows;
@@ -147,7 +149,7 @@ export default {
         this.timeLine2List = [];
 
         this.formData?.processConfigList.forEach((it) => {
-          const process = rows.find((row) => it.nodeNode == row.processId);
+          const process = rows.find((row) => it.nodeNode == row.processId && row.processType === 1);
 
           if (process) {
             this.timeLine1List.push({
@@ -155,15 +157,6 @@ export default {
               label: it.processNode,
               isActive: true,
             });
-            this.timeLine2List.push({
-              time: moment(process.operationTime || new Date()).format(
-                "yyyy-MM-DD HH:mm:ss"
-              ),
-              name: process.operator,
-              desc: process.context,
-              posts: "",
-              direction: directionFlg ? "left" : "right",
-            });
             directionFlg = !directionFlg;
           } else {
             this.timeLine1List.push({
@@ -173,6 +166,20 @@ export default {
             });
           }
         });
+
+        rows.forEach(item =>{
+          this.timeLine2List.push({
+            time: moment(item.operationTime || new Date()).format(
+              "yyyy-MM-DD HH:mm:ss"
+            ),
+            name: item.operatorName,
+            desc: item.context,
+            source: item.source,
+            posts: "",
+            direction: item.source == 1 ? "right" : "left",
+          });
+        })
+
       });
     },
     getProcessNode() {