From 3b75784058166dff3f3905a35ae10ea562b2cccf Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Wed, 27 Mar 2024 17:36:57 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=20=E8=B7=AF=E7=BD=91=E7=AE=A1=E6=8E=A7-?=
 =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E4=BA=8B=E4=BB=B6=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E4=BA=8B=E4=BB=B6=20=E5=B7=B2=E5=A4=84?=
 =?UTF-8?q?=E7=BD=AE=E4=BA=8B=E4=BB=B6=E4=B8=AD=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2=E4=B8=BA=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Video/videoStream.js           |  2 +-
 .../event/event/EventDetailDialog/index.vue   | 11 +++++---
 .../pages/control/event/event/index.vue       | 27 ++++++++++---------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
index 4aecfbf3..dc4b6fff 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
@@ -83,7 +83,7 @@ async function getUrl({ camId, url, pileNum, rangeIndex } = {}) {
       return;
     }
     camId = data[rangeIndex || 0]?.camId;
-    console.log(rangeIndex, "rangeIndex", data, data[rangeIndex], cameraData);
+    console.log("rangeIndex", rangeIndex, data[rangeIndex]);
   }
 
   if (camId) {
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 ce2b75e2..892587a9 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,9 +5,13 @@
 
       <div class="video-pic">
         <Video style="height: 100%; width: 380px;" :showHeader="false"
-          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[0] : ''" videoType="mp4" />
+          :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) ? formData.videoList[1] : ''" videoType="mp4" />
+          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[1] : ''"
+          :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
+          :videoType="formData.videoType" />
 
         <Carousel v-else style="flex: 1" :pictures="formData.pictures" />
       </div>
@@ -19,7 +23,8 @@
 
     <!-- 确认弹窗 -->
     <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="formData" :activeName="activeName"
-      @reInitData="() => { this.$emit('update:value', false); this.$emit('queryData', true); }" @close="onCloseAddNew" />
+      @reInitData="() => { this.$emit('update:value', false); this.$emit('queryData', true); }"
+      @close="onCloseAddNew" />
 
     <template #footer>
       <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px;"
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 aec6be1c..6afde669 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
@@ -158,7 +158,7 @@ export default {
     queryData(flag) {
       this.getData()
     },
-    getData() {
+    getData() { //列表数据查询
       if (this.activeName === '-1') {
         request({
           url: `/perceivedEvents/warning/perceivedEventsList`,//感知事件
@@ -259,7 +259,7 @@ export default {
     onCloseAddNew() {
       this.isShowAddNew = false;
     },
-    firstBtnClick(id) {
+    firstBtnClick(id) {//点击去确认/详情/处置记录等第一个按钮
       console.log("id", id);
       if (this.activeName == '-1') {
         request({
@@ -289,7 +289,7 @@ export default {
             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']
           }
-
+          data.videoType = "mp4";
           this.detailDialogFormData = data;
           // console.log('data', this.detailDialogFormData)
 
@@ -299,7 +299,7 @@ export default {
         request({
           url: `/dc/system/event/${id}`,//交通事件
           method: "get",
-        }).then((result) => {
+        }).then(async (result) => {
           if (result.code != 200) return Message.error(result?.msg);
           let data = result.data;
           data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
@@ -307,15 +307,16 @@ export default {
 
 
           data.videoList = [];
-          // const cameraData = (await getNearCameraNew(data.stakeMark));//新的上下游摄像头接口
-          // console.log("cameraData", cameraData)
-
-          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']
-          }
+          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;