From 90f7a70ef7dd68fe20a4c29318615febf3b1efcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Sat, 21 Dec 2024 11:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E6=A0=8F=E7=A2=B0=E6=92=9E=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E8=A7=86=E9=A2=91=E5=BD=95=E5=83=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=AF=B9=E5=BA=94=E7=9B=B8=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/VideoMulti/index.vue           | 83 +++++++++++--------
 .../Dialogs/GuardrailCollision/index.vue      | 11 ++-
 .../event/event/EventDetailDialog/index.vue   |  2 +-
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
index 56d3d68a..ca6689b4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
@@ -1,30 +1,32 @@
 <template>
   <div class="video-container">
     <div class="header">
-      <ElSelect @change="cameraChange" v-model="cameraId">
+      <ElSelect v-model="cameraId" @change="cameraChange">
         <ElOption v-for="item in urls" :key="item.id" :label="item.deviceName" :value="item.iotDeviceId">
         </ElOption>
       </ElSelect>
-      <img @click="controlDialogVisible = true" v-if="[0, '0'].includes(
+      <img v-if="[0, '0'].includes(
         dialogData.parseOtherConfig &&
         dialogData.parseOtherConfig.ptzCtrl
       )
-        " src="@screen/images/camera-control-icon.svg" width="18px" height="18px"
-        style="cursor: pointer;background-color: #0d5f79;margin-top: 3px" />
+        " height="18px" src="@screen/images/camera-control-icon.svg" style="cursor: pointer;background-color: #0d5f79;margin-top: 3px" width="18px"
+           @click="controlDialogVisible = true"/>
     </div>
 
-    <Transition name="fade" mode="out-in">
-      <video controls autoplay muted class="video-stream" v-bind="$attrs" ref="videoContainerRef" />
+    <Transition mode="out-in" name="fade">
+      <video ref="videoContainerRef" v-bind="$attrs" autoplay class="video-stream" controls muted/>
     </Transition>
-    <CameraControlDialog  :deviceId="dialogData.iotDeviceId" :dialogData="dialogData" :visible="controlDialogVisible" @update:value="handleClose" />
+    <CameraControlDialog :deviceId="dialogData.iotDeviceId" :dialogData="dialogData" :visible="controlDialogVisible"
+                         @update:value="handleClose"/>
   </div>
 </template>
 
 <script>
-import { HttpLivePlayer, openLiveVideo } from "./videoStream.js"
-import { find } from "lodash"
+import {HttpLivePlayer} from "./videoStream.js"
+import {find} from "lodash"
 import {
-  getNearCameraNew,getNearCameraNewStation,
+  getNearCameraNew,
+  getNearCameraNewStation,
 } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 import CameraControlDialog from "@screen/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue";
 
