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

ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js

@@ -49,12 +49,12 @@ export const releaseChannel = {
   default: [],
   options: {
     options: [
-      { key: "1", label: "微博" },
+      { key: "1", label: "微博", width: "87px" },
-      { key: "3", label: "微信小程序" },
+      { key: "3", label: "微信小程序", width: "87px" },
-      { key: "4", label: "服务网站" },
+      { key: "4", label: "服务网站", width: "87px" },
-      { key: "5", label: "情报板" },
+      { key: "5", label: "情报板", width: "87px" },
-      { key: "6", label: "手机短信" },
+      { key: "6", label: "手机短信", width: "87px" },
-      { key: "7", label: "微信公众号" },
+      { key: "7", label: "微信公众号", width: "87px" },
     ],
   },
 };

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

@@ -113,7 +113,7 @@ export default {
   height: 100%;
   background: rgba(0, 0, 0, 0.36);
   border-radius: 0px 0px 0px 0px;
-  z-index: 1100;
+  z-index: 2100;
   // display: flex;
   // align-items: center;
   // justify-content: center;

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

@@ -10,6 +10,7 @@
       :disabled="item.disabled"
       :label="item[id] || item[label]"
       :key="item[id] || item[label]"
+      :style="{ width: [item.width ? item.width : 'auto'] }"
     >
       <slot :name="item[id] || item[label]" :data="item"
         >{{ item[label] }}
@@ -70,7 +71,6 @@ export default {
       display: flex;
       align-items: center;
       gap: 6px;
-      width: 87px;
 
       .el-checkbox__input {
         line-height: 0;

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue

@@ -5,7 +5,7 @@
       <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%" :pictures="dialogData.formData.pictures" />
+        <Carousel style="flex: 1; height: 100%;max-width: 300px;" :pictures="dialogData.formData.pictures" />
       </div>
       <LineChart class="chart" />
       <Form class="form" v-loading="loading" v-model="data" ref="FormConfigRef" :formList="formList" column="1" />

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

@@ -2,12 +2,11 @@
   <div class="Carousel">
     <img src="./images/arrow.svg" @click="prevSlide" class="arrow" />
 
-    <VueSlickCarousel style="width: 100%" v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef"
+    <VueSlickCarousel v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
-      class="vueSlickCarousel">
       <div v-for="(item, index) in pictures" :key="index" class="item">
         <!-- <img :src="require(`@screen/images/${item}`)" style="height: 100%"> -->
         <!-- <img :src="item" style="height: 100%"> -->
-        <el-image style="height: 100%;width:100%" :src="item" :preview-src-list="pictures">
+        <el-image style="height: 100%" :src="item" :preview-src-list="pictures">
         </el-image>
       </div>
     </VueSlickCarousel>
@@ -48,7 +47,7 @@ export default {
         infinite: true,
         arrows: false,
         speed: 600,
-        slidesToShow: 3,
+        slidesToShow: 1,
         slidesToScroll: 1,
         autoplay: true,
         autoplaySpeed: 1800,
@@ -77,37 +76,20 @@ export default {
   .vueSlickCarousel {
     flex: 1;
     overflow: hidden;
-    width: 100%;
 
     ::v-deep {
       .slick-list {
         height: 100%;
-        width: 100%;
-
-        .slick-track {
-          width: 100% !important;
-          height: 100% !important;
-
-          .slick-slide {
-            width: 100% !important;
 
         div {
-              width: 100%;
           height: 100%;
         }
       }
-
-
-        }
-
-
-      }
     }
 
     .item {
       img {
         height: 100%;
-        width: 100%;
       }
     }
   }