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

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

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: 350px;" :videos="dialogData.videoList || []" />
-        <Carousel style="flex: 1; height: 100%;max-width: 300px;" :pictures="dialogData.formData.pictures" />
+        <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:
+          this.formList[5].options = {
-            WarningSubclassList[data.warningType] || []};
+            options:
+              WarningSubclassList[data.warningType] || []
+          };
 
           setTimeout(() => {
             this.$refs.FormConfigRef.reset(true);