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

ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElSelect.vue

@@ -12,6 +12,10 @@
 export default {
   name: 'ElSelect_',
   props: {
+    defaultl: {
+      type: Number,
+      default: undefined
+    },
     options: {
       type: Array,
       default: () => []

ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue

@@ -116,7 +116,7 @@ export default {
   .left {
     img {
       width: 212px;
-      height: 159;
+      height: 159px;
     }
   }
 

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

@@ -3,8 +3,9 @@
     <img src="./images/arrow.svg" @click="prevSlide" class="arrow" />
 
     <VueSlickCarousel v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
-      <div v-for="(item, index) in carouselItems" :key="index" class="item">
+      <div v-for="(item, index) in pictures" :key="index" class="item">
-        <img :src="require(`@screen/images/${item.imageURL}`)" style="height: 100%">
+        <!-- <img :src="require(`@screen/images/${item}`)" style="height: 100%"> -->
+        <img :src="item" style="height: 100%">
       </div>
     </VueSlickCarousel>
 
@@ -22,6 +23,19 @@ import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css'
 export default {
   name: "Carousel",
   components: { VueSlickCarousel },
+  props: {
+    pictures: {
+      type: Array,
+      default: () => [
+        "shareWith/message-active.svg",
+        "shareWith/message.svg",
+        "shareWith/website-active.svg",
+        "shareWith/website.svg",
+        "shareWith/weChat-active.svg",
+        "shareWith/weChat-active.svg"
+      ]
+    },
+  },
   data() {
     return {
       carouselItems: [

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

@@ -6,7 +6,7 @@
       <div class="video-pic">
         <Video style="height: 100%;" />
 
-        <Carousel style="flex: 1" />
+        <Carousel style="flex: 1" :pictures="formData.pictures"/>
       </div>
 
       <TimeLine1 :data="timeLine1List" />

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js

@@ -203,6 +203,7 @@ export const eventLevel = {
   required: true,
   type: "select",
   options:{
+    defaultl: 5,
     options:[
       {
         key: 1,

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js

@@ -87,23 +87,23 @@ export const gjSearchFormList = [
   },
   {
     ...PresetFormItems.station,
-    label: "开始桩号:",
+    label: "桩号:",
     required: false,
   },
-  merge(cloneDeep(PresetFormItems.station), {
+  // merge(cloneDeep(PresetFormItems.station), {
-    options: {
+  //   options: {
-      options: [
+  //     options: [
-        {
+  //       {
-          key: "endStakeMark[0]",
+  //         key: "endStakeMark[0]",
-        },
+  //       },
-        {
+  //       {
-          key: "endStakeMark[1]",
+  //         key: "endStakeMark[1]",
-        },
+  //       },
-      ],
+  //     ],
-    },
+  //   },
-    label: "结束桩号:",
+  //   label: "结束桩号:",
-    required: false,
+  //   required: false,
-  }),
+  // }),
 ];
 
 export const gzSearchFormList = [

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

@@ -297,6 +297,10 @@ export default {
           data.startTime = data.warningTime;
           data.stringEventState = warningStateMapping[data.warningState];
           data.stringEventType = warningTypeMapping[data.warningType];
+          if (data.otherConfig) {
+            let otherConfig = JSON.parse(data.otherConfig);
+            data.pictures = otherConfig.pictures || [];
+          }
 
           this.detailDialogFormData = data;
           // console.log('data', this.detailDialogFormData)