diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md
index 6f9886d8..82cc4cbe 100644
--- a/ruoyi-ui/README.md
+++ b/ruoyi-ui/README.md
@@ -84,84 +84,13 @@ data.js 表单封装,里面会使用PresetFormItems的一些FormItem.
 
 Form表单属性介绍:
 <Form labelWidth="90px" column="2" class="form" ref="FormConfigRef" :formList="formList" />
-  {
-    key: "ServiceAreaAbnormal", //唯一标识 一般tabs才需要
-    label: "服务区异常",//表单标题
-    formConfig: {
-      formOptions: {//element中表单配置参数
-        column: 2, //一行放多少元素(基于:style grid布局实现)
-      },
-      list: [//FormItem定义
-        {
-          label: "异常分类:",
-          key: "eventSubclass",
-          type: "RadioGroup",
-          isAlone: true,
-          required: true,
-          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: true,
-          required: true,
-          options: {
-            options: [
-              {
-                value: "选项1",
-                label: "黄金糕",
-              },
-            ],
-          },
-        },
-        {
-          label: "出入口:",
-          key: "dcEventServiceArea.exitsInlets",
-          type: "RadioGroup",
-          isAlone: true,
-          required: true,
-          options: {
-            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
-            options: [
-              {
-                key: "1",
-                label: "出口",
-              },
-              {
-                key: "2",
-                label: "入口",
-              },
-            ],
-          },
-        },
-        PresetFormItems.startTime,
-        PresetFormItems.expectedEndTime,
-        PresetFormItems.remark,
-        PresetFormItems.source,
-      ],
-    },
-  }
+/*
+  column:  一行放多少元素(基于:style grid布局实现)
+  formList: 表单项(FormItem)配置集合
+  v-model: 双向绑定的表单数据(可以获取到表单数据(同步表单数据this.$emit("update:value", this.formData)), 也可修改表单数据)
+*/
 
