Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

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

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@@ -1,83 +1,42 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情" width="35vw">
-    <div
+    <div class="EventDetail" :style="{
-      class="EventDetail"
-      :style="{
     height: activeName == '-1' || activeName == '0' ? '380px' : '768px',
-      }"
+  }">
-    >
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
       <div class="video-pic">
-        <Video
+        <Video style="height: 100%; width: 380px;" :showHeader="false"
-          style="height: 100%; width: 380px"
+          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[0] : ''"
-          :showHeader="false"
+          :camId="formData.upCamId" :pileNum="formData.stakeMark" rangeIndex="upCamera"
-          :url="
+          :videoType="formData.videoType" />
-            formData.videoList && formData.videoList.length > 0
+        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px;" :showHeader="false"
-              ? formData.videoList[0]
+          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[1] : ''"
-              : ''
+          :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
-          "
+          :videoType="formData.videoType" />
-          videoType="mp4"
-        />
-        <Video
-          v-if="activeName != '-1'"
-          style="height: 100%; width: 380px"
-          :showHeader="false"
-          :url="
-            formData.videoList && formData.videoList.length > 0
-              ? formData.videoList[1]
-              : ''
-          "
-          videoType="mp4"
-        />
 
         <Carousel v-else style="flex: 1" :pictures="formData.pictures" />
       </div>
       <!-- <div>{{ formData.videoList[0] }}</div> -->
-      <TimeLine1
+      <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
-        v-if="activeName == '1' || activeName == '2'"
+      <TimeLine2 v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" style="flex: 1" />
-        :data="timeLine1List"
-      />
-      <TimeLine2
-        v-if="activeName == '1' || activeName == '2'"
-        :data="timeLine2List"
-        style="flex: 1"
-      />
     </div>
 
     <!-- 确认弹窗 -->
-    <EventPlanDialog
+    <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="formData" :activeName="activeName"
-      :visible="isShowDialog"
+      @reInitData="() => {
-      :info="info"
-      :eventFormData="formData"
-      :activeName="activeName"
-      @reInitData="
-        () => {
     this.$emit('update:value', false);
     this.$emit('queryData', true);
   }
-      "
+    " @close="onCloseAddNew" />
-      @close="onCloseAddNew"
-    />
 
     <template #footer>
-      <Button
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
-        v-if="activeName == '-1' || activeName == '0'"
+        @click.native="onDelete">误报</Button>
-        style="padding: 0 24px"
+      <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
-        @click.native="onDelete"
+        @click.native="modelVisible = false">取消</Button>
-        >误报</Button
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
-      >
+        @click.native="onSubmit">确认</Button>
-      <Button
-        :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
-        @click.native="modelVisible = false"
-        >取消</Button
-      >
-      <Button
-        v-if="activeName == '-1' || activeName == '0'"
-        style="padding: 0 24px"
-        @click.native="onSubmit"
-        >确认</Button
-      >
     </template>
   </Dialog>
 </template>
@@ -118,7 +77,7 @@ export default {
     activeName: String,
     formData: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
   },
   data() {

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));//新的上下游摄像头接口
+          const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
-          // console.log("cameraData", cameraData)
+          data.downCamId = downCamera?.camId;
-
+          data.upCamId = upCamera?.camId;
-          if (data.otherConfig) {
+          data.videoType = "flv";
-            let otherConfig = JSON.parse(data.otherConfig);
+          // if (data.otherConfig) {
-            // data.pictures = otherConfig.pictures || [];
+          //   let otherConfig = JSON.parse(data.otherConfig);
-            data.videoList = otherConfig.videoList || [];
+          //   // data.pictures = otherConfig.pictures || [];
-            //data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
+          //   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;