From f81f9a52c25d928179a1125ecc0acc4ce4f95650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Thu, 25 Apr 2024 15:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=8B=E4=BB=B6=E8=A7=A3?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/plugins/modal.js                 |  2 +-
 .../components/Video/videoStream.js           |  4 +--
 .../components/VideoMulti/videoStream.js      |  9 ++++--
 .../Dialogs/TrafficIncidents/index.vue        | 28 ++++++++++++++++---
 .../Home/components/RoadAndEvents/index.vue   | 15 ++++++++--
 .../RoadAndEvents/utils/httpList.js           |  1 -
 6 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/plugins/modal.js b/ruoyi-ui/src/plugins/modal.js
index 7ad9d297..df2d20b3 100644
--- a/ruoyi-ui/src/plugins/modal.js
+++ b/ruoyi-ui/src/plugins/modal.js
@@ -9,7 +9,7 @@ export default {
   },
   // 错误消息
   msgError(content) {
-    Message.error(content)
+    Message.error('commerror：'+content)
   },
   // 成功消息
   msgSuccess(content) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
index 03447f1a..ffdc31d6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
@@ -93,7 +93,7 @@ async function getUrl({ camId, url, pileNum, rangeIndex } = {}) {
   if (camId) {
     const { code, data } = await getCameraStream(camId).catch(() => ({}));
     if (code != 200) {
-      Message.warning("未获取到当前相机的播放地址");
+      // Message.warning("未获取到当前相机的播放地址");
       return;
     }
 
@@ -101,7 +101,7 @@ async function getUrl({ camId, url, pileNum, rangeIndex } = {}) {
   }
 
   if (!url) {
-    Message.warning("未获取到当前相机的播放地址");
+    // Message.warning("未获取到当前相机的播放地址");
     return Promise.reject("获取 url 失败!");
   }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js
index 4584c73e..0dd0e8da 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js
@@ -34,6 +34,7 @@ const testFlvUrl =
  * @returns
  */
 export async function openVideoStream(container, { camId, url } = {}) {
+  console.log(camId,333)
   if (camId) {
     const { code, data } = await getCameraStream(camId).catch(() => ({}));
 
@@ -65,16 +66,18 @@ export async function openVideoStream(container, { camId, url } = {}) {
 }
 
 async function getUrl({ camId} = {}) {
- 
+ if(!camId){
+    return
+ }
   const { code, data } = await getCameraStream(camId).catch(() => ({}));
   if (code != 200) {
-    Message.warning("未获取到当前相机的播放地址");
+    // Message.warning("未获取到当前相机的播放地址");
     return;
   }
 
   let url = data.liveUrl;
   if (!url) {
-    Message.warning("未获取到当前相机的播放地址");
+    // Message.warning("未获取到当前相机的播放地址");
     return Promise.reject("获取 url 失败!");
   }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
index 256e5633..60edfa4f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
@@ -8,7 +8,7 @@
       <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
     </div>
     <div class="foote">
-          <Button @click.native="submitClick" :loading="submitting" style="width: 100px;">
+          <Button @click.native="handleEventRelieve" style="width: 100px;">
             事件解除
           </Button>
           <Button @click.native="goStrategy" style="width: 100px;">
@@ -30,7 +30,9 @@ import Video from "@screen/components/VideoMulti";
 
 import request from "@/utils/request";
 import { dialogDelayVisible } from "./../mixin";
-
+import {
+  postCompleteEvent,
+} from "@/api/commandDispatch";
 // 所有交通事件的详情
 export default {
   name: "TrafficIncidents",
@@ -131,7 +133,6 @@ export default {
         if (code != 200) return;
 
         this.data = { ...data, ...this.data };
-        console.log("trafficIncidents", data);
       })
       .catch((err) => { });
   },
@@ -142,7 +143,26 @@ export default {
     },
     goStrategy(){
       this.$router.push(`/control/device/strategy`);
-    }
+    },
+    handleEventRelieve() {
+      
+      this.$confirm("确定解除事件吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let data = new FormData();
+          data.append("eventId", this.dialogData.id);
+          postCompleteEvent(data).then((result) => {
+            console.log('--------',result)
+            if (result.code != 200) return [];
+            this.$message.success("事件解除成功");
+            this.$emit('traffic-relieve',this.data);
+          });
+        })
+        .catch(() => {});
+    },
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 78100f62..36ee6074 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -28,7 +28,7 @@
     <!-- 摄像机 G35 K094+079 下行（可控） 枪机 可打开-->
     <!-- <Camera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 1" /> -->
     <component :dialogData="dialogConfig.data" visible :selectedDevice="dialogConfig.data" :is="dialogConfig.component"
-      @change="handleCameraChange" @update:visible="handleCameraChange" />
+      @change="handleCameraChange" @update:visible="handleCameraChange" @traffic-relieve="handleTrafficRelieve" />
   </Bg1>
 </template>
 
@@ -272,7 +272,7 @@ export default {
       window.infoWindow.close();
     },
 
-    // 摄像机 可控 不可控 弹窗 回调
+    // 摄像机 可控 不可控 弹窗 回调traffic-relieve
     handleCameraChange() {
       this.dialogConfig = {
         // 0 有 可控（球机）ControlCamera | 1 ⽆ 不可控（枪机）Camera
@@ -287,6 +287,17 @@ export default {
         gridRowStart: Math.floor(index / columns) + 1,
         gridColumnStart: (index % columns) + 1,
       }
+    },
+    async handleTrafficRelieve(e){
+      await this.handleDeviceImmediate(e._itemData)
+      setTimeout(async () => {
+        await this.handleDeviceImmediate(e._itemData)  
+      }, 500);
+      this.dialogConfig = {
+        // 0 有 可控（球机）ControlCamera | 1 ⽆ 不可控（枪机）Camera
+        component: null,
+        data: null
+      }
     }
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index ce60eb92..68a48f72 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -30,7 +30,6 @@ export async function getCameraStream(camId, media = 1) {
     data.data.liveUrl =
       "https://10.0.81.202/camera?target=" + data.data.liveUrl.substring(7);
   }*/
-
   return data;
 }