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

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

@@ -251,33 +251,22 @@ export const startEndStation = {
   },
 };
 
-// export const direction = {
+export function directionCreater(type){
-//   label: "方向:",
+  return {
-//   key: "direction",
+    label: "路段方向:",
-//   required: true,
+    key: "direction",
-//   type: "select",
+    type,  //CheckboxGroup 或 RadioGroup
-//   options: {
+    isAlone: true,
-//     options: [
+    default: [],
-//       // { key: "济南方向", label: "济南方向" },
+    options: {
-//       // { key: "菏泽方向", label: "菏泽方向" },
+      options: [
-//     ],
+        { key: "1", label: "菏泽方向" },
-//   },
+        { key: "2", label: "双向" },
-// };
+        { key: "3", label: "济南方向" },
-
+      ],
-export const direction = {
+    },
-  label: "路段方向:",
+  };
-  key: "direction",
+}
-  type: "CheckboxGroup",
-  isAlone: true,
-  default: [],
-  options: {
-    options: [
-      { key: "1", label: "济南方向" },
-      { key: "3", label: "菏泽方向" },
-      { key: "2", label: "双向" },
-    ],
-  },
-};
 
 export const problemDescription = {
   label: "问题描述:",

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/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/Home/components/RoadAndEvents/index.vue

@@ -51,7 +51,7 @@ import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
 import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue";
 
 import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue";
-import { addInGraphHandle } from "./utils/map"
+import { addInGraphHandle, markerClusterIns } from "./utils/map"
 import { lngLatMap } from "./utils/buttonEvent";
 
 export default {
@@ -183,6 +183,8 @@ export default {
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
     Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
+    markerClusterIns.clear();
+    window.renderData = undefined;
   },
   methods: {
     selectedCompletedHandle(item) {

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js

@@ -39,7 +39,7 @@ export class MarkerCluster {
   markerCluster;
   infoWindow;
 
-  data = [];
+  data = []; //标注集合
 
   constructor() {}
 
@@ -115,7 +115,7 @@ export class MarkerCluster {
     window.totalPages = totalPages;
     let num = (page - 1) * pageSize;
     function renderData(page) {
-      if (page < 1 || page > totalPages) return;
+      if (!data || page < 1 || page > totalPages) return;
       window.page = page;
       const pageSize = window.pageSize;
       const dataContainer = document.getElementById("dataContainer");
@@ -127,7 +127,7 @@ export class MarkerCluster {
       const startIndex = (page - 1) * pageSize;
       const endIndex = startIndex + pageSize;
       let num = (page - 1) * pageSize;
-      if (!data || data.length === 0 || data.length === 1) {
+      if (data.length === 0 || data.length === 1) {
         return this.infoWindow.close();
       }
       const { latitude: lat, longitude: lng } = data[0].extData;
@@ -391,6 +391,9 @@ export class MarkerCluster {
   setData() {
     this.markerCluster.setData(this.data);
   }
+  clear() {
+    this.data = [];
+  }
 }
 
 export function getContent(data) {

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%;
-            }
-          }
-
 
+        div {
+          height: 100%;
         }
-
-
       }
     }
 
     .item {
       img {
         height: 100%;
-        width: 100%;
       }
     }
   }

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js

@@ -0,0 +1,63 @@
+// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+// import { merge, cloneDeep } from "lodash";
+
+export const searchFormList = [
+  {
+    label: "时间范围:",
+    key: "daterange",
+    required: false,
+    type: "datePicker",
+    options: {
+      type: "daterange",
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
+    },
+  },
+  PresetFormItems.directionCreater("CheckboxGroup"),
+  {
+    label: "发布状态:",
+    key: "releaseStatus",
+    type: "checkboxGroup",
+    default: [],
+    options: {
+      options: [
+        {
+          key: "1",
+          label: "成功",
+        },
+        {
+          key: "0",
+          label: "失败",
+        },
+      ],
+    },
+  },
+  
+  // {
+  //   label: "内容:",
+  //   key: "releaseContent",
+  //   type: "input",
+  //   default: ""
+  // },
+  
+  // {
+  //   ...PresetFormItems.station,
+  //   label: "开始桩号:",
+  //   required: false,
+  // },
+  // merge(cloneDeep(PresetFormItems.station), {
+  //   options: {
+  //     options: [
+  //       {
+  //         key: "endStakeMark[0]",
+  //       },
+  //       {
+  //         key: "endStakeMark[1]",
+  //       },
+  //     ],
+  //   },
+  //   label: "结束桩号:",
+  //   required: false,
+  // }),
+];

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue

@@ -2,8 +2,7 @@
   <div class='board_record'>
     <!-- 搜索栏 -->
     <div class="filter">
-      <div>
+        <ButtonGradient @click="onRefreshForm" class="refresh-btn">
-        <ButtonGradient @click="onRefresh" class="refresh-btn">
           <template #prefix>
             <img src="./images/refresh.svg" />
           </template>
@@ -16,7 +15,14 @@
           新增
         </ButtonGradient> -->
 
-      </div>
+        <InputSearch
+          ref="searchComp"
+          style="width: 402px"
+          :formList="searchFormList"
+          :formConfigOptions="{ dFormData: { eventState: '0' } }"
+          @handleSearch="handleSearch"
+        />
+
     </div>
 
     <!-- 内容 -->
@@ -30,7 +36,7 @@
         <el-table-column
           prop="direction"
           label="方向"
-          width="120"
+          width="110"
           :formatter="formatterDirection" />
         <ElTableColumn label="内容" prop="releaseContent" width="500" header-align="center">
           <template slot-scope="scope">
@@ -41,9 +47,9 @@
             </el-carousel>
           </template>
         </ElTableColumn>
-        <ElTableColumn label="状态" prop="releaseStatus" width="120" :formatter="formatterStatus"/>
+        <ElTableColumn label="状态" prop="releaseStatus" width="80" :formatter="formatterStatus"/>
-        <ElTableColumn label="用户名" prop="releaseUserName" width="180" />
+        <ElTableColumn label="用户名" prop="releaseUserName" width="120" />
-        <ElTableColumn label="用户ID" prop="releaseUserId" width="180" />
+        <ElTableColumn label="用户ID" prop="releaseUserId" width="120" />
         <ElTableColumn label="用户IP" prop="releaseIp" width="200" />
        <!--
         <ElTableColumn label="操作" width="210">
@@ -73,6 +79,8 @@ import Table from '@screen/components/Table.vue';
 import request from "@/utils/request";
 import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
 import {DirectionTypes} from '@screen/utils/enum.js';
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import { searchFormList } from "./data";
 
 export default {
   name: 'boardRecord',
@@ -80,12 +88,14 @@ export default {
     ButtonGradient,
     Pagination,
     Table,
-    BoardRecordPreview
+    BoardRecordPreview,
+    InputSearch
   },
   data() {
     return {
       testData : {"STAY":"30","ACTION":"1","SPEED":"0","COLOR":"ffff00","FONT":"3","FONT_SIZE":"32","CONTENT":"因改扩建施工 平阴南、梁山收费站出入口封闭","width":"768","height":"64","formatStyle":"2"},
       tableData: [],
+      searchFormList,
       isShowPhrases: false,
       isShowDisposal: false,
       total: 20,
@@ -102,6 +112,40 @@ export default {
     this.initData();
   },
   methods: {
+    onRefreshForm(){
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    handleSearch(data) {
+      let daterange = data.daterange;
+      console.log(data, "dataaaaaaaaaaaa");
+
+      // let dStakeMark = data.stakeMark;
+      // let dendStakeMark = data.endStakeMark;
+
+      // let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : "";
+      // let endStakeMark = dendStakeMark[0]
+      //   ? `K${dendStakeMark[0]}+${dendStakeMark[1]}`
+      //   : "";
+
+      let startTime = "";
+      let endTime = "";
+      if(daterange && daterange.length > 0){
+        startTime = daterange[0];
+        endTime = daterange[1];
+      }
+
+      this.searchData = {
+        ...this.searchData,
+        // releaseContent: data.releaseContent || "",
+        direction: data.direction || "",
+        startTime,
+        endTime,
+        // stakeMark: stakeMark,
+        // endStakeMark: endStakeMark,
+      };
+      this.initData();
+    },
     indexMethod(index) {
         return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
       },
@@ -122,11 +166,11 @@ export default {
         this.total = result.total;
       });
     },
-    onRefresh() {
+    // onRefresh() {
-      this.tableData = [];
+    //   this.tableData = [];
-      this.searchData.pageNum = 1;
+    //   this.searchData.pageNum = 1;
-      this.initData();
+    //   this.initData();
-    },
+    // },
     onSizeChange(pageSize) {
       this.tableData = [];
       this.searchData.pageSize = pageSize;
@@ -178,7 +222,7 @@ export default {
       padding: 7px 4px;
     }
   }
-  ::v-deep .el-table__cell div {
+  ::v-deep .el-table__cell div.cell {
     padding: 0 10px !important;
   }
 }