From 78570b02e3e2214f0fb325fb41248a573dd996ae Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 18 Apr 2024 11:28:38 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/event/EventDetailDialog/index.vue   | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
index cbd6026f..8cafab83 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@@ -136,9 +136,10 @@ export default {
         url: `/system/process/list`,
         method: "get",
         params: { eventId: this.formData.id },
-      }).then((result) => {
-        if (result.code != 200) return Message.error(result?.msg);
-        const rows = result.rows;
+      }).then((rows) => {
+        console.log('rows',rows)
+        // if (result.code != 200) return Message.error(result?.msg);
+        // const rows = result.rows;
         this.timeLine1List = [];
         this.timeLine2List = [];
 
@@ -171,6 +172,28 @@ export default {
         });
       });
     },
+    getProcessNode() {
+      return request({
+        url:
+          `/dc/system/event/getProcessNode/${this.formData.id}`,
+        method: "GET",
+      })
+        .then((result) => {
+          if (result.code != 200) return [];
+          // this.timeLine1List = result.data.map((item) => {
+          //   return {
+          //     time: item.operationTime,
+          //     label: item.processNode,
+          //     isActive: item.status == 1 ? true : false,
+          //   };
+          // });
+          // this.options = result.data.filter((item) => {
+          //   item.status == 0;
+          //   return item;
+          // });
+        })
+        .catch((err) => []);
+    },
     onCloseAddNew() {
       this.isShowDialog = false;
     },

From 7eb11aa35e854fcee4464cb7f8fcaff0d764688e Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 18 Apr 2024 14:55:24 +0800
Subject: [PATCH 02/10] =?UTF-8?q?feat=20=E6=89=B9=E9=87=8F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=20=E5=AE=8C=E6=88=90=E8=AE=BE=E5=A4=87=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Descriptions.vue               |  27 +--
 .../components/BroadcastParamMulti.vue        |  11 +-
 .../SmartDevice/components/DeviceParams.vue   | 139 ++++++------
 .../components/DeviceParamsMulti.vue          | 208 ++++++++----------
 .../components/HomeFrameControl/index.vue     |   6 +-
 .../src/views/JiHeExpressway/utils/common.js  |  19 ++
 6 files changed, 186 insertions(+), 224 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
index 1db5ee26..4be2b1c3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
@@ -1,16 +1,8 @@
 <template>
   <div class="Descriptions keep-ratio" origin="left" :style="getStyle()">
-    <div
-      class="item"
-      v-for="(item, index) in getResolveList"
-      :key="`${item.key || item.label}${index}`"
-      :style="[gridStyle(item, index), transformStyle(itemStyle)]"
-      v-if="item.visible != false"
-    >
-      <div
-        class="text title"
-        :style="{ ...transformStyle(titleStyle), width: labelWidth }"
-      >
+    <div class="item" v-for="(item, index) in getResolveList" :key="`${item.key || item.label}${index}`"
+      :style="[gridStyle(item, index), transformStyle(itemStyle)]" v-if="item.visible != false">
+      <div v-if="!item.labelHidden" class="text title" :style="{ ...transformStyle(titleStyle), width: labelWidth }">
         <p>
           <slot :name="`title-${item.key || item.label}`" :data="item">
             {{ item.label || "-" }}
@@ -18,18 +10,9 @@
         </p>
         :
       </div>
-      <ContentText
-        :style="transformStyle(titleStyle)"
-        class="content text"
-        :data="data"
-        :_config="item"
-      >
+      <ContentText :style="transformStyle(titleStyle)" class="content text" :data="data" :_config="item">
         <template #default="{ value }">
-          <slot
-            :name="`content-${item.key || item.label}`"
-            :value="value"
-            :data="item"
-          >
+          <slot :name="`content-${item.key || item.label}`" :value="value" :data="item">
             {{ value }}
           </slot>
         </template>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
index 0fabeb8f..39fad584 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
@@ -30,6 +30,7 @@ import CheckboxGroup from "@screen/components/FormConfig/components/ElCheckboxGr
 
 import request from "@/utils/request";
 import { batchFunctions } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+import { multiResultShow } from "@screen/utils/common";
 
 import { Message } from "element-ui";
 
