From 56772980016f5c387b8170a40aa8af848b2a48e6 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 17 Apr 2024 14:29:14 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E9=A2=84=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../control/event/plan/addAndEditDialog/ScopeTable.vue      | 6 +-----
 .../pages/control/event/plan/addAndEditDialog/index.vue     | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

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
index a6b44689..bfd9003a 100644
--- 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
@@ -155,7 +155,7 @@
                     <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-col v-if="tableInfo.deviceType == 5" :span="4">
                 <el-input v-model="tableInfo.hf_content" placeholder="请输入发布内容"></el-input>
             </el-col>
         </el-row>
@@ -213,10 +213,6 @@ export default {
                 },
                 {
                     value: 3,
-                    label: '事发下游最近'
-                },
-                {
-                    value: 4,
                     label: '最近公里数'
                 },
             ],
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 404e0476..71088655 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
@@ -273,7 +273,7 @@ export default {
           let dcArr = [];
           this.tableData.forEach(item => {
             let dcData = {
-              id: item.id || '',
+              id: null,
               deviceType: item.deviceType,
               searchRule: item.searchRule,
               number: item.number
@@ -346,13 +346,13 @@ export default {
                 if (result.code != 200) return Message.error(result?.msg);
                 Message.success("提交成功");
                 this.modelVisible = false;
+                this.$emit("reInitData", true);
               })
               .catch(() => {
                 Message.error("提交失败");
               })
               .finally(() => {
                 this.submitting = false;
-                this.$emit("reInitData", true);
               });
           }
         }

From 9d7dd68bf21da1b03ccc166be51555448491bc2c Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Wed, 17 Apr 2024 16:25:52 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=20=20=E8=AF=AD=E9=9F=B3=E5=B9=BF=E6=92=AD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BroadcastParamMulti.vue        | 182 ++++++++++++++++++
 .../components/HomeFrameControl/index.vue     |  29 +--
 .../RoadAndEvents/utils/httpList.js           |   8 +
 .../views/JiHeExpressway/pages/Home/index.vue |   2 +-
 4 files changed, 207 insertions(+), 14 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.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
new file mode 100644
index 00000000..0fabeb8f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
@@ -0,0 +1,182 @@
+<template>
+  <div class="body">
+    <div class="right" :style="{ width: isMultiControl ? '100%' : undefined }">
+      <div class="top-content">
+        <Video v-if="!isMultiControl" class="item-video" :pileNum="pileNum" />
+
+        <label style="width: 99px;">发布内容: </label>
+        <ElInput type="textarea" v-model="releaseMessage" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
+          showWordLimit placeholder="请输入发布内容" />
+      </div>
+
+      <div class="footer">
+        <Button @click.native="handleSubmit" :loading="submitting">
+          确定
+        </Button>
+
+        <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="cancelClick">
+          取消
+        </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 { batchFunctions } 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,
+    isMultiControl: Boolean,
+    selectItems: {
+      type: Array,
+      default: () => []
+    }
+  },
+  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: {
+    cancelClick() {
+      this.$emit("update:activeIcon", null);
+      this.submitting = false;
+    },
+    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("发布内容不能为空!");
+      if (!selectItems.length)
+        return Message.error("请至少选择一个广播设备!");
+
+      this.submitting = true;
+
+      batchFunctions(
+        {
+          "devices": selectItems,
+          "functions": [
+            {
+              "functionId": "1",//随便 不为空即可
+              "params": {
+                name: "task-3",
+                outVol: "6",
+                priority: "1",
+                text: this.releaseMessage.trim(),
+                repeatTimes: "3",
+                termList: checkList,
+                functionType: "startPaTts",
+              }
+            }
+
+          ]
+        })
+        .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}个!`);
+          }
+        })
+        .finally(() => {
+          this.submitting = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.body {
+  display: flex;
+  gap: 9px;
+  height: 100%;
+  padding-right: 9px;
+  margin-top: 15px;
+
+  .right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .top-content {
+      display: flex;
+      flex-direction: row;
+      // gap: 9px;
+      align-items: center;
+
+      .item-video {
+        width: 545px;
+      }
+
+      label {
+        font-size: 15px;
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 400;
+        color: #3de8ff;
+        line-height: 19px;
+        vertical-align: middle;
+        text-align: right;
+        padding-right: 12px;
+        box-sizing: border-box;
+      }
+    }
+  }
+}
+
+.footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 9px;
+}
+</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 18227f6a..6fea9c31 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
@@ -13,14 +13,14 @@
           <i class="el-icon-close" />
         </span>
         <Form v-model="data" labelWidth="90px" column="2" class="form" ref="FormConfigRef" :formList="formList" />
-        <component :is="componentMap[DeviceTopics[data.deviceType]]" :isMultiControl="true"></component>
-        <!-- -->
-        <div class="footer">
-          <Button @click.native="">
+        <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">
             确认
           </Button>
           <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="cancelClick"> 取消 </Button>
-        </div>
+        </div> -->
       </div>
     </ElPopover>
 
@@ -38,11 +38,9 @@ import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils
 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 BroadcastParam from "@screen/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue";
+import BroadcastParam from "@screen/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue";
+import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
 
-import Vue from "vue";
-
-import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent"
 const componentMap = { "语音广播": "BroadcastParam" } //DeviceTopics[deviceType]
 //"情报板": undefined, "行车诱导": undefined, "疲劳唤醒": undefined, "合流区": undefined,"设备箱": "DeviceParams",
 const controlMulti = Object.keys(componentMap);//6种批量控制
@@ -51,13 +49,14 @@ const DeviceTopics = {};//6种批量控制 事件专题 {key:label}
 Object.keys(DeviceForMap).forEach(DeviceLabel => {
   controlMulti.indexOf(DeviceLabel) !== -1 && (DeviceTopics[DeviceForMap[DeviceLabel].deviceType] = DeviceLabel);
 });
+const deviceTypeDefault = Object.keys(DeviceTopics)[0];
 async function setDeviceOptions(config, filterData, formList) {
   const data = await getDeviceList(config.deviceType, filterData).then(async (data) => {
     await delay(600);
     return data;
   });
   formList[4].options.options = data.map(item => {
-    return { label: `${item.deviceName}`, value: JSON.stringify({ id: item.id, iotDeviceId: item.iotDeviceId }), disabled: item.deviceState != 1 }
+    return { label: `${item.deviceName}`, value: JSON.stringify({ id: item.id, iotDeviceId: item.iotDeviceId, deviceType: item.deviceType, otherConfig: item.otherConfig }), disabled: item.deviceState != 1 }
   })
 };
 function changeHandle(data, formList) {
@@ -85,6 +84,7 @@ export default {
           label: "设备类型:",
           key: "deviceType",
           type: "select",
+          default: deviceTypeDefault,
           options: {
             clearable: true,
             options: Object.keys(DeviceTopics).map(key => { return { label: DeviceTopics[key], value: key } }),
@@ -92,7 +92,6 @@ export default {
           ons: { //on监听 element事件
             change(value, ...args) {
               const { data, formList } = args.slice(-1)[0]; //data 为数据  formList为传入的配置项
-              console.log(Vue, this)
               if (data.deviceType) changeHandle(data, formList);
               else data.childType = undefined;
             }
@@ -274,14 +273,18 @@ export default {
   //     deep: true
   //   }
   // },
+  mounted() {
+    changeHandle(this.data, this.formList);
+  },
   methods: {
+    submitClick() {
+      this.$refs.ControlComponent.handleSubmit()
+    },
     cancelClick() {
       this.activeIcon = null;
     },
     handleClick(type) {
-      console.log("type: ", type);
       this.activeIcon = this.activeIcon === type ? null : type;
-      console.log("this.activeIcon", this.activeIcon);
     },
     filterEnd(data) {
       this.activeIcon = null;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index 8faea32f..82465cfc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -3,6 +3,14 @@ import { Message } from "element-ui";
 import moment from "moment";
 import request from "@/utils/request";
 
+export function batchFunctions(data) {
+  return request({
+    url: `/business/device/batchFunctions`,
+    method: "post",
+    data: data,
+  });
+}
+
 /**
  *
  * @param {string} camId 相机 ID
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
index 98aa54f1..91b5bd4c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
@@ -22,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>

From e0c58921e9cbae440373b2c20118fa42a4dc7ea4 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 18 Apr 2024 10:22:43 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/control/event/event/FormEvent/data.js               | 4 ++--
 .../pages/control/event/event/FormEvent/index.vue             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 251c488c..6f046ee6 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
@@ -945,7 +945,7 @@ export const tabConfigList = [
         },
         {
           label: "限制类型:",
-          key: "dcEventAccident.limitedType",
+          key: "dcEventTrafficControl.limitedType",
           required: true,
           type: "select",
           options: {
@@ -963,7 +963,7 @@ export const tabConfigList = [
         },
         {
           label: "车辆类型:",
-          key: "dcEventAccident.vehicleType",
+          key: "dcEventTrafficControl.vehicleType",
           required: true,
           type: "select",
           options: {
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 70f91816..964a4986 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
@@ -162,7 +162,7 @@ export default {
           formData.lang = "";
         }
         if (this.index == 2 && formData.dcEventTrafficControl.facilityId instanceof Array) {
-          let ids = formData.dcEventTrafficControl.facilityId.join(',');
+          let ids = formData.dcEventTrafficControl.facilityId;
           formData.dcEventTrafficControl.facilityIds = ids
           formData.dcEventTrafficControl.facilityId = ''
         }

From ba1465edbd212e452a97a45bceada884492b75f8 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Thu, 18 Apr 2024 10:40:02 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E8=81=94=E7=BB=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/commandDispatch/index.js     |  47 ++-
 .../components/TimeLine/LineClick/index.vue   | 172 +++++----
 .../components/TimeLine/TimeLine1/index.vue   | 169 +++++----
 .../CrowdnessIndicatorRankings/index.vue      |  41 +-
 .../Cards/DispatchLiaison/index.vue           |  55 +--
 .../DisposalProcess/DialogVisible/index.vue   | 356 ++++++++++++++++++
 .../Cards/DisposalProcess/index.vue           | 192 +++++-----
 .../statisticalAnalysis/index.vue             |  29 +-
 ruoyi-ui/vue.config.js                        |   4 +-
 9 files changed, 790 insertions(+), 275 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue

diff --git a/ruoyi-ui/src/api/commandDispatch/index.js b/ruoyi-ui/src/api/commandDispatch/index.js
index ca7af949..4016b54c 100644
--- a/ruoyi-ui/src/api/commandDispatch/index.js
+++ b/ruoyi-ui/src/api/commandDispatch/index.js
@@ -1,7 +1,7 @@
 import request from "@/utils/request";
 
 // 查询事件气象
-export function WeatherForecast(lng, lat) {
+export function getWeatherForecast(lng, lat) {
   return request({
     url:
       "/weatherForecast/queryTheSpecifiedLatitudeAndLongitudeWeather/" +
@@ -13,10 +13,53 @@ export function WeatherForecast(lng, lat) {
 }
 
 // 查询调度联络
-export function commandDispatch(data) {
+export function postCommandDispatch(data) {
   return request({
     url: "/business/warning/commandAndDispatch",
     method: "post",
     data,
   });
 }
+
+// 处置过程节点
+export function getProcessNode(eventId) {
+  return request({
+    url: "/dc/system/event/getProcessNode/" + eventId,
+    method: "get",
+  });
+}
+
+// 处置过程记录
+export function getProcessList(eventId) {
+  return request({
+    url: "/system/process/list/?eventId=" + eventId,
+    method: "get",
+  });
+}
+
+// 处置过程发送
+export function postProcess(data) {
+  return request({
+    url: "/system/process",
+    method: "post",
+    data,
+  });
+}
+
+// 解除事件
+export function postCompleteEvent(data) {
+  return request({
+    url: "/dc/system/event/completeEvent",
+    method: "post",
+    data,
+  });
+}
+
+// 无需清障
+export function postNoSkipClear(data) {
+  return request({
+    url: "/dc/system/event/skipClear",
+    method: "post",
+    data,
+  });
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue
index 5a571264..b4c5603d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class='["TimeLine1", { "auto-size": autoSize }]' ref="TimeLine1Ref">
+  <div :class="['TimeLine1', { 'auto-size': autoSize }]" ref="TimeLine1Ref">
     <!-- 节点 -->
     <div class="node" v-for="(item, index) in data" :key="index" ref="nodeRefs">
       <span class="top-label keep-ratio-bottom">
@@ -8,33 +8,49 @@
         </slot>
       </span>
       <div class="center">
-        <div class="line" v-if="!index" :style="{ width: `${nodeLinesWidth[-1]}px` }" />
-        <div class="circle keep-ratio" :style="{ '--active-color': !item.isActive ? normalColor : activeColor }">
-        </div>
-        <div class="line" :style="{
-          width: `${nodeLinesWidth[index]}px`,
-          borderImage: getBorderImageStyle(item),
-        }" />
+        <div
+          class="line"
+          v-if="!index"
+          :style="{ width: `${nodeLinesWidth[-1]}px` }"
+        />
+        <div
+          class="circle keep-ratio"
+          :style="{
+            '--active-color': !item.isActive ? normalColor : activeColor,
+          }"
+        ></div>
+        <div
+          class="line"
+          :style="{
+            width: `${nodeLinesWidth[index]}px`,
+            borderImage: getBorderImageStyle(item),
+          }"
+        />
       </div>
       <slot name="bottom-label" :data="item">
-        <div class="bottom keep-ratio" @click="onClick(item)"
-          :style="{ backgroundImage: `url(${require(`./images/bg${item.isActive ? '-active' : ''}.svg`)})` }">
+        <div
+          class="bottom keep-ratio"
+          @click="onClick(item)"
+          :style="{
+            backgroundImage: `url(${require(`./images/bg${
+              item.isActive ? '-active' : ''
+            }.svg`)})`,
+          }"
+        >
           {{ item.label }}
         </div>
       </slot>
     </div>
-
   </div>
 </template>
 
 <script>
-
 function getPositionAtCenter(element) {
   const { top, left } = element.getBoundingClientRect();
 
   return {
     x: left,
-    y: top
+    y: top,
   };
 }
 
@@ -42,73 +58,87 @@ function getDistanceBetweenElements(domA, domB) {
   const domAPosition = getPositionAtCenter(domA);
   const domBPosition = getPositionAtCenter(domB);
 
-  return Math.hypot(domAPosition.x - domBPosition.x, domAPosition.y - domBPosition.y);
+  return Math.hypot(
+    domAPosition.x - domBPosition.x,
+    domAPosition.y - domBPosition.y
+  );
 }
 
 export default {
-  name: 'TimeLine1',
+  name: "TimeLine1",
   props: {
     data: {
       type: Array,
-      default: () => Array.from({ length: 15 }).map(() => ({
-        time: "16.36",
-        label: "阿发",
-        isActive: false
-      }))
+      default: () =>
+        Array.from({ length: 15 }).map(() => ({
+          time: "16.36",
+          label: "阿发",
+          isActive: false,
+        })),
     },
     activeColor: {
       type: String,
-      default: "#39D5BF"
+      default: "#39D5BF",
     },
     normalColor: {
       type: String,
-      default: "#ccc"
+      default: "#ccc",
     },
     lineActiveColor: {
       type: String,
-      default: "linear-gradient(90deg, rgba(59, 216, 188, 1), rgba(29, 171, 215, 1)}) 2 2"
+      default:
+        "linear-gradient(90deg, rgba(59, 216, 188, 1), rgba(29, 171, 215, 1)}) 2 2",
     },
     lineNormalColor: {
       type: String,
-      default: null
+      default: null,
     },
     // 自动适配宽度
     autoSize: {
       type: Boolean,
-      default: true
+      default: true,
     },
     filterDistance: {
       type: Function,
-      default: null
-    }
+      default: null,
+    },
   },
   data() {
     return {
-      nodeLinesWidth: {}
-    }
+      nodeLinesWidth: {},
+    };
   },
   watch: {
     data: {
       handler(data) {
-        let needFilter = false
+        let needFilter = false;
         const nodeLinesWidth = [];
 
-        const filterDistance = num => needFilter ? this.filterDistance(num) : num;
+        const filterDistance = (num) =>
+          needFilter ? this.filterDistance(num) : num;
 
         const removeDistance = 20 + 4 * 2;
 
         function getDistance(index) {
-          return filterDistance(getDistanceBetweenElements(
-            this.$refs.nodeRefs[index].querySelector('.center'),
-            this.$refs.nodeRefs[index + 1].querySelector('.center'))
-          ) - removeDistance
-        };
+          return (
+            filterDistance(
+              getDistanceBetweenElements(
+                this.$refs.nodeRefs[index].querySelector(".center"),
+                this.$refs.nodeRefs[index + 1].querySelector(".center")
+              )
+            ) - removeDistance
+          );
+        }
 
         function getSpecialDistance(index) {
-          return filterDistance(getDistanceBetweenElements(
-            this.$refs.nodeRefs[index].parentElement,
-            this.$refs.nodeRefs[index].querySelector('.center'))
-          ) - removeDistance
+          return (
+            filterDistance(
+              getDistanceBetweenElements(
+                this.$refs.nodeRefs[index].parentElement,
+                this.$refs.nodeRefs[index].querySelector(".center")
+              )
+            ) - removeDistance
+          );
         }
 
         const getLineWidths = () => {
@@ -117,52 +147,60 @@ export default {
           data.forEach((_, index) => {
             if (index === data.length - 1) {
               if (this.autoSize) {
-                nodeLinesWidth[-1] = getSpecialDistance.call(this, 0)
-                nodeLinesWidth[data.length - 1] = getSpecialDistance.call(this, data.length - 1)
+                nodeLinesWidth[-1] = getSpecialDistance.call(this, 0);
+                nodeLinesWidth[data.length - 1] = getSpecialDistance.call(
+                  this,
+                  data.length - 1
+                );
               }
 
-              return
-            };
+              return;
+            }
 
             nodeLinesWidth[index] = getDistance.call(this, index);
           });
 
           this.nodeLinesWidth = nodeLinesWidth;
-        }
+        };
 
         this.$nextTick(() => {
           const timeLine1RefDom = this.$refs.TimeLine1Ref;
-          if (timeLine1RefDom.clientWidth != timeLine1RefDom.getBoundingClientRect().width) {
-            needFilter = true
+          if (
+            timeLine1RefDom.clientWidth !=
+            timeLine1RefDom.getBoundingClientRect().width
+          ) {
+            needFilter = true;
           }
           getLineWidths();
-        })
+        });
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   methods: {
     getBorderImageStyle(item) {
-      const linearColor = item.isActive ? (this.lineActiveColor || `${this.activeColor}, ${this.activeColor}`) : (this.lineNormalColor || `${this.normalColor}, ${this.normalColor}`)
+      const linearColor = item.isActive
+        ? this.lineActiveColor || `${this.activeColor}, ${this.activeColor}`
+        : this.lineNormalColor || `${this.normalColor}, ${this.normalColor}`;
 
-      return `linear-gradient(90deg, ${linearColor}) 2 2`
+      return `linear-gradient(90deg, ${linearColor}) 2 2`;
     },
     onClick(item) {
-      this.data.forEach(it => {
+      this.data.forEach((it) => {
         if (it.id == item.id) {
           it.isActive = true;
         } else {
           it.isActive = false;
         }
-      })
-      this.$emit('update:tableData', item.id);
+      });
+      this.$emit("update:tableData", item.id);
       // console.log('data', item)
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 div.auto-size {
   justify-content: space-between;
   overflow: hidden;
@@ -187,7 +225,7 @@ div.auto-size {
   font-size: 14px;
   font-family: PingFang SC, PingFang SC;
   font-weight: 400;
-  color: #FFFFFF;
+  color: #ffffff;
   display: flex;
   flex-wrap: nowrap;
   overflow: auto;
@@ -215,7 +253,7 @@ div.auto-size {
       position: relative;
 
       .circle {
-        border: 1px solid var(--active-color, #39D5BF);
+        border: 1px solid var(--active-color, #39d5bf);
         border-radius: 50%;
         width: 15px;
         height: 15px;
@@ -230,19 +268,23 @@ div.auto-size {
           left: 50%;
           top: 50%;
           transform: translate(-50%, -50%);
-          background-color: var(--active-color, #39D5BF);
+          background-color: var(--active-color, #39d5bf);
         }
       }
 
-
       .line {
         position: absolute;
         height: 0px;
         opacity: 1;
         border: 2px solid;
         //border-image: linear-gradient(90deg, rgba(59, 216, 188, 1), rgba(29, 171, 215, 1)) 2 2;
-        border-image: linear-gradient(90deg, rgb(204, 204, 204), rgb(204, 204, 204)) 2 / 1 / 0 stretch;
-        
+        border-image: linear-gradient(
+            90deg,
+            rgb(204, 204, 204),
+            rgb(204, 204, 204)
+          )
+          2 / 1 / 0 stretch;
+
         &:first-child {
           right: calc(50% + 8px + 6px);
         }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue
index 2e3de38e..41e56224 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class='["TimeLine1", { "auto-size": autoSize }]' ref="TimeLine1Ref">
+  <div :class="['TimeLine1', { 'auto-size': autoSize }]" ref="TimeLine1Ref">
     <!-- 节点 -->
     <div class="node" v-for="(item, index) in data" :key="index" ref="nodeRefs">
       <span class="top-label keep-ratio-bottom">
@@ -8,33 +8,48 @@
         </slot>
       </span>
       <div class="center">
-        <div class="line" v-if="!index" :style="{ width: `${nodeLinesWidth[-1]}px` }" />
-        <div class="circle keep-ratio" :style="{ '--active-color': !item.isActive ? normalColor : activeColor }">
-        </div>
-        <div class="line" :style="{
-          width: `${nodeLinesWidth[index]}px`,
-          borderImage: getBorderImageStyle(item),
-        }" />
+        <div
+          class="line"
+          v-if="!index"
+          :style="{ width: `${nodeLinesWidth[-1]}px` }"
+        />
+        <div
+          class="circle keep-ratio"
+          :style="{
+            '--active-color': !item.isActive ? normalColor : activeColor,
+          }"
+        ></div>
+        <div
+          class="line"
+          :style="{
+            width: `${nodeLinesWidth[index]}px`,
+            borderImage: getBorderImageStyle(item),
+          }"
+        />
       </div>
       <slot name="bottom-label" :data="item">
-        <div class="bottom keep-ratio"
-          :style="{ backgroundImage: `url(${require(`./images/bg${item.isActive ? '-active' : ''}.svg`)})` }">
+        <div
+          class="bottom keep-ratio"
+          :style="{
+            backgroundImage: `url(${require(`./images/bg${
+              item.isActive ? '-active' : ''
+            }.svg`)})`,
+          }"
+        >
           {{ item.label }}
         </div>
       </slot>
     </div>
-
   </div>
 </template>
 
 <script>
-
 function getPositionAtCenter(element) {
   const { top, left } = element.getBoundingClientRect();
 
   return {
     x: left,
-    y: top
+    y: top,
   };
 }
 
@@ -42,73 +57,87 @@ function getDistanceBetweenElements(domA, domB) {
   const domAPosition = getPositionAtCenter(domA);
   const domBPosition = getPositionAtCenter(domB);
 
-  return Math.hypot(domAPosition.x - domBPosition.x, domAPosition.y - domBPosition.y);
+  return Math.hypot(
+    domAPosition.x - domBPosition.x,
+    domAPosition.y - domBPosition.y
+  );
 }
 
 export default {
-  name: 'TimeLine1',
+  name: "TimeLine1",
   props: {
     data: {
       type: Array,
-      default: () => Array.from({ length: 15 }).map(() => ({
-        time: "16.36",
-        label: "阿发",
-        isActive: false
-      }))
+      default: () =>
+        Array.from({ length: 15 }).map(() => ({
+          time: "16.36",
+          label: "阿发",
+          isActive: false,
+        })),
     },
     activeColor: {
       type: String,
-      default: "#39D5BF"
+      default: "#39D5BF",
     },
     normalColor: {
       type: String,
-      default: "#ccc"
+      default: "#ccc",
     },
     lineActiveColor: {
       type: String,
-      default: "linear-gradient(90deg, rgba(59, 216, 188, 1), rgba(29, 171, 215, 1)}) 2 2"
+      default:
+        "linear-gradient(90deg, rgba(59, 216, 188, 1), rgba(29, 171, 215, 1)}) 2 2",
     },
     lineNormalColor: {
       type: String,
-      default: null
+      default: null,
     },
     // 自动适配宽度
     autoSize: {
       type: Boolean,
-      default: true
+      default: true,
     },
     filterDistance: {
       type: Function,
-      default: null
-    }
+      default: null,
+    },
   },
   data() {
     return {
-      nodeLinesWidth: {}
-    }
+      nodeLinesWidth: {},
+    };
   },
   watch: {
     data: {
       handler(data) {
-        let needFilter = false
+        let needFilter = false;
         const nodeLinesWidth = [];
 
-        const filterDistance = num => needFilter ? this.filterDistance(num) : num;
+        const filterDistance = (num) =>
+          needFilter ? this.filterDistance(num) : num;
 
         const removeDistance = 20 + 4 * 2;
 
         function getDistance(index) {
-          return filterDistance(getDistanceBetweenElements(
-            this.$refs.nodeRefs[index].querySelector('.center'),
-            this.$refs.nodeRefs[index + 1].querySelector('.center'))
-          ) - removeDistance
-        };
+          return (
+            filterDistance(
+              getDistanceBetweenElements(
+                this.$refs.nodeRefs[index].querySelector(".center"),
+                this.$refs.nodeRefs[index + 1].querySelector(".center")
+              )
+            ) - removeDistance
+          );
+        }
 
         function getSpecialDistance(index) {
-          return filterDistance(getDistanceBetweenElements(
-            this.$refs.nodeRefs[index].parentElement,
-            this.$refs.nodeRefs[index].querySelector('.center'))
-          ) - removeDistance
+          return (
+            filterDistance(
+              getDistanceBetweenElements(
+                this.$refs.nodeRefs[index].parentElement,
+                this.$refs.nodeRefs[index].querySelector(".center")
+              )
+            ) - removeDistance
+          );
         }
 
         const getLineWidths = () => {
@@ -117,41 +146,49 @@ export default {
           data.forEach((_, index) => {
             if (index === data.length - 1) {
               if (this.autoSize) {
-                nodeLinesWidth[-1] = getSpecialDistance.call(this, 0)
-                nodeLinesWidth[data.length - 1] = getSpecialDistance.call(this, data.length - 1)
+                nodeLinesWidth[-1] = getSpecialDistance.call(this, 0);
+                nodeLinesWidth[data.length - 1] = getSpecialDistance.call(
+                  this,
+                  data.length - 1
+                );
               }
 
-              return
-            };
+              return;
+            }
 
             nodeLinesWidth[index] = getDistance.call(this, index);
           });
 
           this.nodeLinesWidth = nodeLinesWidth;
-        }
+        };
 
         this.$nextTick(() => {
           const timeLine1RefDom = this.$refs.TimeLine1Ref;
-          if (timeLine1RefDom.clientWidth != timeLine1RefDom.getBoundingClientRect().width) {
-            needFilter = true
+          if (
+            timeLine1RefDom.clientWidth !=
+            timeLine1RefDom.getBoundingClientRect().width
+          ) {
+            needFilter = true;
           }
           getLineWidths();
-        })
+        });
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   methods: {
     getBorderImageStyle(item) {
-      const linearColor = item.isActive ? (this.lineActiveColor || `${this.activeColor}, ${this.activeColor}`) : (this.lineNormalColor || `${this.normalColor}, ${this.normalColor}`)
+      const linearColor = item.isActive
+        ? this.lineActiveColor || `${this.activeColor}, ${this.activeColor}`
+        : this.lineNormalColor || `${this.normalColor}, ${this.normalColor}`;
 
-      return `linear-gradient(90deg, ${linearColor}) 2 2`
-    }
-  }
-}
+      return `linear-gradient(90deg, ${linearColor}) 2 2`;
+    },
+  },
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 div.auto-size {
   justify-content: space-between;
   overflow: hidden;
@@ -176,7 +213,7 @@ div.auto-size {
   font-size: 14px;
   font-family: PingFang SC, PingFang SC;
   font-weight: 400;
-  color: #FFFFFF;
+  color: #ffffff;
   display: flex;
   flex-wrap: nowrap;
   overflow: auto;
@@ -192,8 +229,9 @@ div.auto-size {
     min-width: 90px;
 
     .top-label {
-      line-height: 16px;
-      height: 24px;
+      line-height: 12px;
+      height: 20px;
+      text-align: center;
     }
 
     .center {
@@ -202,9 +240,10 @@ div.auto-size {
       justify-content: center;
       gap: 6px;
       position: relative;
+      margin-top: 5px;
 
       .circle {
-        border: 1px solid var(--active-color, #39D5BF);
+        border: 1px solid var(--active-color, #39d5bf);
         border-radius: 50%;
         width: 15px;
         height: 15px;
@@ -219,17 +258,21 @@ div.auto-size {
           left: 50%;
           top: 50%;
           transform: translate(-50%, -50%);
-          background-color: var(--active-color, #39D5BF);
+          background-color: var(--active-color, #39d5bf);
         }
       }
 
-
       .line {
         position: absolute;
         height: 0px;
         opacity: 1;
         border: 2px solid;
-        border-image: linear-gradient(90deg, rgba(59, 216, 188, 1), rgba(29, 171, 215, 1)) 2 2;
+        border-image: linear-gradient(
+            90deg,
+            rgba(59, 216, 188, 1),
+            rgba(29, 171, 215, 1)
+          )
+          2 2;
 
         &:first-child {
           right: calc(50% + 8px + 6px);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
index 49db105a..3d429934 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
@@ -1,7 +1,11 @@
 <template>
   <Card class="CrowdnessIndicatorRankings border" title="拥挤度指标排名情况">
     <div class="map">
-      <AMapContainer ref="AMapContainerRef" v-if="delayLoad" style="z-index: 9" />
+      <AMapContainer
+        ref="AMapContainerRef"
+        v-if="delayLoad"
+        style="z-index: 9"
+      />
     </div>
     <div class="right border">
       <div
@@ -11,16 +15,21 @@
         @click="handleClick(item)"
       >
         <div
-            v-if="item.key === 'bar'"
-            class="label"
-            slot="reference"
-            :style="{
-              backgroundImage: `url(${require(`./images/${item.key}${
-                isActive(item) ? '-active' : ''
-              }.svg`)})`,
-            }"
+          v-if="item.key === 'bar'"
+          class="label"
+          slot="reference"
+          :style="{
+            backgroundImage: `url(${require(`./images/${item.key}${
+              isActive(item) ? '-active' : ''
+            }.svg`)})`,
+          }"
         />
-        <ElPopover v-else trigger="manual" :value="isActive(item)" placement="left">
+        <ElPopover
+          v-else
+          trigger="manual"
+          :value="isActive(item)"
+          placement="left"
+        >
           <div v-if="item.key === 'weather'" class="weather">
             <span>天气：{{ weatherData.text }}</span>
             <span>能见度：{{ weatherData.vis }}公里</span>
@@ -51,7 +60,7 @@
 import Card from "@screen/components/Card2/Card.vue";
 import AMapContainer from "@screen/pages/Home/components/AMapContainer/index.vue";
 import { provideMixin } from "./../../mixin";
-import { WeatherForecast } from "@/api/commandDispatch";
+import { getWeatherForecast } from "@/api/commandDispatch";
 import * as echarts from "echarts";
 import { StatChartOption } from "./charts";
 
@@ -106,7 +115,7 @@ export default {
       if (findIndex === -1) this.active.push(item.key);
       else this.active.splice(findIndex, 1);
       if (item.key === "weather") {
-        this.getWeatherForecast();
+        this.getWeather();
       } else if (item.key === "pie") {
         this.$nextTick(() => {
           const statChart = echarts.init(
@@ -114,12 +123,12 @@ export default {
           );
           statChart.setOption(StatChartOption);
         });
-      } else if (item.key === 'bar'){
-        this.$refs.AMapContainerRef.showRoadConditions(findIndex === -1)
+      } else if (item.key === "bar") {
+        this.$refs.AMapContainerRef.showRoadConditions(findIndex === -1);
       }
     },
-    getWeatherForecast() {
-      WeatherForecast(117.2, 36.65).then((res) => {
+    getWeather() {
+      getWeatherForecast(117.2, 36.65).then((res) => {
         this.weatherData =
           res.data.weatherInTheAreaWhereTheIncidentOccurred.now;
         console.log("气象", res);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
index 3218e6ac..8889081d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
@@ -9,22 +9,23 @@
       <div class="dispatch-item">
         <span class="label">业务单位：</span>
         <span class="value">{{
-          dispatchData.organizationName ? dispatchData.organizationName : "-"
+          dispatchData.deptName ? dispatchData.deptName : "-"
         }}</span>
       </div>
       <div class="dispatch-item">
-        <div>
-          <span class="label">值班领导：</span>
-          <span class="value">{{
-            dispatchData.shiftsName ? dispatchData.shiftsName : "-"
-          }}</span>
-        </div>
-        <div>
+        <span class="label">值班领导：</span>
+        <span class="value" v-for="item in dispatchData.shifts">
+          姓名：{{ item.shiftsName ? item.shiftsName : "-" }} 电话：{{
+            item.shiftsNumber ? item.shiftsNumber : "-"
+          }}</span
+        >
+
+        <!-- <div>
           <span class="label">手机号：</span>
           <span class="value">{{
             dispatchData.shiftsNumber ? dispatchData.shiftsNumber : "-"
           }}</span>
-        </div>
+        </div> -->
       </div>
       <div class="dispatch-item">
         <span class="label">调度人员：</span>
@@ -68,7 +69,7 @@ import Card from "@screen/components/Card2/Card.vue";
 import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import Descriptions from "@screen/components/Descriptions.vue";
 import { provideMixin } from "./../../mixin";
-import { commandDispatch } from "@/api/commandDispatch";
+import { postCommandDispatch } from "@/api/commandDispatch";
 import StatsDialogVisible from "./StatsDialogVisible/index.vue";
 import request from "@/utils/request";
 
@@ -99,29 +100,31 @@ export default {
     },
     getCommandDispatch() {
       let data = {
-        stakeMark: "K099+750",
+        stakeMark: "K100+100",
+        id: "96b9918efc01488cb22fa1d9d3236dfd",
       };
-      commandDispatch(data).then((res) => {
-        res.data.forEach((element) => {
-          if (element.vehiclesMap.length > 0) {
-            element.vehiclesMap.forEach((item) => {
-              this.vehicleTypeList.forEach((i) => {
-                if (item.vehicleType == i.dictValue) {
-                  item.vehicleText = "（" + i.dictLabel + "）";
-                }
-              });
-            });
-          }
-        });
-        this.dispatchList = res.data;
-        this.dispatchData = res.data[0];
+      postCommandDispatch(data).then((res) => {
+        // res.data.forEach((element) => {
+        //   if (element.vehiclesMap.length > 0) {
+        //     element.vehiclesMap.forEach((item) => {
+        //       this.vehicleTypeList.forEach((i) => {
+        //         if (item.vehicleType == i.dictValue) {
+        //           item.vehicleText = "（" + i.dictLabel + "）";
+        //         }
+        //       });
+        //     });
+        //   }
+        // });
+        // this.dispatchList = res.data;
+        this.dispatchData = res.data.resource;
+        console.log(" this.dispatchData", this.dispatchData);
       });
     },
     getVehicleTypeList() {
       if (this.vehicleTypeList.length) return;
 
       request({
-        url: `/system/dict/data/type/sys_vehicle_type`,
+        url: `/system/dict/data/type/vehicle_type`,
         method: "GET",
         params: {},
       })
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
new file mode 100644
index 00000000..e94afeb8
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
@@ -0,0 +1,356 @@
+<template>
+  <Dialog v-model="modelVisible" title="收费站管制统计" style="width: 100%">
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index";
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import Table from "@screen/components/Table.vue";
+import { selectTollStation } from "@/api/event/governanceAnalysis";
+import request from "@/utils/request";
+export default {
+  name: "StatsDetail",
+  components: {
+    Dialog,
+    InputSearch,
+    Table,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  props: {
+    visible: Boolean,
+  },
+  data() {
+    return {
+      num: 0,
+      tableData: [],
+      weatherNum: [],
+      startTime: "",
+      endTime: "",
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+      searchType: 1,
+      controlType: 1,
+      facilityIds: [],
+      facilityTableData: [],
+      searchFormList: [
+        {
+          label: "查询条件:",
+          key: "searchType",
+          required: true,
+          isAlone: true,
+          type: "RadioGroup",
+          default: 1,
+          options: {
+            type: "circle",
+            options: [
+              {
+                key: 1,
+                label: "站点",
+              },
+              {
+                key: 2,
+                label: "原因",
+              },
+            ],
+          },
+        },
+        {
+          label: "事件类型:",
+          key: "controlType",
+          required: true,
+          isAlone: true,
+          type: "RadioGroup",
+          visible: (data) => {
+            if (data.searchType == 2) {
+              return true;
+            }
+          },
+          default: 1,
+          options: {
+            type: "circle",
+            options: [
+              {
+                key: 1,
+                label: "收费站封闭",
+              },
+              {
+                key: 2,
+                label: "收费站限行",
+              },
+            ],
+          },
+        },
+        {
+          label: "选择站点:",
+          key: "facilityId",
+          required: true,
+          type: "Select",
+          options: {
+            multiple: true,
+            options: [],
+          },
+          default: [],
+          visible: (data) => {
+            if (data.searchType == 1) {
+              return true;
+            }
+          },
+        },
+        {
+          label: "日期:",
+          key: "date",
+          required: true,
+          type: "datePicker",
+          default: "",
+          options: {
+            pickerOptions: {
+              disabledDate(time) {
+                return time.getTime() > Date.now();
+              },
+            },
+            valueFormat: "yyyy-MM-dd",
+            type: "daterange",
+          },
+        },
+      ],
+      queryParams: {},
+    };
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      },
+    },
+  },
+
+  methods: {
+    getFacilityList() {
+      Promise.allSettled([
+        // 查询收费站
+        request({
+          url: `/business/facility/query`,
+          method: "get",
+        }),
+      ]).then((res) => {
+        if (res[0].status === "fulfilled" && res[0].value.code == 200) {
+          // this.searchFormList[2].options.options = res[0].value.data.map(
+          //   (item) => ({
+          //     key: item.id,
+          //     label: item.facilityName,
+          //   })
+          // );
+          let dataList = [];
+          res[0].value.data.forEach((item) => {
+            if (item.facilityType == 1) {
+              dataList.push({
+                key: item.id,
+                label: item.facilityName,
+              });
+            }
+          });
+          this.searchFormList[2].options.options = dataList;
+          this.facilityIds = res[0].value.data.map((item) => item.id);
+          this.searchFormList[2].default = dataList.map((item) => item.key);
+          console.log(56, this.searchFormList[2].default);
+          let currentMonth = moment().format("YYYY-MM");
+          let currentDate = moment().format("YYYY-MM-DD");
+          this.queryParams = {
+            searchType: 1,
+            facilityId: this.facilityIds,
+            date: [currentMonth + "-01", currentDate],
+          };
+          this.searchFormList[3].default = [currentMonth + "-01", currentDate];
+          this.getSelectTollStation(this.queryParams);
+        }
+      });
+    },
+    // handleResetForm(data) {
+    //   this.getSelectTollStation(data);
+    // },
+    handleSearch(data, value) {
+      console.log(888, data, value);
+      if (value == "reset") {
+        data = this.queryParams;
+      }
+      this.getSelectTollStation(data);
+    },
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (this.searchType == 2) {
+        if (!row.causeTypeName) {
+          if (columnIndex === 0) {
+            return [1, 2];
+          } else if (columnIndex === 1) {
+            return [0, 0];
+          }
+        }
+        if (row.controlCauseName === "恶劣天气") {
+          if (columnIndex === 0) {
+            console.log(this.weatherNum.length);
+            if (rowIndex === 0) {
+              return [this.weatherNum.length, 1];
+            } else if (rowIndex <= this.weatherNum.length) {
+              return [0, 0];
+            }
+            // if (rowIndex === 2) {
+            //     return [7, 1];
+            // }
+            // else if (rowIndex === 3) {
+            //     return [0, 0];
+            // } else if (rowIndex === 4) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 5) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 6) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 7) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 8) {
+            //     return [0, 0];
+            // }
+          }
+          // this.weatherNum = 0
+        }
+      }
+    },
+    getSelectTollStation(data) {
+      let startTime = "";
+      let endTime = "";
+      if (data) {
+        startTime = data.date[0] + " 00:00:00";
+        endTime = data.date[1] + " 23:59:59";
+      } else {
+        startTime = new Date("2024-01-01 11:12:21");
+        startTime = new Date("2024-01-26 11:12:36");
+      }
+
+      var formData = new FormData();
+      this.searchType = data.searchType;
+      this.controlType = data.controlType;
+      if (data.searchType == 1) {
+        formData.append("facilityId", data.facilityId);
+      } else {
+        formData.append("controlType", data.controlType);
+      }
+      formData.append("searchType", data.searchType);
+      formData.append("startTime", startTime);
+      formData.append("endTime", endTime);
+      let weatherData = [];
+      let otherData = [];
+      selectTollStation(formData).then((res) => {
+        if (data.searchType == 2) {
+          this.weatherNum = [];
+          res.data.forEach((item) => {
+            if (item.causeTypeName) {
+              this.weatherNum.push(item.causeTypeName);
+              weatherData.push(item);
+            } else {
+              otherData.push(item);
+            }
+          });
+          this.tableData = weatherData.concat(otherData);
+        } else {
+          res.data.forEach((item) => {
+            item.total =
+              item.facilityClose +
+              item.facilityRestriction +
+              item.facilityInterval;
+          });
+          this.facilityTableData = res.data;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.getFacilityList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  min-height: 800px;
+}
+
+.search {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+::v-deep .is-scrolling-none {
+  background: #0b6581;
+}
+
+::v-deep .el-table__empty-text {
+  color: #3ae0f8;
+}
+
+.StatsDetail {
+  // height: 770px;
+  margin: 20px 0;
+  width: 100%;
+  display: flex;
+  gap: 5px;
+}
+
+.el-table {
+  border: 1px solid #07aec6;
+  background: #0b6581;
+}
+
+::v-deep .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  background: #0b6581;
+  border: 1px solid #07aec6;
+}
+
+::v-deep .el-table th.el-table__cell > .cell {
+  color: #3de8ff;
+}
+
+::v-deep .el-table thead.is-group th.el-table__cell {
+  background: #0b6581;
+  border: 1px solid #07aec6;
+}
+
+// ::v-deep .el-table th.el-table__cell.is-leaf,
+::v-deep .el-table td.el-table__cell {
+  border: 1px solid #07aec6;
+  background: #1b586d;
+  color: #fff;
+}
+
+::v-deep .el-table tr {
+  border: 1px solid #07aec6;
+  background-color: #0b6581;
+}
+
+::v-deep
+  .el-table--enable-row-hover
+  .el-table__body
+  tr:hover
+  > td.el-table__cell {
+  background: #1b586d;
+  border: 1px solid #07aec6;
+}
+
+::v-deep .el-table::before,
+.el-table--group::after,
+.el-table--border::after {
+  background: none;
+}
+</style>
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 d8bf221d..712972aa 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,9 +1,13 @@
 <template>
   <Card class="DisposalProcess" title="处置过程">
     <template #title-suffix>
-      <ButtonGradient class="title-button" @click=""> 事件解除 </ButtonGradient>
+      <ButtonGradient class="title-button" @click="handleEventRelieve">
+        事件解除
+      </ButtonGradient>
       <!-- <ButtonGradient class="title-button"> 协同调度 </ButtonGradient> -->
-      <ButtonGradient class="title-button" @click=""> 无需清障 </ButtonGradient>
+      <ButtonGradient class="title-button" @click="handleNoWrecker">
+        无需清障
+      </ButtonGradient>
       <ButtonGradient class="title-button"> 重要事件上报 </ButtonGradient>
       <!-- <ButtonGradient class="title-button"> 路赔 </ButtonGradient> -->
       <ButtonGradient
@@ -71,6 +75,11 @@
       </ButtonGradient> -->
     </div>
   </Card>
+  <DialogVisible
+    :visible="dialogVisible"
+    :data="dispatchList"
+    @update:value="handleClose"
+  />
 </template>
 
 <script>
@@ -80,6 +89,14 @@ import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/inde
 import { getToken } from "@/utils/auth";
 import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index";
 import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index";
+import DialogVisible from "./DialogVisible/index.vue";
+import {
+  getProcessNode,
+  getProcessList,
+  postProcess,
+  postCompleteEvent,
+  postNoSkipClear,
+} from "@/api/commandDispatch";
 
 import { provideMixin } from "./../../mixin";
 import { timeLine2List } from "./data";
@@ -95,21 +112,16 @@ export default {
     TimeLine1,
     TimeLine2,
     RadioGroup,
+    DialogVisible,
   },
   emit: ["fullHeight"],
   data() {
     return {
+      dialogVisible: true,
+      eventId: "1a91d65cc31f4a9d90122888edb31043",
       test: null,
       testRadio: "input",
       timeLine1List: [],
-
-      // timeLine2List: Array.from({ length: 6 }).map(() => ({
-      //   title: "接警记录",
-      //   time: "2023-12-21 16:35:44",
-      //   name: "甘易玫",
-      //   desc: "描述性文字文字文字文字文字文字文字文字描述性文字文字文字文字文字文字文字文字",
-      //   posts: '淄博发展公司管理员'
-      // })),
       timeLine2List: [],
       isFullHeight: false,
       options: [],
@@ -133,108 +145,114 @@ export default {
 
       this.$emit("fullHeight", "CrowdnessIndicatorRankings");
     },
+
+    // 处置过程节点
+    getProcess(eventId) {
+      getProcessNode(this.eventId).then((result) => {
+        console.log("处置过程节点", 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;
+        });
+      });
+    },
+
+    //处置过程记录
     async detailChange(id) {
-      const timelineData = await this.getDetail(id);
       let processIdMap = {};
+      getProcessList(id).then((result) => {
+        console.log("处置过程记录", result);
+        this.timeLine2List = result.map((item) => {
+          processIdMap[item.processId] = new Date(
+            item.operationTime
+          ).toLocaleTimeString();
 
-      this.timeLine2List = timelineData.map((item) => {
-        processIdMap[item.processId] = new Date(
-          item.operationTime
-        ).toLocaleTimeString();
-
-        return {
-          // title: "接警记录",
-          time: item.operationTime
-            ? new Date(item.operationTime).toLocaleString()
-            : null,
-          name: item.operator,
-          desc: item.context,
-          // posts: '淄博发展公司管理员'
-        };
+          return {
+            // title: "接警记录",
+            time: item.operationTime
+              ? new Date(item.operationTime).toLocaleString()
+              : null,
+            name: item.operator,
+            desc: item.context,
+            // posts: '淄博发展公司管理员'
+          };
+        });
       });
-
-      // this.timeLine1List = data.processConfigList.map((item) => {
-      //   return {
-      //     time: processIdMap[item.nodeNode],
-      //     label: item.processNode,
-      //     isActive: !!processIdMap[item.nodeNode],
-      //   };
-      // });
-    },
-    getDetail(id) {
-      return request({
-        url: `/system/process/list`,
-        method: "GET",
-        params: {
-          eventId: id,
-        },
-      })
-        .then((result) => {
-          return result || [];
-        })
-        .catch((err) => []);
-    },
-    //
-    getProcessNode(eventId) {
-      return request({
-        url:
-          `/dc/system/event/getProcessNode/` +
-          "1a91d65cc31f4a9d90122888edb31043",
-        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) => []);
     },
+
     // 上传成功
     handleUploadSuccess(res, file) {
       this.$message.success("上传成功");
       this.imageUrl = res.url;
     },
+
     // 上传失败
     handleUploadError() {
       this.$message.error("上传失败");
     },
+
     containsArrayElement(str, arr) {
       return arr.filter((element) => str.includes(element));
     },
+    // 处置过程发送
     onSubmit() {
-      let type = this.containsArrayElement(this.imageUrl, this.fileType);
-      console.log(type);
-      request({
-        url: `/system/process`,
-        method: "POST",
-        data: {
-          eventId: "1a91d65cc31f4a9d90122888edb31043",
+      if (this.context || this.imageUrl) {
+        let type = this.containsArrayElement(this.imageUrl, this.fileType);
+        let data = {
+          eventId: this.eventId,
           processId: this.processId,
           context: this.context,
           file: this.imageUrl,
           type: type.join(","),
-        },
-      })
-        .then((result) => {
+          source: 1,
+        };
+        postProcess(data).then((result) => {
           if (result.code != 200) return [];
-          this.getProcessNode();
-          this.detailChange("1a91d65cc31f4a9d90122888edb31043");
-        })
-        .catch((err) => []);
+          this.getProcess();
+          this.detailChange(this.eventId);
+        });
+      } else {
+        this.$message.warning("调度指令不能为空");
+      }
+    },
+
+    // 事件解除
+    handleEventRelieve() {
+      let data = new FormData();
+      data.append("eventId", this.eventId);
+      postCompleteEvent(data).then((result) => {
+        if (result.code != 200) return [];
+        this.$message.success("事件解除成功");
+      });
+    },
+    // 无需清障
+    handleNoWrecker() {
+      let data = new FormData();
+      data.append("eventId", this.eventId);
+      postNoSkipClear(data).then((result) => {
+        if (result.code != 200) return [];
+        this.$message.success("操作成功");
+      });
+    },
+
+    handleClick() {
+      this.dialogVisible = true;
+    },
+    handleClose() {
+      this.dialogVisible = false;
     },
   },
   async mounted() {
-    this.getProcessNode();
-    await this.detailChange("1a91d65cc31f4a9d90122888edb31043");
+    this.getProcess();
+    await this.detailChange(this.eventId);
   },
 };
 </script>
@@ -261,7 +279,7 @@ export default {
 
   .bottom {
     display: grid;
-    grid-template-columns: 0.5fr auto 1fr 90px 90px;
+    grid-template-columns: 0.5fr auto 1fr 90px;
     width: 100%;
     gap: 6px;
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 267fb5f4..b68458be 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -290,24 +290,25 @@ export default {
     initDevice() {
       //设备在线离线率接口
 
-      if (process.env.NODE_ENV == "development") {
-          this.equipments = [];
-          this.equipSeries.forEach((item) => {
-            this.equipments.push({
-              title: item,
-              total: Math.floor(Math.random() * 600) + 800,
-              pctOnl: Math.floor(100 * Math.random()) + "%",
-              pctOffl: "25%",
-              pctLose: "15%",
-              sumUseState: "90%",
-            });
-          });
-          return;
-        }
+      // if (process.env.NODE_ENV == "development") {
+      //     this.equipments = [];
+      //     this.equipSeries.forEach((item) => {
+      //       this.equipments.push({
+      //         title: item,
+      //         total: Math.floor(Math.random() * 600) + 800,
+      //         pctOnl: Math.floor(100 * Math.random()) + "%",
+      //         pctOffl: "25%",
+      //         pctLose: "15%",
+      //         sumUseState: "90%",
+      //       });
+      //     });
+      //     return;
+      //   }
 
       getSystemStatusType().then((res) => {
         let allList = [];
         let sort = res.data["排序规则"].rule.split(",");
+        console.log("sort", sort);
         sort.forEach((i) => {
           for (let key in res.data) {
             let val = res.data[key];
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index dae05292..12505ec7 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -52,8 +52,8 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        // target: `http://10.168.68.42:8087`, //王思祥
+        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.65.194:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝

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 5/9] =?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 6/9] =?UTF-8?q?feat=20=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=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 7/9] =?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 8/9] =?UTF-8?q?feat=20=E6=89=B9=E9=87=8F=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=20=E7=96=B2=E5=8A=B3=E5=94=A4=E9=86=92=E5=AE=8C=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 9/9] =?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: [
         {