From 26f1b627b8431f3ffd66329c6cf42696e90e4506 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 16 Apr 2024 17:24:58 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=91=84=E5=83=8F=E5=A4=B4=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/event/EventDetailDialog/index.vue       | 10 +++++++---
 .../pages/control/event/event/index.vue           | 15 ++++++---------
 2 files changed, 13 insertions(+), 12 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 9bdd89a4..cbd6026f 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
@@ -5,13 +5,15 @@
   }">
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
-      <div class="video-pic">
+      <div class="video-pic" :style="{ height: formData.component === 'VideoMulti' ? '220px' : undefined }">
 
-        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px" :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+        <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" />
 
-        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px" :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+        <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" />
 
@@ -51,6 +53,7 @@ import Form from "@screen/components/FormConfig";
 import { formList } from "./data";
 // import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js"
 import Video from "@screen/components/Video";
+import VideoMulti from "@screen/components/VideoMulti";
 import Carousel from "./Carousel/index.vue";
 import EventPlanDialog from "./eventPlanDialog/index.vue";
 import Button from "@screen/components/Buttons/Button.vue";
@@ -66,6 +69,7 @@ export default {
     TimeLine1,
     TimeLine2,
     Video,
+    VideoMulti,
     Carousel,
     Button,
     EventPlanDialog,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index cf1666aa..501dd3be 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@@ -299,6 +299,7 @@ export default {
             // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
           }
           data.videoType = "mp4";
+          data.component = "Video";
           this.detailDialogFormData = data;
           // console.log('data', this.detailDialogFormData)
 
@@ -316,16 +317,12 @@ export default {
 
 
           data.videoList = [];
-          const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
-          data.downCamId = downCamera?.camId;
-          data.upCamId = upCamera?.camId;
+          data.component = "VideoMulti";
+
+          // const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
+          // data.downCamId = downCamera?.camId;
+          // data.upCamId = upCamera?.camId;
           data.videoType = "flv";
-          // if (data.otherConfig) {
-          //   let otherConfig = JSON.parse(data.otherConfig);
-          //   // data.pictures = otherConfig.pictures || [];
-          //   data.videoList = otherConfig.videoList || [];
-          //   //data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
-          // }
 
           this.detailDialogFormData = data;