@@ -89,7 +90,6 @@ export default {
     },
     handleSubmit() {
       const selectItems = this.selectItems.map(item => JSON.parse(item));
-      console.log(this.selectItems, selectItems, "selectItems");
       const checkList = selectItems.map(item => JSON.parse(item.otherConfig));
       if (!this.releaseMessage?.trim())
         return Message.error("发布内容不能为空!");
@@ -118,14 +118,7 @@ export default {
           ]
         })
         .then((data) => {
-          const allItems = data.data;
-          const successItems = allItems.filter(item => item.result.retCode == 0);
-          console.log("xxxxxxx111")
-          if (successItems.length == allItems.length) {
-            Message.success("广播设置成功!");
-          } else {
-            Message.error(`广播设置失败, 失败${allItems.length - successItems.length}个!`);
-          }
+          multiResultShow(data.data, item => item.result.retCode == 0, "广播设置");
         })
         .finally(() => {
           this.submitting = false;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue
index fd23a851..dc8d4b51 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue
@@ -4,9 +4,11 @@
     <Descriptions :list="devicesList" style="gap: 18px;" column="5">
       <template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }">
         <span>{{ data.text }}</span>
-        <Switcher v-if="!disabled" class="switcher"  :activeOption="activeOption" :value="data.state"
+        <Switcher v-if="!disabled" class="switcher" :activeOption="activeOption" :value="data.state"
           @change="(value) => handleSwitcherChange(value, data)" />
-        <ElTag style="margin-left: 20px;" v-else effect="dark" :type="data.state?'':'info'">{{ data.state?'开':'关' }}</ElTag>
+        <ElTag style="margin-left: 20px;" v-else effect="dark" :type="data.state ? '' : 'info'">{{ data.state ? '开' :
+      '关' }}
+        </ElTag>
       </template>
     </Descriptions>
   </div>
@@ -49,93 +51,93 @@ export default {
   },
   created() {
 
-    Promise.all([this.getAc(), this.getDc()]).then(res=>{
-        // if (result.code != 200) return;
+    Promise.all([this.getAc(), this.getDc()]).then(res => {
+      // if (result.code != 200) return;
 
       let ac = res[0].data;
       let dc = res[1].data;
       let deviceInfo = _.merge({}, ac, dc);
 
-        const typeMap = {
-          ac: '220v',
-          dc: '12v',
-        }
-        for (const key in deviceInfo.formatValue) {
-          // electricity 电流
-          // voltage 电压
-          if (key.includes('electricity')) {
-            const args = key.match(/[a-z]+|[0-9]+$/g);
+      const typeMap = {
+        ac: '220v',
+        dc: '12v',
+      }
+      for (const key in deviceInfo.formatValue) {
+        // electricity 电流
+        // voltage 电压
+        if (key.includes('electricity')) {
+          const args = key.match(/[a-z]+|[0-9]+$/g);
 
-            const type = args[0], num = args.slice(-1)[0], prefix = args.slice(0, 2).join('_');
-            // console.log(type , num , prefix , "+++=========="); //dc 2 dc_out
-            this.devicesList.push(
-              {
-                label: `支路${num} （${typeMap[type]}）   电压`,
-                key: `${prefix}_voltage_${num}`,
-                text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
-                gridColumn: 3
-              },
-              {
-                label: '电流',
-                key: `${prefix}_electricity_${num}`,
-                text: deviceInfo.formatValue[key],
-                gridColumn: 2,
-                state: deviceInfo.value[key] > 0
-              }
-            );
-          }
+          const type = args[0], num = args.slice(-1)[0], prefix = args.slice(0, 2).join('_');
+          // console.log(type , num , prefix , "+++=========="); //dc 2 dc_out
+          this.devicesList.push(
+            {
+              label: `支路${num} （${typeMap[type]}）   电压`,
+              key: `${prefix}_voltage_${num}`,
+              text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
+              gridColumn: 3
+            },
+            {
+              label: '电流',
+              key: `${prefix}_electricity_${num}`,
+              text: deviceInfo.formatValue[key],
+              gridColumn: 2,
+              state: deviceInfo.value[key] > 0
+            }
+          );
         }
-        this.devicesList.push(
-          {
-            label: '风扇',
-            key: `fan_status`,
-            // key: `aa_electricity_1`,
-            text: { 0: '正常', 1: '开' }[deviceInfo.formatValue['fan_status']] || '-',
-            gridColumn: 2,
-            state: (deviceInfo.formatValue['fan_status']==='0')
-          },
-          
-          {
-            label: '温度',
-            key: `temperature`,
-            text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} °C` : '-',
-            gridColumn: 2
-          },
-          {
+      }
+      this.devicesList.push(
+        {
+          label: '风扇',
+          key: `fan_status`,
+          // key: `aa_electricity_1`,
+          text: { 0: '正常', 1: '开' }[deviceInfo.formatValue['fan_status']] || '-',
+          gridColumn: 2,
+          state: (deviceInfo.formatValue['fan_status'] === '0')
+        },
+
+        {
+          label: '温度',
+          key: `temperature`,
+          text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} °C` : '-',
+          gridColumn: 2
+        },
+        {
           label: '箱门',
           key: `door_status`,
           text: { 0: '关闭', 1: '打开' }[deviceInfo.formatValue['door_status']] || '-',
           gridColumn: 1
         },
-          {
-            label: '湿度',
-            key: `humidity`,
-            text: deviceInfo.formatValue['humidity'] ? `${deviceInfo.formatValue['humidity']} %` : '-',
-            gridColumn: 2
-          },
-          {
-            label: '市电掉电',
-            key: `power_status`,
-            text: { 0: '正常', 1: '掉电' }[deviceInfo.formatValue['power_status']] || '-',
-            gridColumn: 2
-          },
-        )
-        // this.data = result.rows;
-        // this.total = result.total;
-      })
+        {
+          label: '湿度',
+          key: `humidity`,
+          text: deviceInfo.formatValue['humidity'] ? `${deviceInfo.formatValue['humidity']} %` : '-',
+          gridColumn: 2
+        },
+        {
+          label: '市电掉电',
+          key: `power_status`,
+          text: { 0: '正常', 1: '掉电' }[deviceInfo.formatValue['power_status']] || '-',
+          gridColumn: 2
+        },
+      )
+      // this.data = result.rows;
+      // this.total = result.total;
+    })
       .finally(() => {
         this.secondLoading = false
       })
   },
   methods: {
-    getAc(){
+    getAc() {
       return request({
         url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/1ac`,
         method: "get",
         params: {}
       })
     },
-    getDc(){
+    getDc() {
       return request({
         url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/1dc`,
         method: "get",
@@ -145,17 +147,16 @@ export default {
     async handleSwitcherChange(value, data) {
       let str = data.state ? "关闭" : "开启";
       let deviceName = "";
-      if(data.key.includes("fan")){
+      if (data.key.includes("fan")) {
         str += "风扇?";
         deviceName = "fan_out_en";
-      }else{
+      } else {
         str += "该支路?"
         deviceName = data.key.match(/^[a-z]+_out|[0-9]+/g).join("_") + "_en"; //dc_out_2_en    ac_out_2_en;
       }
       data.state = value;
       const isContinue = await confirm({ message: `${str}` })
         .catch(() => {
-          console.log(data.state,value,333)
           data.state = !value;
         });
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
index 26bf1e93..1b3c23c2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
@@ -2,8 +2,8 @@
   <div class='DeviceParams'>
     <div class="no-data" v-if="!devicesList.length" v-loading="secondLoading">暂无设备参数</div>
     <Descriptions :list="devicesList" style="gap: 18px;" column="5">
-      <template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }">
-        <span>{{ data.text }}</span>
+      <template v-for="item in devicesList" #[`content-${item.key}`]="{ data }">
+        <span style="font-size: 15px;font-weight: 400;color: #3de8ff;">{{ data.text }}</span>
         <Switcher v-if="!disabled" class="switcher" :activeOption="activeOption" :value="data.state"
           @change="(value) => handleSwitcherChange(value, data)" />
         <ElTag style="margin-left: 20px;" v-else effect="dark" :type="data.state ? '' : 'info'">{{ data.state ? '开' :
@@ -17,10 +17,12 @@
 <script>
 import Descriptions from '@screen/components/Descriptions.vue';
 import Switcher from '@screen/pages/service/PublishingChannelManagement/components/Switcher.vue';
-
+import { cloneDeep } from 'lodash';
 import request from "@/utils/request";
 import { Message } from 'element-ui';
 import { confirm } from "@screen/utils/common";
+import { batchFunctions } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+import { multiResultShow } from "@screen/utils/common";
 
 export default {
   name: 'DeviceParams',
@@ -34,12 +36,57 @@ export default {
       default: () => ({})
     },
     disabled: Boolean,
-    isMultiControl: Boolean
+    isMultiControl: Boolean,
+    selectItems: {
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
       secondLoading: true,
-      devicesList: [],
+      devicesList: [
+        {
+          labelHidden: true,
+          text: `支路1 （220v）:  `,
+          key: `ac_out_1_en`,
+          // text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
+          gridColumn: 1,
+          state: 0
+        },
+        {
+          labelHidden: true,
+          text: `支路2 （220v）:  `,
+          key: `ac_out_2_en`,
+          // text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
+          gridColumn: 1,
+          state: 0
+        },
+        {
+          labelHidden: true,
+          text: `支路1 （12v）: `,
+          key: `dc_out_1_en`,
+          // text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
+          gridColumn: 1,
+          state: 0
+        },
+        {
+          labelHidden: true,
+          text: `支路2 （12v）: `,
+          key: `dc_out_2_en`,
+          // text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
+          gridColumn: 1,
+          state: 0
+        },
+        {
+          labelHidden: true,
+          text: '风扇:',
+          key: `fan_out_en`,
+          // text: { 0: '正常', 1: '开' }[deviceInfo.formatValue['fan_status']] || '-',
+          gridColumn: 1,
+          state: 0
+        },
+      ],
       activeOption: {
         active: {
           text: "开"
@@ -52,135 +99,51 @@ export default {
   },
   created() {
 
-    Promise.all([this.getAc(), this.getDc()]).then(res => {
-      // if (result.code != 200) return;
-
-      let ac = res[0].data;
-      let dc = res[1].data;
-      let deviceInfo = _.merge({}, ac, dc);
-      console.log(deviceInfo, "deviceInfo11")
-      const typeMap = {
-        ac: '220v',
-        dc: '12v',
-      }
-      for (const key in deviceInfo.formatValue) {
-        // electricity 电流
-        // voltage 电压
-        if (key.includes('electricity')) {
-          const args = key.match(/[a-z]+|[0-9]+$/g);
-
-          const type = args[0], num = args.slice(-1)[0], prefix = args.slice(0, 2).join('_');
-          // console.log(type , num , prefix , "+++=========="); //dc 2 dc_out
-          this.devicesList.push(
-            {
-              label: `支路${num} （${typeMap[type]}）   电压`,
-              key: `${prefix}_voltage_${num}`,
-              text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
-              gridColumn: 3
-            },
-            {
-              label: '电流',
-              key: `${prefix}_electricity_${num}`,
-              text: deviceInfo.formatValue[key],
-              gridColumn: 2,
-              state: deviceInfo.value[key] > 0
-            }
-          );
-        }
-      }
-      this.devicesList.push(
-        {
-          label: '风扇',
-          key: `fan_status`,
-          // key: `aa_electricity_1`,
-          text: { 0: '正常', 1: '开' }[deviceInfo.formatValue['fan_status']] || '-',
-          gridColumn: 2,
-          state: (deviceInfo.formatValue['fan_status'] === '0')
-        },
-
-        {
-          label: '温度',
-          key: `temperature`,
-          text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} °C` : '-',
-          gridColumn: 2
-        },
-        {
-          label: '箱门',
-          key: `door_status`,
-          text: { 0: '关闭', 1: '打开' }[deviceInfo.formatValue['door_status']] || '-',
-          gridColumn: 1
-        },
-        {
-          label: '湿度',
-          key: `humidity`,
-          text: deviceInfo.formatValue['humidity'] ? `${deviceInfo.formatValue['humidity']} %` : '-',
-          gridColumn: 2
-        },
-        {
-          label: '市电掉电',
-          key: `power_status`,
-          text: { 0: '正常', 1: '掉电' }[deviceInfo.formatValue['power_status']] || '-',
-          gridColumn: 2
-        },
-      )
-      // this.data = result.rows;
-      // this.total = result.total;
-    })
-      .finally(() => {
-        this.secondLoading = false
-      })
   },
   methods: {
-    getAc() {
-      return request({
-        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/1ac`,
-        method: "get",
-        params: {}
-      })
-    },
-    getDc() {
-      return request({
-        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/1dc`,
-        method: "get",
-        params: {}
-      })
-    },
     async handleSwitcherChange(value, data) {
       let str = data.state ? "关闭" : "开启";
-      let deviceName = "";
-      if (data.key.includes("fan")) {
-        str += "风扇?";
-        deviceName = "fan_out_en";
-      } else {
-        str += "该支路?"
-        deviceName = data.key.match(/^[a-z]+_out|[0-9]+/g).join("_") + "_en"; //dc_out_2_en    ac_out_2_en;
-      }
+      let deviceName = data.key;
+      str += `${data.text.replace(":", "")}?`;
+      // if (data.key.includes("fan")) {
+      //   str += "风扇?";
+      //   deviceName = "fan_out_en";
+      // } else {
+      //   str += "该支路?"
+      //   deviceName = data.key.match(/^[a-z]+_out|[0-9]+/g).join("_") + "_en"; //dc_out_2_en    ac_out_2_en;
+      // }
       data.state = value;
+
+      if (!this.selectItems.length) {
+        setTimeout(() => { data.state = !value; }, 10);
+        Message.error("请至少选择一个广播设备!")
+        return;
+      }
+      const selectItems = this.selectItems.map(item => JSON.parse(item));
+
       const isContinue = await confirm({ message: `${str}` })
         .catch(() => {
-          console.log(data.state, value, 333)
           data.state = !value;
         });
 
       if (!isContinue) return;
 
-      // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc=
-      request({
-        url: `/business/device/functions/${this.dialogData.iotDeviceId}/${102}`,
-        method: "POST",
-        data: {
-          deviceName,
-          // 开关：1=打开，0=关闭
-          value: value ? 1 : 0
-        }
-      })
+      batchFunctions(
+        {
+          "devices": selectItems,
+          "functions": [
+            {
+              "functionId": "102",
+              "params": {
+                deviceName,
+                // 开关：1=打开，0=关闭
+                value: value ? 1 : 0
+              }
+            }
+          ]
+        })
         .then(result => {
-          if (result.code != 200) {
-            Message.error("操作失败");
-            data.state = !value;
-            return;
-          };
-          Message.success("操作成功");
+          multiResultShow(result.data, item => item.result.code == 200, "操作");
         })
         .catch(() => {
           data.state = !value;
@@ -197,5 +160,8 @@ export default {
 <style lang='scss' scoped>
 .DeviceParams {
   height: 100%;
+  padding-right: 9px;
+  padding-left: 14px;
+  margin-top: 15px;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index 6fea9c31..dcb34c55 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -37,12 +37,12 @@ import { ChildTypes } from "@screen/utils/enum.js"
 import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 import { delay } from "@screen/utils/common";
 import { initSearch } from "@screen/utils/enum/common.js"
-import DeviceParams from "@screen/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue";
+import DeviceParams from "@screen/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue";
 import BroadcastParam from "@screen/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue";
 import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
 
-const componentMap = { "语音广播": "BroadcastParam" } //DeviceTopics[deviceType]
-//"情报板": undefined, "行车诱导": undefined, "疲劳唤醒": undefined, "合流区": undefined,"设备箱": "DeviceParams",
+const componentMap = { "设备箱": "DeviceParams", "语音广播": "BroadcastParam" } //DeviceTopics[deviceType]
+//"情报板": undefined, "行车诱导": undefined, "疲劳唤醒": undefined, "合流区": undefined,
 const controlMulti = Object.keys(componentMap);//6种批量控制
 const DeviceTopics = {};//6种批量控制 事件专题 {key:label}
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
index 6e14122b..d20e4f47 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
@@ -1,6 +1,25 @@
 import request from "@/utils/request";
 import { Message, MessageBox } from "element-ui";
 
+/**
+ *
+ * @param {*} result 结果数组
+ * @param {*} predicate 断言函数
+ * @param {*} operationName 操作名称
+ */
+export const multiResultShow = (allItems, predicate, operationName) => {
+  const successItems = allItems.filter(predicate);
+  if (successItems.length == allItems.length) {
+    Message.success(`${operationName}成功!`);
+  } else {
+    Message.error(
+      `${operationName}成功${successItems.length}个, 失败${
+        allItems.length - successItems.length
+      }个!`
+    );
+  }
+};
+
 export function delay(ms = 240) {
   return new Promise((resolve) => setTimeout(() => resolve(void 0), ms));
 }

From fc53562493ae4aabbf46b66d11fdb9ee7d2e1ed9 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 18 Apr 2024 16:35:20 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Cards/DisposalProcess/index.vue           |    2 +
 .../EditEventInformationDialog/data.js        | 2566 ++++++++++++++++-
 .../EditEventInformationDialog/index.vue      |  200 +-
 .../Cards/EventInformation/index.vue          |    7 +-
 .../event/event/FormEvent/PresetFormItems.js  |   18 +-
 5 files changed, 2745 insertions(+), 48 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
index 712972aa..808a9c23 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <div>
   <Card class="DisposalProcess" title="处置过程">
     <template #title-suffix>
       <ButtonGradient class="title-button" @click="handleEventRelieve">
@@ -80,6 +81,7 @@
     :data="dispatchList"
     @update:value="handleClose"
   />
+</div>
 </template>
 
 <script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js
index 9291718f..58ba5634 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data.js
@@ -1,34 +1,2538 @@
 import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import request from "@/utils/request";
+import { Message } from "element-ui";
 
-export const formConfigList = [
-  {
-    label: "事故类型:",
-    key: "key13",
-    type: "select",
-  },
-  PresetFormItems.trafficAccidentType,
-  PresetFormItems.eventLevel,
-  PresetFormItems.callPolicePersonName,
-  PresetFormItems.callPolicePersonPhone,
-  PresetFormItems.locationMode,
-  PresetFormItems.route,
-  PresetFormItems.direction,
-  PresetFormItems.station,
-  PresetFormItems.eventHappenTime,
-  PresetFormItems.aEstimatedReleaseTime,
-  PresetFormItems.pressure,
-  PresetFormItems.weatherConditions,
-  PresetFormItems.effect,
-  PresetFormItems.isArrives,
-  PresetFormItems.isMaintenanceAccident,
-  PresetFormItems.isCongestionAhead,
-  PresetFormItems.isForkRoad,
-  PresetFormItems.isCurveRoad,
-  PresetFormItems.isInTunnel,
-  PresetFormItems.trafficPolicePhone,
-  PresetFormItems.wreckerCalls,
-  PresetFormItems.spillName,
-  PresetFormItems.ownerPhone,
-  PresetFormItems.laneOccupancy,
-  PresetFormItems.vehicleCondition,
+const locationSelect = [
+  {
+    value: "1",
+    label: "入口车道",
+  },
+  {
+    value: "2",
+    label: "入口匝道",
+  },
+  {
+    value: "3",
+    label: "入口",
+  },
+  {
+    value: "4",
+    label: "入口内广场",
+  },
+  {
+    value: "5",
+    label: "出口车道",
+  },
+  {
+    value: "6",
+    label: "出口匝道",
+  },
+  {
+    value: "7",
+    label: "外广场",
+  },
+  {
+    value: "8",
+    label: "出口",
+  },
+  {
+    value: "9",
+    label: "(站外)入口匝道",
+  },
+  {
+    value: "10",
+    label: "(站外)出口匝道",
+  },
+  {
+    value: "11",
+    label: "出口内广场",
+  },
+];
+
+export const tabConfigList = [
+  {
+    key: "TrafficAccident",
+    label: "交通事故",
+    formConfig: {
+      list: [
+        {
+          ...PresetFormItems.callPolicePersonName,
+          key: "dcEventAccident.reporterName",
+        },
+        {
+          ...PresetFormItems.callPolicePersonPhone,
+          key: "dcEventAccident.reporterPhoneNumber",
+        },
+        PresetFormItems.trafficAccidentType,
+        PresetFormItems.eventLevel,
+        {
+          ...PresetFormItems.locationMode,
+          key: "dcEventAccident.locationType",
+        },
+        PresetFormItems.freeway,
+        {
+          label: "服务区:",
+          key: "dcEventAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventAccident.location",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "服务区地点",
+          },
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 3) {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventAccident.rampId") {
+                      console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventAccident.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 3) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "收费站:",
+          key: "dcEventAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 4) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventAccident.location",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "收费站地点",
+            options: locationSelect,
+          },
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 4) {
+              return true;
+            }
+            return false;
+          },
+        },
+        PresetFormItems.direction,
+        PresetFormItems.station,
+        PresetFormItems.eventHappenTime,
+        PresetFormItems.aEstimatedReleaseTime,
+        { ...PresetFormItems.pressure, key: "dcEventAccident.trafficJam" },
+        {
+          ...PresetFormItems.weatherCondition,
+          key: "dcEventAccident.weatherCondition",
+        },
+        { ...PresetFormItems.effect, key: "dcEventAccident.impactLevel" },
+        { ...PresetFormItems.isArrives, key: "dcEventAccident.isReverseCargo" },
+        {
+          ...PresetFormItems.isMaintenanceAccident,
+          key: "dcEventAccident.isMaintenance",
+        },
+        {
+          ...PresetFormItems.trafficPolicePhone,
+          key: "dcEventAccident.policeContact",
+        },
+        {
+          ...PresetFormItems.wreckerCalls,
+          key: "dcEventAccident.towingServiceContact",
+        },
+        {
+          ...PresetFormItems.isCongestionAhead,
+          key: "dcEventAccident.congestionAhead",
+        },
+        {
+          ...PresetFormItems.isForkRoad,
+          key: "dcEventAccident.atIntersection",
+        },
+        { ...PresetFormItems.isCurveRoad, key: "dcEventAccident.onCurve" },
+        { ...PresetFormItems.isInTunnel, key: "dcEventAccident.inTunnel" },
+        { ...PresetFormItems.spillName, key: "dcEventAccident.spillageItem" },
+        {
+          ...PresetFormItems.ownerPhone,
+          key: "dcEventAccident.vehicleOwnerPhone",
+        },
+        PresetFormItems.laneOccupancy,
+        PresetFormItems.vehicleCondition("dcEventAccident"),
+        PresetFormItems.casualties("dcEventAccident"),
+        PresetFormItems.eventTitle,
+        PresetFormItems.eventDesc,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "VehicleFault",
+    label: "车辆故障",
+    formConfig: {
+      formOptions: {},
+      list: [
+        {
+          ...PresetFormItems.callPolicePersonName,
+          key: "dcEventVehicleAccident.reporterName",
+        },
+        {
+          ...PresetFormItems.callPolicePersonPhone,
+          key: "dcEventVehicleAccident.reporterPhoneNumber",
+        },
+        PresetFormItems.vehicleMalfunctionType,
+        PresetFormItems.eventLevel,
+        {
+          ...PresetFormItems.locationMode,
+          key: "dcEventVehicleAccident.locationType",
+        },
+        PresetFormItems.freeway,
+        {
+          label: "服务区:",
+          key: "dcEventVehicleAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventVehicleAccident.location",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "服务区地点",
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventVehicleAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 3) {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventVehicleAccident.rampId") {
+                      // console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败2", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventVehicleAccident.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 3) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "收费站:",
+          key: "dcEventVehicleAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 4) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventVehicleAccident.location",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "收费站地点",
+            options: locationSelect,
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 4) {
+              return true;
+            }
+            return false;
+          },
+        },
+        PresetFormItems.direction,
+        { ...PresetFormItems.station,
+          visible: (data) => {
+            if (data.dcEventVehicleAccident && data.dcEventVehicleAccident.locationType != 1) {
+              return false;
+            }
+            return true;
+          },
+        },
+        PresetFormItems.eventHappenTime,
+        PresetFormItems.aEstimatedReleaseTime,
+        {
+          ...PresetFormItems.pressure,
+          key: "dcEventVehicleAccident.trafficJam",
+        },
+        {
+          ...PresetFormItems.weatherCondition,
+          key: "dcEventVehicleAccident.weatherCondition",
+        },
+        {
+          ...PresetFormItems.isCongestionAhead,
+          key: "dcEventVehicleAccident.congestionAhead",
+        },
+        {
+          ...PresetFormItems.isForkRoad,
+          key: "dcEventVehicleAccident.atIntersection",
+        },
+        {
+          ...PresetFormItems.isCurveRoad,
+          key: "dcEventVehicleAccident.onCurve",
+        },
+        {
+          ...PresetFormItems.isInTunnel,
+          key: "dcEventVehicleAccident.inTunnel",
+        },
+        PresetFormItems.laneOccupancy,
+        PresetFormItems.vehicleCondition("dcEventVehicleAccident"),
+        PresetFormItems.casualties("dcEventVehicleAccident"),
+        PresetFormItems.eventTitle,
+        PresetFormItems.eventDesc,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "TrafficControl",
+    label: "交通管制",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        {
+          label: "管制设施:",
+          key: "eventSubclass",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "3-1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "3-1",
+                label: "主线",
+              },
+              {
+                key: "3-2",
+                label: "收费站",
+              },
+              {
+                key: "3-3",
+                label: "立交",
+              },
+              {
+                key: "3-4",
+                label: "服务区",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              const classify = formList.find(
+                (it) => it.key == "dcEventTrafficControl.classify"
+              );
+              let ss = {
+                "3-1": "主线",
+                "3-2": "收费站",
+                "3-3": "立交",
+                "3-4": "服务区",
+              };
+              let ad = {
+                1: [
+                  {
+                    key: "1",
+                    label: `${ss[value]}关闭`,
+                  },
+                ],
+                2: [
+                  {
+                    key: "2",
+                    label: "主线限行",
+                  },
+                  {
+                    key: "3",
+                    label: "主线间隔放行",
+                  },
+                  {
+                    key: "4",
+                    label: "主线并道",
+                  },
+                  {
+                    key: "5",
+                    label: "主线限速",
+                  },
+                ],
+              };
+              classify.options.options =
+                ad[data.dcEventTrafficControl.controlType];
+
+              if (data.dcEventTrafficControl) {
+                data.dcEventTrafficControl.facilityId = null;
+              }
+              let facilityType = 1;
+              if (value == "3-2") {
+                facilityType = 1;
+              } else if (value == "3-3") {
+                facilityType = 3;
+              } else if (value == "3-4") {
+                facilityType = 6;
+              }
+              if (value && value != "3-1") {
+                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+                request({
+                  url: `/business/facility/query?facilityType=${facilityType}`,
+                  method: "get",
+                })
+                  .then((result) => {
+                    if (result.code != 200) return Message.error(result?.msg);
+                    let lwss = [];
+                    result.data.forEach((it) =>
+                      lwss.push({ key: it.id, label: it.facilityName })
+                    );
+
+                    formList.forEach((it) => {
+                      if (it.key == "dcEventTrafficControl.facilityId") {
+                        it.options.options = lwss;
+                      }
+                    });
+                  })
+                  .catch((err) => {
+                    console.log("err", err);
+                    Message.error("查询失败1", err);
+                  });
+              }
+            },
+          },
+        },
+        {
+          label: "管制分类:",
+          key: "dcEventTrafficControl.controlType",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "封闭",
+              },
+              {
+                key: "2",
+                label: "限行",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              const classify = formList.find(
+                (it) => it.key == "dcEventTrafficControl.classify"
+              );
+              const measure = formList.find(
+                (it) => it.key == "dcEventTrafficControl.measure"
+              );
+              let ss = {
+                "3-1": "主线",
+                "3-2": "收费站",
+                "3-3": "立交",
+                "3-4": "服务区",
+              };
+              let ad = {
+                1: [
+                  {
+                    key: "1",
+                    label: `${ss[data.eventSubclass]}关闭`,
+                  },
+                ],
+                2: [
+                  {
+                    key: "2",
+                    label: "主线限行",
+                  },
+                  {
+                    key: "3",
+                    label: "主线间隔放行",
+                  },
+                  {
+                    key: "4",
+                    label: "主线并道",
+                  },
+                  {
+                    key: "5",
+                    label: "主线限速",
+                  },
+                ],
+              };
+              let cs = {
+                1: [
+                  {
+                    value: "1",
+                    label: "临时关闭",
+                  },
+                ],
+                2: [
+                  {
+                    value: "2",
+                    label: "限行车辆",
+                  },
+                  {
+                    value: "3",
+                    label: "限行车道",
+                  },
+                  {
+                    value: "4",
+                    label: "限行车道且限行车辆",
+                  },
+                  {
+                    value: "5",
+                    label: "间隔放行",
+                  },
+                  {
+                    value: "6",
+                    label: "并道行驶",
+                  },
+                  {
+                    value: "7",
+                    label: "限速",
+                  },
+                ],
+              };
+              measure.options.options = cs[value];
+              classify.options.options = ad[value];
+            },
+          },
+        },
+        {
+          label: "分类:",
+          key: "dcEventTrafficControl.classify",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "主线关闭",
+              },
+            ],
+          },
+        },
+        {
+          label: "分类原因:",
+          key: "dcEventTrafficControl.controlCause",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "车流量大",
+              },
+              {
+                key: "2",
+                label: "交通事故",
+              },
+              {
+                key: "3",
+                label: "恶劣天气",
+              },
+              {
+                key: "4",
+                label: "施工",
+              },
+              {
+                key: "5",
+                label: "警备任务",
+              },
+              {
+                key: "6",
+                label: "其他",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+              const config = formList.find(
+                (it) => it.key == "dcEventTrafficControl.causeType"
+              );
+              let ad = {
+                3: [
+                  {
+                    value: "3-1",
+                    label: "雨",
+                  },
+                  {
+                    value: "3-2",
+                    label: "雪",
+                  },
+                  {
+                    value: "3-3",
+                    label: "雾",
+                  },
+                  {
+                    value: "3-4",
+                    label: "道路积水",
+                  },
+                  {
+                    value: "3-5",
+                    label: "道路湿滑",
+                  },
+                  {
+                    value: "3-6",
+                    label: "道路结冰",
+                  },
+                  {
+                    value: "3-7",
+                    label: "沙尘暴",
+                  },
+                ],
+                4: [
+                  {
+                    value: "4-1",
+                    label: "专项工程施工",
+                  },
+                  {
+                    value: "4-2",
+                    label: "改扩建工程施工",
+                  },
+                  {
+                    value: "4-3",
+                    label: "其他施工",
+                  },
+                ],
+              };
+              config.options.options = ad[value];
+            },
+          },
+        },
+        PresetFormItems.isInTunnel,
+        {
+          label: "原因类型:",
+          key: "dcEventTrafficControl.causeType",
+          type: "select",
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (
+              data?.dcEventTrafficControl.controlCause == "3" ||
+              data?.dcEventTrafficControl.controlCause == "4"
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        PresetFormItems.emptyLine,
+        {
+          label: "出入口:",
+          key: "dcEventTrafficControl.exitsInlets",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "2",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "出口",
+              },
+              {
+                key: "2",
+                label: "入口",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-2" || data?.eventSubclass == "3-4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "收费站:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+            multiple: true,
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-2") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+            multiple: true,
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-3") {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  // console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventTrafficControl.rampId") {
+                      console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventTrafficControl.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "服务区:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "措施:",
+          required: true,
+          key: "dcEventTrafficControl.measure",
+          type: "select",
+          options: {
+            options: [
+              {
+                value: "1",
+                label: "临时关闭",
+              },
+            ],
+          },
+        },
+        {
+          label: "限制类型:",
+          key: "dcEventAccident.limitedType",
+          required: true,
+          type: "select",
+          options: {
+            options: [
+              { key: "1", label: "只允许" },
+              { key: "2", label: "禁止" },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventTrafficControl.controlType == "2") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "车辆类型:",
+          key: "dcEventAccident.vehicleType",
+          required: true,
+          type: "select",
+          options: {
+            options: [
+              { key: "1", label: "10座以下客车" },
+              { key: "2", label: "10座以下客车(间隔放行)" },
+              { key: "3", label: "19座以上客车" },
+              { key: "4", label: "一型客车(不含面包车)" },
+              { key: "5", label: "两客一危" },
+              { key: "6", label: "三类以上班线客车" },
+              {
+                key: "7",
+                label: "四轴及四轴以上货车(运送生鲜果蔬、抗疫物资车辆除外)",
+              },
+              { key: "8", label: "三轴及以上(含三轴)货车" },
+              { key: "9", label: "3轴以上货车(不含危险品运输车)" },
+              { key: "10", label: "3轴以上货车" },
+              { key: "11", label: "四轴及以上(含四轴)货车" },
+              { key: "12", label: "4轴以上货车(不含危险品运输车)" },
+              { key: "13", label: "4轴以上货车" },
+              { key: "14", label: "4轴以下货车" },
+              { key: "15", label: "57座以上客车" },
+              { key: "16", label: "五轴及以上货车" },
+              { key: "17", label: "5轴以上货车" },
+              { key: "18", label: "5轴以上货车(不含危险品运输车)" },
+              { key: "19", label: "5轴以下货车" },
+              { key: "20", label: "6座以上客车" },
+              { key: "21", label: "6座以上面包车" },
+              { key: "22", label: "7座以上客车" },
+              { key: "23", label: "7座以下客车" },
+              { key: "24", label: "8座以上客车" },
+              //   25- 8座以下客车
+              //   26- 8座以下客车(间隔放行)
+              //   27- 9座以上客车
+              //   28- 半挂货车
+              //   29- 车辆（不含10座以下客车）
+              //   30- 车辆（不含8座以下客车）
+              //   31- 车辆（不含小轿车）
+              //   32- 不可解体物品超限运输车
+              //   33- 不可解体物品运输车
+              //   34- 超长超宽超高车辆
+              //   35- 车辆运输车
+              //   36- 超限运输车
+              //   37- 大型货车(不含危险品运输车)
+              //   38- 大型货车
+              //   39- 大型客车
+              //   40- 大中型货车
+              //   41- 已安装ETC的客车
+              //   42- 已安装ETC的小型客车
+              //   43- 罐车
+              //   44- 货车
+              //   45- 黄牌货车
+              //   46- 黄牌货车(不含危险品运输车)
+              //   47- 黄牌货车(运送民生物资车辆除外)
+              //   48- 核载总质量4.5吨以上货车(运送民生物资车辆除外)
+              // 49- 客车（包括小轿车）
+              // 50- 客运车辆
+              // 51- 蓝牌货车
+              // 52- 旅游包车
+              // 53- 面包车
+              // 54- 皮卡
+              // 55- 全部车型
+              // 56- (未安装ETC)车辆
+              // 57- 外埠号牌车辆
+              // 58- 危化品运输车
+              // 59- 危险物品运输车
+              // 60- 武装押运车辆
+              // 61- 小轿车
+              // 62- 厢式货车
+              // 63- 小型车辆
+              // 64- (已安装ETC)车辆
+              // 65- 已安装ETC的货车
+              // 66- 押款车辆
+              // 67- 疫情防控物资运输车辆
+              // 68- 运输剧毒、放射性物品车辆
+              // 69- 运输枪支弹药、爆炸、剧毒、放射性物品车辆
+              // 70- 营运客车
+              // 71- 重型货车
+              // 72- 核载总质量1.8吨以上货车
+              // 73- 中型货车
+              // 74- 小型车辆限速80公里/小时、大型车辆限速70
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventTrafficControl.controlType == "2") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "桩号:",
+          key: "stakeMark",
+          required: true,
+          type: "MultipleLabelItem",
+          options: {
+            options: [
+              {
+                prefix: {
+                  text: "K",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[0]",
+              },
+              {
+                prefix: {
+                  text: "+",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[1]",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-1") {
+              return true;
+            }
+            return false;
+          },
+        },
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.remark,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "TrafficCongestion",
+    label: "交通拥堵",
+    formConfig: {
+      formOptions: {},
+      list: [
+        {
+          label: "拥堵类型:",
+          key: "eventSubclass",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "4-1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "4-1",
+                label: "道路拥堵",
+              },
+              {
+                key: "4-2",
+                label: "立交拥堵",
+              },
+              {
+                key: "4-3",
+                label: "收费站拥堵",
+              },
+              {
+                key: "4-4",
+                label: "服务区拥堵",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              if (data.dcEventTrafficCongestion) {
+                data.dcEventTrafficCongestion.facilityId = null;
+              }
+              let facilityType = 1;
+              if (value == "4-2") facilityType = 3;
+              if (value == "4-3") facilityType = 1;
+              if (value == "4-4") facilityType = 6;
+              //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+              request({
+                url: `/business/facility/query?facilityType=${facilityType}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let lwss = [];
+                  result.data.forEach((it) =>
+                    lwss.push({ key: it.id, label: it.facilityName })
+                  );
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventTrafficCongestion.facilityId") {
+                      it.options.options = lwss;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败1", err);
+                });
+            },
+          },
+        },
+        {
+          ...PresetFormItems.congestionCause,
+          key: "dcEventTrafficCongestion.congestionCause",
+        },
+        {
+          label: "详细原因:",
+          key: "detailedReasons",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          // default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "收费站广场拥堵导致出口压车",
+              },
+              {
+                key: "2",
+                label: "收费站设备故障",
+              },
+              {
+                key: "3",
+                label: "地方道路原因",
+              },
+              {
+                key: "4",
+                label: "省内非集团所辖高速原因",
+              },
+              {
+                key: "5",
+                label: "集团所辖道路拥堵",
+              },
+              {
+                key: "6",
+                label: "集团所辖枢纽立交异常导致主线压车",
+              },
+              {
+                key: "7",
+                label: "路侧起火",
+              },
+              {
+                key: "8",
+                label: "备注项添加",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              if (data.dcEventTrafficCongestion) {
+                data.dcEventTrafficCongestion.facilityId = null;
+              }
+              if (
+                data.dcEventTrafficCongestion.congestionCause == 1 &&
+                value == 2
+              ) {
+                console.log("value2", value);
+                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+                request({
+                  url: `/business/facility/query?facilityType=1`,
+                  method: "get",
+                })
+                  .then((result) => {
+                    if (result.code != 200) return Message.error(result?.msg);
+                    let sfz = [];
+                    result.data.forEach((it) =>
+                      sfz.push({ key: it.id, label: it.facilityName })
+                    );
+                    formList.forEach((it) => {
+                      if (it.key == "dcEventTrafficCongestion.facilityId") {
+                        it.options.options = sfz;
+                      }
+                    });
+                  })
+                  .catch((err) => {
+                    console.log("err", err);
+                    Message.error("查询失败1", err);
+                  });
+              }
+            },
+          },
+          visible: (data) => {
+            if (
+              data?.eventSubclass == "4-1" &&
+              (data?.dcEventTrafficCongestion?.congestionCause == 1 ||
+                data?.dcEventTrafficCongestion?.congestionCause == 6)
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        { ...PresetFormItems.isInTunnel, isAlone: true },
+        {
+          label: "高速公路:",
+          required: true,
+          key: "roadId",
+          type: "select",
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" || data?.eventSubclass == "4-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "方向:",
+          key: "direction",
+          required: true,
+          type: "select",
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" || data?.eventSubclass == "4-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "拥堵收费站:",
+          key: "dcEventTrafficCongestion.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (
+              data?.eventSubclass == "4-3" ||
+              (data?.eventSubclass == "4-1" &&
+                data?.dcEventTrafficCongestion.congestionCause == "1" &&
+                data.detailedReasons == "2")
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventTrafficCongestion.location",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "收费站地点",
+            options: locationSelect,
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "拥堵服务区:",
+          key: "dcEventTrafficCongestion.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventTrafficCongestion.location",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "地点描述",
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点类型:",
+          key: "locationType",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "单点",
+              },
+              {
+                key: "2",
+                label: "多点",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "桩号:",
+          key: "stakeMark",
+          required: true,
+          type: "MultipleLabelItem",
+          options: {
+            options: [
+              {
+                prefix: {
+                  text: "K",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[0]",
+              },
+              {
+                prefix: {
+                  text: "+",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[1]",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" && data?.locationType == 1) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "起止桩号:",
+          key: "stakeMark",
+          required: true,
+          isAlone: true,
+          type: "MultipleLabelItem",
+          options: {
+            options: [
+              {
+                prefix: {
+                  text: "K",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[0]",
+              },
+              {
+                prefix: {
+                  text: "+",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[1]",
+              },
+              {
+                prefix: {
+                  text: "至K",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "endStakeMark[0]",
+              },
+              {
+                prefix: {
+                  text: "+",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "endStakeMark[1]",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" && data?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventTrafficCongestion.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-2") {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventTrafficCongestion.rampId") {
+                      console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventTrafficCongestion.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-2") {
+              return true;
+            }
+            return false;
+          },
+        },
+
+        {
+          label: "拥堵里程:",
+          key: "dcEventTrafficCongestion.congestionMileage",
+          required: true,
+          type: "MultipleLabelItem",
+          options: {
+            options: [
+              {
+                suffix: {
+                  text: "千米",
+                },
+                type: "InputNumber",
+                key: "dcEventTrafficCongestion.congestionMileage",
+              },
+            ],
+          },
+        },
+        {
+          label: "最大拥堵里程:",
+          key: "dcEventTrafficCongestion.maxCongestionMileage",
+          required: true,
+          type: "MultipleLabelItem",
+          options: {
+            options: [
+              {
+                suffix: {
+                  text: "千米",
+                },
+                type: "InputNumber",
+                key: "dcEventTrafficCongestion.maxCongestionMileage",
+              },
+            ],
+          },
+        },
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.remark,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "IllegalOnRoad",
+    label: "非法上路",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        PresetFormItems.illegalTriggeringType,
+        PresetFormItems.additionalNotes,
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        PresetFormItems.station,
+        PresetFormItems.isInTunnel,
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.problemDescription,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "BarricadesCleared",
+    label: "路障清除",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        {
+          label: "障碍物类型:",
+          key: "eventSubclass",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "6-1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "6-1",
+                label: "烟雾",
+              },
+              {
+                key: "6-2",
+                label: "倒伏树木",
+              },
+              {
+                key: "6-3",
+                label: "撒落物",
+              },
+              {
+                key: "6-4",
+                label: "动物",
+              },
+              {
+                key: "6-5",
+                label: "其他",
+              },
+            ],
+          },
+        },
+        PresetFormItems.additionalNotes,
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        PresetFormItems.station,
+        PresetFormItems.isInTunnel,
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.problemDescription,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "Construction",
+    label: "施工建设",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        {
+          label: "施工类型:",
+          key: "key0123",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "养护施工类施工",
+              },
+              {
+                key: "2",
+                label: "工程建设类施工",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+              const config = formList.find((it) => it.key == "eventSubclass");
+              const ad = {
+                1: [
+                  {
+                    key: "7-1",
+                    label: "道路养护施工",
+                  },
+                  {
+                    key: "7-2",
+                    label: "收费站养护施工",
+                  },
+                  {
+                    key: "7-3",
+                    label: "服务区养护施工",
+                  },
+                  {
+                    key: "7-4",
+                    label: "枢纽立交匝道养护施工",
+                  },
+                  {
+                    key: "7-5",
+                    label: "地方道路养护施工",
+                  },
+                ],
+                2: [
+                  {
+                    key: "7-6",
+                    label: "道路建设施工",
+                  },
+                  {
+                    key: "7-7",
+                    label: "收费站建设施工",
+                  },
+                  {
+                    key: "7-8",
+                    label: "服务区建设施工",
+                  },
+                  {
+                    key: "7-9",
+                    label: "枢纽立交匝道建设施工",
+                  },
+                  {
+                    key: "7-10",
+                    label: "地方道路建设施工",
+                  },
+                ],
+              };
+              config.options.options = ad[value] || [];
+            },
+          },
+        },
+        {
+          label: "施工分类:",
+          key: "eventSubclass",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "7-1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "7-1",
+                label: "道路养护施工",
+              },
+              {
+                key: "7-2",
+                label: "收费站养护施工",
+              },
+              {
+                key: "7-3",
+                label: "服务区养护施工",
+              },
+              {
+                key: "7-4",
+                label: "枢纽立交匝道养护施工",
+              },
+              {
+                key: "7-5",
+                label: "地方道路养护施工",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              if (data.dcEventConstruction) {
+                data.dcEventConstruction.facilityId = null;
+              }
+              let facilityType = 1;
+              if (value == "7-2" || value == "7-7") {
+                facilityType = 1;
+              } else if (value == "7-3" || value == "7-8") {
+                facilityType = 6;
+              } else if (value == "7-4" || value == "7-9") {
+                facilityType = 3;
+              }
+              if (value && (value != "7-1" && value != "7-6")) {
+                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+                request({
+                  url: `/business/facility/query?facilityType=${facilityType}`,
+                  method: "get",
+                })
+                  .then((result) => {
+                    if (result.code != 200) return Message.error(result?.msg);
+                    let lwss = [];
+                    result.data.forEach((it) =>
+                      lwss.push({ key: it.id, label: it.facilityName })
+                    );
+
+                    formList.forEach((it) => {
+                      if (it.key == "dcEventConstruction.facilityId") {
+                        it.options.options = lwss;
+                      }
+                    });
+                  })
+                  .catch((err) => {
+                    console.log("err", err);
+                    Message.error("查询失败1", err);
+                  });
+              }
+            },
+          },
+        },
+        {
+          label: "管制方式:",
+          key: "dcEventConstruction.controlMode",
+          type: "RadioGroup",
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "封闭",
+              },
+              {
+                key: "2",
+                label: "不封闭",
+              },
+            ],
+          },
+        },
+        PresetFormItems.isInTunnel,
+        {
+          //地点类型
+          ...PresetFormItems.locationType,
+          key: "dcEventConstruction.locationType",
+          visible: (data) => {
+            if (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "施工方式:",
+          key: "dcEventConstruction.constructionMethod",
+          type: "RadioGroup",
+          isAlone: false,
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "车道",
+              },
+              {
+                key: "2",
+                label: "其他",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data.eventSubclass == "7-2" || data.eventSubclass == "7-7") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "通行情况:",
+          key: "dcEventConstruction.trafficCondition",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "通行受限",
+              },
+              {
+                key: "2",
+                label: "车辆谨慎慢行",
+              },
+              {
+                key: "3",
+                label: "车辆正常通行",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (
+              data.eventSubclass == "7-2" ||
+              data.eventSubclass == "7-7" ||
+              data.eventSubclass == "7-4" ||
+              data.eventSubclass == "7-9"
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        {
+          ...PresetFormItems.station,
+          visible: (data) => {
+            if (
+              (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") &&
+              data?.dcEventConstruction.locationType == "1"
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          ...PresetFormItems.startEndStation,
+          visible: (data) => {
+            if (
+              (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") &&
+              data?.dcEventConstruction.locationType == "2"
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        // PresetFormItems.emptyLine,
+        {
+          ...PresetFormItems.laneOccupancy,
+          required: true,
+          visible: (data) => {
+            if (data?.dcEventConstruction.controlMode == "2") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "收费站:",
+          key: "dcEventConstruction.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data.eventSubclass == "7-2" || data.eventSubclass == "7-7") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "出入口:",
+          key: "dcEventConstruction.exitsInlets",
+          type: "RadioGroup",
+          isAlone: false,
+          required: true,
+          default: "2",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "出口",
+              },
+              {
+                key: "2",
+                label: "入口",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data.eventSubclass == "7-2" || data.eventSubclass == "7-7") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "服务区:",
+          key: "dcEventConstruction.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data.eventSubclass == "7-3" || data.eventSubclass == "7-8") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventConstruction.location",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "服务区地点",
+          },
+          visible: (data) => {
+            if (data.eventSubclass == "7-3" || data.eventSubclass == "7-8") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventConstruction.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data.eventSubclass == "7-4" || data.eventSubclass == "7-9") {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  // console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventConstruction.rampId") {
+                      // console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventConstruction.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data.eventSubclass == "7-4" || data.eventSubclass == "7-9") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地方道路名称:",
+          key: "dcEventConstruction.localRoadName",
+          isAlone: true,
+          required: true,
+          options: {},
+          visible: (data) => {
+            if (data.eventSubclass == "7-5" || data.eventSubclass == "7-10") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "特殊地点描述:",
+          key: "dcEventConstruction.specialPlaceDescription",
+          isAlone: true,
+          options: {
+            type: "textarea",
+            autosize: true,
+            maxlength: 50,
+            autosize: { minRows: 6, maxRows: 6 },
+            showWordLimit: true,
+          },
+        },
+        {
+          ...PresetFormItems.specialConstruction,
+          key: "dcEventConstruction.specialConstruction",
+        },
+        {
+          label: "专项施工名称:",
+          key: "dcEventConstruction.otherConstructionName",
+          isAlone: true,
+          options: {},
+          visible: (data) => {
+            if (data?.dcEventConstruction.specialConstruction == "4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          ...PresetFormItems.constructionMeasurement,
+          key: "dcEventConstruction.constructionMeasurement",
+          visible: (data) => {
+            if (data.eventSubclass == "7-1" || data.eventSubclass == "7-6") {
+              return true;
+            }
+            return false;
+          },
+        },
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.remark,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "ServiceAreaAbnormal",
+    label: "服务区异常",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        {
+          label: "异常分类:",
+          key: "eventSubclass",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "8-1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "8-1",
+                label: "封闭、暂停营业",
+              },
+              {
+                key: "8-2",
+                label: "重要设施停用",
+              },
+              {
+                key: "8-3",
+                label: "其他异常",
+              },
+            ],
+          },
+        },
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        {
+          label: "服务区:",
+          key: "dcEventServiceArea.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+        },
+        {
+          label: "停用设施:",
+          key: "dcEventServiceArea.disableFacility",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "1",
+                label: "卫生间",
+              },
+              {
+                value: "2",
+                label: "餐厅",
+              },
+              {
+                value: "3",
+                label: "停车场",
+              },
+              {
+                value: "4",
+                label: "加油站",
+              },
+              {
+                value: "5",
+                label: "充电桩",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "8-2") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "出入口:",
+          key: "dcEventServiceArea.exitsInlets",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "2",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "出口",
+              },
+              {
+                key: "2",
+                label: "入口",
+              },
+            ],
+          },
+        },
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.remark,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "HiddenDangersEquipment",
+    label: "设施设备隐患",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        {
+          label: "类型:",
+          key: "eventSubclass",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "9-1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "9-1",
+                label: "摄像机",
+              },
+              {
+                key: "9-2",
+                label: "护栏",
+              },
+              {
+                key: "9-3",
+                label: "隔离栅",
+              },
+              {
+                key: "9-4",
+                label: "情报板",
+              },
+              {
+                key: "9-5",
+                label: "防眩板",
+              },
+              {
+                key: "9-6",
+                label: "其他",
+              },
+            ],
+          },
+        },
+        {
+          label: "设备补充说明:",
+          key: "eventSourceTips",
+          isAlone: true,
+          options: {
+            type: "textarea",
+            autosize: true,
+            maxlength: 150,
+            autosize: { minRows: 6, maxRows: 6 },
+            showWordLimit: true,
+          },
+          required: true,
+        },
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        PresetFormItems.station,
+        PresetFormItems.isInTunnel,
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.problemDescription,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "AbnormalWeather",
+    label: "异常天气",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        {
+          label: "异常天气:",
+          key: "eventSubclass",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "10-1",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "10-1",
+                label: "雨",
+              },
+              {
+                key: "10-2",
+                label: "雪",
+              },
+              {
+                key: "10-3",
+                label: "雾",
+              },
+              {
+                key: "10-4",
+                label: "大风",
+              },
+              {
+                key: "10-5",
+                label: "低温寒潮",
+              },
+              {
+                key: "10-6",
+                label: "路面积雪",
+              },
+              {
+                key: "10-7",
+                label: "路面结冰",
+              },
+              {
+                key: "10-8",
+                label: "路面积水",
+              },
+              {
+                key: "10-9",
+                label: "其他",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+              const config = formList.find(
+                (it) => it.key == "dcEventAbnormalWeather.weatherSituation"
+              );
+              let ad = {
+                "10-1": [
+                  {
+                    key: "1-1",
+                    label: "雨雾",
+                  },
+                  {
+                    key: "1-2",
+                    label: "雨雪",
+                  },
+                  {
+                    key: "1-3",
+                    label: "中雨",
+                  },
+                  {
+                    key: "1-4",
+                    label: "小雨",
+                  },
+                  {
+                    key: "1-5",
+                    label: "大雨",
+                  },
+                  {
+                    key: "1-6",
+                    label: "暴雨",
+                  },
+                ],
+                "10-2": [
+                  {
+                    key: "2-1",
+                    label: "小雪",
+                  },
+                  {
+                    key: "2-2",
+                    label: "中雪",
+                  },
+                  {
+                    key: "2-3",
+                    label: "大雪",
+                  },
+                  {
+                    key: "2-4",
+                    label: "暴雪",
+                  },
+                  {
+                    key: "2-5",
+                    label: "大暴雪",
+                  },
+                  {
+                    key: "2-6",
+                    label: "特大暴雪",
+                  },
+                ],
+                "10-3": [
+                  {
+                    key: "3-1",
+                    label: "轻雾",
+                  },
+                  {
+                    key: "3-2",
+                    label: "大雾",
+                  },
+                  {
+                    key: "3-3",
+                    label: "浓雾",
+                  },
+                  {
+                    key: "3-4",
+                    label: "强浓雾",
+                  },
+                  {
+                    key: "3-5",
+                    label: "团雾",
+                  },
+                ],
+              };
+              config.options.options = ad[value];
+            },
+          },
+        },
+        {
+          ...PresetFormItems.weatherSituation,
+          key: "dcEventAbnormalWeather.weatherSituation",
+        },
+        PresetFormItems.additionalNotes,
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        PresetFormItems.startEndStation,
+        {
+          label: "紧急级别:",
+          key: "dcEventAbnormalWeather.emergencyLevel",
+          required: true,
+          type: "select",
+          options: {
+            options: [
+              {
+                value: "1",
+                label: "一般",
+              },
+              {
+                value: "2",
+                label: "紧急",
+              },
+            ],
+          },
+        },
+        PresetFormItems.isInTunnel,
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.problemDescription,
+        PresetFormItems.source,
+      ],
+    },
+  },
+  {
+    key: "OtherEvents",
+    label: "其他事件",
+    formConfig: {
+      formOptions: {
+        column: 2,
+      },
+      list: [
+        {
+          label: "事件说明:",
+          key: "eventSourceTips",
+          isAlone: true,
+          options: {
+            type: "textarea",
+            autosize: true,
+            maxlength: 150,
+            autosize: { minRows: 6, maxRows: 6 },
+            showWordLimit: true,
+          },
+        },
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        PresetFormItems.station,
+        PresetFormItems.isInTunnel,
+        PresetFormItems.startTime,
+        PresetFormItems.expectedEndTime,
+        PresetFormItems.problemDescription,
+        PresetFormItems.source,
+      ],
+    },
+  },
 ];
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
index 2d094e28..948b0a4e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
@@ -1,11 +1,11 @@
 <template>
-  <Dialog v-model="modelVisible" title="修改事件信息" width="550px">
+  <Dialog v-model="modelVisible" title="修改事件信息" width="1100px" top="10%">
     <div class="EditEventInformationDialog">
-      <Form class="form" :formList="formConfigList" labelWidth="120px" />
+      <Form class="form" :formList="formConfigList" v-model="fData" labelWidth="120px" />
 
       <div class="footer">
-        <Button>保存</Button>
-        <Button style="background: #c9c9c9">关闭</Button>
+        <Button @click.native="onSubmit">保存</Button>
+        <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
       </div>
     </div>
   </Dialog>
@@ -15,8 +15,106 @@
 import Dialog from "@screen/components/Dialog/index";
 import Form from "@screen/components/FormConfig";
 import Button from "@screen/components/Buttons/Button.vue";
+import request from "@/utils/request";
+import { tabConfigList } from "./data.js";
 
-import { formConfigList } from "./data.js";
+const eventInfo = {
+  id: "60f022d95a7c4b6cada2d780246543d8",
+  deptId: null,
+  deptName: null,
+  stakeMark: "k103+900",
+  endStakeMark: null,
+  direction: "菏泽方向",
+  userId: 1,
+  startTime: null,
+  endTime: null,
+  estimatedEndTime: "2024-02-22 10:44:27",
+  eventLevel: 1,
+  eventType: 1,
+  stringEventType: "交通事故",
+  eventSubclass: "其他事故",
+  eventCause: "其他事故",
+  description: "其他事故",
+  eventState: 0,
+  eventSource: null,
+  stringEventSource: "96659",
+  eventNature: null,
+  eventSourceTips: null,
+  inTunnel: null,
+  roadId: null,
+  occurrenceTime: "2024-02-22 10:44:18",
+  isPerceived: 0,
+  lang: "2,3",
+  roadName: "济菏高速",
+  organizationName: "研发部门",
+  processConfigList: [
+    {
+      "id": 8,
+      "eventType": 1,
+      "nodeNode": "1",
+      "processNode": "接警记录",
+      "commonPhrases": ""
+    },
+  ],
+  eventTitle: "发生其他事故事故",
+  dimension: null,
+  longitude: null,
+  dcEventMap: null,
+  dcEventAbnormalWeather: null,
+  dcEventAccident: {
+    searchValue: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    remark: null,
+    params: {},
+    id: "60f022d95a7c4b6cada2d780246543d8",
+    reporterName: "王兴琳",
+    reporterPhoneNumber: "19806119906",
+    locationType: 1,
+    trafficJam: 100,
+    weatherCondition: 1,
+    impactLevel: 2,
+    isReverseCargo: 1,
+    isMaintenance: 1,
+    policeContact: "96659",
+    towingServiceContact: "19806119906",
+    congestionAhead: 0,
+    atIntersection: 0,
+    onCurve: 1,
+    spillageItem: "抛洒物",
+    vehicleOwnerPhone: "19806119906",
+    smallCar: 10,
+    trucks: 0,
+    buses: 0,
+    tankers: 0,
+    minorInjuries: 1,
+    seriousInjuries: null,
+    fatalities: null,
+    isPrivate: null,
+    facilityId: null,
+    rampId: null,
+    location: null,
+    dcEvent: null
+  },
+  dcEventConstruction: null,
+  dcEventServiceArea: null,
+  dcEventTrafficCongestion: null,
+  dcEventVehicleAccident: null,
+  dcEventTrafficControl: null,
+  nickName: "管理员",
+  stringEventState: "待确认",
+  commonPhrases: null,
+  nodeNode: null,
+  eventName: "交通事故",
+  processNode: null,
+  updateTime: null,
+  createTime: "2024-02-22 10:49:34",
+  remark: null,
+  subclass: "1-5",
+  linkId: null
+};
 
 export default {
   name: "EditEventInformationDialog",
@@ -34,19 +132,107 @@ export default {
   },
   data() {
     return {
-      formConfigList,
+      formConfigList: {},
+      // tabConfigList,
+      fData: {},
+      eventId: '1a91d65cc31f4a9d90122888edb31043',
+      roads: [],
+      direction: [],
+      lwss: []
     };
   },
   computed: {
     modelVisible: {
       get() {
+        if (this.visible) {
+          this.initData()
+        }
         return this.visible;
       },
       set(val) {
+        console.log('val', val)
         this.$emit("close", val);
       },
     },
   },
+  mounted() {
+
+  },
+  methods: {
+    initData() {
+      let configList = tabConfigList.find(item => item.label == '交通事故')
+      this.formConfigList = configList.formConfig.list
+      let info = eventInfo;
+      if (info.stakeMark instanceof Array) {
+        let numbers = info.stakeMark.match(/\d+/g).map(Number);
+        info.stakeMark = numbers;
+      }
+
+
+      this.fData = info;
+      // Promise.all([
+      //   //道路
+      //   request({
+      //     url: `/business/road/query`,
+      //     method: "get",
+      //   })
+      //     .then((result) => {
+      //       if (result.code != 200) return Message.error(result?.msg);
+      //       result.data.forEach((it) => {
+      //         this.roads.push({ key: it.id, label: it.roadName });
+      //       });
+      //     })
+      //     .catch((err) => {
+      //       Message.error("查询失败4", err);
+      //     }),
+      //   //方向字典
+      //   request({
+      //     url: `/system/dict/data/type/iot_event_direction`,
+      //     method: "get",
+      //   })
+      //     .then((result) => {
+      //       if (result.code != 200) return Message.error(result?.msg);
+      //       result.data.forEach((it) => {
+      //         this.direction.push({ key: it.dictValue, label: it.dictLabel });
+      //       });
+      //     })
+      //     .catch((err) => {
+      //       Message.error("查询失败5", err);
+      //     }),
+      //   //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+      //   request({
+      //     url: `/business/facility/query`,
+      //     method: "get",
+      //   })
+      //     .then((result) => {
+      //       if (result.code != 200) return Message.error(result?.msg);
+      //       result.data.forEach((it) =>
+      //         this.lwss.push({
+      //           key: it.id,
+      //           label: it.facilityName,
+      //           type: it.facilityType,
+      //         })
+      //       );
+      //     })
+      //     .catch((err) => {
+      //       console.log("err", err);
+      //       Message.error("查询失败6", err);
+      //     }),
+      // ]);
+      // request({
+      //   url: `/dc/system/event/eventSubclass/1/60f022d95a7c4b6cada2d780246543d8`,//交通事件
+      //   method: "get",
+      // }).then(async (result) => {
+      //   if (result.code != 200) return Message.error(result?.msg);
+      //   // this.formData = result.data;
+      // })
+
+
+    },
+    onSubmit() {
+      this.modelVisible = false;
+    }
+  }
 };
 </script>
 
@@ -54,7 +240,7 @@ export default {
 .EditEventInformationDialog {
   gap: 9px;
   width: 1050px;
-  height: 810px;
+  height: 850px;
   display: flex;
   flex-direction: column;
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue
index 7b49b40c..581eeaec 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue
@@ -22,7 +22,7 @@
       <div class="tag" >{{ detailData.eventLevel?`${detailData.eventCause+['','一','二','三','四','五'][detailData.eventLevel]}级事件` : '暂无事件等级' }}</div>
     </div>
 
-    <EditEventInformationDialog v-model="editEventInformationDialogVisible" />
+    <EditEventInformationDialog v-model="editEventInformationDialogVisible" @close="closeDialog"/>
   </Card>
 </template>
 
@@ -80,6 +80,11 @@ export default {
       ],
       editEventInformationDialogVisible: false
     }
+  },
+  methods: {
+    closeDialog(){
+      this.editEventInformationDialogVisible = false;
+    }
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
index fd67d925..93c2b120 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
@@ -731,10 +731,10 @@ export const locationMode = {
   default: "1",
   options: {
     options: [
-      { key: "1", label: "高速主线" },
-      { key: "2", label: "服务区" },
-      { key: "3", label: "立交桥" },
-      { key: "4", label: "收费站" },
+      { key: 1, label: "高速主线" },
+      { key: 2, label: "服务区" },
+      { key: 3, label: "立交桥" },
+      { key: 4, label: "收费站" },
     ],
   },
   ons: {
@@ -907,11 +907,11 @@ export const effect = {
   type: "select",
   options: {
     options: [
-      { key: "1", label: "无" },
-      { key: "2", label: "危化品泄漏" },
-      { key: "3", label: "整车自燃" },
-      { key: "4", label: "车辆复燃" },
-      { key: "5", label: "散装人工倒货" },
+      { key: 1, label: "无" },
+      { key: 2, label: "危化品泄漏" },
+      { key: 3, label: "整车自燃" },
+      { key: 4, label: "车辆复燃" },
+      { key: 5, label: "散装人工倒货" },
     ],
   },
 };

From 5d8cdf93a6e0d3b8c1d8388827fd47ca3d9f5f29 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 18 Apr 2024 17:22:06 +0800
Subject: [PATCH 04/10] =?UTF-8?q?feat=20=E6=89=B9=E9=87=8F=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=20=E7=96=B2=E5=8A=B3=E5=94=A4=E9=86=92=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BroadcastParamMulti.vue        |  13 +-
 .../components/DeviceControlDialog.vue        | 361 +--------------
 .../FatigueWakesUp/components/DeviceParam.vue | 421 ++++++++++++++++++
 .../components/DeviceParamsMulti.vue          |   3 +-
 .../components/HomeFrameControl/index.vue     |  25 +-
 5 files changed, 450 insertions(+), 373 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
index 39fad584..4221768b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
@@ -9,7 +9,7 @@
           showWordLimit placeholder="请输入发布内容" />
       </div>
 
-      <div class="footer">
+      <!-- <div class="footer">
         <Button @click.native="handleSubmit" :loading="submitting">
           确定
         </Button>
@@ -17,7 +17,7 @@
         <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="cancelClick">
           取消
         </Button>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -86,7 +86,8 @@ export default {
   methods: {
     cancelClick() {
       this.$emit("update:activeIcon", null);
-      this.submitting = false;
+      this.$emit("update:submitting", false);
+      // this.submitting = false;
     },
     handleSubmit() {
       const selectItems = this.selectItems.map(item => JSON.parse(item));
@@ -96,7 +97,8 @@ export default {
       if (!selectItems.length)
         return Message.error("请至少选择一个广播设备!");
 
-      this.submitting = true;
+      // this.submitting = true;
+      this.$emit("update:submitting", true);
 
       batchFunctions(
         {
@@ -121,7 +123,8 @@ export default {
           multiResultShow(data.data, item => item.result.retCode == 0, "广播设置");
         })
         .finally(() => {
-          this.submitting = false;
+          // this.submitting = false;
+          this.$emit("update:submitting", false);
         });
     },
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
index 738de131..af45d841 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
@@ -1,86 +1,8 @@
 <template>
   <Dialog v-model="modelVisible" title="设备操作" width="910px">
     <div class="DeviceControlDialog">
-      <ElTabs v-model="activeName" class="tabs" @tab-click="tabClick">
-        <ElTabPane label="一般模式" name="first">
-          <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList1" column="1"
-            labelWidth="120px" />
-        </ElTabPane>
-        <ElTabPane label="自定义模式" name="second">
-          <!-- <div style="display: flex; margin: 20px 0">
-            <p style="width: 115px">工作时长(分):</p>
-            <el-input-number v-model="onWorkStatus2" :min="0" :max="999" label="工作时长(s分):"></el-input-number>
-          </div> -->
-          <Table :data="tableData">
-            <ElTableColumn prop="ds" label="段数"></ElTableColumn>
-
-            <ElTableColumn prop="time" width="120" label="时间(毫秒)">
-              <template slot-scope="scope">
-                <div style="display: flex">
-                  <el-input-number style="width: 120px" v-model="scope.row.time" :min="0"></el-input-number>
-                </div>
-              </template>
-            </ElTableColumn>
-
-            <ElTableColumn prop="A" label="线路A">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.A" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-            <ElTableColumn prop="B" label="线路B">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.B" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-            <ElTableColumn prop="C" label="线路C">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.C" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-            <ElTableColumn prop="D" label="线路D">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.D" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-            <ElTableColumn prop="E" label="线路E">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.E" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-            <ElTableColumn prop="F" label="线路F">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.F" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-            <ElTableColumn prop="G" label="线路G">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.G" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-            <ElTableColumn prop="H" label="线路H">
-              <template slot-scope="scope">
-                <el-switch active-value="1" inactive-value="0" v-model="scope.row.H" active-color="#13ce66"
-                  inactive-color="#C9C9C9">
-                </el-switch>
-              </template>
-            </ElTableColumn>
-          </Table>
-        </ElTabPane>
-      </ElTabs>
+      <DeviceParam v-model="modelVisible" ref="DeviceParam" :deviceId="this.deviceId" :productId="this.productId">
+      </DeviceParam>
     </div>
 
     <template #footer>
@@ -100,7 +22,7 @@ import Button from "@screen/components/Buttons/Button.vue";
 import Form from "@screen/components/FormConfig";
 import request from "@/utils/request";
 import { Message } from "element-ui";
-
+import DeviceParam from "./DeviceParam.vue";
 export default {
   name: "DeviceControlDialog",
   components: {
@@ -108,6 +30,7 @@ export default {
     Button,
     Form,
     Table,
+    DeviceParam,
   },
   model: {
     prop: "visible",
@@ -121,153 +44,11 @@ export default {
   data() {
     return {
       submitting: false,
-      activeName: "first",
-      onWorkStatus2: 0,
-      formData: {},
-      duan: [
-        "A",
-        "B",
-        "C",
-        "D",
-        "E",
-        "F",
-        "G",
-        "H",
-        "I",
-        "J",
-        "K",
-        "L",
-        "M",
-        "N",
-        "O",
-        "P",
-        "Q",
-        "R",
-        "S",
-        "T",
-      ],
-      tableData: [
-        // {
-        //   ds: 'A',
-        //   time: 0,
-        //   A: false,
-        //   B: false,
-        //   C: false,
-        //   D: false,
-        //   E: false,
-        //   F: false,
-        //   G: false,
-        //   H: false,
-        // }
-      ],
-      formList1: [
-        {
-          label: "工作模式:",
-          key: "controlType",
-          type: "select",
-          default: "1",
-          options: {
-            options: [
-              {
-                value: "0",
-                label: "激光关闭",
-              },
-              {
-                value: "1",
-                label: "常亮模式",
-              },
-              {
-                value: "2",
-                label: "间隔100ms闪烁模式",
-              },
-              {
-                value: "3",
-                label: "间隔200ms闪烁模式",
-              },
-              {
-                value: "4",
-                label: "间隔500ms闪烁模式",
-              },
-              {
-                value: "5",
-                label: "2次闪烁模式",
-              },
-              {
-                value: "6",
-                label: "SOS模式",
-              },
-              {
-                value: "7",
-                label: "自定义模式",
-              },
-            ],
-          },
-        },
-        {
-          label: "工作时长(分):",
-          key: "onWorkStatus",
-          required: true,
-          default: 0,
-          type: "inputNumber",
-          options: {
-            min: 0,
-            max: 999,
-          },
-        },
-      ],
-      formList2: [
-        {
-          label: "工作模式:",
-          key: "controlType",
-          type: "RadioGroup",
-          default: "00",
-          options: {
-            type: "circle",
-            options: [
-              {
-                key: "00",
-                label: "常量",
-              },
-              {
-                key: "01",
-                label: "闪烁",
-              },
-            ],
-          },
-        },
-        {
-          label: "线路选择:",
-          key: "onWorkStatus2",
-          required: true,
-          type: "select",
-          options: {
-            placeholder: "请选择",
-          },
-        },
-        {
-          label: "工作时长:",
-          key: "onWorkStatus",
-          required: true,
-          type: "select",
-          options: {
-            placeholder: "请选择",
-          },
-        },
-      ],
-      rules: {
-        onWorkStatus: [
-          { required: true, message: "工作时长不能为空", trigger: "blur" },
-        ],
-      },
     };
   },
   computed: {
     modelVisible: {
       get() {
-        if (this.visible) {
-          // this.deviceId = 'K82+285';
-          this.initData();
-        }
         return this.visible;
       },
       set(val) {
@@ -275,141 +56,9 @@ export default {
       },
     },
   },
-  // watch: {
-  //   modelVisible: {
-  //     immediate: true,
-  //     handler(bool) {
-  //       if (!bool) return;
-
-  //       // this.requestURL();
-  //     }
-  //   }
-  // },
   methods: {
-    async initData() {
-      //查询模式
-      let result = await this.requestURL("ASKMD");
-      // if (result.data == 7) {
-      //   this.activeName = "second";
-      //   this.tabClick();
-      // } else {
-      this.formData.controlType = result.data + "" || "1";
-      //查询时间
-      let resultTime = await this.requestURL("ASKTM");
-      this.formData.onWorkStatus = resultTime.data || 0;
-      this.activeName = "first";
-      // }
-    },
-    async requestURL(functionId, options = {}) {
-      let result = await request({
-        url: `/business/device/functions/${this.deviceId}/${functionId}`,
-        method: "post",
-        data: options,
-      });
-      if (result.code != 200) return Message.error(result?.msg);
-      //模式设定：SETMD；模式查询：ASKMD；时间设定：SETTM；时间查询：ASKTM；自定义设置：SETDF；自定义查询：ASKDF
-      console.log("aaaa", result);
-      return result;
-    },
-    async tabClick() {
-      if (this.activeName == "second") {
-        //查询自定义模式
-        let result = await request({
-          url: `/business/device/properties/latest/${this.deviceId}`,
-          method: "get",
-        });
-        if (result.code != 200) return Message.error(result?.msg);
-
-        this.tableData = [];
-        let tData = [];
-        result.data.forEach((item) => {
-          if (item.property == "TM") {
-            this.onWorkStatus2 = item.value;
-          } else if (item.property == "MD") {
-          } else {
-            let data = JSON.parse(item.formatValue || {});
-
-            tData.push({ ...data, ds: item.property });
-          }
-        });
-        tData.sort((a, b) => a.ds.toUpperCase().localeCompare(b.ds.toUpperCase()));
-        this.tableData = tData;
-      } else {
-        //查询时间
-        let resultTime = await this.requestURL("ASKTM");
-        this.formData.onWorkStatus = resultTime.data || 0;
-        this.activeName = "first";
-      }
-    },
     async handleSubmit() {
-      if (this.activeName == "first") {
-        //一般模式
-        this.$refs.FormConfigRef.validate().then(async (formData) => {
-          console.log("formData", formData);
-          //设定模式
-          await this.requestURL("SETMD", { SET: formData.controlType });
-          //设定时长
-          let res = await this.requestURL("SETTM", {
-            SET: formData.onWorkStatus,
-          });
-          console.log("res", res);
-          if (res.code == 200) {
-            Message.success("设置成功！");
-            this.$emit("update:value", false);
-          }
-        });
-      } else if (this.activeName == "second") {
-        //自定义模式
-        let rData = [];
-
-        this.tableData.forEach((it, index) => {
-          rData.push({
-            functionId: "SETDF",
-            params: {
-              order: 7,
-              time: it.time,
-              numberOfSegments: it.ds || this.duan[index],
-              A: Number(it.A),
-              B: Number(it.B),
-              C: Number(it.C),
-              D: Number(it.D),
-              E: Number(it.E),
-              F: Number(it.F),
-              G: Number(it.G),
-              H: Number(it.H),
-            }
-          });
-        });
-
-        //设定自定义模式
-        let res = await request({
-          url: `/business/device/batchFunctions`,
-          method: "post",
-          // data: {
-          //   deviceId: this.deviceId,
-          //   functionId: "SETDF",
-          //   params: rData,
-          // },
-          data: {
-            devices: [{
-              iotDeviceId: this.deviceId,
-              id: this.productId,
-              deviceType: 10
-            }],
-            functions: rData
-          }
-        });
-        if (res.code == 200) {
-          Message.success("设置成功！");
-          this.$emit("update:value", false);
-        }
-        //设定时长
-        // let res = await this.requestURL("SETTM", { SET: this.onWorkStatus2 });
-        // if (res.code == 200) {
-        //   Message.success("设置成功！");
-        //   this.$emit("update:value", false);
-        // }
-      }
+      this.$refs.DeviceParam?.handleSubmit();
     },
   },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
new file mode 100644
index 00000000..e1b5e676
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
@@ -0,0 +1,421 @@
+<template>
+  <div :style="{
+    'max-height': isMultiControl ? '250px' : undefined, 'overflow-y': isMultiControl ? 'auto' : undefined,
+    'margin-left': isMultiControl ? '14px' : undefined
+  }">
+    <ElTabs v-model="activeName" class="tabs" @tab-click="tabClick">
+      <ElTabPane label="一般模式" name="first">
+        <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList1" column="1" labelWidth="120px" />
+      </ElTabPane>
+      <ElTabPane label="自定义模式" name="second">
+        <!-- <div style="display: flex; margin: 20px 0">
+            <p style="width: 115px">工作时长(分):</p>
+            <el-input-number v-model="onWorkStatus2" :min="0" :max="999" label="工作时长(s分):"></el-input-number>
+          </div> -->
+        <Table :data="tableData">
+          <ElTableColumn prop="ds" label="段数"></ElTableColumn>
+
+          <ElTableColumn prop="time" width="120" label="时间(毫秒)">
+            <template slot-scope="scope">
+              <div style="display: flex">
+                <el-input-number style="width: 120px" v-model="scope.row.time" :min="0"></el-input-number>
+              </div>
+            </template>
+          </ElTableColumn>
+
+          <ElTableColumn prop="A" label="线路A">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.A" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+          <ElTableColumn prop="B" label="线路B">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.B" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+          <ElTableColumn prop="C" label="线路C">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.C" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+          <ElTableColumn prop="D" label="线路D">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.D" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+          <ElTableColumn prop="E" label="线路E">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.E" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+          <ElTableColumn prop="F" label="线路F">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.F" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+          <ElTableColumn prop="G" label="线路G">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.G" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+          <ElTableColumn prop="H" label="线路H">
+            <template slot-scope="scope">
+              <el-switch active-value="1" inactive-value="0" v-model="scope.row.H" active-color="#13ce66"
+                inactive-color="#C9C9C9">
+              </el-switch>
+            </template>
+          </ElTableColumn>
+        </Table>
+      </ElTabPane>
+    </ElTabs>
+  </div>
+</template>
+
+<script>
+import Table from "@screen/components/Table.vue";
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import { batchFunctions } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+import { multiResultShow } from "@screen/utils/common";
+export default {
+  name: "DeviceControlDialog",
+  components: {
+    Dialog,
+    Button,
+    Form,
+    Table,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  props: {
+    visible: Boolean,
+    deviceId: String,
+    productId: String,
+    isMultiControl: Boolean,
+    selectItems: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      submitting: false,
+      activeName: "first",
+      onWorkStatus2: 0,
+      formData: {},
+      duan: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+      ],
+      tableData: [
+        // {
+        //   ds: 'A',
+        //   time: 0,
+        //   A: false,
+        //   B: false,
+        //   C: false,
+        //   D: false,
+        //   E: false,
+        //   F: false,
+        //   G: false,
+        //   H: false,
+        // }
+      ],
+      formList1: [
+        {
+          label: "工作模式:",
+          key: "controlType",
+          type: "select",
+          default: "1",
+          options: {
+            options: [
+              {
+                value: "0",
+                label: "激光关闭",
+              },
+              {
+                value: "1",
+                label: "常亮模式",
+              },
+              {
+                value: "2",
+                label: "间隔100ms闪烁模式",
+              },
+              {
+                value: "3",
+                label: "间隔200ms闪烁模式",
+              },
+              {
+                value: "4",
+                label: "间隔500ms闪烁模式",
+              },
+              {
+                value: "5",
+                label: "2次闪烁模式",
+              },
+              {
+                value: "6",
+                label: "SOS模式",
+              },
+              {
+                value: "7",
+                label: "自定义模式",
+              },
+            ],
+          },
+        },
+        {
+          label: "工作时长(分):",
+          key: "onWorkStatus",
+          required: true,
+          default: 0,
+          type: "inputNumber",
+          options: {
+            min: 0,
+            max: 999,
+          },
+        },
+      ],
+      formList2: [
+        {
+          label: "工作模式:",
+          key: "controlType",
+          type: "RadioGroup",
+          default: "00",
+          options: {
+            type: "circle",
+            options: [
+              {
+                key: "00",
+                label: "常量",
+              },
+              {
+                key: "01",
+                label: "闪烁",
+              },
+            ],
+          },
+        },
+        {
+          label: "线路选择:",
+          key: "onWorkStatus2",
+          required: true,
+          type: "select",
+          options: {
+            placeholder: "请选择",
+          },
+        },
+        {
+          label: "工作时长:",
+          key: "onWorkStatus",
+          required: true,
+          type: "select",
+          options: {
+            placeholder: "请选择",
+          },
+        },
+      ],
+      rules: {
+        onWorkStatus: [
+          { required: true, message: "工作时长不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  mounted() {
+    if (!this.isMultiControl)
+      this.initData();
+  },
+  methods: {
+    async initData() {
+      //查询模式
+      let result = await this.requestURL("ASKMD");
+      // if (result.data == 7) {
+      //   this.activeName = "second";
+      //   this.tabClick();
+      // } else {
+      this.formData.controlType = result.data + "" || "1";
+      //查询时间
+      let resultTime = await this.requestURL("ASKTM");
+      this.formData.onWorkStatus = resultTime.data || 0;
+      this.activeName = "first";
+      // }
+    },
+    async requestURL(functionId, options = {}) {
+      let result = await request({
+        url: `/business/device/functions/${this.deviceId}/${functionId}`,
+        method: "post",
+        data: options,
+      });
+      if (result.code != 200) return Message.error(result?.msg);
+      //模式设定：SETMD；模式查询：ASKMD；时间设定：SETTM；时间查询：ASKTM；自定义设置：SETDF；自定义查询：ASKDF
+      return result;
+    },
+    async tabClick() {
+      if (this.activeName == "second") {
+        if (this.isMultiControl)
+          this.tableData = this.duan.map(item => {
+            return {
+              ds: item,
+              time: 0,
+              A: false,
+              B: false,
+              C: false,
+              D: false,
+              E: false,
+              F: false,
+              G: false,
+              H: false,
+            }
+          });
+        else {
+          // 查询自定义模式
+          let result = await request({
+            url: `/business/device/properties/latest/${this.deviceId}`,
+            method: "get",
+          });
+          if (result.code != 200) return Message.error(result?.msg);
+
+          this.tableData = [];
+          let tData = [];
+          result.data.forEach((item) => {
+            if (item.property == "TM") {
+              this.onWorkStatus2 = item.value;
+            } else if (item.property == "MD") {
+            } else {
+              let data = JSON.parse(item.formatValue || {});
+
+              tData.push({ ...data, ds: item.property });
+            }
+          });
+          tData.sort((a, b) => a.ds.toUpperCase().localeCompare(b.ds.toUpperCase()));
+          this.tableData = tData;
+        }
+      } else {
+        if (!this.isMultiControl) {
+          //查询时间
+          let resultTime = await this.requestURL("ASKTM");
+          this.formData.onWorkStatus = resultTime.data || 0;
+          this.activeName = "first";
+        }
+      }
+    },
+    async handleSubmit() {
+      if (this.isMultiControl && !this.selectItems.length) {
+        return Message.error("请至少选择一个疲劳唤醒设备!");
+      }
+      const selectItems = this.selectItems.map(item => JSON.parse(item));
+      let devices;
+      if (this.isMultiControl) devices = selectItems;
+      else devices = [{
+        iotDeviceId: this.deviceId,
+        id: this.productId,
+        deviceType: 10
+      }]
+      if (this.activeName == "first") {
+        //一般模式
+        this.$refs.FormConfigRef.validate().then(async (formData) => {
+          //设定模式
+          // await this.requestURL("SETMD", { SET: formData.controlType });
+          //设定时长
+          // let res = await this.requestURL("SETTM", {
+          //   SET: formData.onWorkStatus,
+          // });
+          let res = await batchFunctions({
+            devices: devices,
+            functions: [
+              { "functionId": "SETMD", "params": { SET: formData.controlType } },//设定模式
+              {
+                "functionId": "SETTM", "params": {  //设定时长
+                  SET: formData.onWorkStatus,
+                }
+              }
+            ]
+          });
+          if (res.code == 200) {
+            Message.success("设置成功！");
+            this.$emit("update:value", false);
+          }
+        });
+      } else if (this.activeName == "second") {
+        //自定义模式
+        let rData = [];
+
+        this.tableData.forEach((it, index) => {
+          rData.push({
+            functionId: "SETDF",
+            params: {
+              order: 7,
+              time: it.time,
+              numberOfSegments: it.ds || this.duan[index],
+              A: Number(it.A),
+              B: Number(it.B),
+              C: Number(it.C),
+              D: Number(it.D),
+              E: Number(it.E),
+              F: Number(it.F),
+              G: Number(it.G),
+              H: Number(it.H),
+            }
+          });
+        });
+
+        //设定自定义模式
+        let res = await batchFunctions({
+          devices: devices,
+          functions: rData
+        });
+        if (res.code == 200) {
+          Message.success("设置成功！");
+          this.$emit("update:value", false);
+        }
+        //设定时长
+        // let res = await this.requestURL("SETTM", { SET: this.onWorkStatus2 });
+        // if (res.code == 200) {
+        //   Message.success("设置成功！");
+        //   this.$emit("update:value", false);
+        // }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
index 1b3c23c2..7596498f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
@@ -116,8 +116,7 @@ export default {
 
       if (!this.selectItems.length) {
         setTimeout(() => { data.state = !value; }, 10);
-        Message.error("请至少选择一个广播设备!")
-        return;
+        return Message.error("请至少选择一个广播设备!");
       }
       const selectItems = this.selectItems.map(item => JSON.parse(item));
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index dcb34c55..dec03b5c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -14,13 +14,14 @@
         </span>
         <Form v-model="data" labelWidth="90px" column="2" class="form" ref="FormConfigRef" :formList="formList" />
         <component ref="ControlComponent" :is="componentMap[DeviceTopics[data.deviceType]]" :isMultiControl="true"
-          :selectItems="data.childType" @update:activeIcon="(val) => { this.activeIcon = val }"></component>
-        <!-- <div class="footer">
-          <Button @click.native="submitClick">
+          :selectItems="data.childType" @update:activeIcon="(val) => { this.activeIcon = val }"
+          @update:submitting="(val) => { submitting = val }"></component>
+        <div class="footer">
+          <Button @click.native="submitClick" :loading="submitting">
             确认
           </Button>
           <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="cancelClick"> 取消 </Button>
-        </div> -->
+        </div>
       </div>
     </ElPopover>
 
@@ -37,12 +38,14 @@ import { ChildTypes } from "@screen/utils/enum.js"
 import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 import { delay } from "@screen/utils/common";
 import { initSearch } from "@screen/utils/enum/common.js"
-import DeviceParams from "@screen/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue";
+import SmartDeviceParams from "@screen/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue";
 import BroadcastParam from "@screen/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue";
+import FatigueWakesUpParam from "@screen/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue";
+
 import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
 
-const componentMap = { "设备箱": "DeviceParams", "语音广播": "BroadcastParam" } //DeviceTopics[deviceType]
-//"情报板": undefined, "行车诱导": undefined, "疲劳唤醒": undefined, "合流区": undefined,
+const componentMap = { "设备箱": "SmartDeviceParams", "语音广播": "BroadcastParam", "疲劳唤醒": "FatigueWakesUpParam" } //DeviceTopics[deviceType]
+//"情报板": undefined, "行车诱导": undefined, , "合流区": undefined,
 const controlMulti = Object.keys(componentMap);//6种批量控制
 const DeviceTopics = {};//6种批量控制 事件专题 {key:label}
 
@@ -72,13 +75,15 @@ export default {
   components: {
     Button,
     Form,
-    DeviceParams,
-    BroadcastParam
+    SmartDeviceParams,
+    BroadcastParam,
+    FatigueWakesUpParam,
   },
   data() {
     return {
       activeIcon: null,
       data: {},
+      submitting: false,
       formList: [
         {
           label: "设备类型:",
@@ -278,7 +283,7 @@ export default {
   },
   methods: {
     submitClick() {
-      this.$refs.ControlComponent.handleSubmit()
+      this.$refs.ControlComponent?.handleSubmit();
     },
     cancelClick() {
       this.activeIcon = null;

From c9b81a40d06ba868acfb64730c2bd42f448e6105 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 18 Apr 2024 17:35:10 +0800
Subject: [PATCH 05/10] =?UTF-8?q?feat=20=20=E4=BC=98=E5=8C=96=20=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/Broadcast/components/BroadcastParamMulti.vue      | 2 +-
 .../Dialogs/FatigueWakesUp/components/DeviceParam.vue         | 2 +-
 .../Dialogs/SmartDevice/components/DeviceParamsMulti.vue      | 2 +-
 .../pages/Home/components/HomeFrameControl/index.vue          | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
index 4221768b..10e19ac0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
@@ -95,7 +95,7 @@ export default {
       if (!this.releaseMessage?.trim())
         return Message.error("发布内容不能为空!");
       if (!selectItems.length)
-        return Message.error("请至少选择一个广播设备!");
+        return Message.error("请至少选择一个设备!");
 
       // this.submitting = true;
       this.$emit("update:submitting", true);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
index e1b5e676..fa7f49f4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
@@ -339,7 +339,7 @@ export default {
     },
     async handleSubmit() {
       if (this.isMultiControl && !this.selectItems.length) {
-        return Message.error("请至少选择一个疲劳唤醒设备!");
+        return Message.error("请至少选择一个设备!");
       }
       const selectItems = this.selectItems.map(item => JSON.parse(item));
       let devices;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
index 7596498f..64b0dda6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue
@@ -116,7 +116,7 @@ export default {
 
       if (!this.selectItems.length) {
         setTimeout(() => { data.state = !value; }, 10);
-        return Message.error("请至少选择一个广播设备!");
+        return Message.error("请至少选择一个设备!");
       }
       const selectItems = this.selectItems.map(item => JSON.parse(item));
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index dec03b5c..df3343db 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -16,7 +16,7 @@
         <component ref="ControlComponent" :is="componentMap[DeviceTopics[data.deviceType]]" :isMultiControl="true"
           :selectItems="data.childType" @update:activeIcon="(val) => { this.activeIcon = val }"
           @update:submitting="(val) => { submitting = val }"></component>
-        <div class="footer">
+        <div v-if="hiddenDevices.indexOf(componentMap[DeviceTopics[data.deviceType]]) == -1" class="footer">
           <Button @click.native="submitClick" :loading="submitting">
             确认
           </Button>
@@ -46,6 +46,7 @@ import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/
 
 const componentMap = { "设备箱": "SmartDeviceParams", "语音广播": "BroadcastParam", "疲劳唤醒": "FatigueWakesUpParam" } //DeviceTopics[deviceType]
 //"情报板": undefined, "行车诱导": undefined, , "合流区": undefined,
+const hiddenDevices = ["SmartDeviceParams"];
 const controlMulti = Object.keys(componentMap);//6种批量控制
 const DeviceTopics = {};//6种批量控制 事件专题 {key:label}
 
@@ -83,6 +84,7 @@ export default {
     return {
       activeIcon: null,
       data: {},
+      hiddenDevices,
       submitting: false,
       formList: [
         {

From f0217885ec24549462c137f80b0629ed4528ca99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Thu, 18 Apr 2024 18:12:39 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Cards/ReleaseInformation/index.vue        | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
index 06e1004c..2a2f46da 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
@@ -25,7 +25,7 @@
     </Descriptions> -->
 
     <div class="bottom">
-      <ButtonGradient @click="confirm" class="title-button special-button">
+      <ButtonGradient @click.native="handleSubmit" :loading="submitting" class="title-button special-button">
         一键发布
       </ButtonGradient>
       <!-- <ButtonGradient class="title-button special-button">
@@ -42,7 +42,7 @@ import Form from '@screen/components/FormConfig';
 import CheckboxGroup from '@screen/components/FormConfig/components/ElCheckboxGroup.vue';
 import Descriptions from '@screen/components/Descriptions.vue';
 import { provideMixin } from "./../../mixin"
-import { method, result } from "lodash";
+import request from "@/utils/request";
 
 export default {
   name: 'ReleaseInformation',
@@ -70,6 +70,7 @@ export default {
         {  key: '3', label: '网站' },
         {  key: '4', label: '新浪' },
       ],
+      submitting: false,
       formList: [{
         label: "发布内容:",
         key: "content",
@@ -90,13 +91,44 @@ export default {
     }
   },
   methods: {
-    async confirm(){
+    async handleSubmit(){
       await this.$refs.FormMsgRef.validate()
-          .then((res) => {
-           console.log(res)
+          .then(async (res) => {
+           const {content,type} = res;
+            if(content === null){
+              this.$message.warning(`未输入发布内容`);
+              return;
+            }
+            if(type.length === 0){
+              this.$message.warning(`未选择发布平台`);
+              return;
+            }
+            // res.eventid = 
+            if(type.indexOf('1') !== -1){
+              res.phone = '13589019062'
+            }
+            res.eventId = this.detailData.id;
+            this.submitting = true;
+
+            await request({
+              url: `/business/sms/pushAll`,
+              method: "post",
+              data: res,
+            })
+              .then((result) => {
+                if (result.code != 200) return this.$message.error(result?.msg);
+                this.$message.success("提交成功");
+                this.modelVisible = false;
+              })
+              .catch(() => {
+                this.$message.error("提交失败");
+              })
+              .finally(() => {
+                this.submitting = false;
+              });
           })
           .catch((err) => {
-            console.log("catch");
+            console.log("catch"+err);
           });
     }
   }

From 96a41957ef1ea05a80c9d068b4e5e948b338e873 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Fri, 19 Apr 2024 09:58:10 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat=20=20=E6=89=B9=E9=87=8F=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=20=E8=A1=8C=E8=BD=A6=E8=AF=B1=E5=AF=BC=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeviceControlDialog.vue        | 222 +------------
 .../components/DeviceParam.vue                | 307 ++++++++++++++++++
 .../Dialogs/DrivingGuidance/index.vue         |  19 +-
 .../components/DeviceControlDialog.vue        |   6 +-
 .../FatigueWakesUp/components/DeviceParam.vue |   3 +-
 .../Dialogs/FatigueWakesUp/index.vue          |  24 +-
 .../components/HomeFrameControl/index.vue     |  10 +-
 7 files changed, 343 insertions(+), 248 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index a34a4490..5080769c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -1,28 +1,12 @@
 <template>
   <Dialog v-model="modelVisible" title="设备操作" width="600px">
-    <div class="DeviceControlDialog">
-      <Form
-        v-model="formData"
-        class="form"
-        ref="FormConfigRef"
-        :formList="formList"
-        column="1"
-        labelWidth="120px"
-      />
-
-      <div class="tips" v-if="formData.controlType === '01'">
-        说明: 定时控制模式下,诱导灯在开始时间自动打开,结束时间自动关闭
-      </div>
-      <div class="tips" v-if="formData.controlType === '02'">
-        说明: 万年历自动模式下,诱导灯在白天会自动关闭,夜晚会自动打开
-      </div>
-    </div>
+    <DeviceParam v-model="modelVisible" ref="DeviceParam" :deviceId="deviceId" :id="id" :deviceType="deviceType"
+      @update:submitting="(val) => { submitting = val }">
+    </DeviceParam>
 
     <template #footer>
-      <Button
-        style="background-color: rgba(0, 179, 204, 0.3)"
-        @click.native="(modelVisible = false), (submitting = false)"
-      >
+      <Button style="background-color: rgba(0, 179, 204, 0.3)"
+        @click.native="(modelVisible = false), (submitting = false)">
         取消
       </Button>
       <Button @click.native="handleSubmit" :loading="submitting"> 确定 </Button>
@@ -35,14 +19,10 @@ import Dialog from "@screen/components/Dialog/index.vue";
 import Button from "@screen/components/Buttons/Button.vue";
 import Form from "@screen/components/FormConfig";
 
-import { cloneDeep } from "lodash";
-import { delay } from "@screen/utils/common.js";
-import request from "@/utils/request";
-
 import { Message } from "element-ui";
 // import { axiosIns } from "@screen/utils/axios/auth.js";
 import { handle3CResult } from "@screen/utils/deviceControl.js";
-
+import DeviceParam from "./DeviceParam.vue";
 const workStatus = [
   {
     key: "00",
@@ -74,6 +54,7 @@ export default {
     Dialog,
     Button,
     Form,
+    DeviceParam,
   },
   model: {
     prop: "visible",
@@ -82,99 +63,12 @@ export default {
   props: {
     visible: Boolean,
     deviceId: String,
+    id: String,
+    deviceType: String,
   },
-  inject: ["requestURL"],
   data() {
     return {
       submitting: false,
-      formData: {},
-      formList: [
-        {
-          label: "类型:",
-          key: "controlType",
-          type: "RadioGroup",
-          default: "00",
-          ons: {
-            input: (value, { data }) => {
-              const oldFormData = this.oldFormData;
-              if (!oldFormData) return;
-
-              this.formList[1].options.options.splice(-1, 1, {
-                ...workStatus.slice(-1)[0],
-                disabled: value != "00",
-              });
-
-              this.formList[1].options.options.splice(0, 1, {
-                ...workStatus[0],
-                disabled: value != "00",
-              });
-
-              switch (value) {
-                case "01":
-                  if (["04", "00"].includes(data.onWorkStatus))
-                    data.onWorkStatus = null;
-                  if (["04", "00"].includes(data.inWorkStatus))
-                    data.inWorkStatus = null;
-
-                  Array.isArray(oldFormData.displayTime) &&
-                    (data.displayTime = [...oldFormData.displayTime]);
-                  break;
-              }
-            },
-          },
-          options: {
-            type: "circle",
-            options: [
-              {
-                key: "00",
-                label: "手动控制",
-              },
-              {
-                key: "01",
-                label: "自动控制",
-              },
-              {
-                key: "02",
-                label: "万年历",
-              },
-            ],
-          },
-        },
-        {
-          label: "上行工作状态:",
-          key: "onWorkStatus",
-          required: true,
-          type: "select",
-          options: {
-            placeholder: "请选择",
-            options: workStatus,
-          },
-        },
-        {
-          label: "下行工作状态:",
-          key: "inWorkStatus",
-          required: true,
-          type: "select",
-          options: {
-            placeholder: "请选择",
-            options: workStatus,
-          },
-        },
-        {
-          label: "选择时间:",
-          key: "displayTime",
-          type: "timePicker",
-          required: true,
-          visible: (data) => data.controlType == "01",
-          options: {
-            isRange: true,
-            rangeSeparator: "至",
-            valueFormat: "HH:mm",
-            startPlaceholder: "开始时间",
-            endPlaceholder: "结束时间",
-          },
-        },
-      ],
     };
   },
   computed: {
@@ -187,105 +81,9 @@ export default {
       },
     },
   },
-  watch: {
-    modelVisible: {
-      immediate: true,
-      handler(bool) {
-        if (!bool) return;
-
-        this.reDisplay();
-      },
-    },
-  },
   methods: {
-    reDisplay() {
-      this.requestURL().then(async (data) => {
-        await delay(0);
-
-        const formData = this.$refs.FormConfigRef?.formData;
-
-        formData.controlType = data.mode;
-
-        await handle3CResult(data, formData, this.requestURL);
-
-        this.oldFormData = { ...formData };
-      });
-    },
     handleSubmit() {
-      const result = {},
-        formData = this.$refs.FormConfigRef?.formData;
-
-      result.mode = formData.controlType;
-
-      delete result.controlType;
-
-      if (result.mode === "01") {
-        if (!formData.displayTime?.length)
-          return Message.error(`时间不能为空!`);
-      }
-
-      if (!formData.onWorkStatus || !formData.inWorkStatus)
-        return Message.error(`工作状态不能为空!`);
-
-      if (["01", "02"].includes(result.mode)) {
-        if (["04", "00"].includes(formData.onWorkStatus))
-          return Message.error(`上行工作状态不能选择当前类型!`);
-        if (["04", "00"].includes(formData.inWorkStatus))
-          return Message.error(`下行工作状态不能选择当前类型!`);
-      }
-
-      result.onWorkStatus = formData.onWorkStatus;
-      result.inWorkStatus = formData.inWorkStatus;
-
-      this.submitting = true;
-
-      // this.submitting = false;
-      // return;
-
-      /**
-       * 接口 地址
-       *
-       * https://www.showdoc.com.cn/2450725213006196/10877717880262686
-       */
-      let promise = [];
-
-      switch (result.mode) {
-        case "00":
-          promise.push(this.requestURL("51", result));
-          break;
-        case "01":
-        case "02":
-          const options = { mode: result.mode };
-
-          if (result.mode === "01") {
-            options.startDisplayTime = formData.displayTime[0];
-            options.endDisplayTime = formData.displayTime[1];
-          }
-
-          promise.push(
-            this.requestURL("30", {
-              onWorkStatus: result.onWorkStatus,
-              inWorkStatus: result.inWorkStatus,
-            }),
-            this.requestURL("51", options)
-          );
-          break;
-      }
-      Promise.all(promise)
-        .then(() => {
-          this.modelVisible = false;
-        })
-        .catch((err) => {
-          console.log(
-            "%c [ err ]-110-「DeviceControlDialog.vue」",
-            "font-size:15px; background:#547bf2; color:#98bfff;",
-            err
-          );
-          Message.error(`设备操作失败!`);
-        })
-        .finally(() => {
-          this.submitting = false;
-        });
+      this.$refs.DeviceParam.handleSubmit();
     },
   },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
new file mode 100644
index 00000000..9a92dfd8
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
@@ -0,0 +1,307 @@
+<template>
+  <div class="DeviceControlDialog" :style="{
+
+    'margin-top': isMultiControl ? '15px' : undefined,
+    'width': isMultiControl ? '100%' : undefined,
+  }">
+    <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList" column="1" labelWidth="120px" />
+
+    <div class="tips" v-if="formData.controlType === '01'">
+      说明: 定时控制模式下,诱导灯在开始时间自动打开,结束时间自动关闭
+    </div>
+    <div class="tips" v-if="formData.controlType === '02'">
+      说明: 万年历自动模式下,诱导灯在白天会自动关闭,夜晚会自动打开
+    </div>
+  </div>
+
+
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+
+import { cloneDeep } from "lodash";
+import { delay } from "@screen/utils/common.js";
+import request from "@/utils/request";
+
+import { Message } from "element-ui";
+// import { axiosIns } from "@screen/utils/axios/auth.js";
+import { handle3CResult } from "@screen/utils/deviceControl.js";
+import { batchFunctions } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+import { multiResultShow } from "@screen/utils/common";
+
+const workStatus = [
+  {
+    key: "00",
+    label: "不更新状态",
+    disabled: false,
+  },
+  {
+    key: "01",
+    label: "常亮",
+  },
+  {
+    key: "02",
+    label: "流水",
+  },
+  {
+    key: "03",
+    label: "闪烁",
+  },
+  {
+    key: "04",
+    label: "关闭",
+    disabled: false,
+  },
+];
+
+export default {
+  name: "DeviceControlDialog",
+  components: {
+    Dialog,
+    Button,
+    Form,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  props: {
+    visible: Boolean,
+    deviceId: String,
+    id: String,
+    deviceType: String,
+    isMultiControl: Boolean,
+    selectItems: {
+      type: Array,
+      default: () => []
+    }
+  },
+  inject: ["requestURL"],
+  data() {
+    return {
+      formData: {},
+      formList: [
+        {
+          label: "类型:",
+          key: "controlType",
+          type: "RadioGroup",
+          default: "00",
+          ons: {
+            input: (value, { data }) => {
+              const oldFormData = this.oldFormData;
+              if (!oldFormData) return;
+
+              this.formList[1].options.options.splice(-1, 1, {
+                ...workStatus.slice(-1)[0],
+                disabled: value != "00",
+              });
+
+              this.formList[1].options.options.splice(0, 1, {
+                ...workStatus[0],
+                disabled: value != "00",
+              });
+
+              switch (value) {
+                case "01":
+                  if (["04", "00"].includes(data.onWorkStatus))
+                    data.onWorkStatus = null;
+                  if (["04", "00"].includes(data.inWorkStatus))
+                    data.inWorkStatus = null;
+
+                  Array.isArray(oldFormData.displayTime) &&
+                    (data.displayTime = [...oldFormData.displayTime]);
+                  break;
+              }
+            },
+          },
+          options: {
+            type: "circle",
+            options: [
+              {
+                key: "00",
+                label: "手动控制",
+              },
+              {
+                key: "01",
+                label: "自动控制",
+              },
+              {
+                key: "02",
+                label: "万年历",
+              },
+            ],
+          },
+        },
+        {
+          label: "上行工作状态:",
+          key: "onWorkStatus",
+          required: true,
+          type: "select",
+          options: {
+            placeholder: "请选择",
+            options: workStatus,
+          },
+        },
+        {
+          label: "下行工作状态:",
+          key: "inWorkStatus",
+          required: true,
+          type: "select",
+          options: {
+            placeholder: "请选择",
+            options: workStatus,
+          },
+        },
+        {
+          label: "选择时间:",
+          key: "displayTime",
+          type: "timePicker",
+          required: true,
+          visible: (data) => data.controlType == "01",
+          options: {
+            isRange: true,
+            rangeSeparator: "至",
+            valueFormat: "HH:mm",
+            startPlaceholder: "开始时间",
+            endPlaceholder: "结束时间",
+          },
+        },
+      ],
+    };
+  },
+  mounted() {
+    this.$emit("update:submitting", false);
+    if (!this.isMultiControl)
+      this.reDisplay();
+  },
+  methods: {
+    reDisplay() {
+      console.log(this.requestURL)
+      this.requestURL().then(async (data) => {
+        await delay(0);
+        const formData = this.$refs.FormConfigRef?.formData;
+
+        formData.controlType = data.mode;
+
+        await handle3CResult(data, formData, this.requestURL);
+
+        this.oldFormData = { ...formData };
+      });
+    },
+    handleSubmit() {
+      const result = {},
+        formData = this.$refs.FormConfigRef?.formData;
+
+      result.mode = formData.controlType;
+
+      delete result.controlType;
+
+      if (result.mode === "01") {
+        if (!formData.displayTime?.length)
+          return Message.error(`时间不能为空!`);
+      }
+
+      if (!formData.onWorkStatus || !formData.inWorkStatus)
+        return Message.error(`工作状态不能为空!`);
+
+      if (["01", "02"].includes(result.mode)) {
+        if (["04", "00"].includes(formData.onWorkStatus))
+          return Message.error(`上行工作状态不能选择当前类型!`);
+        if (["04", "00"].includes(formData.inWorkStatus))
+          return Message.error(`下行工作状态不能选择当前类型!`);
+      }
+      if (this.isMultiControl && !this.selectItems.length) {
+        return Message.error("请至少选择一个设备!");
+      }
+      const selectItems = this.selectItems.map(item => JSON.parse(item));
+
+      result.onWorkStatus = formData.onWorkStatus;
+      result.inWorkStatus = formData.inWorkStatus;
+
+      this.$emit("update:submitting", true);
+
+      let devices;
+      if (this.isMultiControl) devices = selectItems;
+      else devices = [{
+        iotDeviceId: this.deviceId,
+        id: this.id,
+        deviceType: this.deviceType
+      }]
+      const functions = [];
+      /**
+       * 接口 地址
+       *
+       * https://www.showdoc.com.cn/2450725213006196/10877717880262686
+       */
+      let promise = [];
+
+      switch (result.mode) {
+        case "00":
+          // promise.push(this.requestURL("51", result));
+          functions.push({ "functionId": "51", "params": result })
+          break;
+        case "01":
+        case "02":
+          const options = { mode: result.mode };
+
+          if (result.mode === "01") {
+            options.startDisplayTime = formData.displayTime[0];
+            options.endDisplayTime = formData.displayTime[1];
+          }
+          functions.push({
+            "functionId": "30", "params": {
+              onWorkStatus: result.onWorkStatus,
+              inWorkStatus: result.inWorkStatus,
+            }
+          },
+            { "functionId": "51", "params": options })
+          // promise.push(
+          //   this.requestURL("30", {
+          //     onWorkStatus: result.onWorkStatus,
+          //     inWorkStatus: result.inWorkStatus,
+          //   }),
+          //   this.requestURL("51", options)
+          // );
+          break;
+      }
+      batchFunctions({
+        devices: devices,
+        functions: functions
+      })
+        // Promise.all(promise)
+        .then(() => {
+          this.$emit("update:value", false); // this.modelVisible = false;
+          Message.success(`操作成功`);
+        })
+        .catch((err) => {
+          console.log(
+            "%c [ err ]-110-「DeviceControlDialog.vue」",
+            "font-size:15px; background:#547bf2; color:#98bfff;",
+            err
+          );
+          Message.error(`设备操作失败!`);
+        })
+        .finally(() => {
+          this.$emit("update:submitting", false);
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.DeviceControlDialog {
+  width: 450px;
+  height: 210px;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+
+  .tips {
+    font-size: 12px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 44f73803..31cc6dd6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -9,11 +9,7 @@
         </ElTabPane>
         <!-- <ElTabPane label="设备参数" name="second">设备参数</ElTabPane> -->
         <ElTabPane label="在线率统计" name="third">
-          <LineChart
-            v-if="activeName === 'third'"
-            :productId="dialogData.id"
-            style="height: 180px"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
         </ElTabPane>
       </ElTabs>
 
@@ -21,12 +17,9 @@
         <Button @click.native="deviceControlVisible = true">设备操作</Button>
       </div>
     </div>
-
     <!-- <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId || '8697-1'" /> -->
-    <DeviceControlDialog
-      v-model="deviceControlVisible"
-      :deviceId="dialogData.iotDeviceId"
-    />
+    <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" :id="dialogData.id"
+      :deviceType="dialogData.deviceType" />
   </Dialog>
 </template>
 
@@ -127,7 +120,7 @@ export default {
       .then((data) => {
         this.dialogData.brand = data.brand;
       })
-      .catch((err) => {});
+      .catch((err) => { });
 
     // this.requestURL(52)
     //   .then((result) => {
@@ -164,7 +157,7 @@ export default {
     if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
-    handleClickTabs() {},
+    handleClickTabs() { },
     requestURL(functionId = 52, options = {}) {
       return new Promise((resolve, reject) => {
         request
@@ -219,7 +212,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
index af45d841..e21cc56c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
@@ -1,7 +1,8 @@
 <template>
   <Dialog v-model="modelVisible" title="设备操作" width="910px">
     <div class="DeviceControlDialog">
-      <DeviceParam v-model="modelVisible" ref="DeviceParam" :deviceId="this.deviceId" :productId="this.productId">
+      <DeviceParam v-model="modelVisible" ref="DeviceParam" :deviceId="this.deviceId" :productId="this.productId"
+        :deviceType="deviceType">
       </DeviceParam>
     </div>
 
@@ -39,7 +40,8 @@ export default {
   props: {
     visible: Boolean,
     deviceId: String,
-    productId: String
+    productId: String,
+    deviceType: String
   },
   data() {
     return {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
index fa7f49f4..64e8e65f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
@@ -110,6 +110,7 @@ export default {
     visible: Boolean,
     deviceId: String,
     productId: String,
+    deviceType: String,
     isMultiControl: Boolean,
     selectItems: {
       type: Array,
@@ -347,7 +348,7 @@ export default {
       else devices = [{
         iotDeviceId: this.deviceId,
         id: this.productId,
-        deviceType: 10
+        deviceType: this.deviceType
       }]
       if (this.activeName == "first") {
         //一般模式
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
index 2ff3e25a..afc444cb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
@@ -4,20 +4,11 @@
       <Video class="video-stream" :pileNum="dialogData.stakeMark" />
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
-          <Descriptions
-            labelWidth="72px"
-            :list="list"
-            :data="data"
-            style="gap: 18px"
-          />
+          <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
         <!-- <ElTabPane label="设备参数" name="second">设备参数</ElTabPane> -->
         <ElTabPane label="在线率统计" name="third">
-          <LineChart
-            v-if="activeName === 'third'"
-            :productId="dialogData.id"
-            style="height: 180px"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -26,11 +17,8 @@
       <Button @click.native="deviceControlVisible = true">设备操作</Button>
     </template>
     <!-- 设备操作弹窗 -->
-    <DeviceControlDialog
-      v-model="deviceControlVisible"
-      :deviceId="dialogData.iotDeviceId"
-      :productId="dialogData.id"
-    />
+    <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" :productId="dialogData.id"
+      :deviceType="dialogData.deviceType" />
   </Dialog>
 </template>
 
@@ -115,7 +103,7 @@ export default {
     if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
   },
   methods: {
-    handleClickTabs() {},
+    handleClickTabs() { },
   },
 };
 </script>
@@ -156,7 +144,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index df3343db..c5fd436f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -41,11 +41,16 @@ import { initSearch } from "@screen/utils/enum/common.js"
 import SmartDeviceParams from "@screen/pages/Home/components/Dialogs/SmartDevice/components/DeviceParamsMulti.vue";
 import BroadcastParam from "@screen/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue";
 import FatigueWakesUpParam from "@screen/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue";
+import DrivingGuidanceParam from "@screen/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue";
+
 
 import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
 
-const componentMap = { "设备箱": "SmartDeviceParams", "语音广播": "BroadcastParam", "疲劳唤醒": "FatigueWakesUpParam" } //DeviceTopics[deviceType]
-//"情报板": undefined, "行车诱导": undefined, , "合流区": undefined,
+const componentMap = {
+  "设备箱": "SmartDeviceParams", "语音广播": "BroadcastParam", "疲劳唤醒": "FatigueWakesUpParam",
+  "行车诱导": "DrivingGuidanceParam"
+} //DeviceTopics[deviceType]
+//"情报板": undefined, , , "合流区": undefined,
 const hiddenDevices = ["SmartDeviceParams"];
 const controlMulti = Object.keys(componentMap);//6种批量控制
 const DeviceTopics = {};//6种批量控制 事件专题 {key:label}
@@ -79,6 +84,7 @@ export default {
     SmartDeviceParams,
     BroadcastParam,
     FatigueWakesUpParam,
+    DrivingGuidanceParam,
   },
   data() {
     return {

From 5c01c07b73f4893341024610b999ade933431d96 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Fri, 19 Apr 2024 10:20:38 +0800
Subject: [PATCH 08/10] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96=20=E8=A1=8C?=
 =?UTF-8?q?=E8=BD=A6=E8=AF=B1=E5=AF=BC=E6=8E=A7=E5=88=B6=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=20provide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeviceControlDialog.vue        | 25 -------------------
 .../components/DeviceParam.vue                |  4 ++-
 .../Dialogs/DrivingGuidance/index.vue         | 20 +++++++++------
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index 5080769c..efaad632 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -21,32 +21,7 @@ import Form from "@screen/components/FormConfig";
 
 import { Message } from "element-ui";
 // import { axiosIns } from "@screen/utils/axios/auth.js";
-import { handle3CResult } from "@screen/utils/deviceControl.js";
 import DeviceParam from "./DeviceParam.vue";
-const workStatus = [
-  {
-    key: "00",
-    label: "不更新状态",
-    disabled: false,
-  },
-  {
-    key: "01",
-    label: "常亮",
-  },
-  {
-    key: "02",
-    label: "流水",
-  },
-  {
-    key: "03",
-    label: "闪烁",
-  },
-  {
-    key: "04",
-    label: "关闭",
-    disabled: false,
-  },
-];
 
 export default {
   name: "DeviceControlDialog",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
index 9a92dfd8..9b9decee 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
@@ -79,7 +79,7 @@ export default {
       default: () => []
     }
   },
-  inject: ["requestURL"],
+  inject: ["requestURL", "updateFormData"],
   data() {
     return {
       formData: {},
@@ -267,6 +267,7 @@ export default {
           // );
           break;
       }
+      console.log(result, "resultxxxxx")
       batchFunctions({
         devices: devices,
         functions: functions
@@ -275,6 +276,7 @@ export default {
         .then(() => {
           this.$emit("update:value", false); // this.modelVisible = false;
           Message.success(`操作成功`);
+          this.updateFormData({ ...result, workMode: result.mode });
         })
         .catch((err) => {
           console.log(
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 31cc6dd6..6ec632b5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -37,7 +37,7 @@ import request from "@/utils/request";
 import { delay } from "@screen/utils/common.js";
 import { handle3CResult } from "@screen/utils/deviceControl.js";
 import { controlModelMap, gzztMap } from "@screen/utils/enum.js";
-import { find } from "lodash";
+import { find, assign } from "lodash";
 import { dialogDelayVisible } from "./../mixin";
 import LineChart from "../../LineChart/index.vue";
 
@@ -48,6 +48,7 @@ export default {
   provide() {
     return {
       requestURL: this.requestURL,
+      updateFormData: this.updateFormData
     };
   },
   components: {
@@ -138,13 +139,7 @@ export default {
       const formData = {};
       formData.controlType = data.mode;
       await handle3CResult(data, formData, this.requestURL);
-
-      formData.controlType &&
-        this.$set(this.data, "workMode", controlModelMap[formData.controlType]); //(this.data.workMode = controlModelMap[formData.controlType]);
-      formData.inWorkStatus &&
-        this.$set(this.data, "inWorkStatus", gzztMap[formData.inWorkStatus]); //(this.data.inWorkStatus = gzztMap[formData.inWorkStatus]);
-      formData.onWorkStatus &&
-        this.$set(this.data, "onWorkStatus", gzztMap[formData.onWorkStatus]); //(this.data.onWorkStatus = gzztMap[formData.onWorkStatus]);
+      this.updateFormData({ ...formData, workMode: data.mode });
     });
 
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
@@ -157,6 +152,15 @@ export default {
     if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
+    updateFormData(formData) {
+      formData.workMode &&
+        this.$set(this.data, "workMode", controlModelMap[formData.workMode]); //(this.data.workMode = controlModelMap[formData.controlType]);
+      formData.inWorkStatus &&
+        this.$set(this.data, "inWorkStatus", gzztMap[formData.inWorkStatus]); //(this.data.inWorkStatus = gzztMap[formData.inWorkStatus]);
+      formData.onWorkStatus &&
+        this.$set(this.data, "onWorkStatus", gzztMap[formData.onWorkStatus]); //(this.data.onWorkStatus = gzztMap[formData.onWorkStatus]);
+
+    },
     handleClickTabs() { },
     requestURL(functionId = 52, options = {}) {
       return new Promise((resolve, reject) => {

From 672d8a752009de3c0ce91f677c17b72a3f317bd8 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Fri, 19 Apr 2024 10:39:07 +0800
Subject: [PATCH 09/10] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96=E7=96=B2?=
 =?UTF-8?q?=E5=8A=B3=E5=94=A4=E9=86=92=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue  | 2 +-
 .../Dialogs/FatigueWakesUp/components/DeviceParam.vue          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
index e21cc56c..41b4362a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
@@ -2,7 +2,7 @@
   <Dialog v-model="modelVisible" title="设备操作" width="910px">
     <div class="DeviceControlDialog">
       <DeviceParam v-model="modelVisible" ref="DeviceParam" :deviceId="this.deviceId" :productId="this.productId"
-        :deviceType="deviceType">
+        :deviceType="deviceType" @update:submitting="(val) => { submitting = val }">
       </DeviceParam>
     </div>
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
index 64e8e65f..d96b92cc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
@@ -261,6 +261,7 @@ export default {
     };
   },
   mounted() {
+    this.$emit("update:submitting", false);
     if (!this.isMultiControl)
       this.initData();
   },
@@ -350,6 +351,7 @@ export default {
         id: this.productId,
         deviceType: this.deviceType
       }]
+      this.$emit("update:submitting", true);
       if (this.activeName == "first") {
         //一般模式
         this.$refs.FormConfigRef.validate().then(async (formData) => {
@@ -414,6 +416,7 @@ export default {
         //   this.$emit("update:value", false);
         // }
       }
+      this.$emit("update:submitting", false);
     },
   },
 };

From 53df2ff9f29d3f1f7cfa122aaf61e9a3c958a21e Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Fri, 19 Apr 2024 11:19:21 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EditEventInformationDialog/index.vue      | 219 ++++++++++++------
 1 file changed, 152 insertions(+), 67 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
index 948b0a4e..a78c2425 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue
@@ -1,10 +1,10 @@
 <template>
   <Dialog v-model="modelVisible" title="修改事件信息" width="1100px" top="10%">
     <div class="EditEventInformationDialog">
-      <Form class="form" :formList="formConfigList" v-model="fData" labelWidth="120px" />
+      <Form class="form" ref="FormConfigRef" :formList="formConfigList" v-model="fData" labelWidth="120px" />
 
       <div class="footer">
-        <Button @click.native="onSubmit">保存</Button>
+        <Button @click.native="onSubmit" :loading="submitting">保存</Button>
         <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
       </div>
     </div>
@@ -17,6 +17,7 @@ import Form from "@screen/components/FormConfig";
 import Button from "@screen/components/Buttons/Button.vue";
 import request from "@/utils/request";
 import { tabConfigList } from "./data.js";
+import { Message } from "element-ui";
 
 const eventInfo = {
   id: "60f022d95a7c4b6cada2d780246543d8",
@@ -132,9 +133,10 @@ export default {
   },
   data() {
     return {
-      formConfigList: {},
-      // tabConfigList,
+      formConfigList: [],
+      submitting: false,
       fData: {},
+      resultEventData: {},
       eventId: '1a91d65cc31f4a9d90122888edb31043',
       roads: [],
       direction: [],
@@ -159,78 +161,161 @@ export default {
 
   },
   methods: {
-    initData() {
-      let configList = tabConfigList.find(item => item.label == '交通事故')
-      this.formConfigList = configList.formConfig.list
-      let info = eventInfo;
-      if (info.stakeMark instanceof Array) {
+    async initData() {
+      let infoData = await request({
+        url: `/dc/system/event/eventSubclass/1/60f022d95a7c4b6cada2d780246543d8`,//交通事件
+        method: "get",
+      })
+
+      if (infoData.code != 200) return Message.error(infoData?.msg);
+      this.resultEventData = { ...infoData.data };
+
+      let info = infoData.data;
+      if (typeof info.stakeMark == 'string') {
         let numbers = info.stakeMark.match(/\d+/g).map(Number);
+        // console.log('numbers', numbers);
         info.stakeMark = numbers;
       }
+      this.fData = info;
 
+      let configList = tabConfigList.find(item => item.label == this.fData.eventName)
+      this.formConfigList = configList.formConfig.list
 
-      this.fData = info;
-      // Promise.all([
-      //   //道路
-      //   request({
-      //     url: `/business/road/query`,
-      //     method: "get",
-      //   })
-      //     .then((result) => {
-      //       if (result.code != 200) return Message.error(result?.msg);
-      //       result.data.forEach((it) => {
-      //         this.roads.push({ key: it.id, label: it.roadName });
-      //       });
-      //     })
-      //     .catch((err) => {
-      //       Message.error("查询失败4", err);
-      //     }),
-      //   //方向字典
-      //   request({
-      //     url: `/system/dict/data/type/iot_event_direction`,
-      //     method: "get",
-      //   })
-      //     .then((result) => {
-      //       if (result.code != 200) return Message.error(result?.msg);
-      //       result.data.forEach((it) => {
-      //         this.direction.push({ key: it.dictValue, label: it.dictLabel });
-      //       });
-      //     })
-      //     .catch((err) => {
-      //       Message.error("查询失败5", err);
-      //     }),
-      //   //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
-      //   request({
-      //     url: `/business/facility/query`,
-      //     method: "get",
-      //   })
-      //     .then((result) => {
-      //       if (result.code != 200) return Message.error(result?.msg);
-      //       result.data.forEach((it) =>
-      //         this.lwss.push({
-      //           key: it.id,
-      //           label: it.facilityName,
-      //           type: it.facilityType,
-      //         })
-      //       );
-      //     })
-      //     .catch((err) => {
-      //       console.log("err", err);
-      //       Message.error("查询失败6", err);
-      //     }),
-      // ]);
-      // request({
-      //   url: `/dc/system/event/eventSubclass/1/60f022d95a7c4b6cada2d780246543d8`,//交通事件
-      //   method: "get",
-      // }).then(async (result) => {
-      //   if (result.code != 200) return Message.error(result?.msg);
-      //   // this.formData = result.data;
-      // })
+      await Promise.all([
+        //道路
+        request({
+          url: `/business/road/query`,
+          method: "get",
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            this.roads = [];
+            result.data.forEach((it) => {
+              this.roads.push({ key: it.id, label: it.roadName });
+            });
+          })
+          .catch((err) => {
+            Message.error("查询失败4", err);
+          }),
+        //方向字典
+        request({
+          url: `/system/dict/data/type/iot_event_direction`,
+          method: "get",
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            this.direction = []
+            result.data.forEach((it) => {
+              this.direction.push({ key: it.dictValue, label: it.dictLabel });
+            });
+          })
+          .catch((err) => {
+            Message.error("查询失败5", err);
+          }),
+        //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+        request({
+          url: `/business/facility/query`,
+          method: "get",
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            this.lwss = [];
+            result.data.forEach((it) =>
+              this.lwss.push({
+                key: it.id,
+                label: it.facilityName,
+                type: it.facilityType,
+              })
+            );
+          })
+          .catch((err) => {
+            console.log("err", err);
+            Message.error("查询失败6", err);
+          }),
+      ])
 
+      this.formConfigList.forEach((it) => {
+        if (it.key == "direction") {
+          it.options.options = this.direction;
+        }
+        if (it.key == "roadId") {
+          it.options.options = this.roads;
+        }
+        if (it.key == "dcEventServiceArea.facilityId") {
+          it.options.options = this.lwss.filter((ss) => ss.type == 6);
+        }
+      });
 
     },
     onSubmit() {
-      this.modelVisible = false;
+      this.$refs.FormConfigRef.validate().then((formData) => {
+        this.submitting = true;
+        let eventType = this.resultEventData.eventType;
+        formData.eventType == eventType;
+
+        if ((eventType == 1 || eventType == 2) && Array.isArray(formData.lang)) {
+          formData.lang = formData.lang.join(",");
+        }
+        if (eventType == 3 && formData.dcEventTrafficControl.facilityId instanceof Array) {
+          let ids = formData.dcEventTrafficControl.facilityId;
+          formData.dcEventTrafficControl.facilityIds = ids
+          formData.dcEventTrafficControl.facilityId = ''
+        }
+        if (formData.endStakeMark && formData.endStakeMark[0] != null) {
+          let endStakeMark = formData.endStakeMark;
+          let strMark = endStakeMark && endStakeMark.length > 0 ? "K" + endStakeMark[0] + "+" + endStakeMark[1] : "";
+          if (eventType == 4) {
+            formData.dcEventTrafficCongestion.endStakeMark = strMark;
+          }
+          if (eventType == 7) {
+            formData.dcEventConstruction.endStakeMark = strMark;
+          }
+          if (eventType == 10) {
+            formData.dcEventAbnormalWeather.endStakeMark = strMark;
+          }
+          formData.endStakeMark = "";
+        } else {
+          formData.endStakeMark = "";
+        }
+        let stakeMark = formData.stakeMark;
+
+        // console.log('formData', {
+        //   ...formData,
+        //   id: this.resultEventData.id,
+        //   eventState: this.resultEventData.eventState,
+        //   stakeMark: (stakeMark && stakeMark[0] != null) ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
+        // })
+        // this.submitting = false;
+        // return;
+
+        request({
+          url: `/dc/system/event`,
+          method: "put",
+          data: {
+            ...formData,
+            id: this.resultEventData.id,
+            eventState: this.resultEventData.eventState,
+            stakeMark:
+              stakeMark && stakeMark[0] != null
+                ? stakeMark && stakeMark.length > 0
+                  ? "K" + stakeMark[0] + "+" + stakeMark[1]
+                  : ""
+                : "",
+          },
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            Message.success("提交成功");
+            this.modelVisible = false;
+          })
+          .catch(() => {
+            Message.error("提交失败");
+          })
+          .finally(() => {
+            this.submitting = false;
+          });
+      });
+
     }
   }
 };