-FormItem属性介绍:
+FormItem属性介绍 & ons 事件监听:
 
 export const additionalNotes = {
   label: "补充说明:", // 标题
@@ -184,8 +113,9 @@ export const additionalNotes = {
   },
   ons: { //on监听 element事件
       change(value, ...args) {
-        const { data, formList } = args.slice(-1)\[0]; //data 为数据  formList为传入的配置项
-        mileCal(data);
+        const { data, formList } = args.slice(-1)\[0]; //data 为表单数据  formList为传入的配置项
+        formList[4].options.options = []; //调整配置项 修改下拉框options选项
+        this.$set(this.data, 'deviceState', undefined); //更新v-model双向绑定的表单数据
       }
     },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue
new file mode 100644
index 00000000..e6b921b7
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="body">
+    <div class="left">
+      <div class="title">路测广播列表</div>
+      <CheckboxGroup class="checkbox-group" gap="9px" :showIcon="true" v-model="checkList" :options="musicList"
+        id="otherConfig" label="deviceName">
+        <template #[otherConfig]="{ data }">
+          <span style="color: #6ee5fe"> {{ data.deviceName }}(当前) </span>
+        </template>
+      </CheckboxGroup>
+    </div>
+    <div class="right">
+      <div class="top-content">
+        <Video class="item-video" :pileNum="pileNum" />
+
+        <label>发布内容: </label>
+        <ElInput type="textarea" v-model="releaseMessage" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
+          showWordLimit placeholder="请输入发布内容" />
+      </div>
+
+      <div class="footer">
+        <Button style="background-color: rgba(0, 179, 204, 0.3)"
+          @click.native="(modelVisible = false), (submitting = false)">
+          取消
+        </Button>
+        <Button @click.native="handleSubmit" :loading="submitting">
+          确定
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Video from "@screen/components/Video";
+import CheckboxGroup from "@screen/components/FormConfig/components/ElCheckboxGroup.vue";
+
+import request from "@/utils/request";
+import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+
+import { Message } from "element-ui";
+
+export default {
+  name: "BroadcastReleases",
+  components: {
+    Dialog,
+    Button,
+    Video,
+    CheckboxGroup,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  props: {
+    visible: Boolean,
+    pileNum: String,
+    otherConfig: String,
+  },
+  data() {
+    return {
+      submitting: false,
+      checkList: [],
+      releaseMessage: null,
+      musicList: [],
+    };
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      },
+    },
+  },
+  created() {
+    getDeviceList(5).then((data) => {
+      if (Array.isArray(data))
+        this.musicList = data.map((item) => ({
+          ...item,
+          disabled: item.deviceState != 1,
+        }));
+    });
+  },
+  methods: {
+    handleSubmit() {
+      if (!this.releaseMessage?.trim())
+        return Message.error("发布内容不能为空!");
+      if (!this.checkList.length)
+        return Message.error("请至少选择一个广播设备!");
+
+      this.submitting = true;
+
+      request({
+        url: `/broadcast/broadcastFunctionCall`,
+        method: "post",
+        data: {
+          name: "task-3",
+          outVol: "6",
+          priority: "1",
+          text: this.releaseMessage.trim(),
+          repeatTimes: "3",
+          termList: this.checkList.map((str) => JSON.parse(str)),
+          functionType: "startPaTts",
+        },
+      })
+        .then((data) => {
+          // console.log(data);
+          if (data.retCode == "0") {
+            Message.success("广播设置成功!");
+            this.modelVisible = false;
+          } else {
+            Message.error("广播设置失败!");
+          }
+        })
+        .finally(() => {
+          this.submitting = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.body {
+  display: flex;
+  gap: 9px;
+  height: 100%;
+
+  .left {
+    width: 251px;
+    border-radius: 3px 3px 3px 3px;
+    border: 1px solid #3de8ff;
+    padding: 3px 12px;
+    display: flex;
+    flex-direction: column;
+    gap: 9px;
+
+    ::v-deep .el-checkbox__label {
+      display: flex !important;
+      justify-content: space-between;
+      width: 100%;
+
+      .title {
+        flex: 1;
+        width: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        word-break: keep-all;
+      }
+
+      .state {
+        width: 18px;
+        height: 18px;
+        margin-right: 4px;
+      }
+
+      .huiduButton {
+        background: transparent;
+        border: none;
+        height: 18px;
+        width: 18px;
+        line-height: 20px;
+        padding: 0;
+        color: #fff;
+        font-size: 16px;
+      }
+
+      .huiduButton:hover {
+        color: #05afe3 !important;
+      }
+    }
+
+    .checkbox-group {
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+      overflow: auto;
+      height: 100%;
+      flex: 1;
+      flex-wrap: nowrap;
+    }
+  }
+
+  .right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .top-content {
+      display: flex;
+      flex-direction: column;
+      gap: 9px;
+
+      .item-video {
+        width: 545px;
+      }
+
+      label {
+        font-size: 16px;
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 400;
+        color: #3de8ff;
+        line-height: 19px;
+      }
+    }
+  }
+}
+
+.footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 9px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
index 019b76c1..01cbfb3f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
@@ -1,51 +1,37 @@
 <template>
   <Dialog v-model="modelVisible" title="广播发布" width="850px">
     <div class="BroadcastReleases">
-      <div class="body">
+      <BroadcastParam v-model="modelVisible" :pileNum="pileNum" :otherConfig="otherConfig" />
+      <!-- <div class="body">
         <div class="left">
           <div class="title">路测广播列表</div>
-          <CheckboxGroup
-            class="checkbox-group"
-            gap="9px"
-            :showIcon="true"
-            v-model="checkList"
-            :options="musicList"
-            id="otherConfig"
-            label="deviceName"
-          >
+          <CheckboxGroup class="checkbox-group" gap="9px" :showIcon="true" v-model="checkList" :options="musicList"
+            id="otherConfig" label="deviceName">
             <template #[otherConfig]="{ data }">
               <span style="color: #6ee5fe"> {{ data.deviceName }}(当前) </span>
             </template>
-          </CheckboxGroup>
-        </div>
-        <div class="right">
-          <div class="top-content">
-            <Video class="item-video" :pileNum="pileNum" />
-
-            <label>发布内容: </label>
-            <ElInput
-              type="textarea"
-              v-model="releaseMessage"
-              :autosize="{ minRows: 3, maxRows: 3 }"
-              :maxlength="150"
-              showWordLimit
-              placeholder="请输入发布内容"
-            />
-          </div>
-
-          <div class="footer">
-            <Button
-              style="background-color: rgba(0, 179, 204, 0.3)"
-              @click.native="(modelVisible = false), (submitting = false)"
-            >
-              取消
-            </Button>
-            <Button @click.native="handleSubmit" :loading="submitting">
-              确定
-            </Button>
-          </div>
-        </div>
-      </div>
+</CheckboxGroup>
+</div>
+<div class="right">
+  <div class="top-content">
+    <Video class="item-video" :pileNum="pileNum" />
+
+    <label>发布内容: </label>
+    <ElInput type="textarea" v-model="releaseMessage" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
+      showWordLimit placeholder="请输入发布内容" />
+  </div>
+
+  <div class="footer">
+    <Button style="background-color: rgba(0, 179, 204, 0.3)"
+      @click.native="(modelVisible = false), (submitting = false)">
+      取消
+    </Button>
+    <Button @click.native="handleSubmit" :loading="submitting">
+      确定
+    </Button>
+  </div>
+</div>
+</div> -->
     </div>
   </Dialog>
 </template>
@@ -55,7 +41,7 @@ import Dialog from "@screen/components/Dialog/index.vue";
 import Button from "@screen/components/Buttons/Button.vue";
 import Video from "@screen/components/Video";
 import CheckboxGroup from "@screen/components/FormConfig/components/ElCheckboxGroup.vue";
-
+import BroadcastParam from "./BroadcastParam.vue";
 import request from "@/utils/request";
 import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 
@@ -68,6 +54,7 @@ export default {
     Button,
     Video,
     CheckboxGroup,
+    BroadcastParam
   },
   model: {
     prop: "visible",
@@ -75,9 +62,7 @@ export default {
   },
   props: {
     visible: Boolean,
-    deviceId: String,
     pileNum: String,
-    currentId: [String, Number],
     otherConfig: String,
   },
   data() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
index 21008c8e..033773fa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
@@ -10,11 +10,7 @@
         </ElTabPane>
         <!-- <ElTabPane label="设备参数" name="second">设备参数</ElTabPane> -->
         <ElTabPane label="在线率统计" name="third">
-          <LineChart
-            v-if="activeName === 'third'"
-            :productId="dialogData.id"
-            style="height: 150px"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 150px" />
         </ElTabPane>
       </ElTabs>
 
@@ -23,13 +19,7 @@
       </div>
     </div>
 
-    <BroadcastReleases
-      v-model="releaseVisible"
-      :deviceId="dialogData.iotDeviceId"
-      :pileNum="dialogData.stakeMark"
-      :otherConfig="dialogData.otherConfig"
-      :currentId="dialogData.id"
-    />
+    <BroadcastReleases v-model="releaseVisible" :pileNum="dialogData.stakeMark" :otherConfig="dialogData.otherConfig" />
   </Dialog>
 </template>
 
@@ -131,7 +121,7 @@ export default {
     if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
-    handleClickTabs() {},
+    handleClickTabs() { },
   },
 };
 </script>
@@ -171,7 +161,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/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
index e24e8e8a..2fc0ff81 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
@@ -90,7 +90,6 @@ export default {
   watch: {
     activeDeviceTypes: {
       handler(val) {
-        console.log(val, this.activeDeviceTypes, 'xxx')
         const options = []
         for (let id of DeviceTypeIds) {
           if (this.activeDeviceTypes.indexOf(`路测设备_${id}`) >= 0) {
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 31acbadd..78bf3965 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,10 +37,11 @@ import { delay } from "@screen/utils/common";
 import { initSearch } from "@screen/utils/enum/common.js"
 
 import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent"
-const DeviceTopics = {}
+const controlMulti = ["情报板", "行车诱导", "疲劳唤醒", "合流区", "设备箱", "语音广播"];
+const DeviceTopics = {};//6种批量控制 事件专题 {key:label}
 
 Object.keys(DeviceForMap).forEach(DeviceLabel => {
-  DeviceTopics[DeviceForMap[DeviceLabel].deviceType] = DeviceLabel;
+  controlMulti.indexOf(DeviceLabel) !== -1 && (DeviceTopics[DeviceForMap[DeviceLabel].deviceType] = DeviceLabel);
 });
 async function setDeviceOptions(config, filterData, formList) {
   const data = await getDeviceList(config.deviceType, filterData).then(async (data) => {
@@ -248,7 +249,7 @@ export default {
           const match = activeDeviceType.match(/路测设备_(\d+)/);
           if (match) {
             const deviceType = match[1];
-            activeTopicOptions.push({ label: DeviceTopics[deviceType], value: deviceType });
+            DeviceTopics[deviceType] && activeTopicOptions.push({ label: DeviceTopics[deviceType], value: deviceType });
 
           }
         });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 74a6d568..b1ff7993 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -246,7 +246,6 @@ export default {
         this.emitter.emit("selectedCompleted", item);
         return this.$emit("onClickItem", item);
       }
-      console.log(`${key}${status ? "_close" : ""}`, this.filterData, isDefault)
 
       await eventMap[`${key}${status ? "_close" : ""}`]?.call(this, item, this.filterData, isDefault, this.cb);
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
index b0fd17c3..fc62b317 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
@@ -1,13 +1,9 @@
 <template>
   <div class="Home">
-    <AMapContainer
-      ref="AMapContainerRef"
-      @update:isGisCompleted="
-        (data) => {
-          this.isGisCompleted = data;
-        }
-      "
-    />
+    <AMapContainer ref="AMapContainerRef" @update:isGisCompleted="(data) => {
+        this.isGisCompleted = data;
+      }
+      " />
     <section class="content">
       <!-- 左侧 -->
       <div class="content-l">
@@ -15,11 +11,7 @@
         <FocusedMonitoring class="card-menu" />
 
         <!-- 下 -->
-        <RoadAndEvents
-          ref="RoadAndEventsRef"
-          :isGisCompleted="isGisCompleted"
-          class="content-l-b card-menu"
-        />
+        <RoadAndEvents ref="RoadAndEventsRef" :isGisCompleted="isGisCompleted" class="content-l-b card-menu" />
       </div>
 
       <!-- 右侧 -->
@@ -30,7 +22,7 @@
           <HomeVector class="item" />
           <HomeWord class="item" />
           <!-- <HomeVectorControl class="item" /> -->
-          <!-- <HomeFrameControl class="item" /> -->
+          <HomeFrameControl class="item" />
         </div>
         <ConditionStatistics class="right card-menu" />
       </div>
@@ -39,11 +31,7 @@
     <footer class="footer card-menu">
       <div class="footer-title">
         <span>济菏高速缩略图</span>
-        <i
-          class="el-icon-s-fold"
-          style="color: #2ad9fd; transform: rotate(-90deg)"
-          @click.stop="handleShrink"
-        />
+        <i class="el-icon-s-fold" style="color: #2ad9fd; transform: rotate(-90deg)" @click.stop="handleShrink" />
       </div>
       <div class="footer-content">
         <Thumbnail />
@@ -147,7 +135,7 @@ export default {
     height: min-content;
     pointer-events: none;
 
-    > div {
+    >div {
       pointer-events: auto;
     }
 
@@ -161,7 +149,7 @@ export default {
       overflow: hidden;
       height: 100%;
 
-      > div {
+      >div {
         pointer-events: all;
         flex: 1;
       }
@@ -202,7 +190,7 @@ export default {
     will-change: height;
     bottom: 0;
 
-    > div {
+    >div {
       pointer-events: all;
     }
 
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 59cb6169..9bdd89a4 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
@@ -15,8 +15,8 @@
     ? formData.videoList[1] : ''" :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
           :videoType="formData.videoType" />
 
-        <Carousel v-if="activeName == '-1'" style="flex: 1" :videos="formData.videoList" :pictures="[]"/>
-        <Carousel v-if="activeName == '-1'" style="flex: 1" :pictures="formData.pictures" :videos="[]"/>
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :videos="formData.videoList" :pictures="[]" />
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :pictures="formData.pictures" :videos="[]" />
 
       </div>
       <!-- <div>{{ formData.videoList[0] }}</div> -->
@@ -206,6 +206,7 @@ export default {
       }
     },
     onSubmit() {
+      return;
       let url = "/business/plans/list/warning/type";
       if (this.activeName == "-1") {
         url = "/business/plans/list/warning/type";
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
index 0516f4e2..251c488c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
@@ -842,6 +842,7 @@ export const tabConfigList = [
           required: true,
           options: {
             options: [],
+            multiple: true,
           },
           visible: (data) => {
             if (data?.eventSubclass == "3-2") {
@@ -858,6 +859,7 @@ export const tabConfigList = [
           required: true,
           options: {
             options: [],
+            multiple: true,
           },
           visible: (data) => {
             if (data?.eventSubclass == "3-3") {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
index 6474542a..70f91816 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
@@ -2,37 +2,18 @@
   <Dialog v-model="modelVisible" title="交通事故录入" width="1100px" top="14%">
     <div class="EventDetailDialog">
       <ElTabs v-model="activeName" @tab-click="handleChange">
-        <ElTabPane
-          v-for="(item, index) in tabConfigList"
-          :key="index"
-          :label="item.label"
-          :name="item.key"
-        />
+        <ElTabPane v-for="(item, index) in tabConfigList" :key="index" :label="item.label" :name="item.key" />
       </ElTabs>
 
       <Transition name="fade">
-        <Form
-          class="form"
-          ref="FormConfigRef"
-          :formList="formConfig.list"
-          v-bind="getFormOptions"
-          labelWidth="120px"
-        />
+        <Form class="form" ref="FormConfigRef" :formList="formConfig.list" v-bind="getFormOptions" labelWidth="120px" />
       </Transition>
     </div>
 
     <template #footer>
-      <Button
-        style="background: #c9c9c9; padding: 0 24px"
-        @click.native="(modelVisible = false), (submitting = false)"
-        >取消</Button
-      >
-      <Button
-        style="padding: 0 24px"
-        @click.native="handleSubmit"
-        :loading="submitting"
-        >保存</Button
-      >
+      <Button style="background: #c9c9c9; padding: 0 24px"
+        @click.native="(modelVisible = false), (submitting = false)">取消</Button>
+      <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">保存</Button>
     </template>
   </Dialog>
 </template>
@@ -180,12 +161,14 @@ export default {
         } else {
           formData.lang = "";
         }
+        if (this.index == 2 && formData.dcEventTrafficControl.facilityId instanceof Array) {
+          let ids = formData.dcEventTrafficControl.facilityId.join(',');
+          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]
-              : "";
+          let strMark = endStakeMark && endStakeMark.length > 0 ? "K" + endStakeMark[0] + "+" + endStakeMark[1] : "";
           if (this.index == 3) {
             formData.dcEventTrafficCongestion.endStakeMark = strMark;
           }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
new file mode 100644
index 00000000..a6b44689
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
@@ -0,0 +1,413 @@
+<template>
+    <div class="ScopeTable">
+        <el-row>
+            <el-col :span="2">
+                <p>设备资源:</p>
+            </el-col>
+            <el-col :span="4">
+                <!-- 设备类型 -->
+                <el-select v-model="tableInfo.deviceType" placeholder="" @change="changeDeviceType" transfer="true"
+                    :popper-append-to-body="false">
+                    <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-col>
+            <el-col :span="4">
+                <!-- 规则条件 -->
+                <el-select v-model="tableInfo.searchRule" placeholder="">
+                    <el-option v-for="item in zyOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-col>
+            <el-col :span="4">
+                <!-- 设备列表 -->
+                <el-select v-if="tableInfo.searchRule == 1" v-model="tableInfo.devList" placeholder="请选择设备" multiple
+                    collapse-tags>
+                    <el-option v-for="item in sbOptions" :key="item.id" :label="item.deviceName" :value="item.id">
+                    </el-option>
+                </el-select>
+                <!-- 个 -->
+                <el-input-number v-if="tableInfo.searchRule == 2 || tableInfo.searchRule == 3"
+                    v-model="tableInfo.number" :min="0" :max="9999" style="width: 130px;"></el-input-number>
+                <span v-if="tableInfo.searchRule == 2 || tableInfo.searchRule == 3">个</span>
+                <!-- 公里 -->
+                <el-input-number v-if="tableInfo.searchRule == 4" v-model="tableInfo.number" :min="0" :max="9999"
+                    style="width: 130px;"></el-input-number>
+                <span v-if="tableInfo.searchRule == 4" style="width: 56px;">公里</span>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="2">
+                <p>执行操作:</p>
+            </el-col>
+            <!-- 可变信息标识 -->
+            <el-col v-if="tableInfo.deviceType == 2" :span="4">
+                <el-select v-model="tableInfo.zx_operationType" placeholder="请选择">
+                    <el-option label="自定义发布" :value="1"></el-option>
+                    <el-option label="智能发布" :value="2"></el-option>
+                </el-select>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 2 && tableInfo.zx_operationType == 1" :span="4">
+                <el-input @click.native="clickQbb('zx_content')" placeholder="请选择" v-model="tableInfo.zx_content" readonly>
+                    <i slot="suffix" class="el-input__icon el-icon-search"></i>
+                </el-input>
+            </el-col>
+            <!-- 疲劳唤醒 -->
+            <el-col v-if="tableInfo.deviceType == 10" :span="4">
+                <el-select v-model="tableInfo.zx_name" placeholder="工作模式">
+                    <el-option v-for="item in gzmsOptions" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
+                </el-select>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 10" :span="4">
+                <el-input-number placeholder="" v-model="tableInfo.zx_operationDuration" :min="0"
+                    :max="999"></el-input-number>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 10" :span="2">
+                <span>时长(分钟)</span>
+            </el-col>
+            <!-- 行车诱导 -->
+            <el-col v-if="tableInfo.deviceType == 12" :span="4">
+                <el-select v-model="tableInfo.zx_controlModel" placeholder="请选择模式" transfer="true"
+                    :popper-append-to-body="false">
+                    <el-option label="手动模式" value="00"></el-option>
+                    <el-option label="自动模式" value="01"></el-option>
+                    <el-option label="万年历" value="02"></el-option>
+                </el-select>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 12 && tableInfo.zx_controlModel == '01'" :span="4">
+                <el-time-picker v-model="tableInfo.zx_time" is-range style="" range-separator="-" placeholder="选择时间"
+                    value-format="HH:mm" format="HH:mm">
+                </el-time-picker>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 12" :span="4">
+                <el-select v-model="tableInfo.zx_state" placeholder="工作状态">
+                    <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
+                </el-select>
+            </el-col>
+            <!-- 语音广播 -->
+            <el-col v-if="tableInfo.deviceType == 5" :span="4">
+                <el-select v-model="tableInfo.zx_operationType" placeholder="请选择">
+                    <el-option label="自定义发布" :value="1"></el-option>
+                    <el-option label="智能发布" :value="2"></el-option>
+                </el-select>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 5 && tableInfo.zx_operationType == 1" :span="4">
+                <el-input v-model="tableInfo.zx_content" placeholder="请输入发布内容"></el-input>
+            </el-col>
+        </el-row>
+
+        <el-row>
+            <el-col :span="2">
+                <p>恢复操作:</p>
+            </el-col>
+            <!-- 可变信息标识 -->
+            <el-col v-if="tableInfo.deviceType == 2" :span="4">
+                <el-select v-model="tableInfo.hf_operationType" placeholder="请选择">
+                    <el-option label="自定义发布" :value="1"></el-option>
+                    <el-option label="还原上次" :value="2"></el-option>
+                </el-select>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 2 && tableInfo.hf_operationType == 1" :span="4">
+                <el-input @click.native="clickQbb('hf_content')" placeholder="请选择" v-model="tableInfo.hf_content" readonly>
+                    <i slot="suffix" class="el-input__icon el-icon-search"></i>
+                </el-input>
+            </el-col>
+            <!-- 疲劳唤醒 -->
+            <el-col v-if="tableInfo.deviceType == 10" :span="4">
+                <el-select v-model="tableInfo.hf_name" placeholder="工作模式">
+                    <el-option v-for="item in gzmsOptions" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
+                </el-select>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 10" :span="4">
+                <el-input-number placeholder="" v-model="tableInfo.hf_operationDuration" :min="0"
+                    :max="999"></el-input-number>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 10" :span="2">
+                <span>时长(分钟)</span>
+            </el-col>
+            <!-- 行车诱导 -->
+            <el-col v-if="tableInfo.deviceType == 12" :span="4">
+                <el-select v-model="tableInfo.hf_controlModel" placeholder="请选择模式" transfer="true"
+                    :popper-append-to-body="false">
+                    <el-option label="手动模式" value="00"></el-option>
+                    <el-option label="自动模式" value="01"></el-option>
+                    <el-option label="万年历" value="02"></el-option>
+                </el-select>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 12 && tableInfo.hf_controlModel == '01'" :span="4">
+                <el-time-picker v-model="tableInfo.hf_time" is-range style="" range-separator="-" placeholder="选择时间"
+                    value-format="HH:mm" format="HH:mm">
+                </el-time-picker>
+            </el-col>
+            <el-col v-if="tableInfo.deviceType == 12" :span="4">
+                <el-select v-model="tableInfo.hf_state" placeholder="工作状态">
+                    <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
+                </el-select>
+            </el-col>
+            <!-- 语音广播 -->
+            <!-- <el-col v-if="tableInfo.deviceType == 5" :span="4">
+                <el-select v-model="tableInfo.hf_operationType" placeholder="请选择">
+                    <el-option label="自定义发布" :value="1"></el-option>
+                    <el-option label="智能发布" :value="2"></el-option>
+                </el-select>
+            </el-col> -->
+            <el-col v-if="tableInfo.deviceType == 5 && tableInfo.hf_operationType == 1" :span="4">
+                <el-input v-model="tableInfo.hf_content" placeholder="请输入发布内容"></el-input>
+            </el-col>
+        </el-row>
+
+
+
+
+        <!-- 情报板弹窗 -->
+        <QbbDialog :visible="isShowDialog" :info="qbbData" @close="onCloseDialog" @dialogSubmit="dialogSubmit" />
+    </div>
+</template>
+
+<script>
+import Table from '@screen/components/Table.vue';
+import Button from '@screen/components/Buttons/Button.vue';
+import request from "@/utils/request";
+import QbbDialog from "../qbbDialog/index.vue";
+import { Message } from 'element-ui'
+import { planDeviceOptions } from "@screen/utils/enum.js";
+import { defaultTableInfo } from "../data";
+
+export default {
+    name: 'ScopeTable',
+    components: {
+        Button,
+        Table,
+        QbbDialog
+    },
+    model: {
+        prop: 'visible',
+        event: 'update:value'
+    },
+    inject: ['loadData'],
+    props: {
+        visible: Boolean,
+        eventType: Number,
+        type: Number,
+        tableInfo: {
+            type: Object,
+            default: () => ({...defaultTableInfo})
+        }
+    },
+    data() {
+        return {
+            isShowDialog: false,
+            deviceOptions: planDeviceOptions,
+            zyOptions: [
+                {
+                    value: 1,
+                    label: '指定设备资源'
+                },
+                {
+                    value: 2,
+                    label: '事发上游最近'
+                },
+                {
+                    value: 3,
+                    label: '事发下游最近'
+                },
+                {
+                    value: 4,
+                    label: '最近公里数'
+                },
+            ],
+            gzztOptions: [
+                {
+                    value: "01",
+                    label: "常亮"
+                },
+                {
+                    value: "02",
+                    label: "流水"
+                },
+                {
+                    value: "03",
+                    label: "闪烁"
+                },
+                {
+                    value: "04",
+                    label: "关闭",
+                }
+            ],
+            gzmsOptions: [
+                {
+                    value: "激光关闭",
+                    label: "激光关闭"
+                },
+                {
+                    value: "常亮模式",
+                    label: "常亮模式"
+                },
+                {
+                    value: "间隔100ms闪烁模式",
+                    label: "间隔100ms闪烁模式"
+                },
+                {
+                    value: "间隔200ms闪烁模式",
+                    label: "间隔200ms闪烁模式",
+                },
+                {
+                    value: "间隔500ms闪烁模式",
+                    label: "间隔500ms闪烁模式",
+                },
+                {
+                    value: "2次闪烁模式",
+                    label: "2次闪烁模式"
+                },
+                {
+                    value: "SOS模式",
+                    label: "SOS模式"
+                },
+                {
+                    value: "自定义模式1",
+                    label: "自定义模式1",
+                },
+                {
+                    value: "自定义模式2",
+                    label: "自定义模式2",
+                },
+                {
+                    value: "自定义模式3",
+                    label: "自定义模式3",
+                }
+            ],
+            qbbData: {},
+            sbOptions: [],
+            deviceType: 1,
+            clickQbbName: 1
+        }
+    },
+    watch: {
+        // async tableData(newValue) {
+        //     console.log('newValue', newValue)
+        //     if (newValue) {
+        //         const item = this.tableData.find(it => it.searchRule == 1);
+        //         console.log('item', item);
+        //         if (item && item.deviceType) {
+        //             let loadData = await this.loadData(item.deviceType);
+        //             console.log('aa', loadData)
+        //             this.sbOptions = loadData;
+        //         }
+        //     }
+        // }
+    },
+    async mounted() {
+        let loadData = await this.loadData(2);
+        // console.log('aa', loadData)
+        this.sbOptions = loadData;
+    },
+    methods: {
+        initData() {
+
+        },
+        async changeDeviceType(value) {
+            this.deviceType = value;
+            console.log('value', value)
+            this.sbOptions = await this.loadData(value);
+        },
+        onAdd(id) {
+            this.tableData.push({
+                deviceType: 1,
+                searchRule: 1,
+                qbb: ''
+            })
+        },
+        onDel(index) {
+            if (this.tableData.length <= 1) {
+                return Message.warning('最后一项不可删除！');
+            }
+            this.tableData.splice(index, 1)
+        },
+        clickQbb(name) {
+            this.clickQbbName = name;
+            // this.qbbData = this.tableData[index].dcInfoBoardTemplate;
+            this.isShowDialog = true;
+        },
+        onCloseDialog() {
+            this.isShowDialog = false;
+        },
+        dialogSubmit(data) {
+            console.log('qbbData',data)
+            this.tableInfo[this.clickQbbName] = data.content;
+            // this.tableData[this.index].otherConfig = JSON.stringify(data);
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.ScopeTable {
+    display: flex;
+    gap: 9px;
+    width: 100%;
+    // height: 768px;
+    min-height: 50px;
+    margin-top: 5px;
+    flex-direction: column;
+
+    p {
+        color: aqua;
+    }
+
+    ::v-deep {
+        .el-table .el-table__cell {
+            padding: 0 5px;
+        }
+
+        .el-col-4 {
+            margin-left: 6px;
+        }
+    }
+
+    .mjs {
+        display: flex;
+
+        >div {
+            margin-right: 10px;
+        }
+    }
+
+    .ms {
+        width: 160px;
+    }
+
+    .plhx {
+        display: flex;
+    }
+
+    ::v-deep {
+        .el-tag.el-tag--info {
+            max-width: 100px;
+        }
+
+        .el-range-editor--medium .el-range__icon,
+        .el-range-editor--medium .el-range__close-icon {
+            display: none;
+        }
+    }
+
+}
+
+.elButton {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    color: #FFFFFF;
+}
+
+.elButton:hover,
+.elButton:focus {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    border-color: #FFFFFF;
+    color: #FFFFFF;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index copy.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index copy.vue
new file mode 100644
index 00000000..653eed22
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index copy.vue	
@@ -0,0 +1,472 @@
+<template>
+  <Dialog v-model="modelVisible" :title="title" width="1330px">
+    <div class="EventAddPlanDialog">
+      <ElForm :model="formData" inline :rules="rules" ref="ruleForm">
+        <div class="first">
+          <el-form-item prop="eventCategory">
+            <el-radio-group v-model="formData.eventCategory" @input="changeRadio">
+              <el-radio-button :label="1">交通事件</el-radio-button>
+              <el-radio-button :label="2">感知事件</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item required label="预案名称:" prop="planName">
+            <el-input v-model="formData.planName" placeholder="请输入预案名称"></el-input>
+          </el-form-item>
+          <el-form-item required label="事件类型:" prop="eventType">
+            <el-select v-model="formData.eventType" placeholder="请选择事件类型" @change="changeEventType">
+              <el-option v-for="item in eventOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="触发类型:" prop="triggerMechanism">
+            <el-select v-model="formData.triggerMechanism" placeholder="请选择触发类型">
+              <el-option v-for="item in mechanismOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+
+        <div class="second">
+          <el-row>
+            <el-col :span="2">
+              <div class="text"><i style="color: red">*</i>执行操作:</div>
+            </el-col>
+            <el-col :span="22">
+              <FormTable ref="secondFormTable" :tableData="secondFormData" :type="1"></FormTable>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="third">
+          <el-row>
+            <el-col :span="2">
+              <div class="text"><i style="color: red">*</i>恢复操作:</div>
+            </el-col>
+            <el-col :span="22">
+              <FormTable ref="thirdFormTable" :tableData="thirdFormData" :type="2"></FormTable>
+            </el-col>
+          </el-row>
+        </div>
+      </ElForm>
+    </div>
+
+    <template #footer>
+      <Button style="background: #c9c9c9; padding: 0 24px"
+        @click.native="(modelVisible = false), (submitting = false)">取消</Button>
+      <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">保存</Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index";
+import Form from "@screen/components/FormConfig";
+import FormTable from "../formTable/index";
+import Button from "@screen/components/Buttons/Button.vue";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import { throttle } from "lodash";
+import {
+  controlModelMap,
+  gzztMap,
+  gzmsMap,
+  eventSubClassMap,
+  trafficKV,
+  WarningTypeList as perceptionKV,
+} from "@screen/utils/enum.js";
+
+const typeMap = {
+  1: trafficKV,
+  2: perceptionKV,
+};
+
+export default {
+  name: "addAndEditDialog",
+  components: {
+    Dialog,
+    Form,
+    Button,
+    FormTable,
+  },
+  model: {
+    prop: "visible",
+    event: "close",
+  },
+  provide() {
+    return {
+      // loadData: throttle(this.loadData, 100)
+      loadData: this.loadData,
+    };
+  },
+  props: {
+    visible: Boolean,
+    detail: {
+      type: Object,
+      default: () => { },
+    },
+  },
+  data() {
+    return {
+      title: "新增预案",
+      dialogType: 1,
+      planId: 0,
+      submitting: false,
+      formData: {
+        eventCategory: 1,
+        eventType: 1,
+        triggerMechanism: "",
+      },
+      secondFormData: [
+        {
+          deviceType: 1,
+          searchRule: 1,
+          qbb: "",
+        },
+      ],
+      thirdFormData: [
+        {
+          deviceType: 1,
+          searchRule: 1,
+          qbb: "",
+        },
+      ],
+      deviceData: [],
+      eventOptions: trafficKV,
+      mechanismOptions: [
+        {
+          value: "1-1",
+          label: "追尾",
+        },
+        {
+          value: "1-2",
+          label: "侧翻",
+        },
+        {
+          value: "1-3",
+          label: "撞护栏",
+        },
+        {
+          value: "1-4",
+          label: "自然",
+        },
+        {
+          value: "1-5",
+          label: "其他事故",
+        },
+      ],
+      rules: {
+        planName: [{ required: true, message: "请输入预案名称" }],
+        eventType: [
+          { required: true, message: "请选择事件类型", trigger: "change" },
+        ],
+      },
+    };
+  },
+  mounted() { },
+  computed: {
+    modelVisible: {
+      get() {
+        if (this.visible) {
+          if (Object.keys(this.detail).length > 0) {
+            this.title = "修改预案";
+            this.dialogType = 2;
+            this.eventOptions = typeMap[this.detail.eventCategory];
+            this.mechanismOptions =
+              eventSubClassMap[this.detail.eventCategory || 1][
+              this.detail.eventType
+              ];
+            this.initData(this.detail.id);
+          } else {
+            this.title = "新增预案";
+            this.dialogType = 1;
+            this.formData = {
+              eventCategory: 1,
+              eventType: 1,
+              triggerMechanism: "",
+            };
+            this.secondFormData = [
+              {
+                deviceType: 1,
+                searchRule: 1,
+                qbb: "",
+              },
+            ];
+            this.thirdFormData = [
+              {
+                deviceType: 1,
+                searchRule: 1,
+                qbb: "",
+              },
+            ];
+          }
+        }
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("close", val);
+      },
+    },
+  },
+  methods: {
+    initData(id = 1) {
+      request({
+        url: `/business/plans/list/${id}`,
+        method: "get",
+      })
+        .then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          let data = result.data;
+          let dcExecuteAction = result.data.dcExecuteAction;
+
+          this.planId = data.id;
+          this.formData = {
+            eventCategory: data.eventCategory,
+            planName: data.planName,
+            eventType: data.eventType,
+            triggerMechanism: data.triggerMechanism,
+          };
+          this.secondFormData = [];
+          this.thirdFormData = [];
+          dcExecuteAction.forEach((it) => {
+            let action = {};
+            if (it.otherConfig) {
+              let config = JSON.parse(it.otherConfig);
+              let qbb = "";
+              if (config.id) {
+                qbb = config.content;
+                config = { dcInfoBoardTemplate: config };
+              }
+              // if (config.state) {
+              //     config.gzms = config.state
+              // }
+              action = { ...it, ...config, qbb: qbb };
+            }
+            if (it.deviceList) {
+              action.deviceList = it.deviceList
+                .split(",")
+                .map((str) => Number(str));
+            }
+            if (it.actionType == 1) {
+              this.secondFormData.push(action);
+            } else if (it.actionType == 2) {
+              this.thirdFormData.push(action);
+            }
+          });
+          console.log("secondFormData", this.secondFormData);
+        })
+        // console.log('secondFormData', this.secondFormData)
+        // }).catch((err) => {
+        //   console.log(err)
+        //   Message.error("查询事件预案列表失败", err);
+        // })
+
+        .catch((err) => {
+          console.log(err);
+          Message.error("查询事件预案列表失败", err);
+        });
+    },
+    async loadData(deviceType = 1) {
+      this.deviceData = [];
+      let result = await request({
+        url: `business/device/query?deviceType=${deviceType}`,
+        method: "get",
+      });
+      if (result.code != 200) return Message.error(result?.msg);
+      if (deviceType == 1) {
+        this.deviceData = result.data.filter((it) => it.childType !== "1-1");
+      } else {
+        this.deviceData = result.data;
+      }
+      return this.deviceData;
+    },
+    changeEventType(value = 1) {
+      this.mechanismOptions =
+        eventSubClassMap[this.formData.eventCategory || 1][value];
+    },
+    changeRadio(value = 1) {
+      this.formData.triggerMechanism = "";
+      this.eventOptions = typeMap[value];
+      this.changeEventType(1);
+    },
+    handleChange() { },
+    formatData(it, value = 1, id = "") {
+      let data = { ...it, actionType: value, emergencyPlansId: id };
+      if (
+        it.deviceList &&
+        typeof it.deviceList !== "string" &&
+        it.deviceList.length > 0
+      ) {
+        data.deviceList = it.deviceList.join(",");
+      } else {
+        data.deviceList = "";
+      }
+      if (it.content) {
+        data.otherConfig = JSON.stringify({ content: it.content });
+      }
+      if (it.controlModel) {
+        let other = {
+          controlModel: it.controlModel,
+          controlModelName: controlModelMap[it.controlModel],
+          state: it.state,
+          name: gzztMap[it.state],
+        };
+        if (it.time && it?.time[0]) {
+          other = {
+            controlModel: it.controlModel,
+            controlModelName: controlModelMap[it.controlModel],
+            state: it.state,
+            name: gzztMap[it.state],
+            startTime: it.time[0],
+            endTime: it.time[1],
+          };
+        }
+        data.otherConfig = JSON.stringify(other);
+      }
+      if (it.gzms) {
+        data.otherConfig = JSON.stringify({
+          state: it.gzms,
+          name: gzmsMap[it.gzms],
+          operationDuration: it.operationDuration,
+        });
+      }
+      return data;
+    },
+    handleSubmit() {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          // this.submitting = false;
+          let secondFormTable = this.$refs["secondFormTable"].tableData || [];
+          let thirdFormTable = this.$refs["thirdFormTable"].tableData || [];
+          // let flg = false;
+          // for (let item of secondFormTable) {
+          //   if (this.areAllValuesEmpty(item)) { flg = true; break };
+          // }
+          // if (flg) return Message.warning('执行操作子项不能为空！');
+          // for (let item of thirdFormTable) {
+          //   if (this.areAllValuesEmpty(item)) { flg = true; break };
+          // }
+          // if (flg) return Message.warning('恢复操作子项不能为空！');
+          // console.log('12', secondFormTable);
+          // console.log('34', thirdFormTable);
+          let dcArr = [];
+          let id = "";
+          if (this.dialogType == 2) id = this.planId;
+          secondFormTable.forEach((it) => {
+            dcArr.push(this.formatData(it, 1, id));
+          });
+          thirdFormTable.forEach((it) => {
+            dcArr.push(this.formatData(it, 2, id));
+          });
+
+          console.log({
+            ...this.formData,
+            dcExecuteAction: dcArr,
+          });
+          // return;
+          if (this.dialogType == 1) {
+            //新增
+            request({
+              url: `/business/plans`,
+              method: "post",
+              data: {
+                ...this.formData,
+                dcExecuteAction: dcArr,
+              },
+            })
+              .then((result) => {
+                if (result.code != 200) return Message.error(result?.msg);
+                Message.success("提交成功");
+                this.modelVisible = false;
+              })
+              .catch(() => {
+                Message.error("提交失败");
+              })
+              .finally(() => {
+                this.submitting = false;
+                this.$emit("reInitData", true);
+              });
+          } else if (this.dialogType == 2) {
+            //修改
+            request({
+              url: `/business/plans`,
+              method: "put",
+              data: {
+                ...this.formData,
+                id: this.planId,
+                dcExecuteAction: dcArr,
+              },
+            })
+              .then((result) => {
+                if (result.code != 200) return Message.error(result?.msg);
+                Message.success("提交成功");
+                this.modelVisible = false;
+              })
+              .catch(() => {
+                Message.error("提交失败");
+              })
+              .finally(() => {
+                this.submitting = false;
+                this.$emit("reInitData", true);
+              });
+          }
+        }
+      });
+    },
+    areAllValuesEmpty(obj) {
+      console.log("ass", obj);
+      return Object.keys(obj).every(function (key) {
+        const value = obj[key];
+        return (
+          value == null ||
+          value === "" ||
+          (Array.isArray(value) && value.length === 0) ||
+          (value instanceof Object && Object.keys(value).length === 0)
+        );
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.24s;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+
+.EventAddPlanDialog {
+  gap: 9px;
+  width: 1280px;
+  height: 310px;
+  display: flex;
+  flex-direction: column;
+
+  .first,
+  .second,
+  .third {
+    padding: 5px 10px 8px;
+    background-color: #296887;
+    margin-bottom: 15px;
+
+    .text {
+      margin-top: 12px;
+    }
+  }
+
+  .form {
+    flex: 1;
+    overflow-y: auto;
+  }
+
+  .footer {
+    display: flex;
+    justify-content: end;
+    gap: 15px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
index 653eed22..404e0476 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -3,12 +3,6 @@
     <div class="EventAddPlanDialog">
       <ElForm :model="formData" inline :rules="rules" ref="ruleForm">
         <div class="first">
-          <el-form-item prop="eventCategory">
-            <el-radio-group v-model="formData.eventCategory" @input="changeRadio">
-              <el-radio-button :label="1">交通事件</el-radio-button>
-              <el-radio-button :label="2">感知事件</el-radio-button>
-            </el-radio-group>
-          </el-form-item>
           <el-form-item required label="预案名称:" prop="planName">
             <el-input v-model="formData.planName" placeholder="请输入预案名称"></el-input>
           </el-form-item>
@@ -18,35 +12,26 @@
               </el-option>
             </el-select>
           </el-form-item>
-
-          <el-form-item label="触发类型:" prop="triggerMechanism">
-            <el-select v-model="formData.triggerMechanism" placeholder="请选择触发类型">
+          <el-form-item label="细分类型:" prop="triggerMechanism">
+            <el-select v-model="formData.triggerMechanism" placeholder="请选择细分类型">
               <el-option v-for="item in mechanismOptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
         </div>
 
-        <div class="second">
-          <el-row>
-            <el-col :span="2">
-              <div class="text"><i style="color: red">*</i>执行操作:</div>
-            </el-col>
+        <div>
+          <el-row v-for="(item, index) in tableData" :key="item.id" class="rowBlock">
             <el-col :span="22">
-              <FormTable ref="secondFormTable" :tableData="secondFormData" :type="1"></FormTable>
+              <ScopeTable :tableInfo="item"></ScopeTable>
             </el-col>
-          </el-row>
-        </div>
-        <div class="third">
-          <el-row>
             <el-col :span="2">
-              <div class="text"><i style="color: red">*</i>恢复操作:</div>
-            </el-col>
-            <el-col :span="22">
-              <FormTable ref="thirdFormTable" :tableData="thirdFormData" :type="2"></FormTable>
+              <ElButton class="elButton" icon="el-icon-plus" plain size="mini" @click.native="onAdd()" />
+              <ElButton class="elButton" icon="el-icon-delete" plain size="mini" @click.native="onDel(index)" />
             </el-col>
           </el-row>
         </div>
+
       </ElForm>
     </div>
 
@@ -65,21 +50,17 @@ import FormTable from "../formTable/index";
 import Button from "@screen/components/Buttons/Button.vue";
 import request from "@/utils/request";
 import { Message } from "element-ui";
-import { throttle } from "lodash";
+import ScopeTable from "./ScopeTable.vue";
+import { defaultTableInfo } from "../data";
+import Table from '@screen/components/Table.vue';
 import {
   controlModelMap,
   gzztMap,
   gzmsMap,
   eventSubClassMap,
-  trafficKV,
-  WarningTypeList as perceptionKV,
+  trafficKV
 } from "@screen/utils/enum.js";
 
-const typeMap = {
-  1: trafficKV,
-  2: perceptionKV,
-};
-
 export default {
   name: "addAndEditDialog",
   components: {
@@ -87,6 +68,8 @@ export default {
     Form,
     Button,
     FormTable,
+    Table,
+    ScopeTable
   },
   model: {
     prop: "visible",
@@ -112,24 +95,10 @@ export default {
       planId: 0,
       submitting: false,
       formData: {
-        eventCategory: 1,
         eventType: 1,
         triggerMechanism: "",
       },
-      secondFormData: [
-        {
-          deviceType: 1,
-          searchRule: 1,
-          qbb: "",
-        },
-      ],
-      thirdFormData: [
-        {
-          deviceType: 1,
-          searchRule: 1,
-          qbb: "",
-        },
-      ],
+      tableData: [],
       deviceData: [],
       eventOptions: trafficKV,
       mechanismOptions: [
@@ -170,34 +139,17 @@ export default {
           if (Object.keys(this.detail).length > 0) {
             this.title = "修改预案";
             this.dialogType = 2;
-            this.eventOptions = typeMap[this.detail.eventCategory];
-            this.mechanismOptions =
-              eventSubClassMap[this.detail.eventCategory || 1][
-              this.detail.eventType
-              ];
+            this.mechanismOptions = eventSubClassMap[1][this.detail.eventType];
             this.initData(this.detail.id);
           } else {
             this.title = "新增预案";
             this.dialogType = 1;
             this.formData = {
-              eventCategory: 1,
               eventType: 1,
               triggerMechanism: "",
             };
-            this.secondFormData = [
-              {
-                deviceType: 1,
-                searchRule: 1,
-                qbb: "",
-              },
-            ];
-            this.thirdFormData = [
-              {
-                deviceType: 1,
-                searchRule: 1,
-                qbb: "",
-              },
-            ];
+            console.log('defaultTableInfo', { ...defaultTableInfo })
+            this.tableData = [{ ...defaultTableInfo }]
           }
         }
         return this.visible;
@@ -216,43 +168,38 @@ export default {
         .then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
           let data = result.data;
-          let dcExecuteAction = result.data.dcExecuteAction;
+          let dcExecuteAction = data.dcExecuteAction;
 
           this.planId = data.id;
           this.formData = {
-            eventCategory: data.eventCategory,
             planName: data.planName,
             eventType: data.eventType,
             triggerMechanism: data.triggerMechanism,
           };
-          this.secondFormData = [];
-          this.thirdFormData = [];
+          let dcArr = [];
           dcExecuteAction.forEach((it) => {
-            let action = {};
-            if (it.otherConfig) {
-              let config = JSON.parse(it.otherConfig);
-              let qbb = "";
-              if (config.id) {
-                qbb = config.content;
-                config = { dcInfoBoardTemplate: config };
-              }
-              // if (config.state) {
-              //     config.gzms = config.state
-              // }
-              action = { ...it, ...config, qbb: qbb };
+            let action = { ...it };
+            if (it.executeConfig) {
+              let executeConfig = JSON.parse(it.executeConfig);
+              let execute = this.mapKeys(executeConfig, 'zx_');
+              action = { ...action, ...execute };
+            }
+            if (it.recoverConfig) {
+              let recoverConfig = JSON.parse(it.recoverConfig);
+              let recover = this.mapKeys(recoverConfig, 'hf_');
+              action = { ...action, ...recover };
             }
             if (it.deviceList) {
-              action.deviceList = it.deviceList
+              action.devList = it.deviceList
                 .split(",")
                 .map((str) => Number(str));
             }
-            if (it.actionType == 1) {
-              this.secondFormData.push(action);
-            } else if (it.actionType == 2) {
-              this.thirdFormData.push(action);
-            }
+
+            dcArr.push(action);
           });
-          console.log("secondFormData", this.secondFormData);
+          this.tableData = dcArr;
+
+          console.log("tableData", this.tableData);
         })
         // console.log('secondFormData', this.secondFormData)
         // }).catch((err) => {
@@ -265,6 +212,12 @@ export default {
           Message.error("查询事件预案列表失败", err);
         });
     },
+    mapKeys(obj, prefix) {
+      return Object.keys(obj).reduce((result, key) => {
+        result[`${prefix}${key}`] = obj[key];
+        return result;
+      }, {});
+    },
     async loadData(deviceType = 1) {
       this.deviceData = [];
       let result = await request({
@@ -280,87 +233,80 @@ export default {
       return this.deviceData;
     },
     changeEventType(value = 1) {
-      this.mechanismOptions =
-        eventSubClassMap[this.formData.eventCategory || 1][value];
-    },
-    changeRadio(value = 1) {
-      this.formData.triggerMechanism = "";
-      this.eventOptions = typeMap[value];
-      this.changeEventType(1);
+      console.log('changeEventType', value)
+      this.mechanismOptions = eventSubClassMap[1][value];
+      this.formData.triggerMechanism = ''
     },
     handleChange() { },
-    formatData(it, value = 1, id = "") {
-      let data = { ...it, actionType: value, emergencyPlansId: id };
-      if (
-        it.deviceList &&
-        typeof it.deviceList !== "string" &&
-        it.deviceList.length > 0
-      ) {
-        data.deviceList = it.deviceList.join(",");
-      } else {
-        data.deviceList = "";
-      }
-      if (it.content) {
-        data.otherConfig = JSON.stringify({ content: it.content });
+    onAdd() {
+      this.tableData.push({ ...defaultTableInfo })
+    },
+    onDel(index) {
+      if (this.tableData.length <= 1) {
+        return Message.warning('最后一项不可删除！');
       }
+      this.tableData.splice(index, 1)
+    },
+    formatData(it) {
+      let data = {};
+
       if (it.controlModel) {
-        let other = {
+        data = {
           controlModel: it.controlModel,
           controlModelName: controlModelMap[it.controlModel],
           state: it.state,
           name: gzztMap[it.state],
         };
         if (it.time && it?.time[0]) {
-          other = {
-            controlModel: it.controlModel,
-            controlModelName: controlModelMap[it.controlModel],
-            state: it.state,
-            name: gzztMap[it.state],
+          data = {
+            ...data,
             startTime: it.time[0],
             endTime: it.time[1],
           };
         }
-        data.otherConfig = JSON.stringify(other);
-      }
-      if (it.gzms) {
-        data.otherConfig = JSON.stringify({
-          state: it.gzms,
-          name: gzmsMap[it.gzms],
-          operationDuration: it.operationDuration,
-        });
       }
       return data;
     },
     handleSubmit() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
-          // this.submitting = false;
-          let secondFormTable = this.$refs["secondFormTable"].tableData || [];
-          let thirdFormTable = this.$refs["thirdFormTable"].tableData || [];
-          // let flg = false;
-          // for (let item of secondFormTable) {
-          //   if (this.areAllValuesEmpty(item)) { flg = true; break };
-          // }
-          // if (flg) return Message.warning('执行操作子项不能为空！');
-          // for (let item of thirdFormTable) {
-          //   if (this.areAllValuesEmpty(item)) { flg = true; break };
-          // }
-          // if (flg) return Message.warning('恢复操作子项不能为空！');
-          // console.log('12', secondFormTable);
-          // console.log('34', thirdFormTable);
           let dcArr = [];
-          let id = "";
-          if (this.dialogType == 2) id = this.planId;
-          secondFormTable.forEach((it) => {
-            dcArr.push(this.formatData(it, 1, id));
-          });
-          thirdFormTable.forEach((it) => {
-            dcArr.push(this.formatData(it, 2, id));
-          });
+          this.tableData.forEach(item => {
+            let dcData = {
+              id: item.id || '',
+              deviceType: item.deviceType,
+              searchRule: item.searchRule,
+              number: item.number
+            }
+            if (this.dialogType == 2) {
+              dcData.emergencyPlansId = this.planId;
+            }
+            if (item.devList && item.devList.length > 0) {
+              dcData.deviceList = item.devList.join(",");
+            }
+            let zxData = {}, hfData = {};
+            Object.keys(item).forEach(key => {
+              if (/^zx_/.test(key)) {
+                let keyName = key.substring(3);
+                zxData[keyName] = item[key];
+              }
+              if (/^hf_/.test(key)) {
+                let keyName = key.substring(3);
+                hfData[keyName] = item[key];
+              }
+            })
+            if (item.deviceType == 12) {
+              zxData = this.formatData(zxData);
+              hfData = this.formatData(hfData);
+            }
+            dcData.executeConfig = JSON.stringify(zxData);
+            dcData.recoverConfig = JSON.stringify(hfData);
 
+            dcArr.push(dcData);
+          })
           console.log({
             ...this.formData,
-            dcExecuteAction: dcArr,
+            dcExecuteAction: dcArr
           });
           // return;
           if (this.dialogType == 1) {
@@ -468,5 +414,26 @@ export default {
     justify-content: end;
     gap: 15px;
   }
+
+  .rowBlock {
+    background-color: #296887;
+    padding: 5px 10px;
+    margin-bottom: 10px;
+  }
+
+}
+
+.elButton {
+  background: #2ba8c3;
+  border-radius: 2px 2px 2px 2px;
+  color: #FFFFFF;
+}
+
+.elButton:hover,
+.elButton:focus {
+  background: #2ba8c3;
+  border-radius: 2px 2px 2px 2px;
+  border-color: #FFFFFF;
+  color: #FFFFFF;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
index c1686c21..e027ec97 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
@@ -1,5 +1,4 @@
-import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
-import { merge, cloneDeep } from "lodash";
+import { planDeviceOptions } from "@screen/utils/enum.js";
 
 export const searchFormList = [
   {
@@ -7,50 +6,19 @@ export const searchFormList = [
     key: "planName",
   },
   {
-    label: "事件分类:",
-    key: "eventCategory",
-    type: "RadioGroup",
+    label: "设备类型:",
+    key: "deviceType",
+    type: "select",
     options: {
-      options: [
-        {
-          key: "1",
-          label: "交通事件",
-        },
-        {
-          key: "2",
-          label: "感知事件",
-        },
-      ],
+      options: planDeviceOptions,
     },
   },
-  // {
-  //   label: "时间范围:",
-  //   key: "daterange",
-  //   required: false,
-  //   type: "datePicker",
-  //   options: {
-  //     type: "daterange",
-  //     format: "yyyy-MM-dd HH:mm:ss",
-  //     valueFormat: "yyyy-MM-dd HH:mm:ss",
-  //   },
-  // },
-  // {
-  //   ...PresetFormItems.station,
-  //   label: "开始桩号:",
-  //   required: false,
-  // },
-  // merge(cloneDeep(PresetFormItems.station), {
-  //   options: {
-  //     options: [
-  //       {
-  //         key: "endStakeMark[0]",
-  //       },
-  //       {
-  //         key: "endStakeMark[1]",
-  //       },
-  //     ],
-  //   },
-  //   label: "结束桩号:",
-  //   required: false,
-  // }),
 ];
+
+export const defaultTableInfo = {
+  deviceType: 2,
+  searchRule: 1,
+  number: 0,
+  // zx_operationType: 2,
+  // hf_operationType: 2,
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
index 838b2e1b..05462c3e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
@@ -24,9 +24,9 @@
         <!-- 内容 -->
         <div class="body">
             <Table :data="tableData">
-                <ElTableColumn prop="strEventCategory" label="事件分类" width="100" align="center" />
-                <ElTableColumn prop="strEventType" label="事件类型" width="100" align="center" />
+                <!-- <ElTableColumn prop="strEventCategory" label="事件分类" width="100" align="center" /> -->
                 <ElTableColumn prop="planName" label="预案名称" width="140" align="center" />
+                <ElTableColumn prop="strEventType" label="事件类型" width="140" align="center" />
                 <ElTableColumn prop="triggeringCondition" label="检索条件" width="140" />
                 <ElTableColumn prop="deviceType" label="设备类型" />
                 <ElTableColumn prop="controllableDeviceName" label="可控设备" />
@@ -63,12 +63,7 @@ import request from "@/utils/request";
 import { confirm } from "@screen/utils/common";
 import { Message } from 'element-ui'
 import { searchFormList } from './data';
-import { WarningType, trafficType } from "@screen/utils/enum.js";
-
-const eventTypeMap = {
-    1: trafficType,
-    2: WarningType,
-}
+import { trafficType } from "@screen/utils/enum.js";
 
 export default {
     name: 'controlEventPlan',
@@ -106,8 +101,7 @@ export default {
             }).then((result) => {
                 if (result.code != 200) return Message.error(result?.msg);
                 result.rows.forEach(it => {
-                    it.strEventCategory = it.eventCategory == 1 ? '交通事件' : '感知事件';
-                    it.strEventType = eventTypeMap[it.eventCategory || 0][it.eventType];
+                    it.strEventType = trafficType[it.eventType];
                     // it.strDeviceType = deviceMap[it.deviceType];
                 })
                 this.tableData = result.rows;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
index 894152a4..fdefd20b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
@@ -1,25 +1,17 @@
 <template>
-  <Dialog v-model="modelVisible" title="选择情报板" width="550px">
-    <div class="EventAddPlanDialog">
+  <Dialog v-model="modelVisible" title="选择情报板" width="700px">
+    <div class="PlanQbbDialog">
       <vuescroll :ops="scrollOptions" class="listBox">
         <div v-for="item in templateAvailable" :key="item.dictValue">
           <!-- 原来是<el-collapse v-model="activeNames"> -->
           <h3>{{ item.dictLabel }}</h3>
           <div v-for="(itm, indx) in item.list" :key="indx" class="tplItem">
             <!-- 模板内容 -->
-            <BoardTplPreview
-              class="boardPreview"
-              boardWH="1400*200"
-              :tpl="itm"
-            ></BoardTplPreview>
+            <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="itm"></BoardTplPreview>
             <!-- 操作按钮 -->
             <div class="infoBtnBox infoBtnBoxSm">
               <p class="btn">
-                <el-radio
-                  v-model="radio1"
-                  :label="itm.id"
-                  @input="changeRadio(itm)"
-                />
+                <el-radio v-model="radio1" :label="itm.id" @input="changeRadio(itm)" />
               </p>
             </div>
           </div>
@@ -28,17 +20,9 @@
     </div>
 
     <template #footer>
-      <Button
-        style="background: #c9c9c9; padding: 0 24px"
-        @click.native="(modelVisible = false), (submitting = false)"
-        >取消</Button
-      >
-      <Button
-        style="padding: 0 24px"
-        @click.native="handleSubmit"
-        :loading="submitting"
-        >确认</Button
-      >
+      <Button style="background: #c9c9c9; padding: 0 24px"
+        @click.native="(modelVisible = false), (submitting = false)">取消</Button>
+      <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">确认</Button>
     </template>
   </Dialog>
 </template>
@@ -67,7 +51,7 @@ export default {
     visible: Boolean,
     info: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
   },
   data() {
@@ -255,7 +239,7 @@ export default {
   opacity: 0;
 }
 
-.EventAddPlanDialog {
+.PlanQbbDialog {
   gap: 9px;
   width: 650px;
   height: 510px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index a04a0945..864c2617 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -288,49 +288,49 @@ export const eventSubClassMap = {
     ],
     2: [
       {
-        value: 1,
+        value: '1',
         label: "高速主线",
       },
       {
-        value: 2,
+        value: '2',
         label: "服务区",
       },
       {
-        value: 3,
+        value: '3',
         label: "立交桥",
       },
       {
-        value: 4,
+        value: '4',
         label: "收费站",
       },
     ],
     3: [
       {
-        value: 1,
+        value: '1',
         label: "主线关闭",
       },
       {
-        value: 2,
+        value: '2',
         label: "主线限行",
       },
       {
-        value: 6,
+        value: '6',
         label: "收费站关闭",
       },
       {
-        value: 7,
+        value: '7',
         label: "收费站限行",
       },
       {
-        value: 10,
+        value: '10',
         label: "匝道立交关闭",
       },
       {
-        value: 12,
+        value: '12',
         label: "匝道立交限行",
       },
       {
-        value: 14,
+        value: '14',
         label: "服务区关闭",
       },
     ],
@@ -394,43 +394,43 @@ export const eventSubClassMap = {
     ],
     7: [
       {
-        value: 1,
+        value: '1',
         label: "道路养护施工",
       },
       {
-        value: 2,
+        value: '2',
         label: "收费站养护施工",
       },
       {
-        value: 3,
+        value: '3',
         label: "服务区养护施工",
       },
       {
-        value: 4,
+        value: '4',
         label: "枢纽立交匝道养护施工",
       },
       {
-        value: 5,
+        value: '5',
         label: "地方道路养护施工",
       },
       {
-        value: 6,
+        value: '6',
         label: "道路工程建设施工",
       },
       {
-        value: 7,
+        value: '7',
         label: "收费站工程建设施工",
       },
       {
-        value: 8,
+        value: '8',
         label: "服务区工程建设施工",
       },
       {
-        value: 9,
+        value: '9',
         label: "枢纽立交匝道工程建设施工",
       },
       {
-        value: 10,
+        value: '10',
         label: "地方道路工程建设施工",
       },
     ],
@@ -450,27 +450,27 @@ export const eventSubClassMap = {
     ],
     9: [
       {
-        value: 1,
+        value: '1',
         label: "摄像机",
       },
       {
-        value: 2,
+        value: '2',
         label: "护栏",
       },
       {
-        value: 3,
+        value: '3',
         label: "隔离栅",
       },
       {
-        value: 4,
+        value: '4',
         label: "情报板",
       },
       {
-        value: 5,
+        value: '5',
         label: "防炫板",
       },
       {
-        value: 6,
+        value: '6',
         label: "其他",
       },
     ],
@@ -514,7 +514,7 @@ export const eventSubClassMap = {
     ],
     11: [
       {
-        value: 1,
+        value: '1',
         label: "其他事件",
       },
     ],
@@ -763,10 +763,10 @@ export const planDeviceMap = {
 };
 //预案设备Options
 export const planDeviceOptions = [
-  {
-    value: 1,
-    label: "摄像机",
-  },
+  // {
+  //   value: 1,
+  //   label: "摄像机",
+  // },
   {
     value: 2,
     label: "可变信息标志",
@@ -781,7 +781,7 @@ export const planDeviceOptions = [
   // },
   {
     value: 5,
-    label: "路段语音广播",
+    label: "语音广播",
   },
   // {
   //   value: 6,
@@ -791,17 +791,17 @@ export const planDeviceOptions = [
   //   value: 7,
   //   label: "毫米波雷达",
   // },
-  {
-    value: 8,
-    label: "合流区预警",
-  },
+  // {
+  //   value: 8,
+  //   label: "合流区预警",
+  // },
   // {
   //   value: 9,
   //   label: "智慧锥桶",
   // },
   {
     value: 10,
-    label: "激光疲劳唤醒",
+    label: "疲劳唤醒",
   },
   // {
   //   value: 11,
@@ -813,12 +813,12 @@ export const planDeviceOptions = [
   },
   {
     value: 13,
-    label: "智能设备箱",
-  },
-  {
-    value: 14,
-    label: "光线在线监测",
+    label: "设备箱",
   },
+  // {
+  //   value: 14,
+  //   label: "光线在线监测",
+  // },
 ];
 
 // 非机预警事件主类