From c24a885788f7b99c7056356868a52ba9308799ea Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Mon, 13 May 2024 14:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8-=E5=8E=BB?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/event/EventDetailDialog/index.vue   | 98 +++++++------------
 1 file changed, 34 insertions(+), 64 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 42fad4a7..4d5485ae 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,74 +1,32 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
-    <div
-      class="EventDetail"
-      :style="{
-        height: activeName == '-1' || activeName == '0' ? '380px' : '598px',
-      }"
-    >
+    <div class="EventDetail" :style="{
+    height: activeName == '-1' || activeName == '0' ? '380px' : '598px',
+  }">
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
-      <div
-        class="video-pic"
-        :style="{
-          height: formData.component === 'VideoMulti' ? '242px' : undefined,
-        }"
-      >
-        <component
-          :is="formData.component"
-          v-if="activeName != '-1'"
-          style="height: 100%; width: 380px"
-          :showHeader="false"
-          :url="
-            formData.videoList && formData.videoList.length > 0
-              ? formData.videoList[0]
-              : ''
-          "
-          :camId="formData.upCamId"
-          :pileNum="formData.stakeMark"
-          rangeIndex="upCamera"
-          :videoType="formData.videoType"
-        />
+      <div class="video-pic" :style="{
+    height: formData.component === 'VideoMulti' ? '242px' : undefined,
+  }">
+        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
+          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+    ? formData.videoList[0]
+    : ''
+    " :camId="formData.upCamId" :pileNum="formData.stakeMark" rangeIndex="upCamera" :videoType="formData.videoType" />
 
-        <component
-          :is="formData.component"
-          v-if="activeName != '-1'"
-          style="height: 100%; width: 380px"
-          :showHeader="false"
-          :url="
-            formData.videoList && formData.videoList.length > 0
-              ? formData.videoList[1]
-              : ''
-          "
-          :camId="formData.downCamId"
-          :pileNum="formData.stakeMark"
-          rangeIndex="downCamera"
-          :videoType="formData.videoType"
-        />
+        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
+          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+    ? formData.videoList[1]
+    : ''
+    " :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
+          :videoType="formData.videoType" />
 
-        <Carousel
-          v-if="activeName == '-1'"
-          style="flex: 1"
-          :videos="formData.videoList"
-          :pictures="[]"
-        />
-        <Carousel
-          v-if="activeName == '-1'"
-          style="flex: 1"
-          :pictures="formData.pictures"
-          :videos="[]"
-        />
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :videos="formData.videoList" :pictures="[]" />
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :pictures="formData.pictures" :videos="[]" />
       </div>
       <!-- <div>{{ formData.videoList[0] }}</div> -->
-      <TimeLine1
-        v-if="activeName == '1' || activeName == '2'"
-        :data="timeLine1List"
-      />
-      <TimeLine2
-        v-if="activeName == '1' || activeName == '2'"
-        :data="timeLine2List"
-        style="flex: 1"
-      />
+      <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
+      <TimeLine2 v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" style="flex: 1" />
     </div>
 
     <!-- 确认弹窗 -->
@@ -321,13 +279,25 @@ export default {
           if (result.code != 200) return Message.error(result?.msg);
           else Message.success("成功！");
 
+          this.modelVisible = false;
+          this.$emit("queryData", true);
+        });
+      } else if (this.activeName == '0') {
+        request({
+          url: `/dc/system/event/dcEventState/${this.formData.id}/1`,
+          method: "put",
+          data: reData,
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          else Message.success("成功！");
+
           this.modelVisible = false;
           this.$emit("queryData", true);
         });
       } else {
         let eventId = this.formData.id;
         this.modelVisible = false;
-        
+
         setTimeout(() => {
           this.$router.push(`/control/event/commandDispatch?eventId=${eventId}`);
           // this.$router.push(`/control/event/commandDispatch`);