From 8bde4193f8c25ab97535690ae411bc95a48679c6 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 9 May 2024 14:58:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E8=AF=B1=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/DrivingGuidance/components/DeviceControlDialog.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index 93b1ef0b..307c624d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -49,9 +49,6 @@ export default {
   computed: {
     modelVisible: {
       get() {
-        if(this.visible){
-          console.log('id',id)
-        }
         return this.visible;
       },
       set(val) {

From 4718f9b527f49696192bd905e713080be4fd7fdb Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 9 May 2024 15:17:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=84=9F=E7=9F=A5?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/PerceiveEvent/index.vue           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index 3da4843a..5d3ba978 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -5,8 +5,8 @@
       <div class="video-pic">
         <!-- <Video style="height: 100%; flex: 1" :showHeader="false" :url="dialogData.formData.videoList[0]"
           videoType="mp4" /> -->
-        <Carousel style="flex: 1; height: 100%;max-width: 350px;" :videos="dialogData.formData.videoList" />
-        <Carousel style="flex: 1; height: 100%;max-width: 300px;" :pictures="dialogData.formData.pictures" />
+        <Carousel style="flex: 1; height: 100%;max-width: 350px;" :videos="dialogData.videoList || []" />
+        <Carousel style="flex: 1; height: 100%;max-width: 300px;" :pictures="dialogData.pictures || []" />
       </div>
       <LineChart class="chart" />
       <Form class="form" v-loading="loading" v-model="data" ref="FormConfigRef" :formList="formList" column="1" />
@@ -188,7 +188,16 @@ export default {
       self.getDetails();
     });
   },
-  async mounted() { },
+  async mounted() {
+    
+    if (this.dialogData.otherConfig) {
+      const otherConfig = JSON.parse(this.dialogData.otherConfig);
+      this.dialogData.videoList = otherConfig.videoList
+      this.dialogData.pictures = otherConfig.pictures
+    }
+
+    console.log(1122, this.dialogData, 3344);
+  },
   beforeDestroy() {
     clearInterval(this.interval);
   },
@@ -300,8 +309,10 @@ export default {
             lane: data.lane?.split(",") || [],
           };
 
-          this.formList[5].options = { options:
-            WarningSubclassList[data.warningType] || []};
+          this.formList[5].options = {
+            options:
+              WarningSubclassList[data.warningType] || []
+          };
 
           setTimeout(() => {
             this.$refs.FormConfigRef.reset(true);