@@ -36,9 +38,9 @@ export default {
   },
   props: {
     //
-    facilityType:{
+    facilityType: {
       type: String,
-      default:null
+      default: null
     },
     // 桩号
     pileNum: {
@@ -68,7 +70,7 @@ export default {
     this.playVideo();
     this.$once("hook:beforeDestroy", () => this.player?.destroy());
   },
-  destroyed(){
+  destroyed() {
     this.player?.destroy();
   },
   methods: {
@@ -79,8 +81,8 @@ export default {
     cameraChange() {
       console.log('chanage.======')
       this.controlDialogVisible = false
-      const changeItem = find(this.urls, { iotDeviceId: this.cameraId });
-      this.dialogData = { ...changeItem, parseOtherConfig: changeItem.otherConfig && JSON.parse(changeItem.otherConfig) };
+      const changeItem = find(this.urls, {iotDeviceId: this.cameraId});
+      this.dialogData = {...changeItem, parseOtherConfig: changeItem.otherConfig && JSON.parse(changeItem.otherConfig)};
       this.player?.destroy();
       const self = this;
       setTimeout(() => {
@@ -92,12 +94,12 @@ export default {
       this.player?.destroy();
       let reqCamrea = null;
       console.log(this.facilityType)
-      if(this.facilityType && this.facilityType === 1){ //收费站单独处理
+      if (this.facilityType && this.facilityType === 1) { //收费站单独处理
         reqCamrea = await getNearCameraNewStation(this.pileNum).catch(() => ({}));
       } else {
         reqCamrea = await getNearCameraNew(this.pileNum).catch(() => ({}));
       }
-      let { code, data } = reqCamrea;
+      let {code, data} = reqCamrea;
       if (
         code != 200 ||
         (Array.isArray(data) ? !data?.length : !Object.keys(data || {}).length)
@@ -106,28 +108,36 @@ export default {
         return;
       }
       let urls = [];
-      if(this.rangeIndex === 'all'){
-        for(let i in data){
-          urls = [...urls,...data[i]]
+      if (this.rangeIndex === 'all') {
+        for (let i in data) {
+          urls = [...urls, ...data[i]]
         }
-        this.$emit('nearload', urls.map(x=>x.iotDeviceId))
-      }
-      else if (data[this.rangeIndex]) {
-          urls = data[this.rangeIndex]
+        this.$emit('nearload', urls.map(x => x.iotDeviceId))
+      } else if (data[this.rangeIndex]) {
+        urls = data[this.rangeIndex]
       }
-      if(urls.length > 0){
+      if (urls.length > 0) {
+        let firstItem
         this.urls = urls;
-        const firstItem = urls[0];
+        let list = urls.filter(itm => itm.stakeMark === this.pileNum & itm.childType === "1-1");
+        if (list.length === 0) {
+          firstItem = urls[0];
+        }else if (list.length>0){
+          firstItem = list[0];
+        }
+       // console.log("摄像机+++++++++++++++++++++++++++++++++++++++++++++++++")
+       // console.log(this.pileNum)
         this.cameraId = firstItem['iotDeviceId'];
-        this.dialogData = { ...firstItem, parseOtherConfig: firstItem.otherConfig && JSON.parse(firstItem.otherConfig) }
+       // console.log("摄像机id："+this.cameraId)
+        this.dialogData = {...firstItem, parseOtherConfig: firstItem.otherConfig && JSON.parse(firstItem.otherConfig)}
         this.showVideo();
       }
     },
     showVideo() {
-      this.player = new HttpLivePlayer(this.$refs.videoContainerRef, { camId: this.cameraId });
+      this.player = new HttpLivePlayer(this.$refs.videoContainerRef, {camId: this.cameraId});
     },
-    setCameraId(id){
-      console.log('外部改变cameraId',id,3333)
+    setCameraId(id) {
+      console.log('外部改变cameraId', id, 3333)
       this.cameraId = id;
       this.cameraChange();
     }
@@ -136,7 +146,7 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-.video-pic .video-container:nth-child(2){
+.video-pic .video-container:nth-child(2) {
   margin-right: 0px;
 }
 
@@ -149,7 +159,8 @@ export default {
   overflow: hidden;
   display: flex;
   justify-content: center;
-  flex-direction:column;
+  flex-direction: column;
+
   .fade-enter-active,
   .fade-leave-active {
     transition: opacity 0.24s ease;
@@ -166,6 +177,7 @@ export default {
     display: flex;
     justify-content: space-between;
     background-color: #145775;
+
     .radio {
       background: #265A70;
       border-radius: 41px 41px 41px 41px;
@@ -227,11 +239,12 @@ export default {
   .video-stream {
     width: 100%;
   }
+
   @media (min-width: 3000px) {
     .video-stream {
-    height: 90%;
-    width: 100%;
-  }
+      height: 90%;
+      width: 100%;
+    }
   }
 
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
index 2e768345..6a64ec14 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
@@ -16,9 +16,8 @@
                   ">
                 警示灯:
               </span>
-              <Button style="margin-left: 5px" @click.native="controlClick(30)">开</Button>
-              <Button style="margin-left: 5px" @click.native="controlClick(31)">关</Button>
-              <Button style="margin-left: 5px" @click.native="controlClick(34)">退出</Button>
+              <Button style="margin-left: 5px" @click.native="controlClick(30)">强制开启</Button>
+              <Button style="margin-left: 5px" @click.native="controlClick(31)">强制关闭</Button>
             </div>
         </ElTabPane>
 
@@ -126,17 +125,17 @@ export default {
     // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
 
   console.log(this.dialogData,3333)
-      // 修改camid  
+      // 修改camid
       if(typeof this.dialogData.otherConfig === 'string'){
       const oConfig = JSON.parse(this.dialogData.otherConfig)
       if(oConfig && oConfig.camId){
         this.camId = oConfig.camId
       }
     }
-    
+
     this.data = { ...this.dialogData, roadName: '济菏高速' };
 
-    
+
     // getProduct(this.dialogData.productId)
     //   .then(data => {
     //     this.dialogData.brand = data.brand;
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 e946c7bc..aad9604b 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
@@ -67,7 +67,7 @@
     " @close="onCloseAddNew" />
 
     <template #footer>
-      <Button @click.native="onOpen" :style="{ marginTop: '30px', padding: '0 24px' }">视频录像</Button>
+      <Button  v-if="[1,2,5].includes(data.warningSource)"  @click.native="onOpen" :style="{ marginTop: '30px', padding: '0 24px' }">视频录像</Button>
       <Button :loading="submitLoading"  v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent','home:notice:closeEvent']) && activeName == '1'" style="margin-top: 30px;padding: 0 24px"
               @click.native="onEnd">终止</Button>
       <Button :loading="submitLoading"  v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent']) && (activeName == '-1' || activeName == '0')" style="margin-top: 30px;padding: 0 24px"