修改首页问题

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

@@ -29,7 +29,7 @@ import Video from "@screen/components/Video";
 import Form from "@screen/components/FormConfig";
 import request from "@/utils/request";
 import { Message } from "element-ui";
-import moment from "moment";
+import moment, { fn } from "moment";
 import Carousel from "@screen/pages/control/event/event/EventDetailDialog/Carousel";
 import {
   WarningTypeList,
@@ -183,8 +183,10 @@ export default {
     };
   },
   async created() {
-    this.getDetails();
-    this.getVehicleTypeList();
+    let self = this;
+    this.getVehicleTypeList(function(){
+      self.getDetails();
+    });
   },
   async mounted() { },
   beforeDestroy() {
@@ -220,8 +222,11 @@ export default {
           });
         });
     },
-    getVehicleTypeList() {
-      if (vehicleTypeList.length) return;
+    getVehicleTypeList(fn) {
+      if (vehicleTypeList.length) {
+        fn()
+        return
+      };
 
       request({
         url: `/system/dict/data/type/${"sys_vehicle_type"}`,
@@ -230,13 +235,13 @@ export default {
       })
         .then(({ data, code }) => {
           if (code != 200) return Message.error("详情获取失败");
-
           vehicleTypeList = this.formList[5].options.options = data.map(
             (item) => ({
               key: item.dictValue,
               label: item.dictLabel,
             })
           );
+          fn();
         })
         .catch((err) => { });
     },
@@ -301,10 +306,6 @@ export default {
           setTimeout(() => {
             this.$refs.FormConfigRef.reset(true);
           });
-          setTimeout(() => {
-            this.formList[5].options = { options:
-            WarningSubclassList[data.warningType] || []};
-          }, 100);
           this.data.direction = DirectionTypes[this.data.direction];
           this.data.duration = getDuration(this.data.warningTime);
           this.interval = setInterval(() => {

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js

@@ -24,7 +24,7 @@ export const dialogDelayVisible = {
   emits: ["change"],
   computed: {
     obverseVisible: {
-      set(bool) {
+      set(bool) { 
         try {
           typeof this.visibleClose === "function" && this.visibleClose?.(bool);
         } catch (error) {}

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

@@ -53,11 +53,11 @@
         <div v-if="tabAction === '3'" style="width:70vw;height: 500px;display: flex;flex-direction: column; justify-content: center;align-items: flex-start;" >
           <Form v-model="dataRecord" style="width:100%;" labelWidth="90px" column="2" class="form" ref="FormRecordRef" :formList="formRecord" />
           <Table :data="tableData" height="500px" style="margin: 20px;width:95%">
-            <ElTableColumn label="管控时间" prop="operTime" width="200"/>
-            <ElTableColumn label="设备名称" prop="dcDeviceName" width="300"/>
-            <ElTableColumn label="管控方式" prop="operType" width="100"/>
-            <ElTableColumn label="操作人" prop="operName" width="100"/>
-            <ElTableColumn label="执行结果" prop="stakeMark" >
+            <ElTableColumn label="管控时间" prop="operTime" width="300"/>
+            <ElTableColumn label="设备名称" prop="dcDeviceName"/>
+            <ElTableColumn label="管控方式" prop="operType" width="200"/>
+            <ElTableColumn label="操作人" prop="operName" width="200"/>
+            <ElTableColumn label="执行结果" prop="stakeMark"  width="150" >
               <template slot-scope="scope">
                 <el-popover
                   placement="top-start"

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

@@ -110,6 +110,7 @@ function resolveDataOptions(data, config, component, isDefault) {
         const formData = extData?.otherConfig
           ? JSON.parse(extData.otherConfig)
           : null;
+        // formData.pictures = ["https://pic1.zhimg.com/80/v2-c00beaae1f6e3c09a6d77c16c70002fe_1440w.webp?source=1def8aca","https://pic1.zhimg.com/80/v2-c56626621906417a453d262ac11f3385_1440w.webp?source=1def8aca"]
         console.log(component, "DialogComponent");
         this.dialogConfig = {
           component,

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

@@ -205,6 +205,7 @@ const DeviceTypeMap = {
   14: "光线在线监测",
  */
 export function getDeviceList(deviceType, options) {
+  console.log(deviceType, options,'------------')
   return new Promise((resolve, reject) => {
     if (!deviceType) {
       // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
@@ -220,10 +221,13 @@ export function getDeviceList(deviceType, options) {
       newStartStakeMark.push(String(item));
     });
     let data = {
-      deviceType,
+      deviceType: deviceType,
       endStakeMark: newEndStakeMark,
       startStakeMark: newStartStakeMark
     }
+    if(options.childType && options.childType.split('-')[0] === deviceType){
+      data.childType = options.childType
+    }
     if(options.deviceState && options.deviceState !== ''){
       data['deviceState'] = options.deviceState
     }

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

@@ -103,7 +103,6 @@ export default {
               this.$message.warning(`未选择发布平台`);
               return;
             }
-            // res.eventid = 
             if(type.indexOf('1') !== -1){
               res.phone = '13589019062'
             }