From bd5fdf8ee6d0a63580f9d7a7cd6b0d20742a333d Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Fri, 17 May 2024 17:58:15 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=87=E6=8C=A5?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/commandDispatch/index.js     |  16 +
 .../eventDialogTable/eventDialog.vue          |  30 +-
 .../TimeLine/TimeLine2/DescCard.vue           | 329 +++++++++++++++++-
 .../DisposalProcess/DialogVisible/index.vue   |  10 +-
 .../Cards/DisposalProcess/index.vue           |   2 +
 5 files changed, 359 insertions(+), 28 deletions(-)

diff --git a/ruoyi-ui/src/api/commandDispatch/index.js b/ruoyi-ui/src/api/commandDispatch/index.js
index 3f85b074..970ec5e0 100644
--- a/ruoyi-ui/src/api/commandDispatch/index.js
+++ b/ruoyi-ui/src/api/commandDispatch/index.js
@@ -141,3 +141,19 @@ export function importantFileStatus(eventId) {
     method: "get",
   });
 }
+
+// 事件预案详情
+export function eventDetails(assocId) {
+  return request({
+    url: `/business/plans/event/assocId/${assocId}`,
+    method: "get",
+  });
+}
+
+// 获取重要文件内容详情
+export function getEventImportantFileDetails(id) {
+  return request({
+    url: `/business/eventImportantFile/${id}`,
+    method: "get",
+  });
+}
diff --git a/ruoyi-ui/src/components/eventDialogTable/eventDialog.vue b/ruoyi-ui/src/components/eventDialogTable/eventDialog.vue
index 95c5ac8b..6d6452a8 100644
--- a/ruoyi-ui/src/components/eventDialogTable/eventDialog.vue
+++ b/ruoyi-ui/src/components/eventDialogTable/eventDialog.vue
@@ -561,7 +561,9 @@
           </el-row>
         </el-form>
         <div class="dialogFooterButton">
-          <div @click="submitDialog" v-hasPermi="['system:event:check']">复核提交</div>
+          <div @click="submitDialog" v-hasPermi="['system:event:check']">
+            复核提交
+          </div>
           <!-- <div
             @click="openProcess(1, eventFormDetail.id)"
           >
@@ -577,10 +579,10 @@
       title="事件视频"
       class="videoDialog"
     >
-    <div class="dialogStyleBox">
-      <div class="dialogLine"></div>
-      <div class="dialogCloseButton"></div>
-    </div>
+      <div class="dialogStyleBox">
+        <div class="dialogLine"></div>
+        <div class="dialogCloseButton"></div>
+      </div>
       <div class="videoDialogClass">
         <video :src="videoUrl" controls muted loop fluid autoplay></video>
       </div>
@@ -592,10 +594,10 @@
       width="60%"
       :before-close="handleCloseImg"
     >
-    <div class="dialogStyleBox">
-      <div class="dialogLine"></div>
-      <div class="dialogCloseButton"></div>
-    </div>
+      <div class="dialogStyleBox">
+        <div class="dialogLine"></div>
+        <div class="dialogCloseButton"></div>
+      </div>
       <img :src="alongImgUrl" style="width: 100%" />
       <!-- <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisibleImg = false">取 消</el-button>
@@ -968,7 +970,7 @@ export default {
         } else {
           callback(new Error("请输入正确的车牌号，字母大写"));
         }
-      }else{
+      } else {
         callback();
       }
     },
@@ -1324,9 +1326,9 @@ export default {
 
     // 处置记录
     // getEventList() {
-      // eventFlowList({ eventId: this.eventForm.id }).then((res) => {
-      //   this.eventWarnList = res.rows;
-      // });
+    // eventFlowList({ eventId: this.eventForm.id }).then((res) => {
+    //   this.eventWarnList = res.rows;
+    // });
     // },
     getReservePlanData() {
       this.ReservePlanList = [];
@@ -2321,7 +2323,7 @@ hr {
   video {
     width: 100%;
     height: auto;
-    max-height:550px;
+    max-height: 550px;
   }
 }
 .el-carousel {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
index 4b27fb04..3ada8ecb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
@@ -7,7 +7,8 @@
       <span class="posts">{{ data.posts }}</span>
     </div>
     <div class="desc" v-if="data.processId">节点：{{ data.processName }}</div>
-    <img
+    <el-image
+      style="width: 100px; height: 100px"
       v-if="
         data.type == 'bmp' ||
         data.type == 'jpg' ||
@@ -15,21 +16,264 @@
         data.type == 'png'
       "
       :src="data.url"
-    />
-    {{ data.url }}
+    >
+    </el-image>
+
     <video
       v-if="data.type == 'mp4' || data.type == 'avi' || data.type == 'xmvb'"
+      class="videoClass"
       :src="data.url"
+      :poster="data.url"
+      muted
+      controls
+    ></video>
+    <div v-if="data.type == 'text'">
+      <div class="desc" v-html="data.desc" />
+    </div>
+    <el-popover
+      trigger="click"
+      placement="right"
+      v-if="data.processType == '3'"
+      style="color: red; cursor: pointer"
     >
-      <!-- <source :src="data.desc" /> -->
-    </video>
-    <!-- <div class="desc">{{ data.desc }}</div> -->
-    <div v-if="data.type == 'text'" class="desc" v-html="data.desc" />
+      <span slot="reference" @click="handleDetails(data)">详情</span>
+      <div class="detailsBox" v-if="data.processType == '3'">
+        <div class="item" v-for="item in controlResult" :key="item.deviceName">
+          <span class="label"> {{ item.deviceName }}：</span>
+          <span class="value"> {{ item.content }}</span>
+        </div>
+      </div>
+    </el-popover>
+    <div
+      v-if="data.processType == '4'"
+      style="color: red; cursor: pointer"
+      @click="openDetailsDialog(data)"
+    >
+      详情
+    </div>
+    <Dialog style="" v-model="detailsDialog" width="1085px" top="60px">
+      <div v-if="data.processType == '4'" class="docx-wrapper">
+        <section
+          ref="initFile"
+          class="docx"
+          style="
+            padding: 72pt 90.15pt;
+            width: 595.3pt;
+            min-height: 741.9pt;
+            column-count: 1;
+            column-gap: 36pt;
+          "
+        >
+          <article>
+            <p
+              style="
+                line-height: 1;
+                text-align: center;
+                vertical-align: baseline;
+                margin-bottom: 10px;
+              "
+            >
+              <span
+                lang="en-US"
+                style="
+                  font-family: 方正小标宋简体;
+                  color: rgb(255, 0, 0);
+                  min-height: 46pt;
+                  font-size: 46pt;
+                  font-weight: 700;
+                "
+                >重要事件</span
+              >
+            </p>
+            <p
+              style="
+                margin-bottom: 2pt;
+                min-height: 15pt;
+                line-height: 15pt;
+                text-align: center;
+                vertical-align: baseline;
+              "
+            >
+              <span
+                lang="null"
+                style="
+                  font-family: 仿宋_GB2312;
+                  font-weight: normal;
+                  min-height: 10.5pt;
+                  font-size: 10.5pt;
+                "
+                >报送单位：</span
+              ><span
+                lang="en-US"
+                style="
+                  font-family: 仿宋_GB2312;
+                  font-weight: normal;
+                  min-height: 10.5pt;
+                  font-size: 10.5pt;
+                "
+              >
+                {{ formFileData.fromDept }}</span
+              ><span
+                lang="null"
+                style="
+                  font-family: 仿宋_GB2312;
+                  font-weight: normal;
+                  min-height: 10.5pt;
+                  font-size: 10.5pt;
+                "
+                >报送时间：</span
+              ><span
+                lang="en-US"
+                style="
+                  font-family: 仿宋_GB2312;
+                  font-weight: normal;
+                  min-height: 10.5pt;
+                  font-size: 10.5pt;
+                "
+                >{{ formFileData.createTime }}</span
+              >
+            </p>
+            <p
+              style="
+                margin-bottom: 1pt;
+                min-height: 10pt;
+                line-height: 10pt;
+                text-align: center;
+                vertical-align: baseline;
+              "
+            >
+              <span
+                style="
+                  font-family: 'Times New Roman';
+                  font-weight: bold;
+                  color: rgb(255, 0, 0);
+                  min-height: 22pt;
+                  font-size: 22pt;
+                "
+                >——————————————————</span
+              >
+            </p>
+            <p
+              style="
+                margin-bottom: 6pt;
+                min-height: 25pt;
+                line-height: 25pt;
+                text-align: center;
+                vertical-align: baseline;
+              "
+            >
+              <span
+                lang="en-US"
+                style="
+                  font-family: 方正小标宋简体;
+                  min-height: 22pt;
+                  font-size: 22pt;
+                  font-weight: bold;
+                "
+                >{{ formFileData.title }}</span
+              >
+            </p>
+            <p
+              style="
+                text-indent: 0pt;
+                text-align: left;
+                vertical-align: baseline;
+              "
+            >
+              <span
+                lang="en-US"
+                style="
+                  font-family: 仿宋_GB2312;
+                  font-weight: normal;
+                  color: black;
+                  min-height: 16pt;
+                  font-size: 16pt;
+                "
+                >智慧管理中心：</span
+              >
+            </p>
+            <textarea
+              v-model="formFileData.content"
+              disabled
+              style="
+                width: 100%;
+                height: 40vh;
+                line-height: 1.5;
+                text-indent: 0pt;
+                vertical-align: baseline;
+                font-family: 仿宋_GB2312;
+                font-weight: normal;
+                color: black;
+                min-height: 16pt;
+                font-size: 16pt;
+                background: #fff;
+                border: none;
+              "
+            >
+                
+                  {{ formFileData.content }}
+               
+              </textarea
+            >
+
+            <p
+              style="line-height: 1; text-indent: 0pt; vertical-align: baseline"
+            ></p>
+            <p style="vertical-align: baseline"></p>
+            <p
+              style="
+                margin-bottom: 1pt;
+                min-height: 10pt;
+                line-height: 10pt;
+                text-align: center;
+                vertical-align: baseline;
+              "
+            >
+              <span
+                style="
+                  font-family: 'Times New Roman';
+                  font-weight: bold;
+                  color: rgb(255, 0, 0);
+                  min-height: 22pt;
+                  font-size: 22pt;
+                "
+                >——————————————————</span
+              >
+            </p>
+            <p
+              class="docx-num-0-0"
+              style="
+                display: flex;
+                justify-content: space-between;
+                margin-top: 0pt;
+                text-align: center;
+                vertical-align: baseline;
+                font-family: 仿宋_GB2312;
+                font-weight: normal;
+                min-height: 14pt;
+                font-size: 14pt;
+              "
+            >
+              <span lang="en-US">填报人:{{ formFileData.createName }} </span>
+              <span>联系电话:{{ formFileData.phoneNumber }}</span>
+              <span> 签发人：{{ formFileData.issued }}</span>
+            </p>
+          </article>
+        </section>
+        <!-- <button @click="handleDownload">下载</button> -->
+      </div>
+      <div></div>
+    </Dialog>
   </div>
 </template>
 
 <script>
 import Video from "@screen/components/VideoMulti";
+import Dialog from "@screen/components/Dialog/index";
+import {
+  eventDetails,
+  getEventImportantFileDetails,
+} from "@/api/commandDispatch";
 export default {
   name: "DescCard",
   props: {
@@ -43,7 +287,6 @@ export default {
       handler(newValue, oldValue) {
         if (newValue != "text") {
           this.data.url = process.env.VUE_APP_BASE_API + this.data.desc;
-          console.log("this.data.url", this.data.url);
         }
       },
       deep: true,
@@ -52,6 +295,40 @@ export default {
   },
   components: {
     Video,
+    Dialog,
+  },
+  data() {
+    return {
+      detailsDialog: false,
+      controlResult: [],
+      formFileData: {
+        fromDept: "齐鲁高速股份有限公司",
+        createTime: "2024年04月24日17时22分",
+        title: "关于G20青银高速K305+208交通事故的续报1",
+        toDept: "智慧管理中心",
+        content: "路管等单位及清障救援车辆已到达现场。预计结束时间为12时44分。",
+        createName: "张三",
+        phoneNumber: "18678866677",
+        issued: "康传刚",
+        status: 0,
+        id: null,
+      },
+    };
+  },
+  methods: {
+    handleDetails(data) {
+      eventDetails(data.id).then((res) => {
+        if (res.data?.controlResult) {
+          this.controlResult = JSON.parse(res.data.controlResult);
+        }
+      });
+    },
+    openDetailsDialog(data) {
+      this.detailsDialog = true;
+      getEventImportantFileDetails(data.id).then((res) => {
+        this.formFileData = res.data;
+      });
+    },
   },
 };
 </script>
@@ -99,4 +376,40 @@ export default {
     line-height: 19px;
   }
 }
+.videoClass {
+  width: 300px;
+  height: 180px;
+}
+.docx-wrapper {
+  background: #fff;
+  padding: 30px;
+  display: flex;
+  flex-flow: column;
+  align-items: center;
+  > section.docx {
+    background: white;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+    margin-bottom: 30px;
+  }
+  .docx p,
+  p.docx_1 span {
+    font-family: var(--docx-minorHAnsi-font);
+    color: #00000a;
+    min-height: 11pt;
+    font-size: 11pt;
+  }
+  button {
+    cursor: pointer;
+    width: 100px;
+    height: 35px;
+    line-height: 35px;
+    color: #fff;
+    background: #00b3cc;
+    border-radius: 48px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border: none;
+  }
+}
 </style>
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
index 8ff821d1..9108070e 100644
--- 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
@@ -17,7 +17,7 @@
             ref="FormReportRef"
             :formList="reportList"
             v-model="reportData"
-            label-width="100px"
+            label-width="150px"
           />
           <div class="footer">
             <Button @click.native="onSubmit">保存</Button>
@@ -992,18 +992,16 @@ export default {
       padding: 0;
     }
     .el-textarea__inner {
-      caret-color: #000;
+      caret-color: #000 !important;
       margin-bottom: 20px;
       font-size: 1.14583vw;
       font-family: 仿宋;
       margin: 0 20px;
       height: 400px !important;
       border-width: initial;
-      border-style: none;
-      border-color: initial;
-      border-image: initial;
+      border: none !important;
       background: #fff;
-      color: #000;
+      color: #000 !important;
       padding: 0;
     }
   }
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 51f08ace..47af8e59 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
@@ -278,6 +278,7 @@ export default {
 
           return {
             // title: "接警记录",
+            id: item.processId,
             time: item.operationTime
               ? new Date(item.operationTime).toLocaleString()
               : null,
@@ -287,6 +288,7 @@ export default {
             processId: item.processId,
             processName: item.processName,
             type: item.type,
+            processType: item.processType,
             // posts: '淄博发展公司管理员'
           };
         });

From a48b4ef7a9dc899e3a61aaaf2490179b1585599b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Fri, 17 May 2024 18:48:30 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E9=A2=84=E6=A1=88=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrowdnessIndicatorRankings/index.vue      |   1 -
 .../DeviceControl/components/ScopeTable.vue   | 122 +++++++++++++-----
 .../Cards/DeviceControl/data.js               |   1 +
 .../Cards/DeviceControl/index.vue             |  48 ++++++-
 .../control/event/commandDispatch/index.vue   |   8 +-
 .../smart/manage/index.vue                    |   1 -
 6 files changed, 148 insertions(+), 33 deletions(-)

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 a7cfaef2..0314e34e 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
@@ -287,7 +287,6 @@ export default {
       }
       const self = this;
       setTimeout(() => {
-        console.log(self.detailData,'---------------')
         // 获取map接口
         const { AMap, mapIns } = self.$refs.AMapContainerRef.getMapInstance();
         const { longitude, dimension, eventName } = self.detailData;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
index 9b84a6b8..e08e17b1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
@@ -4,11 +4,10 @@
             <el-col :span="7">
                 <!-- 设备类型 -->
                 <el-select v-model="tableInfo.deviceType" placeholder="" @change="changeDeviceType" transfer="true"
-                     style="width: 123px;">
+                    style="width: 123px;">
                     <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
-                
             </el-col>
             <el-col :span="1">
             </el-col>
@@ -30,8 +29,31 @@
                     style="width: 75px;"></el-input-number>
                 <span v-if="tableInfo.searchRule == 4" style="width: 56px;">公里</span>
             </el-col>
+            <el-col :span="4" v-if="tableInfo.deviceType == '2'">
+                <div class="firstBtns">
+                    <ButtonGradient class="title-button" @click.native="$emit('onConfirm', index)">
+                        <i class="el-icon-check"></i>
+                    </ButtonGradient>
+                    <el-dropdown>
+                        <span class="el-dropdown-link">
+                            <ButtonGradient class="title-button">
+                                <i class="el-icon-more"></i>
+                            </ButtonGradient>
+                        </span>
+                        <el-dropdown-menu slot="dropdown"
+                            style="background-color: #102833;border: solid 1px #0b5575;">
+                            <el-dropdown-item icon="el-icon-plus" @click.native="$emit('onAdd', index)">
+                               新增
+                            </el-dropdown-item>
+                            <el-dropdown-item icon="el-icon-delete" @click.native="$emit('onDel', index)">
+                                删除
+                            </el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
 
-            <el-col :span="4">
+                </div>
+            </el-col>
+            <el-col :span="4" v-else>
                 <div class="firstBtns">
                     <ButtonGradient class="title-button" @click.native="$emit('onAdd')">
                         <i class="el-icon-plus"></i>
@@ -62,12 +84,6 @@
                     <el-option label="智能发布" :value="2"></el-option>
                 </el-select>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 2 && tableInfo.zx_operationType == 1" :span="8">
-                <el-input @click.native="clickQbb('zx_content')" placeholder="请选择" v-model="tableInfo.zx_content"
-                    readonly>
-                    <i slot="suffix" class="el-input__icon el-icon-search"></i>
-                </el-input>
-            </el-col>
             <!-- 疲劳唤醒 -->
             <el-col v-if="tableInfo.deviceType == 10" :span="8">
                 <el-select v-model="tableInfo.zx_name" placeholder="工作模式">
@@ -113,7 +129,28 @@
                 <el-input v-model="tableInfo.zx_content" placeholder="请输入发布内容"></el-input>
             </el-col>
         </el-row>
-
+        <el-row v-if="tableInfo.deviceType == 2 && tableInfo.executeConfig && tableInfo.executeConfig.contentList">
+            <el-col :span="24">
+               <div class="keep-ratio" origin="top" v-for="(itm,idx) of tableInfo.executeConfig.contentList">
+                <div class="contentLabel" >{{ itm.deviceName }}</div>
+                <div class="contentValue" v-if="itm.isEditor === undefined">
+                    <div class="contentBoard" >{{ itm.content }}</div>
+                    <ButtonGradient class="btn" @click.native="$emit('onContentEdit', {field:'executeConfig',index,idx,type:'edit'})">
+                        <i class="el-icon-edit"></i>
+                    </ButtonGradient>
+                </div>
+                <div class="contentValue" v-else>
+                    <input class="contentBoard" placeholder="请输入文字" v-model="itm.content"></input>
+                    <ButtonGradient class="btn" style="margin-left: 5px;" @click.native="$emit('onContentEdit', {field:'executeConfig',index,idx,type:'cancel'})">
+                        <i class="el-icon-refresh-left"></i>
+                    </ButtonGradient>
+                    <ButtonGradient class="btn"  style="margin-left: 5px;" @click.native="$emit('onContentEdit', {field:'executeConfig',index,idx,type:'confirm'})">
+                        <i class="el-icon-check"></i>
+                    </ButtonGradient>
+                </div>
+              </div>
+            </el-col>
+        </el-row>
         <el-row v-if="tableInfo.deviceType !== 5">
             <el-col :span="3">
                 <p>恢复:</p>
@@ -125,12 +162,6 @@
                     <el-option label="还原上次" :value="2"></el-option>
                 </el-select>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 2 && tableInfo.hf_operationType == 1" :span="8">
-                <el-input @click.native="clickQbb('hf_content')" placeholder="请选择" v-model="tableInfo.hf_content"
-                    readonly>
-                    <i slot="suffix" class="el-input__icon el-icon-search"></i>
-                </el-input>
-            </el-col>
             <!-- 疲劳唤醒 -->
             <el-col v-if="tableInfo.deviceType == 10" :span="8">
                 <el-select v-model="tableInfo.hf_name" placeholder="工作模式">
@@ -166,17 +197,18 @@
                 </el-select>
             </el-col>
             <!-- 语音广播 -->
-            <!-- <el-col v-if="tableInfo.deviceType == 5" :span="4">
-                <el-select v-model="tableInfo.hf_operationType" placeholder="请选择">
-                    <el-option label="自定义发布" :value="1"></el-option>
-                    <el-option label="智能发布" :value="2"></el-option>
-                </el-select>
-            </el-col> -->
             <el-col v-if="tableInfo.deviceType == 5" :span="12">
                 <el-input v-model="tableInfo.hf_content" placeholder="请输入发布内容"></el-input>
             </el-col>
         </el-row>
-
+        <el-row v-if="tableInfo.deviceType == 2 && tableInfo.recoverConfig && tableInfo.recoverConfig.contentList">
+            <el-col :span="24">
+               <div class="keep-ratio" origin="top" v-for="(item,index) of tableInfo.recoverConfig.contentList">
+                <div class="contentLabel" >{{ item.deviceName }}</div>
+                <div class="contentValue"><div class="contentBoard" >{{ item.content }}</div><el-button icon="el-icon-edit"></el-button></div>
+              </div>
+            </el-col>
+        </el-row>
         <!-- 情报板弹窗 -->
         <QbbDialog :visible="isShowDialog" :info="qbbData" @close="onCloseDialog" @dialogSubmit="dialogSubmit" />
     </div>
@@ -309,12 +341,9 @@ export default {
         }
     },
     async mounted() {
-        // this.loadData(2);
     },
     methods: {
-        initData() {
-
-        },
+        initData() { },
         async loadData(deviceType = 1) {
             this.sbOptions = [];
             let result = await request({
@@ -347,14 +376,30 @@ export default {
             this.isShowDialog = false;
         },
         dialogSubmit(data) {
-            console.log('qbbData', data)
             this.tableInfo[this.clickQbbName] = data.content;
             // this.tableData[this.index].otherConfig = JSON.stringify(data);
-        }
+        },
     }
 }
 </script>
 
+<style>
+    .el-dropdown-menu__item {
+    color: #fff !important;
+    &:hover {
+        background-color: #2ca5ad !important;
+    }
+    }
+    .el-dropdown-menu__item.is-active {
+    color: #409EFF;
+    background-color: #ecf5ff;
+    }
+
+    .el-dropdown-menu__item.is-disabled {
+    color: #409EFF;
+    background-color:  #ecf5ff;
+    }
+</style>
 <style lang="scss" scoped>
 .ScopeTable {
     display: flex;
@@ -382,5 +427,24 @@ export default {
 
     }
 
+    .dropmenu {
+        color: white !important;
+    }
+}
+.contentValue{
+    display: flex;
+    width:100%;
+    align-items: center;
+    margin-bottom: 10px;
+}
+.contentBoard{
+    flex:1;
+    background-color: #000;  
+    color:yellow;
+    padding: 9px 0px;
+    text-align: center;
+}
+.btn{
+    height:40px;
 }
 </style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js
index 775abffd..3f2b1835 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js
@@ -4,6 +4,7 @@ export const defaultTableInfo = {
   deviceType: 2,
   searchRule: 1,
   number: 0,
+  isDefault: true
   // zx_operationType: 2,
   // hf_operationType: 2,
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
index 83aa5bd4..5e5b1f86 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
@@ -7,6 +7,8 @@
           :index="index"
           @onAdd="onAdd"
           @onDel="onDel"
+          @onConfirm="onConfirm"
+          @onContentEdit="onContentEdit"
         ></ScopeTable>
       </el-row>
     </div>
@@ -59,7 +61,6 @@ export default {
       this.initData(this.detailData);
     },
     initData(eventInfo) {
-      console.log("eventInfo", eventInfo);
       request({
         url: `business/plans/list/event/type`,
         method: "post",
@@ -120,6 +121,51 @@ export default {
       }
       this.tableData.splice(index, 1);
     },
+    onConfirm(index){
+        const param = {
+            "dcEvent": {
+                "eventType": this.detailData.eventType,
+                "direction": this.detailData.direction,
+                "id": this.detailData.id,
+                "stakeMark": this.detailData.stakeMark,
+                "subclass": this.detailData.subclass
+            },
+            "dcExecuteAction": {
+                "id": "",
+                "emergencyPlansId": "",
+                "deviceType": this.tableData[index].deviceType,
+                "searchRule": this.tableData[index].searchRule,
+                "number": this.tableData[index].number,
+                "deviceList": this.tableData[index].devList.join(','),
+                "executeConfig": "{\"operationType\":2}",
+                "recoverConfig": "{\"operationType\":2}"
+            }
+        }
+        request({
+          url: `business/plans/list/event/emergencyPlans`,
+          method: "post",
+          data: param,
+        }).then(result=>{
+          if (result.code != 200) return Message.error(result?.msg);
+          let data = result.data;
+          this.tableData[index].executeConfig = JSON.parse(data.executeConfig)
+          this.tableData[index].recoverConfig = JSON.parse(data.recoverConfig)
+          this.tableData[index].zx_operationType = this.tableData[index].executeConfig?.operationType;
+          this.tableData[index].hf_operationType = this.tableData[index].recoverConfig?.operationType;
+          this.tableData = _.cloneDeep(this.tableData)
+        })
+    },
+    onContentEdit({field,index,idx,type}){
+      if(type==='edit'){
+        this.tableData[index][field]['contentList'][idx]['isEditor'] = this.tableData[index][field]['contentList'][idx].content;
+      } else if(type === 'cancel'){
+        this.tableData[index][field]['contentList'][idx]['content'] = this.tableData[index][field]['contentList'][idx].isEditor;
+        delete  this.tableData[index][field]['contentList'][idx].isEditor
+      } else if(type === 'confirm'){
+        delete  this.tableData[index][field]['contentList'][idx].isEditor
+      }
+      this.tableData = _.cloneDeep(this.tableData)
+    },
     handleSubmit(value = 1) {
       let dcArr = [];
       this.tableData.forEach((item) => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
index 0ca7df3e..45497256 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
@@ -63,8 +63,14 @@ export default {
     let h = window.location.href.split("=");
     if (h.length === 2) {
       this.detailId = window.location.href.split("=")[1];
+      localStorage.setItem('commandDispatch',this.detailId)
     } else {
-      this.detailId = "b825c7bbf4de43cdb8f689e270adf7a1";
+      let id = localStorage.getItem('commandDispatch')
+      if(id && id !== ''){
+        this.detailId = id;
+      } else {
+        this.detailId = "b825c7bbf4de43cdb8f689e270adf7a1";
+      }
     }
     this.getDetail();
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
index a950e12d..9a312ff6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
@@ -342,7 +342,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row,'-------------------')
       this.formData = row;
       this.modelVisible = true;
     },

From 0afd9781a7cb3d224ad6eafcd45d02903abe741f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Sat, 18 May 2024 17:43:45 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=9C=80=E6=B1=822024-05-18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/common/menuData.js               |   12 +
 .../components/RoadStateCard/data.js          |    8 +
 .../RoadStateCard/images/confirmed22.svg      |   32 +
 .../RoadStateCard/images/processed24.svg      |   31 +
 .../RoadStateCard/images/processing21.svg     |   33 +
 .../RoadStateCard/images/toBeConfirmed23.svg  |   32 +
 .../Dialogs/PerceiveEvent/index.vue           |  345 ++-
 .../components/HomeFrameControl/index.vue     |   26 +-
 .../components/RoadAndEvents/utils/map.js     |   10 +-
 .../DeviceControl/components/ScopeTable.vue   |    6 +-
 .../Cards/DeviceControl/index.vue             |   10 +-
 .../event/event/EventDetailDialog/data.js     |    2 +-
 .../event/event/EventDetailDialog/index.vue   |  124 +-
 .../smart/analysis/data.js                    |   28 +
 .../smart/analysis/images/refresh.svg         |   22 +
 .../smart/analysis/index.vue                  |   34 +
 .../Carousel/images/arrow.svg                 |   36 +
 .../EventDetailDialog/Carousel/index.vue      |  126 +
 .../eventAnalysis/EventDetailDialog/data.js   |  177 ++
 .../eventPlanDialog/index.vue                 |  521 ++++
 .../EventDetailDialog/formTable/index.vue     |  336 +++
 .../eventAnalysis/EventDetailDialog/index.vue |  406 +++
 .../EventDetailDialog/qbbDialog/index.vue     |  381 +++
 .../FormEvent/PresetFormItems.js              | 1228 ++++++++
 .../eventAnalysis/FormEvent/data.js           | 2537 +++++++++++++++++
 .../eventAnalysis/FormEvent/index.vue         |  258 ++
 .../pages/perception/eventAnalysis/data.js    |  226 ++
 .../eventAnalysis/images/export.svg           |   14 +
 .../eventAnalysis/images/insert.svg           |    9 +
 .../eventAnalysis/images/refresh.svg          |   22 +
 .../pages/perception/eventAnalysis/index.vue  |  321 +++
 31 files changed, 7147 insertions(+), 206 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/data.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/images/refresh.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/images/arrow.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/data.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/export.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/insert.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/refresh.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue

diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 2e53651d..4260bd4f 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -37,6 +37,12 @@ export default [
         name: "perceptionTrafficSituation",
         component: "perception/trafficSituation/index.vue",
       },
+      {
+        title: "感知事件分析",
+        path: "/perception/eventAnalysis",
+        name: "perceptionEventAnalysis",
+        component: "perception/eventAnalysis/index.vue",
+      },
     ],
   },
   {
@@ -177,6 +183,12 @@ export default [
             path: "/maintain/smart/manage",
             component: "maintenanceOperations/smart/manage/index.vue",
           },
+          {
+            title: "设备数据分析",
+            name: "deviceDataAnalysis",
+            path: "/maintain/smart/analysis",
+            component: "maintenanceOperations/smart/analysis/index.vue",
+          },
         ],
       },
       {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/data.js b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/data.js
index d094e48e..0832e2de 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/data.js
@@ -10,4 +10,12 @@ export const statusMap = {
   4: "processing",
   // 待确认
   5: "toBeConfirmed",
+  // 上报
+  21: "processing21",
+  // 已完成
+  22: "confirmed22",
+  // 已终止
+  23: "toBeConfirmed23",
+  // 自动结束
+  24: "processed24",
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg
new file mode 100644
index 00000000..e38d7fde
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 70 67" style="enable-background:new 0 0 70 67;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#Rectangle_3543_00000027573242941979377840000008498132700452433310_);}
+	.st1{fill:url(#Rectangle_3545_00000108306831714505799710000016481210161124509350_);}
+	.st2{fill:#FFFFFF;}
+	.st3{font-family:'SimHei';}
+	.st4{font-size:12px;}
+</style>
+<g id="Group_1142814579">
+	
+		<linearGradient id="Rectangle_3543_00000061472896844591682200000006038025238129988743_" gradientUnits="userSpaceOnUse" x1="11.787" y1="77.9443" x2="79.1132" y2="9.5398" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#01E3AD"/>
+		<stop  offset="1" style="stop-color:#01E3C8;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3543" style="fill:url(#Rectangle_3543_00000061472896844591682200000006038025238129988743_);" d="M4.8-0.4
+		c-0.8-0.8-0.8-2,0-2.8l13.6-13.4c0.8-0.8,2.1-0.8,2.8,0l64.8,65.3c0.8,0.8,0.8,2,0,2.8L72.5,64.9c-0.8,0.8-2.1,0.8-2.8,0L4.8-0.4z"
+		/>
+	
+		<linearGradient id="Rectangle_3545_00000114777316930785617910000013239311134280107166_" gradientUnits="userSpaceOnUse" x1="3.2789" y1="70.8921" x2="69.4573" y2="4.1666" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1.000000e-04" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		<stop  offset="0.4554" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3545" style="fill:url(#Rectangle_3545_00000114777316930785617910000013239311134280107166_);" d="M0.9-4.4
+		c-0.3-0.3-0.3-0.7,0-1c0.3-0.3,0.7-0.3,1,0l69.6,70.2c0.3,0.3,0.3,0.7,0,1c-0.3,0.3-0.7,0.3-1,0L0.9-4.4z"/>
+</g>
+<text transform="matrix(0.6974 0.7166 -0.7166 0.6974 28.0888 11.4371)" class="st2 st3 st4">已完成</text>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg
new file mode 100644
index 00000000..9a6ff56c
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 69 67" style="enable-background:new 0 0 69 67;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#Rectangle_3543_00000135670463380124271900000010923522838896704945_);}
+	.st1{fill:url(#Rectangle_3545_00000149381956171071755920000000984320330230580101_);}
+	.st2{fill:#FFFFFF;}
+	.st3{font-family:'SimHei';}
+	.st4{font-size:12px;}
+</style>
+<g id="Group_1142814576">
+	
+		<linearGradient id="Rectangle_3543_00000078740831148408449340000013198996239226044321_" gradientUnits="userSpaceOnUse" x1="9.9588" y1="77.9443" x2="77.2851" y2="9.5397" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#8B8B8B"/>
+		<stop  offset="1" style="stop-color:#8B8B8B;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3543" style="fill:url(#Rectangle_3543_00000078740831148408449340000013198996239226044321_);" d="M3-0.4
+		c-0.8-0.8-0.8-2,0-2.8l13.6-13.4c0.8-0.8,2.1-0.8,2.8,0l64.8,65.3c0.8,0.8,0.8,2,0,2.8L70.6,64.9c-0.8,0.8-2.1,0.8-2.8,0L3-0.4z"/>
+	
+		<linearGradient id="Rectangle_3545_00000147204908212795541760000007381703714348779156_" gradientUnits="userSpaceOnUse" x1="3.5468" y1="68.7865" x2="67.689" y2="4.099" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1.000000e-04" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		<stop  offset="0.4554" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3545" style="fill:url(#Rectangle_3545_00000147204908212795541760000007381703714348779156_);" d="M1.3-2.2
+		C1-2.4,1-2.9,1.3-3.2c0.3-0.3,0.7-0.3,1,0l67.5,68c0.3,0.3,0.3,0.7,0,1c-0.3,0.3-0.7,0.3-1,0L1.3-2.2z"/>
+</g>
+<text transform="matrix(0.6947 0.7193 -0.7193 0.6947 22.8984 7.1791)" class="st2 st3 st4">自动结束</text>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg
new file mode 100644
index 00000000..8623846e
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 68 67" style="enable-background:new 0 0 68 67;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#Rectangle_3543_00000053538272738649842960000009181435203724315524_);}
+	.st1{fill:url(#Rectangle_3545_00000042731925473050420680000005354543093107188619_);}
+	.st2{fill:#FFFFFF;}
+	.st3{font-family:'SimHei';}
+	.st4{font-size:12px;}
+	.st5{letter-spacing:1;}
+</style>
+<g id="Group_1142814575">
+	
+		<linearGradient id="Rectangle_3543_00000014623357134123876150000007078429270906634410_" gradientUnits="userSpaceOnUse" x1="9.7959" y1="77.9317" x2="77.1225" y2="9.5524" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#00B3CC"/>
+		<stop  offset="1" style="stop-color:#00B3CC;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3543" style="fill:url(#Rectangle_3543_00000014623357134123876150000007078429270906634410_);" d="M2.9-0.4
+		c-0.8-0.8-0.8-2,0-2.8l13.6-13.4c0.8-0.8,2.1-0.8,2.8,0l64.8,65.3c0.8,0.8,0.8,2,0,2.8L70.5,64.9c-0.8,0.8-2.1,0.8-2.8,0L2.9-0.4z"
+		/>
+	
+		<linearGradient id="Rectangle_3545_00000053537988499499213120000008969392740421215395_" gradientUnits="userSpaceOnUse" x1="2.8341" y1="69.3302" x2="67.5137" y2="4.1291" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1.000000e-04" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		<stop  offset="0.4554" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3545" style="fill:url(#Rectangle_3545_00000053537988499499213120000008969392740421215395_);" d="M0.5-2.8
+		c-0.3-0.3-0.3-0.7,0-1c0.3-0.3,0.7-0.3,1,0l68,68.5c0.3,0.3,0.3,0.7,0,1c-0.3,0.3-0.7,0.3-1,0L0.5-2.8z"/>
+</g>
+<text transform="matrix(0.703 0.7112 -0.7112 0.703 28.8203 14.2373)" class="st2 st3 st4 st5">上报</text>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg
new file mode 100644
index 00000000..9a0317bb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 71 67" style="enable-background:new 0 0 71 67;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#Rectangle_3543_00000051376741410994204160000013762924089411596164_);}
+	.st1{fill:url(#Rectangle_3545_00000044885868572866352330000017989187333113817249_);}
+	.st2{fill:#FFFFFF;}
+	.st3{font-family:'SimHei';}
+	.st4{font-size:12px;}
+</style>
+<g id="Group_1142814578">
+	
+		<linearGradient id="Rectangle_3543_00000100377943266825359860000014707726126855785879_" gradientUnits="userSpaceOnUse" x1="12.8443" y1="77.9443" x2="80.1706" y2="9.5397" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#CB7A00"/>
+		<stop  offset="1" style="stop-color:#CB7A00;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3543" style="fill:url(#Rectangle_3543_00000100377943266825359860000014707726126855785879_);" d="M5.9-0.4
+		c-0.8-0.8-0.8-2,0-2.8l13.6-13.4c0.8-0.8,2.1-0.8,2.8,0l64.8,65.3c0.8,0.8,0.8,2,0,2.8L73.5,64.9c-0.8,0.8-2.1,0.8-2.8,0L5.9-0.4z"
+		/>
+	
+		<linearGradient id="Rectangle_3545_00000006680004188661637840000018048924972681788824_" gradientUnits="userSpaceOnUse" x1="3.5846" y1="71.6466" x2="70.493" y2="4.1908" gradientTransform="matrix(1 0 0 -1 0 67.8898)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1.000000e-04" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		<stop  offset="0.4554" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<path id="Rectangle_3545" style="fill:url(#Rectangle_3545_00000006680004188661637840000018048924972681788824_);" d="M1.2-5.1
+		c-0.3-0.3-0.3-0.7,0-1c0.3-0.3,0.7-0.3,1,0l70.4,70.9c0.3,0.3,0.3,0.7,0,1c-0.3,0.3-0.7,0.3-1,0L1.2-5.1z"/>
+</g>
+<text transform="matrix(0.6909 0.7229 -0.7229 0.6909 30.053 12.0698)" class="st2 st3 st4">已终止</text>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index 9a59b27b..b80b50af 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -13,7 +13,7 @@
     </div>
 
     <template #footer>
-      <Button @click.native="onDelete">误报</Button>
+      <Button @click.native="onDelete" :loading="loading">误报</Button>
       <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="obverseVisible = false">取消</Button>
       <Button @click.native="updateEvent" :loading="btnLoading">确定</Button>
     </template>
@@ -43,7 +43,91 @@ import { markerClusterIns } from "@screen/pages/Home/components/RoadAndEvents/ut
 import { eventMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
 
 let vehicleTypeList = [];
-
+const _formList = [{
+    label: "报警时间:",
+    key: "warningTime",
+    type: "text",
+  },
+  {
+    label: "事件地点:",
+    key: "stakeMark",
+    type: "text",
+  },
+  {
+    label: "路段方向:",
+    key: "direction",
+    type: "text",
+    isAlone: true,
+  },
+  {
+    label: "事件来源:",
+    key: "warningSource",
+    type: "text",
+    enum: "InfoWarningSource",
+  },
+  {
+    label: "事件类型:",
+    key: "warningType",
+    type: "select",
+    options: {
+      disabled: true,
+      options: WarningTypeList,
+    },
+    ons: {
+      change: (value, { data }) => {
+        this.formList[5].options.options =
+          WarningSubclassList[value] || [];
+        data.warningSubclass = null;
+      },
+    },
+  },
+  {
+    label: "细分类型:",
+    key: "warningSubclass",
+    type: "select",
+    options: {
+      options: [],
+    },
+  },
+  // {
+  //   label: "车辆类型:",
+  //   key: "vehicleType",
+  //   type: "select",
+  //   options: {
+  //     options: vehicleTypeList
+  //   },
+  // },
+  {
+    label: "事件描述:",
+    key: "remark",
+    options: {
+      type: "textarea",
+      maxlength: 100,
+      autosize: { minRows: 3, maxRows: 3 },
+      showWordLimit: true,
+    },
+  },
+  {
+    label: "影响车道:",
+    key: "lane",
+    type: "CheckboxGroup",
+    options: {
+      // activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+      options: LaneOccupancyList,
+      gap: "12px",
+    },
+  },
+  {
+    label: "持续时长:",
+    key: "duration",
+    type: "text",
+  },
+  // {
+  //   label: "天气情况:",
+  //   key: "weather",
+  //   type: "text",
+  // },
+]
 function getDuration(warningTime) {
   const currentTime = moment();
   const specifiedTime = moment(warningTime);
@@ -94,92 +178,8 @@ export default {
         // deviceVendors: "XXX厂家",
         // time: "2023/01/02 09:09:09"
       },
-      formList: [
-        {
-          label: "报警时间:",
-          key: "warningTime",
-          type: "text",
-        },
-        {
-          label: "事件地点:",
-          key: "stakeMark",
-          type: "text",
-        },
-        {
-          label: "路段方向:",
-          key: "direction",
-          type: "text",
-          isAlone: true,
-        },
-        {
-          label: "事件来源:",
-          key: "warningSource",
-          type: "text",
-          enum: "InfoWarningSource",
-        },
-        {
-          label: "事件类型:",
-          key: "warningType",
-          type: "select",
-          options: {
-            disabled: true,
-            options: WarningTypeList,
-          },
-          ons: {
-            change: (value, { data }) => {
-              this.formList[5].options.options =
-                WarningSubclassList[value] || [];
-              data.warningSubclass = null;
-            },
-          },
-        },
-        {
-          label: "细分类型:",
-          key: "warningSubclass",
-          type: "select",
-          options: {
-            options: [],
-          },
-        },
-        // {
-        //   label: "车辆类型:",
-        //   key: "vehicleType",
-        //   type: "select",
-        //   options: {
-        //     options: vehicleTypeList
-        //   },
-        // },
-        {
-          label: "事件描述:",
-          key: "remark",
-          options: {
-            type: "textarea",
-            maxlength: 100,
-            autosize: { minRows: 6, maxRows: 6 },
-            showWordLimit: true,
-          },
-        },
-        {
-          label: "影响车道:",
-          key: "lane",
-          type: "CheckboxGroup",
-          options: {
-            // activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
-            options: LaneOccupancyList,
-            gap: "12px",
-          },
-        },
-        {
-          label: "持续时长:",
-          key: "duration",
-          type: "text",
-        },
-        // {
-        //   label: "天气情况:",
-        //   key: "weather",
-        //   type: "text",
-        // },
-      ],
+      formList: [],
+      loading:false,
     };
   },
   async created() {
@@ -196,42 +196,116 @@ export default {
       this.dialogData.pictures = otherConfig.pictures
     }
 
-    console.log(1122, this.dialogData, 3344);
+    this.formList = [..._formList]
   },
   beforeDestroy() {
     clearInterval(this.interval);
   },
   methods: {
     onDelete() {
-      const id = this.dialogData.id;
-      id &&
-        this.$confirm("确定误报吗？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          request({
-            url: `/business/warning/delete`,
-            method: "post",
-            data: { id },
-          }).then((result) => {
-            if (result.code == 200) Message.success("成功！");
-            else Message.error(result?.msg);
-            const item = { title: "感知事件" };
-
-            eventMap[`事件专题/${item.title}_close`]?.call(
-              this,
-              item,
-              (item) => {
-                return item?.extData?.id == id;
+      const self = this;
+      if(this.formList.length === _formList.length ){
+        this.formList.splice(6,0,{
+          label: "解除类型:",
+          key: "relieveType",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "误报解除",
+              },
+              {
+                key: "2",
+                label: "已结束",
               },
-              "special"
-            );
-            //触发全局监听事件
-            this.$root.$emit('refresh-event');
-            // markerClusterIns.setData();
+              {
+                key: "3",
+                label: "无需处理",
+              },
+              {
+                key: "4",
+                label: "其它",
+              }
+            ],
+          },
+        })
+        this.formList.splice(7,0,{
+          label: "解除原因:", // 标题
+          key: "relieveReason", //数据存储字段
+          isAlone: true, //  单独一行
+          type: "input", //组件类型(el-input 去掉el-即可) 不填默认为input
+          options: {  //element原生formItem属性
+            type: "textarea",
+            autosize: true,
+            maxlength: 200,
+            autosize: { minRows: 3, maxRows: 3 },
+            showWordLimit: true,
+          }
+        })
+      } else {
+        this.$refs.FormConfigRef.validate()
+          .then((result) => {
+            this.loading = true;
+            request({
+              url: `/business/warning/falseAlarm`,
+              method: "post",
+              data: {
+                id: this.dialogData.id,
+                relieveType: result.relieveType,
+                relieveReason: result.relieveReason
+              },
+            }).then((result) => {
+              
+              if (result.code == 200) Message.success("成功！");
+              else Message.error(result?.msg);
+              this.obverseVisible = false;
+              this.loading = false;
+              setTimeout(() => {
+                self.$root.$emit('delete-event');
+              //触发全局监听事件
+                self.$root.$emit('refresh-event');  
+              }, 500);
+              
+            
+              });
+          })
+          .catch((err) => {
           });
-        });
+      }
+      // 2024-05-18 修改为二次确认，增加误报类型和误报原因
+      // const id = this.dialogData.id;
+      // id &&
+      //   this.$confirm("确定误报吗？", "提示", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "warning",
+      //   }).then(() => {
+      //     request({
+      //       url: `/business/warning/delete`,
+      //       method: "post",
+      //       data: { id },
+      //     }).then((result) => {
+      //       if (result.code == 200) Message.success("成功！");
+      //       else Message.error(result?.msg);
+      //       const item = { title: "感知事件" };
+
+      //       eventMap[`事件专题/${item.title}_close`]?.call(
+      //         this,
+      //         item,
+      //         (item) => {
+      //           return item?.extData?.id == id;
+      //         },
+      //         "special"
+      //       );
+      //       //触发全局监听事件
+      //       this.$root.$emit('refresh-event');
+      //       // markerClusterIns.setData();
+      //     });
+      //   });
     },
     getVehicleTypeList(fn) {
       if (vehicleTypeList.length) {
@@ -275,35 +349,6 @@ export default {
         .then(({ data, code }) => {
           if (code != 200) return Message.error("详情获取失败");
 
-          // data = {
-          //   "searchValue": null,
-          //   "createBy": null,
-          //   "createTime": "2024-07-23 14:18:58",
-          //   "updateBy": null,
-          //   "updateTime": "2024-02-01 15:55:34",
-          //   "remark": "111",
-          //   "params": {},
-          //   "id": "1",
-          //   "stakeMark": "k103+900",
-          //   "direction": "1",
-          //   "deptId": null,
-          //   "warningState": 1,
-          //   "warningTime": null,
-          //   "userId": null,
-          //   "warningSource": 1,
-          //   "warningLevel": null,
-          //   "warningType": 1,
-          //   "warningSubclass": null,
-          //   "warningTitle": null,
-          //   "otherConfig": null,
-          //   "lane": null,
-          //   "sectionName": null,
-          //   "number": 0,
-          //   "type": null,
-          //   "sectionId": null,
-          //   "longitude": "116.493888",
-          //   "latitude": "36.291145"
-          // };
           data.duration = this.convertSecToHHmmss(data.duration);
           this.data = {
             ...data,
@@ -334,16 +379,6 @@ export default {
     },
     updateEvent() {
       this.btnLoading = true;
-
-      // console.log({
-      //   id: this.dialogData.id,
-      //   warningType: this.data.warningType,
-      //   warningSubclass: this.data.warningSubclass,
-      //   remark: this.data.remark,
-      //   vehicleType: this.data.vehicleType,
-      //   lane: this.data.lane
-      // })
-
       request({
         url: `/perceivedEvents/warning/updateWarning`,
         method: "post",
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 c0e31c42..93f8a409 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
@@ -21,7 +21,8 @@
         <span class="close" @click="() => { this.activeIcon = null; }">
           <i class="el-icon-close" />
         </span>
-        <div v-if="tabAction === '1'" style="width:70vw; min-height: 500px;">
+        <!-- 批量管控 -->
+        <div v-if="tabAction === '1'" style="width:800px; min-height: 320px;">
           <Form v-model="data" labelWidth="90px" column="2" class="form" ref="FormConfigRef" :formList="formList" />
               <component ref="ControlComponent" :is="componentMap[DeviceTopics[data.deviceType]]" :isMultiControl="true"
                 :visible="true" :selectItems="data.childType" @update:activeIcon="(val) => { this.activeIcon = val }"
@@ -33,7 +34,8 @@
             <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="cancelClick"> 取消 </Button>
           </div>
         </div>
-        <div v-if="tabAction === '2'" style="width:70vw; height: 500px; overflow-y:auto" class="cardPanel">
+        <!-- 定时管控 -->
+        <div v-if="tabAction === '2'" style="width:800px; height: 320px; overflow-y:auto" class="cardPanel">
           <Empty v-if="!data2.length" class="no-data" style="position: absolute">暂无数据</Empty>
           <template v-else>
             <div class="cardBox" v-for="(item, index) in data2" :key="index">
@@ -55,20 +57,21 @@
             </div>
           </template>
         </div>
-        <div v-if="tabAction === '3'" style="width:70vw;height: 500px;display: flex;flex-direction: column; justify-content: center;align-items: flex-start;" >
+        <!-- 管控记录 -->
+        <div v-if="tabAction === '3'" style="width:800px;height: 320px;display: flex;flex-direction: column; justify-content: center;align-items: flex-start;" >
           <Form v-model="dataRecord" style="width:100%;" labelWidth="90px" column="2" class="form" ref="FormRecordRef" :formList="formRecord" />
           <Table :data="tableData" height="500px" style="margin: 20px;width:95%">
-            <ElTableColumn label="管控时间" prop="operTime" width="300"/>
+            <ElTableColumn label="管控时间" prop="operTime" width="200"/>
             <ElTableColumn label="设备名称" prop="dcDeviceName"/>
-            <ElTableColumn label="管控方式" prop="operType" width="200"/>
-            <ElTableColumn label="操作人" prop="operName" width="200"/>
-            <ElTableColumn label="执行结果" prop="remark"  width="150" >
+            <ElTableColumn label="管控方式" prop="operType" width="100"/>
+            <ElTableColumn label="操作人" prop="operName" width="100"/>
+            <ElTableColumn label="执行结果" prop="remark"  width="80" >
               <template slot-scope="scope">
                 <el-popover
                   placement="top-start"
-                  width="400"
+                  width="120"
                   trigger="hover"
-                  :content="scope.row.jsonResult">
+                  :content="scope.row.remark||'暂无结果'">
                   <el-button slot="reference" class="btnResult">查看</el-button>
                 </el-popover>
               </template>
@@ -76,7 +79,7 @@
           </Table>
 
           <!-- 分页 -->
-          <div class="footer" style="margin-top:-20px;margin-bottom: 30px">
+          <div class="footer">
             <ElPagination @current-change="bindRecord" @size-change="onSizeChange" width="'100%'" :page-sizes="[10, 20, 30, 40, 50]"
               :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum" layout="total, sizes, prev, pager, next"
               :total="tableTotal" class="Pagination">
@@ -482,6 +485,7 @@ export default {
       })
         .then((result) => {
           if (result.code != 200) return;
+          console.log('########',result)
           result.rows.forEach(e => {
             e.operTime = moment(e.operTime).format('YYYY-MM-DD HH:mm:ss')
             e.operType = _.find(this.Enum_ControlType,{key:e.operType}).label
@@ -515,6 +519,7 @@ div.el-popper.global-input-search-popover {
   // margin-top: 6vh;
 
   .body {
+      width: 800px;
     .title {
       background: linear-gradient(90deg,
           #237e9b 0%,
@@ -523,7 +528,6 @@ div.el-popper.global-input-search-popover {
       position: absolute;
       top: 0;
       left: 0;
-      width: 100%;
     }
 
     .close {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 47cda01e..40199fae 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -57,19 +57,16 @@ export class MarkerCluster {
     if (!Array.isArray(data)) data = [data];
 
     this.data.push(...data);
-
     if (
       !this.markerCluster ||
       this.markerCluster.getMap() !== Vue.prototype.mapIns
-    )
+    ){
       await this.setMarkerCluster();
-
-    const map = this.getMap();
+    }
 
     console.log(
       "%c [ data ]-227-「map.js」",
-      "font-size:15px; background:#641f14; color:#a86358;",
-      data
+      "font-size:15px; background:#641f14; color:#a86358;"
     );
     this.markerCluster.addData(data);
     console.log(
@@ -78,6 +75,7 @@ export class MarkerCluster {
       this.markerCluster
     );
 
+    const map = this.getMap();
     map.setZoom(10);
 
     setTimeout(() => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
index e08e17b1..b3473899 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
@@ -29,7 +29,7 @@
                     style="width: 75px;"></el-input-number>
                 <span v-if="tableInfo.searchRule == 4" style="width: 56px;">公里</span>
             </el-col>
-            <el-col :span="4" v-if="tableInfo.deviceType == '2'">
+            <el-col :span="4" v-if="tableInfo.isDefault === true && (tableInfo.deviceType == '2' || tableInfo.deviceType == 5)">
                 <div class="firstBtns">
                     <ButtonGradient class="title-button" @click.native="$emit('onConfirm', index)">
                         <i class="el-icon-check"></i>
@@ -64,7 +64,7 @@
                 </div>
             </el-col>
         </el-row>
-
+        <!-- 设备列表 -->
         <el-row v-if="tableInfo.searchRule == 1">
             <!-- 设备列表 -->
             <el-select v-model="tableInfo.devList" placeholder="请选择设备" multiple collapse-tags>
@@ -129,7 +129,7 @@
                 <el-input v-model="tableInfo.zx_content" placeholder="请输入发布内容"></el-input>
             </el-col>
         </el-row>
-        <el-row v-if="tableInfo.deviceType == 2 && tableInfo.executeConfig && tableInfo.executeConfig.contentList">
+        <el-row v-if="(tableInfo.deviceType == 2 || tableInfo.deviceType == 5) && tableInfo.executeConfig && tableInfo.executeConfig.contentList">
             <el-col :span="24">
                <div class="keep-ratio" origin="top" v-for="(itm,idx) of tableInfo.executeConfig.contentList">
                 <div class="contentLabel" >{{ itm.deviceName }}</div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
index 5e5b1f86..abd21e9b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
@@ -147,6 +147,7 @@ export default {
           data: param,
         }).then(result=>{
           if (result.code != 200) return Message.error(result?.msg);
+          console.log(param,result,'===============')
           let data = result.data;
           this.tableData[index].executeConfig = JSON.parse(data.executeConfig)
           this.tableData[index].recoverConfig = JSON.parse(data.recoverConfig)
@@ -179,6 +180,12 @@ export default {
         }
         let zxData = {},
           hfData = {};
+        if(item.executeConfig){
+          zxData['executeConfig'] = item.executeConfig
+        }
+        if(item.recoverConfig){
+          zxData['recoverConfig'] = item.recoverConfig
+        }
         Object.keys(item).forEach((key) => {
           if (/^zx_/.test(key)) {
             let keyName = key.substring(3);
@@ -209,12 +216,13 @@ export default {
           id: this.detailData.id,
           eventType: this.detailData.eventType,
           stakeMark: this.detailData.stakeMark,
+          subclass: this.detailData.subclass,
           direction: this.detailData.direction == "菏泽方向" ? "1" : "3",
         },
       };
       console.log("reqData", reqData);
 
-      // return;
+      return;
       request({
         url: "/business/plans/event/confirm",
         method: "post",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
index 9bb55a80..04481efc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
@@ -1,4 +1,4 @@
-export const formList = [
+export const _formList = [
   {
     label: "事件源:",
     key: "stringEventSource",
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 b9f6cc09..0fba9ec8 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
@@ -3,7 +3,7 @@
     <div class="EventDetail" :style="{
     height: activeName == '-1' || activeName == '0' ? '380px' : '698px',
   }">
-      <Form :formList="formList" :dFormData="formData" label-width="100px" />
+      <Form ref="FormConfigRef" :formList="formList" :dFormData="formData" label-width="100px" />
 
       <div class="video-pic" :style="{
     height: formData.component === 'VideoMulti' ? '242px' : undefined,
@@ -53,7 +53,7 @@ import Dialog from "@screen/components/Dialog/index";
 import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index";
 import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index";
 import Form from "@screen/components/FormConfig";
-import { formList } from "./data";
+import { _formList } from "./data";
 // import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js"
 import Video from "@screen/components/Video";
 import VideoMulti from "@screen/components/VideoMulti";
@@ -98,7 +98,7 @@ export default {
   },
   data() {
     return {
-      formList,
+      formList:[..._formList],
       isShowDialog: false,
       info: [],
       timeLine1List: [
@@ -128,6 +128,8 @@ export default {
         return this.visible;
       },
       set(val) {
+        console.log(111)
+        this.formList = [..._formList]
         this.$emit("update:value", val);
       },
     },
@@ -208,32 +210,59 @@ export default {
       this.isShowDialog = false;
     },
     onDelete() {
-      if (this.formData.id) {
-        this.$confirm("确定误报吗1？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          // this.modelVisible = false;
-          //   this.$emit('queryData', true);
-          //   return;
-          if (this.activeName == "-1") {
+      if(this.formList[this.formList.length-1].key !== 'relieveReason' ){
+        this.formList.push({
+          label: "解除类型:",
+          key: "relieveType",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "误报解除",
+              },
+              {
+                key: "2",
+                label: "事件已结束",
+              },
+              {
+                key: "3",
+                label: "无需处理事件",
+              },
+              {
+                key: "4",
+                label: "其它",
+              }
+            ],
+          },
+        })
+        this.formList.push({
+          label: "解除原因:", // 标题
+          key: "relieveReason", //数据存储字段
+          isAlone: true, //  单独一行
+          type: "input", //组件类型(el-input 去掉el-即可) 不填默认为input
+          options: {  //element原生formItem属性
+            type: "textarea",
+            autosize: true,
+            maxlength: 200,
+            autosize: { minRows: 3, maxRows: 3 },
+            showWordLimit: true,
+          }
+        })
+      } else {
+        this.$refs.FormConfigRef.validate()
+          .then((result) => {
             request({
-              url: `/business/warning/delete`,
+              url: `/business/warning/falseAlarm`,
               method: "post",
-              data: { id: this.formData.id },
-            }).then((result) => {
-              if (result.code == 200) Message.success("成功！");
-              else Message.error(result?.msg);
-              this.modelVisible = false;
-              this.$emit("queryData", true);
-              //触发全局监听事件
-              this.$root.$emit('delete-event');
-            });
-          } else {
-            request({
-              url: `dc/system/event/${this.formData.id}`,
-              method: "delete",
+              data: {
+                id: this.formData.id,
+                relieveType: result.relieveType,
+                relieveReason: result.relieveReason
+              },
             }).then((result) => {
               if (result.code == 200) Message.success("成功！");
               else Message.error(result?.msg);
@@ -242,9 +271,46 @@ export default {
               //触发全局监听事件
               this.$root.$emit('delete-event');
             });
-          }
-        });
+          })
+          .catch((err) => {
+          });
       }
+      
+      // 2024-05-18 修改为二次确认，增加误报类型和误报原因
+      // if (this.formData.id) {
+      //   this.$confirm("确定误报吗？", "提示", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "warning",
+      //   }).then(() => {
+      //     if (this.activeName == "-1") {
+      //       request({
+      //         url: `/business/warning/delete`,
+      //         method: "post",
+      //         data: { id: this.formData.id },
+      //       }).then((result) => {
+      //         if (result.code == 200) Message.success("成功！");
+      //         else Message.error(result?.msg);
+      //         this.modelVisible = false;
+      //         this.$emit("queryData", true);
+      //         //触发全局监听事件
+      //         this.$root.$emit('delete-event');
+      //       });
+      //     } else {
+      //       request({
+      //         url: `dc/system/event/${this.formData.id}`,
+      //         method: "delete",
+      //       }).then((result) => {
+      //         if (result.code == 200) Message.success("成功！");
+      //         else Message.error(result?.msg);
+      //         this.modelVisible = false;
+      //         this.$emit("queryData", true);
+      //         //触发全局监听事件
+      //         this.$root.$emit('delete-event');
+      //       });
+      //     }
+      //   });
+      // }
     },
     onSubmit() {
       // let url = "/business/plans/list/warning/type";
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/data.js
new file mode 100644
index 00000000..00caefa4
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/data.js
@@ -0,0 +1,28 @@
+// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+// import { merge, cloneDeep } from "lodash";
+
+import {directionOptions} from '@screen/utils/enum.js';
+export const searchFormList = [
+ 
+  {
+    label: "设备名称:",
+    key: "deviceName",
+    type: "input",
+    default: ""
+  },
+  {
+    label: "物联编号:",
+    key: "iotDeviceId",
+    type: "input",
+    default: ""
+  },  {
+    label: "设备方向:",
+    key: "direction",
+    type: "select",
+    options: {
+      options: directionOptions,
+    },
+  },
+  
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/images/refresh.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/images/refresh.svg
new file mode 100644
index 00000000..e31a5500
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/images/refresh.svg
@@ -0,0 +1,22 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814398">
+<g id="Group 1142814396">
+<path id="Rectangle 1304" d="M1.0437 2.41495L4.5636 2.01738L4.91112 6.00562" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835">
+<mask id="path-2-inside-1_290_77" fill="white">
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z"/>
+</mask>
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z" stroke="white" stroke-width="2" mask="url(#path-2-inside-1_290_77)"/>
+</g>
+</g>
+<g id="Group 1142814397">
+<path id="Rectangle 1304_2" d="M15.0437 11.585L11.5238 11.9826L11.1763 7.99438" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835_2">
+<mask id="path-4-inside-2_290_77" fill="white">
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z"/>
+</mask>
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z" stroke="white" stroke-width="2" mask="url(#path-4-inside-2_290_77)"/>
+</g>
+</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
new file mode 100644
index 00000000..bd094ed2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class='board_record'>
+    TODO
+  </div>
+</template>
+
+<script>
+import request from "@/utils/request";
+export default {
+  name: 'boardRecord',
+  components: {
+    
+  },
+  data() {
+    return {
+     
+    }
+  },
+  created() {
+    
+  },
+  mounted(){
+     
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.board_record {
+  
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/images/arrow.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/images/arrow.svg
new file mode 100644
index 00000000..0e183e4b
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/images/arrow.svg
@@ -0,0 +1,36 @@
+<svg width="13" height="15" viewBox="0 0 13 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814550">
+<g id="Group 1142814473">
+<g id="Polygon 87">
+<path d="M6.16667 1.3635L12 7.49987L6.16667 13.6362" stroke="white" stroke-linecap="round"/>
+<path d="M6.16667 1.3635L12 7.49987L6.16667 13.6362" stroke="url(#paint0_linear_308_1272)" stroke-linecap="round"/>
+</g>
+<path id="Polygon 88" d="M5 -3.57639e-07L12 7.5L5 15L5 -3.57639e-07Z" fill="url(#paint1_linear_308_1272)"/>
+</g>
+<g id="Group 1142814478">
+<g id="Polygon 87_2">
+<path d="M1.16667 1.3635L7 7.49987L1.16667 13.6362" stroke="white" stroke-linecap="round"/>
+<path d="M1.16667 1.3635L7 7.49987L1.16667 13.6362" stroke="url(#paint2_linear_308_1272)" stroke-linecap="round"/>
+</g>
+<path id="Polygon 88_2" d="M1.0378e-06 -3.57639e-07L7 7.5L4.76837e-07 15L1.0378e-06 -3.57639e-07Z" fill="url(#paint3_linear_308_1272)"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_308_1272" x1="10.8868" y1="7.72029" x2="6.30026" y2="7.72029" gradientUnits="userSpaceOnUse">
+<stop stop-color="#39D5BF"/>
+<stop offset="1" stop-color="#1FAED6"/>
+</linearGradient>
+<linearGradient id="paint1_linear_308_1272" x1="12" y1="7.5" x2="5" y2="7.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3AD6C0"/>
+<stop offset="1" stop-color="#20AFD7" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_308_1272" x1="5.88677" y1="7.72029" x2="1.30026" y2="7.72029" gradientUnits="userSpaceOnUse">
+<stop stop-color="#39D5BF"/>
+<stop offset="1" stop-color="#1FAED6"/>
+</linearGradient>
+<linearGradient id="paint3_linear_308_1272" x1="7" y1="7.5" x2="7.57319e-07" y2="7.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3AD6C0"/>
+<stop offset="1" stop-color="#20AFD7" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/index.vue
new file mode 100644
index 00000000..7a032641
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/Carousel/index.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="Carousel">
+    <img src="./images/arrow.svg" @click="prevSlide" class="arrow" />
+
+    <VueSlickCarousel v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
+      <div v-for="(item, index) in pictures" :key="index" class="item">
+        <!-- <img :src="require(`@screen/images/${item}`)" style="height: 100%"> -->
+        <!-- <img :src="item" style="height: 100%"> -->
+        <el-image style="height: 100%" :src="item" :preview-src-list="pictures">
+        </el-image>
+      </div>
+    </VueSlickCarousel>
+
+    <VueSlickCarousel v-if="videos.length > 0" v-bind="videoSettings" ref="CarouselRef" class="vueSlickCarousel">
+      <div v-for="(item, index) in  videos " :key="index" class="item">
+        <Video style="height: 100%;" :showHeader="false" :url="item || ''" videoType="mp4" />
+      </div>
+    </VueSlickCarousel>
+
+    <img src="./images/arrow.svg" @click="nextSlide" class="arrow" />
+  </div>
+</template>
+
+<script>
+
+import VueSlickCarousel from 'vue-slick-carousel'
+import 'vue-slick-carousel/dist/vue-slick-carousel.css'
+// optional style for arrows & dots
+import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css'
+import Video from "@screen/components/Video";
+
+export default {
+  name: "Carousel",
+  components: { VueSlickCarousel, Video },
+  props: {
+    pictures: {
+      type: Array,
+      default: () => [
+        // "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
+        // "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
+        // "require('@screen/images/shareWith/message-active.svg')",
+        // "require('@screen/images/shareWith/message.svg')",
+        // "require('@screen/images/shareWith/website-active.svg')",
+        // "require('@screen/images/shareWith/website.svg')",
+        // "require('@screen/images/shareWith/weChat-active.svg')",
+        // "require('@screen/images/shareWith/weChat-active.svg')"
+      ]
+    },
+    videos: {
+      type: Array,
+      default: () => []
+    },
+  },
+  data() {
+    return {
+      carouselItems: [],
+      settings: {
+        infinite: true,
+        arrows: false,
+        speed: 600,
+        slidesToShow: 1,
+        slidesToScroll: 1,
+        autoplay: true,
+        autoplaySpeed: 1800,
+      },
+      videoSettings: {
+        infinite: true,
+        arrows: false,
+        speed: 600,
+        slidesToShow: 1,
+        slidesToScroll: 1,
+        autoplay: false,
+        autoplaySpeed: 1800,
+      }
+    }
+  },
+  methods: {
+    prevSlide() {
+      this.$refs.CarouselRef.prev()
+    },
+    nextSlide() {
+      // console.log('pics',this.pictures)
+      this.$refs.CarouselRef.next()
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.Carousel {
+  width: 100%;
+  overflow: hidden;
+  display: flex;
+  gap: 9px;
+
+  .vueSlickCarousel {
+    flex: 1;
+    overflow: hidden;
+
+    ::v-deep {
+      .slick-list {
+        height: 100%;
+
+        div {
+          height: 100%;
+        }
+      }
+    }
+
+    .item {
+      img {
+        height: 100%;
+      }
+    }
+  }
+
+  .arrow {
+    cursor: pointer;
+    width: 15px;
+
+    &:first-child {
+      transform: rotate(-180deg)
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/data.js
new file mode 100644
index 00000000..04481efc
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/data.js
@@ -0,0 +1,177 @@
+export const _formList = [
+  {
+    label: "事件源:",
+    key: "stringEventSource",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "桩号:",
+    key: "stakeMark",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "行驶方向:",
+    key: "direction",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "事件类型:",
+    key: "stringEventType",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "高速名称:",
+    key: "roadName",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "事件状态:",
+    key: "stringEventState",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "操作员:",
+    key: "nickName",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "发生时间:",
+    key: "startTime",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "预计结束时间:",
+    key: "estimatedEndTime",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "水膜厚度(mm):",
+    key: "waterFilmThickness",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.waterFilmThickness) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "风速:",
+    key: "windSpeed",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.windSpeed) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "能见度(m):",
+    key: "visibility",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.visibility) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "事件描述:",
+    key: "remark",
+    type: "input",
+    isAlone: true,
+    gridColumn: 3,
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+];
+
+export const timeLine1List = [
+  {
+    time: "16.36",
+    label: "接警记录",
+    isActive: false,
+  },
+  {
+    time: "16.36",
+    label: "指令下达",
+    isActive: false,
+  },
+  {
+    time: "16.36",
+    label: "清障到达",
+    isActive: false,
+  },
+  {
+    time: "",
+    label: "安全防护",
+    isActive: false,
+  },
+  {
+    time: "",
+    label: "开始清障",
+    isActive: false,
+  },
+  {
+    time: "",
+    label: "清障结束",
+    isActive: false,
+  },
+  {
+    time: "",
+    label: "恢复畅通",
+    isActive: false,
+  },
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue
new file mode 100644
index 00000000..efc4f08c
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue
@@ -0,0 +1,521 @@
+<template>
+  <Dialog v-model="modelVisible" :title="title" width="880px">
+    <div class="EventAddPlanDialog">
+      <div class="first">
+        <el-radio-group v-model="planName" @input="changeRadio">
+          <el-radio-button
+            v-for="item in info"
+            :key="item.id"
+            :label="item.planName"
+          ></el-radio-button>
+        </el-radio-group>
+      </div>
+
+      <div class="second">
+        <el-row>
+          <el-col :span="2">
+            <div class="text">联动设备:</div>
+          </el-col>
+          <el-col :span="22">
+            <FormTable
+              ref="secondFormTable"
+              :tableData="secondFormData"
+              :type="1"
+            ></FormTable>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="third">
+        <el-row>
+          <el-col :span="2">
+            <div class="text">恢复操作:</div>
+          </el-col>
+          <el-col :span="22">
+            <FormTable
+              ref="thirdFormTable"
+              :tableData="thirdFormData"
+              :type="2"
+            ></FormTable>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+
+    <template #footer>
+      <!-- <Button v-if="isDisBtn" style="padding:0 24px;  pointer-events: none; background-color: #C9C9C9;"
+                @click.native="handleRestore" :loading="submitting">强制恢复</Button> -->
+      <Button
+        style="padding: 0 24px"
+        @click.native="handleSubmit(2)"
+        :loading="submitting"
+        >强制恢复</Button
+      >
+      <Button
+        style="padding: 0 24px"
+        @click.native="handleSubmit(1)"
+        :loading="submitting"
+        >确认</Button
+      >
+      <Button
+        style="background: #c9c9c9; padding: 0 24px"
+        @click.native="(modelVisible = false), (submitting = false)"
+        >取消</Button
+      >
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index";
+import FormTable from "../formTable/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import { throttle } from "lodash";
+
+export default {
+  name: "eventPlanDialog",
+  components: {
+    Dialog,
+    Button,
+    FormTable,
+  },
+  model: {
+    prop: "visible",
+    event: "close",
+  },
+  provide() {
+    return {
+      loadData: throttle(this.loadData, 1000),
+      getAutomatic: this.getTemplateAutomatic,
+      getOriginal: this.getBoardOriginal,
+    };
+  },
+  props: {
+    visible: Boolean,
+    activeName: String,
+    info: {
+      type: Array,
+      default: () => [],
+    },
+    eventFormData: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      title: "事件确认",
+      isDisBtn: true,
+      dialogType: 1,
+      planId: 0,
+      planInfo: {},
+      submitting: false,
+      secondFormData: [
+        {
+          deviceType: 1,
+          searchRule: 1,
+          qbb: "",
+        },
+      ],
+      thirdFormData: [
+        {
+          deviceType: 1,
+          searchRule: 1,
+          qbb: "",
+        },
+      ],
+      planName: "",
+      automaticInfo: {},
+      dcExecuteAction: [],
+      deviceData: [],
+      automaticData: {},
+      boardOriginalData: {},
+      eventOptions: [
+        {
+          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: "路障清除",
+        },
+      ],
+      mechanismOptions: [
+        {
+          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: "其他",
+        },
+      ],
+      conditionOptions: [
+        // {
+        //     value: 1,
+        //     label: '大于(>)'
+        // },
+        {
+          value: 1,
+          label: "小于(<)",
+        },
+      ],
+    };
+  },
+  mounted() {},
+  computed: {
+    modelVisible: {
+      get() {
+        if (this.visible) {
+          if (this.info.length > 0) {
+            this.planName = this.info[0]?.planName || "";
+            this.planInfo = this.info[0];
+            this.initData(this.info[0]);
+          }
+        }
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("close", val);
+      },
+    },
+  },
+  methods: {
+    initData(data) {
+      console.log("data", data);
+      if (!data) return;
+      // this.planId = data.id;
+      let dcExecuteAction = data.dcExecuteAction;
+      let secondFormData = [];
+      let thirdFormData = [];
+      dcExecuteAction.forEach((it) => {
+        let action = { ...it };
+        if (it.otherConfig) {
+          let config = JSON.parse(it.otherConfig);
+          let qbb = "";
+          if (config.id) {
+            qbb = config.content;
+            config = { dcInfoBoardTemplate: config };
+          }
+          // if (config.state) {
+          //     config.gzms = config.state
+          // }
+          action = { ...it, ...config, qbb: qbb };
+        }
+        if (it.deviceList) {
+          action.deviceList = it.deviceList
+            .split(",")
+            .map((str) => Number(str));
+        }
+        if (it.actionType == 1) {
+          secondFormData.push(action);
+        } else if (it.actionType == 2) {
+          thirdFormData.push({
+            ...action,
+            qbb: "默认恢复该情报板上次常态化信息",
+          });
+        }
+      });
+      this.secondFormData = secondFormData;
+      this.thirdFormData = thirdFormData;
+    },
+    async loadData() {
+      if (this.deviceData.length <= 0) {
+        let result = await request({
+          url: `business/device/query?deviceType=2`,
+          method: "get",
+        });
+        if (result.code != 200) return Message.error(result?.msg);
+        // console.log('123');
+        this.deviceData = result.data;
+        // return result.data;
+      }
+      return this.deviceData;
+    },
+    async getTemplateAutomatic() {
+      let url = "";
+      let data = {};
+      let otherConfig = {};
+      let plan = this.info.find((it) => it.planName == this.planName);
+      console.log("plan", plan);
+      let action = plan.dcExecuteAction.find(
+        (it) => it.actionType == 1 && it.deviceType == 2
+      );
+      if (action) {
+        otherConfig = JSON.parse(action.otherConfig);
+        if (this.activeName == "-1") {
+          //感知
+          url = "/business/plans/warning/confirm";
+          data = {
+            dcInfoBoardTemplate: otherConfig,
+            dcWarning: this.eventFormData,
+          };
+        } else {
+          //交通
+          url = "/business/plans/event/automatic";
+          data = {
+            dcInfoBoardTemplate: otherConfig,
+            dcEvent: this.eventFormData,
+          };
+        }
+        const result = await request({
+          url: url,
+          method: "post",
+          data: data,
+        });
+        if (result.code != 200) return Message.error(result?.msg);
+        this.automaticData = result.data;
+      } else {
+        console.log("没有情报板，不调用接口");
+        this.automaticData = {};
+      }
+      return this.automaticData;
+    },
+    async getBoardOriginal() {
+      let url = "";
+      let data = {};
+      let plan = this.info.find((it) => it.planName == this.planName);
+      console.log("plan1", plan);
+      let action = plan.dcExecuteAction.find(
+        (it) => it.actionType == 1 && it.deviceType == 2
+      );
+      if (action) {
+        if (this.activeName == "-1") {
+          //感知
+          url = "/business/plans/warning/board/confirm";
+          data = {
+            dcEmergencyPlans: {
+              ...plan,
+              executeAction: action,
+            },
+            dcWarning: this.eventFormData,
+          };
+        } else {
+          //交通
+          url = "/business/plans/event/board/confirm";
+          data = {
+            dcEmergencyPlans: {
+              ...plan,
+              executeAction: action,
+            },
+            dcEvent: this.eventFormData,
+          };
+        }
+        const result = await request({
+          url: url,
+          method: "post",
+          data: data,
+        });
+        if (result.code != 200) return Message.error(result?.msg);
+        this.boardOriginalData = result.data;
+      } else {
+        console.log("没有情报板，不调用接口");
+        this.boardOriginalData = {};
+      }
+      return this.boardOriginalData;
+    },
+    changeRadio(value) {
+      let plan = this.info.find((it) => it.planName == value);
+      this.planInfo = plan;
+      this.initData(plan);
+    },
+    formatData(it, value = 1) {
+      let data = { ...it, actionType: value, emergencyPlansId: id };
+      if (
+        it.deviceList &&
+        typeof it.deviceList !== "string" &&
+        it.deviceList.length > 0
+      ) {
+        data.deviceList = it.deviceList.join(",");
+      } else {
+        data.deviceList = "";
+      }
+      if (it.content) {
+        data.otherConfig = JSON.stringify({ content: it.content });
+      }
+      if (it.controlModel) {
+        let other = {
+          controlModel: it.controlModel,
+          controlModelName: inducerModeDic[it.controlModel],
+          state: it.state,
+          name: inducerWorkTypeDic[it.state],
+        };
+        if (it.time && it?.time[0]) {
+          other = {
+            controlModel: it.controlModel,
+            controlModelName: inducerModeDic[it.controlModel],
+            state: it.state,
+            name: inducerWorkTypeDic[it.state],
+            startTime: it.time[0],
+            endTime: it.time[1],
+          };
+        }
+        data.otherConfig = JSON.stringify(other);
+      }
+      if (it.gzms) {
+        data.otherConfig = JSON.stringify({
+          state: it.gzms,
+          name: gzmsMap[it.gzms],
+          operationDuration: it.operationDuration,
+        });
+      }
+      return data;
+    },
+    handleSubmit(value = 1) {
+      // this.submitting = false;
+      let plan = { ...this.planInfo };
+      let actions = plan.dcExecuteAction.filter((it) => it.actionType == value);
+      plan.dcExecuteAction = actions;
+
+      let reqData = {
+        operationType: value, //1-执行操作 2-恢复操作
+        dcEmergencyPlans: plan,
+        dcEvent: this.eventFormData,
+      };
+
+      let url = "";
+      if (this.activeName == "-1") {
+        //感知
+        url = "/business/plans/warning/confirm";
+        reqData = { ...reqData, dcWarning: { ...reqData.dcEvent } };
+      } else {
+        //交通
+        url = "/business/plans/event/confirm";
+      }
+      console.log("reqData", reqData);
+      // return;
+      request({
+        url: url,
+        method: "post",
+        data: reqData,
+      })
+        .then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          Message.success("提交成功");
+          this.$emit("close", false);
+          setTimeout(() => {
+            this.$emit("reInitData", true);
+          }, 100);
+        })
+        .catch(() => {
+          Message.error("提交失败");
+        })
+        .finally(() => {
+          this.submitting = false;
+        });
+    },
+    handleRestore() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.24s;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+
+.EventAddPlanDialog {
+  gap: 9px;
+  width: 1280px;
+  height: 310px;
+  display: flex;
+  flex-direction: column;
+
+  .first,
+  .second,
+  .third {
+    padding: 5px 10px 8px;
+    background-color: #296887;
+    margin-bottom: 15px;
+
+    .text {
+      margin-top: 12px;
+    }
+  }
+
+  .form {
+    flex: 1;
+    overflow-y: auto;
+  }
+
+  .footer {
+    display: flex;
+    justify-content: end;
+    gap: 15px;
+  }
+
+  // .disabledBtn {
+  //     height: 24px;
+  //     border-radius: 48px;
+  //     background: #C9C9C9;
+  //     padding: 0 24px;
+  //     color: white !important;
+  //     display: flex;
+  //     align-items: center;
+  //     justify-content: center;
+  // }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue
new file mode 100644
index 00000000..f9865651
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue
@@ -0,0 +1,336 @@
+<template>
+    <div class="EventDetail">
+        <Table :data="tableData" :show-header="false">
+            <ElTableColumn prop="deviceType" width="160">
+                <template slot-scope="scope">
+                    <el-select v-model="scope.row.deviceType" placeholder="请选择设备类型" @change="changeDeviceType">
+                        <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </ElTableColumn>
+
+            <ElTableColumn prop="searchRule" width="230">
+                <template slot-scope="scope">
+                    <div class="plhx">
+                        <el-select v-model="scope.row.searchRule" placeholder="检索规则条件">
+                            <el-option v-for="item in zyOptions" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+
+                        <el-input-number v-if="scope.row.searchRule == 2 || scope.row.searchRule == 3"
+                            v-model="scope.row.number" :min="0" :max="9999" style="width: 130px;"></el-input-number>
+                        <p v-if="scope.row.searchRule == 2 || scope.row.searchRule == 3">个</p>
+
+                        <el-input-number v-if="scope.row.searchRule == 4" v-model="scope.row.number" :min="0"
+                            :max="9999" style="width: 130px;"></el-input-number>
+                        <p v-if="scope.row.searchRule == 4" style="width: 56px;">公里</p>
+                    </div>
+
+                </template>
+            </ElTableColumn>
+
+            <ElTableColumn prop="deviceList" width="400">
+                <template slot-scope="scope">
+                    <div class="mjs">
+                        <el-select v-if="scope.row.searchRule == 1" v-model="scope.row.deviceList" placeholder="请选择设备"
+                            multiple collapse-tags>
+                            <el-option v-for="item in sbOptions" :key="item.id" :label="item.deviceName"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
+                        <!-- 情报板 -->
+                        <el-input @click.native="clickQbb(scope.$index)" v-if="scope.row.deviceType == 2"
+                            placeholder="请选择" v-model="scope.row.qbb" readonly>
+                            <i slot="suffix" class="el-input__icon el-icon-search"></i>
+                        </el-input>
+
+                        <el-select v-if="scope.row.deviceType == 10" v-model="scope.row.gzms" placeholder="工作模式">
+                            <el-option v-for="item in gzmsOptions" :key="item.value" :label="item.label"
+                                :value="item.value"></el-option>
+                        </el-select>
+                        <el-input-number v-if="scope.row.deviceType == 10" placeholder="时长(分钟)"
+                            v-model="scope.row.operationDuration" :min="0" :max="999"></el-input-number>
+
+                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.controlModel"
+                            placeholder="请选择模式">
+                            <el-option label="手动模式" value="00"></el-option>
+                            <el-option label="自动模式" value="01"></el-option>
+                            <el-option label="万年历" value="02"></el-option>
+                        </el-select>
+                        <el-time-picker v-if="scope.row.controlModel == '01' && scope.row.deviceType == 12"
+                            v-model="scope.row.time" is-range style="" range-separator="-" placeholder="选择时间"
+                            value-format="HH:mm" format="HH:mm">
+                        </el-time-picker>
+                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.state" placeholder="工作状态">
+                            <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
+                                :value="item.value"></el-option>
+                        </el-select>
+
+                        <el-input v-if="scope.row.deviceType == 5" v-model="scope.row.content"
+                            placeholder="请输入发布内容"></el-input>
+
+                    </div>
+                </template>
+            </ElTableColumn>
+
+
+            <ElTableColumn label="操作" width="100">
+                <template slot-scope="scope">
+                    <ElButton class="elButton" icon="el-icon-plus" plain size="mini"
+                        @click.native="onAdd(scope.row.id)" />
+                    <ElButton class="elButton" icon="el-icon-delete" plain size="mini"
+                        @click.native="onDel(scope.$index)" />
+                </template>
+            </ElTableColumn>
+        </Table>
+
+        <!-- 情报板弹窗 -->
+        <QbbDialog :visible="isShowDialog" :info="qbbData" :type="type" @close="onCloseDialog"
+            @dialogSubmit="dialogSubmit" />
+    </div>
+</template>
+
+<script>
+import Table from '@screen/components/Table.vue';
+import Button from '@screen/components/Buttons/Button.vue';
+import request from "@/utils/request";
+import QbbDialog from "../qbbDialog/index.vue";
+import { Message } from 'element-ui'
+import { planDeviceOptions } from "@screen/utils/enum.js";
+
+
+export default {
+    name: 'formTable',
+    components: {
+        Button,
+        Table,
+        QbbDialog
+    },
+    // model: {
+    //     prop: 'visible',
+    //     event: 'update:value'
+    // },
+    inject: ['loadData'],
+    props: {
+        eventType: Number,
+        type: Number,
+        tableData: {
+            type: Array,
+            default: () => [{
+                deviceType: 1,
+                searchRule: 1,
+                qbb: ''
+            }]
+        }
+    },
+    data() {
+        return {
+            // tableData: [
+            //     {
+            //         deviceType: 1,
+            //         searchRule: 1,
+            //         qbb: '安全行驶'
+            //     }
+            // ],
+            isShowDialog: false,
+            deviceOptions: planDeviceOptions,
+            zyOptions: [
+                {
+                    value: 1,
+                    label: '指定设备资源'
+                },
+                {
+                    value: 2,
+                    label: '事发上游最近'
+                },
+                {
+                    value: 3,
+                    label: '事发下游最近'
+                },
+                {
+                    value: 4,
+                    label: '最近公里数'
+                },
+            ],
+            gzztOptions: [
+                {
+                    value: "01",
+                    label: "常亮"
+                },
+                {
+                    value: "02",
+                    label: "流水"
+                },
+                {
+                    value: "03",
+                    label: "闪烁"
+                },
+                {
+                    value: "04",
+                    label: "关闭",
+                }
+            ],
+            gzmsOptions: [
+                {
+                    value: "SETMD0",
+                    label: "激光关闭"
+                },
+                {
+                    value: "SETMD1",
+                    label: "常亮模式"
+                },
+                {
+                    value: "SETMD2",
+                    label: "间隔100ms闪烁模式"
+                },
+                {
+                    value: "SETMD3",
+                    label: "间隔200ms闪烁模式",
+                },
+                {
+                    value: "SETMD4",
+                    label: "间隔500ms闪烁模式",
+                },
+                {
+                    value: "SETMD5",
+                    label: "2次闪烁模式"
+                },
+                {
+                    value: "SETMD6",
+                    label: "SOS模式"
+                },
+                {
+                    value: "SETMD7",
+                    label: "自定义模式1",
+                },
+                {
+                    value: "SETMD8",
+                    label: "自定义模式2",
+                },
+                {
+                    value: "SETMD9",
+                    label: "自定义模式3",
+                }
+            ],
+            qbbData: {},
+            sbOptions: [],
+            deviceType: 1,
+            index: 1
+        }
+    },
+    async created() {
+        let loadData = await this.loadData(1);
+        // console.log('aa',loadData)
+        this.sbOptions = loadData;
+    },
+    methods: {
+        initData() {
+            // request({
+            //     url: `business/device/query?deviceType=2`,
+            //     method: "get",
+            // }).then((result) => {
+            //     if (result.code != 200) return Message.error(result?.msg);
+            //     this.sbOptions = result.data;
+
+            // }).catch(() => {
+            //     Message.error("查询可变信息标识失败");
+            // })
+
+        },
+        async changeDeviceType(value) {
+            this.deviceType = value;
+            console.log('value', value)
+            this.sbOptions = await this.loadData(value);
+        },
+        onAdd(id) {
+            this.tableData.push({
+                deviceType: 1,
+                searchRule: 1,
+                qbb: ''
+            })
+        },
+        onDel(index) {
+            if (this.tableData.length <= 1) {
+                return Message.warning('最后一项不可删除！');
+            }
+            this.tableData.splice(index, 1)
+        },
+        clickQbb(index) {
+            this.index = index;
+            // this.qbbData = this.tableData[index].dcInfoBoardTemplate;
+            console.log('this.type', this.type)
+            this.isShowDialog = true;
+        },
+        onCloseDialog() {
+            this.isShowDialog = false;
+        },
+        dialogSubmit(data) {
+            this.tableData[this.index].qbb = data.content;
+            this.tableData[this.index].otherConfig = JSON.stringify(data);
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.EventDetail {
+    display: flex;
+    gap: 9px;
+    width: 100%;
+    // height: 768px;
+    min-height: 50px;
+    margin-top: 5px;
+    flex-direction: column;
+
+    ::v-deep {
+        .el-table .el-table__cell {
+            padding: 0 5px;
+        }
+    }
+
+    .mjs {
+        display: flex;
+
+        >div {
+            margin-right: 10px;
+        }
+    }
+
+    .ms {
+        width: 160px;
+    }
+
+    .plhx {
+        display: flex;
+    }
+
+    ::v-deep {
+        .el-tag.el-tag--info {
+            max-width: 100px;
+        }
+
+        .el-range-editor--medium .el-range__icon,
+        .el-range-editor--medium .el-range__close-icon {
+            display: none;
+        }
+    }
+
+}
+
+.elButton {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    color: #FFFFFF;
+}
+
+.elButton:hover,
+.elButton:focus {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    border-color: #FFFFFF;
+    color: #FFFFFF;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue
new file mode 100644
index 00000000..0fba9ec8
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue
@@ -0,0 +1,406 @@
+<template>
+  <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
+    <div class="EventDetail" :style="{
+    height: activeName == '-1' || activeName == '0' ? '380px' : '698px',
+  }">
+      <Form ref="FormConfigRef" :formList="formList" :dFormData="formData" label-width="100px" />
+
+      <div class="video-pic" :style="{
+    height: formData.component === 'VideoMulti' ? '242px' : undefined,
+  }">
+        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
+          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+    ? formData.videoList[0]
+    : ''
+    " :camId="formData.upCamId" :pileNum="formData.stakeMark" rangeIndex="upCamera" :videoType="formData.videoType" />
+
+        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
+          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+    ? formData.videoList[1]
+    : ''
+    " :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
+          :videoType="formData.videoType" />
+
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :videos="formData.videoList" :pictures="[]" />
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :pictures="formData.pictures" :videos="[]" />
+      </div>
+      <!-- <div>{{ formData.videoList[0] }}</div> -->
+      <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
+      <TimeLine2 v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" style="flex: 1" />
+    </div>
+
+    <!-- 确认弹窗 -->
+    <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="formData" :activeName="activeName"
+      @reInitData="() => {
+    this.$emit('update:value', false);
+    this.$emit('queryData', true);
+  }
+    " @close="onCloseAddNew" />
+
+    <template #footer>
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
+        @click.native="onDelete">误报</Button>
+      <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
+        @click.native="modelVisible = false">取消</Button>
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
+        @click.native="onSubmit">确认</Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index";
+import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index";
+import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index";
+import Form from "@screen/components/FormConfig";
+import { _formList } from "./data";
+// import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js"
+import Video from "@screen/components/Video";
+import VideoMulti from "@screen/components/VideoMulti";
+import Carousel from "./Carousel/index.vue";
+import EventPlanDialog from "./eventPlanDialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+var moment = require("moment");
+import {
+  getProcessNode,
+  getProcessList,
+  postProcess,
+  postCompleteEvent,
+  postNoSkipClear,
+} from "@/api/commandDispatch";
+
+export default {
+  name: "EventDetail",
+  components: {
+    Dialog,
+    Form,
+    TimeLine1,
+    TimeLine2,
+    Video,
+    VideoMulti,
+    Carousel,
+    Button,
+    EventPlanDialog,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  props: {
+    visible: Boolean,
+    activeName: String,
+    formData: {
+      type: Object,
+      default: () => { },
+    },
+  },
+  data() {
+    return {
+      formList:[..._formList],
+      isShowDialog: false,
+      info: [],
+      timeLine1List: [
+        {
+          time: "",
+          label: "",
+          isActive: false,
+        },
+      ],
+      timeLine2List: [
+        {
+          time: "",
+          name: "",
+          desc: "",
+          posts: "",
+          direction: "left",
+        },
+      ],
+    };
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        if (this.visible) {
+          this.getProcess();
+        }
+        return this.visible;
+      },
+      set(val) {
+        console.log(111)
+        this.formList = [..._formList]
+        this.$emit("update:value", val);
+      },
+    },
+  },
+  methods: {
+    getProcess() {
+      if (this.activeName == "-1" || this.activeName == "0") {
+        this.timeLine1List = [];
+        this.timeLine2List = [];
+        return;
+      }
+
+      let directionFlg = true;
+      getProcessList(this.formData.id).then((rows) => {
+        console.log('rows', rows)
+        // if (result.code != 200) return Message.error(result?.msg);
+        // const rows = result.rows;
+        this.timeLine1List = [];
+        this.timeLine2List = [];
+
+        this.formData?.processConfigList.forEach((it) => {
+          const process = rows.find((row) => it.nodeNode == row.processId && row.processType === 1);
+
+          if (process) {
+            this.timeLine1List.push({
+              time: moment(process.operationTime || new Date()).format("HH:mm"),
+              label: it.processNode,
+              isActive: true,
+            });
+            directionFlg = !directionFlg;
+          } else {
+            this.timeLine1List.push({
+              time: "",
+              label: it.processNode,
+              isActive: false,
+            });
+          }
+        });
+
+        rows.forEach(item =>{
+          this.timeLine2List.push({
+            time: moment(item.operationTime || new Date()).format(
+              "yyyy-MM-DD HH:mm:ss"
+            ),
+            name: item.operatorName,
+            desc: item.context,
+            source: item.source,
+            posts: "",
+            direction: item.source == 1 ? "right" : "left",
+          });
+        })
+
+      });
+    },
+    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;
+    },
+    onDelete() {
+      if(this.formList[this.formList.length-1].key !== 'relieveReason' ){
+        this.formList.push({
+          label: "解除类型:",
+          key: "relieveType",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "误报解除",
+              },
+              {
+                key: "2",
+                label: "事件已结束",
+              },
+              {
+                key: "3",
+                label: "无需处理事件",
+              },
+              {
+                key: "4",
+                label: "其它",
+              }
+            ],
+          },
+        })
+        this.formList.push({
+          label: "解除原因:", // 标题
+          key: "relieveReason", //数据存储字段
+          isAlone: true, //  单独一行
+          type: "input", //组件类型(el-input 去掉el-即可) 不填默认为input
+          options: {  //element原生formItem属性
+            type: "textarea",
+            autosize: true,
+            maxlength: 200,
+            autosize: { minRows: 3, maxRows: 3 },
+            showWordLimit: true,
+          }
+        })
+      } else {
+        this.$refs.FormConfigRef.validate()
+          .then((result) => {
+            request({
+              url: `/business/warning/falseAlarm`,
+              method: "post",
+              data: {
+                id: this.formData.id,
+                relieveType: result.relieveType,
+                relieveReason: result.relieveReason
+              },
+            }).then((result) => {
+              if (result.code == 200) Message.success("成功！");
+              else Message.error(result?.msg);
+              this.modelVisible = false;
+              this.$emit("queryData", true);
+              //触发全局监听事件
+              this.$root.$emit('delete-event');
+            });
+          })
+          .catch((err) => {
+          });
+      }
+      
+      // 2024-05-18 修改为二次确认，增加误报类型和误报原因
+      // if (this.formData.id) {
+      //   this.$confirm("确定误报吗？", "提示", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "warning",
+      //   }).then(() => {
+      //     if (this.activeName == "-1") {
+      //       request({
+      //         url: `/business/warning/delete`,
+      //         method: "post",
+      //         data: { id: this.formData.id },
+      //       }).then((result) => {
+      //         if (result.code == 200) Message.success("成功！");
+      //         else Message.error(result?.msg);
+      //         this.modelVisible = false;
+      //         this.$emit("queryData", true);
+      //         //触发全局监听事件
+      //         this.$root.$emit('delete-event');
+      //       });
+      //     } else {
+      //       request({
+      //         url: `dc/system/event/${this.formData.id}`,
+      //         method: "delete",
+      //       }).then((result) => {
+      //         if (result.code == 200) Message.success("成功！");
+      //         else Message.error(result?.msg);
+      //         this.modelVisible = false;
+      //         this.$emit("queryData", true);
+      //         //触发全局监听事件
+      //         this.$root.$emit('delete-event');
+      //       });
+      //     }
+      //   });
+      // }
+    },
+    onSubmit() {
+      // let url = "/business/plans/list/warning/type";
+      // if (this.activeName == "-1") {
+      //   url = "/business/plans/list/warning/type";
+      // } else {
+      //   url = "/business/plans/list/event/type";
+      // }
+      // request({
+      //   url: url,
+      //   method: "post",
+      //   data: this.formData,
+      // }).then((result) => {
+      //   if (result.code != 200) return Message.error(result?.msg);
+      //   this.info = result.data;
+      //   this.isShowDialog = true;
+      // });
+
+      let reData = {
+        id: this.formData.id,
+        stakeMark: this.formData.stakeMark,
+        direction: this.formData.direction == '济南方向' ? 3 : 1,
+        warningType: this.formData.warningType,
+        warningSource: this.formData.warningSource,
+        deptId: this.formData.deptId,
+        warningTime: this.formData.warningTime,
+        warningLevel: this.formData.warningLevel,
+        warningSubclass: this.formData.warningSubclass,
+        warningTitle: this.formData.warningTitle,
+        lane: this.formData.lane,
+        remark: this.formData.remark,
+      }
+      if (this.activeName == '-1') {
+        request({
+          url: '/business/warning/updateWarningConvert',
+          method: "post",
+          data: reData,
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          else Message.success("成功！");
+
+          this.modelVisible = false;
+          this.$emit("queryData", true);
+        });
+      } else if (this.activeName == '0') {
+        request({
+          url: `/dc/system/event/dcEventState/${this.formData.id}/1`,
+          method: "put",
+          data: reData,
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          else Message.success("成功！");
+
+          this.modelVisible = false;
+          this.$emit("queryData", true);
+        });
+      } else {
+        let eventId = this.formData.id;
+        this.modelVisible = false;
+
+        setTimeout(() => {
+          this.$router.push(`/control/event/commandDispatch?eventId=${eventId}`);
+          // this.$router.push(`/control/event/commandDispatch`);
+        })
+
+      }
+
+    },
+    reInitData() {
+      console.log("reInitData");
+      this.$emit("update:value", false);
+      this.$emit("queryData", true);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.EventDetail {
+  display: flex;
+  gap: 9px;
+  width: 836px;
+  // height: 768px;
+  flex-direction: column;
+
+  .video-pic {
+    display: flex;
+    height: 190px;
+    gap: 15px;
+    justify-content: space-around;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue
new file mode 100644
index 00000000..33333f72
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue
@@ -0,0 +1,381 @@
+<template>
+    <div>
+
+
+        <Dialog v-model="modelVisible" title="情报板确认">
+            <div v-if="type == 1" class="EventAddPlanDialog">
+                <h4>预案内容</h4>
+                <dev class="listBox disPid">
+                    <div class="tplItem">
+                        <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="automaticData"></BoardTplPreview>
+                        <div class="infoBtnBox infoBtnBoxSm">
+                            <p class="btn">
+                                <el-radio v-model="radio1" :label="1" @input="changeRadio(automaticData)" />
+                            </p>
+                            <!-- <p @click="____onEditTemplate(automaticData)" class="btn btnEdit" /> -->
+                        </div>
+                    </div>
+                </dev>
+                <h4>自动生成</h4>
+                <dev class="listBox disPid">
+                    <div class="tplItem">
+                        <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="automaticData"></BoardTplPreview>
+                        <div class="infoBtnBox infoBtnBoxSm">
+                            <p class="btn">
+                                <el-radio v-model="radio1" :label="2" @input="changeRadio(automaticData)" />
+                            </p>
+                            <!-- <p @click="____onEditTemplate(automaticData)" class="btn btnEdit" /> -->
+                        </div>
+                    </div>
+                </dev>
+                <h4>情报板模版</h4>
+                <vuescroll :ops="scrollOptions" class="listBox">
+                    <div v-for="(item) in templateAvailable" :key="item.dictValue">
+                        <h5>{{ item.dictLabel }}</h5>
+                        <div v-for="(itm, indx) in item.list" :key="indx" class="tplItem">
+                            <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="itm"></BoardTplPreview>
+                            <div class="infoBtnBox infoBtnBoxSm">
+                                <!-- <p class="btn">
+                                    <el-radio v-model="radio1" :label="itm.id" @input="changeRadio(itm)" />
+                                </p> -->
+                                <p @click="____onEditTemplate(itm)" class="btn btnEdit" />
+                            </div>
+                        </div>
+                    </div>
+                </vuescroll>
+            </div>
+            <div v-if="type == 2" class="EventAddPlanDialog">
+                <div v-for="(item, index) in Object.keys(originalData)" :key="index">
+                    <h4>{{ item }}</h4>
+                    <dev class="listBox disPid">
+                        <div v-for="(it, idx) in originalData[item]" :key="idx" class="tplItem">
+                            <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="it"></BoardTplPreview>
+                        </div>
+                    </dev>
+                </div>
+
+            </div>
+            <template #footer v-if="type == 1">
+                <Button style="background: #C9C9C9;padding:0 24px;"
+                    @click.native="modelVisible = false, submitting = false">取消</Button>
+                <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">确认</Button>
+            </template>
+        </Dialog>
+
+        <BoardInfoEditor @afterSubmit="____onEditSubmit" :mode="editDialog.mode" :type="editDialog.type"
+            :visible.sync="editDialog.visible" :screenSize="selectedSize" :tpl="editDialog.tpl"></BoardInfoEditor>
+    </div>
+</template>
+
+<script>
+import vuescroll from "vuescroll";
+import scrollOptions from "@/common/scrollbar.js";
+import BoardTplPreview from "@screen/components/infoBoard/BoardTplPreview.vue";
+import BoardInfoEditor from "@screen/components/infoBoard/BoardInfoEditor";
+import Dialog from "@screen/components/Dialog/index";
+import Button from '@screen/components/Buttons/Button.vue';
+import { getTemplateList } from "@/api/board/template";
+
+export default {
+    name: 'qbbDialog',
+    components: {
+        Dialog,
+        Button,
+        vuescroll,
+        BoardTplPreview,
+        BoardInfoEditor
+    },
+    model: {
+        prop: 'visible',
+        event: 'close'
+    },
+    inject: ['getAutomatic', 'getOriginal'],
+    props: {
+        visible: Boolean,
+        type: {
+            type: Number,
+            default: 1
+        },
+        info: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    data() {
+        return {
+            submitting: false,
+            selectedSize: "",
+            scrollOptions,
+            templateAvailable: null,
+            tplCategory: [],
+            templateAll: [],
+            radio1: '',
+            itmData: {},
+            automaticData: {},
+            originalData: {},
+            editDialog: {
+                mode: "",
+                type: "",
+                visible: false,
+                tpl: {},
+            },
+        }
+    },
+    mounted() {
+        if (this.type == 1) {
+            this.initData();
+        } else if (this.type == 2) {
+            this.getBoardOriginal();
+        }
+    },
+    computed: {
+        modelVisible: {
+            get() {
+                // if (this.visible2) {
+                //     if (this.info && this.info.id) {
+                //         this.radio1 = Number(this.info.id);
+                //     }
+                // console.log('123', this.getTemplateAutomatic());
+                // }
+                return this.visible;
+            },
+            set(val) {
+                this.$emit('close', val)
+            }
+        },
+    },
+    methods: {
+        initData() {
+            if (this.tplCategory.length && this.templateAll.length) {
+                this.____setAvailableTemplate();
+            } else {
+                Promise.all([
+                    this.____getTemplateCategory(),
+                    this.____getAllTemplate(),
+                ]).then((res) => {
+                    this.____setAvailableTemplate();
+                });
+                this.getTemplateAutomatic();
+            }
+
+        },
+        // 获取信息模板分类
+        ____getTemplateCategory() {
+            return this.getDicts("iot_template_category").then((res) => {
+                this.tplCategory = res.data;
+            });
+        },
+        //获取全部模版
+        ____getAllTemplate() {
+            return getTemplateList().then((res) => {
+                this.templateAll = res.data;
+            });
+        },
+        // 设置当前设备可用的模板
+        ____setAvailableTemplate() {
+            this.templateAvailable = [];
+            this.tplCategory.forEach((item, index) => {
+                let arr = this.templateAll["" + index];
+                if (arr.length > 0) {
+                    let temp = [];
+                    arr.forEach((tpl) => {
+                        if (tpl.screenSize) {
+                            temp.push(tpl);
+                        }
+                    });
+                    if (temp.length > 0) {
+                        this.templateAvailable.push({
+                            ...item,
+                            list: temp,
+                        });
+                    }
+                }
+            });
+        },
+        ____onEditTemplate(tpl) {
+            this.editDialog = {
+                visible: true,
+                mode: "edit",
+                type: "template",
+                tpl,
+            };
+        },
+        //提交之后的回调
+        ____onEditSubmit(para) {
+            this.editDialog.tpl = {};
+            this.editDialog.visible = false;
+
+            if (para.type == "device") {
+                if (para.mode == "edit") {
+                    this.selectedBdMsg[this.boardItemEdtingIndex] = para.data;
+                } else {
+                    this.selectedBdMsg.push(_.cloneDeep(para.data));
+                }
+            } else if (para.mode == "toDevice") {
+                this.selectedBdMsg.push(_.cloneDeep(para.data));
+            } else {
+                this.____refreshPageData(para);
+            }
+        },
+        ____refreshPageData(para) {
+            if (para.type == "template") {
+                this.____getAllTemplate().then((res) => {
+                    this.____setAvailableTemplate();
+                });
+            } else {
+            }
+        },
+        async getTemplateAutomatic() {
+            let data = await this.getAutomatic();
+            console.log('dataaaa', data);
+            this.automaticData = data;
+        },
+        async getBoardOriginal() {
+            let data = await this.getOriginal();
+            console.log('datbbbbb', data);
+            this.originalData = data;
+        },
+        changeRadio(data) {
+            this.itmData = data;
+        },
+        handleSubmit() {
+            this.modelVisible = false;
+            this.$emit('dialogSubmit', this.itmData);
+        }
+
+
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.listBox {
+    padding: 20px;
+
+    .tplItem {
+        margin-right: 14px;
+        display: flex;
+        align-items: stretch;
+        padding-bottom: 10px;
+
+        .boardPreview {
+            border: 1px solid rgba(61, 232, 255, 0.5);
+            // width: 560px;
+            // height:80px;
+            flex: 1;
+        }
+
+        .infoBtnBox {
+            &.infoBtnBoxSm {
+                width: 60px;
+            }
+
+            width: 110px;
+            height: 80px;
+            display: flex;
+            margin-left: 10px;
+            /* // border: solid 1px #05afe3; */
+            border: 1px solid rgba(61, 232, 255, 0.5);
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+
+            .btn {
+                background-repeat: no-repeat;
+                background-size: 100% 100%;
+                width: 15px;
+                height: 30px;
+
+                &.btnApply {
+                    background-image: url(~@/assets/jihe/images/button/toLeft.svg);
+                }
+
+                &.btnEdit {
+                    background-image: url(~@/assets/jihe/images/button/edit.svg);
+                }
+
+                &.btnDelete {
+                    background-image: url(~@/assets/jihe/images/button/delete.svg);
+                }
+            }
+
+            i {
+                font-size: 24px;
+                color: #666;
+                padding-left: 4px;
+                cursor: pointer;
+                caret-color: rgba(0, 0, 0, 0);
+                user-select: none;
+            }
+
+            i:hover {
+                color: #05afe3;
+            }
+
+            .disabledClass {
+                pointer-events: none;
+                cursor: auto !important;
+                color: #ccc;
+            }
+        }
+    }
+
+    .controlBox {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        display: flex;
+        justify-content: center;
+    }
+
+    .el-collapse {
+        max-height: 100% !important;
+        overflow: auto;
+        border-bottom: none;
+        border-top: none;
+        padding: 0 0.5vw;
+    }
+}
+
+.disPid {
+    padding: 0 20px !important;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity .24s;
+}
+
+.fade-enter,
+.fade-leave-to {
+    opacity: 0;
+}
+
+.EventAddPlanDialog {
+    gap: 9px;
+    width: 650px;
+    height: 700px;
+    display: flex;
+    flex-direction: column;
+
+    h4 {
+        margin: 0 0 5px 0;
+    }
+
+    ::v-deep {
+        .el-radio__label {
+            display: none;
+        }
+    }
+
+    .form {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    .footer {
+        display: flex;
+        justify-content: end;
+        gap: 15px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js
new file mode 100644
index 00000000..93c2b120
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js
@@ -0,0 +1,1228 @@
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import moment from "moment";
+
+export const source = {
+  label: "来源:",
+  key: "eventSource",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  default: "1",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1",
+        label: "96659",
+      },
+      {
+        key: "2",
+        label: "交通转接",
+      },
+      {
+        key: "3",
+        label: "道路巡查",
+      },
+      {
+        key: "4",
+        label: "视频巡查",
+      },
+      {
+        key: "5",
+        label: "视频AI",
+      },
+      {
+        key: "6",
+        label: "一键救援",
+      },
+      {
+        key: "7",
+        label: "其他",
+      },
+    ],
+  },
+};
+
+export const illegalTriggeringType = {
+  label: "类型:",
+  key: "eventSubclass",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  default: "5-1",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "5-1",
+        label: "行人",
+      },
+      {
+        key: "5-2",
+        label: "非机动车",
+      },
+      {
+        key: "5-3",
+        label: "摩托车",
+      },
+      {
+        key: "5-4",
+        label: "其他",
+      },
+    ],
+  },
+};
+
+export const station = {
+  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.dcEventAccident && data.dcEventAccident.locationType != 1) {
+      return false;
+    }
+    return true;
+  },
+};
+
+export const startEndStation = {
+  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]",
+      },
+    ],
+  },
+};
+
+export const direction = {
+  label: "方向:",
+  key: "direction",
+  required: true,
+  type: "select",
+  options: {
+    options: [
+      // { key: "济南方向", label: "济南方向" },
+      // { key: "菏泽方向", label: "菏泽方向" },
+    ],
+  },
+};
+
+export const problemDescription = {
+  label: "问题描述:",
+  key: "description",
+  isAlone: true,
+  options: {
+    type: "textarea",
+    autosize: true,
+    maxlength: 150,
+    autosize: { minRows: 6, maxRows: 6 },
+    showWordLimit: true,
+  },
+  required: true,
+};
+
+export const startTime = {
+  label: "开始时间:",
+  key: "occurrenceTime",
+  required: true,
+  isAlone: true,
+  type: "datePicker",
+  default: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+  options: {
+    type: "datetime",
+    format: "yyyy-MM-dd HH:mm:ss",
+    valueFormat: "yyyy-MM-dd HH:mm:ss",
+  },
+};
+
+export const expectedEndTime = {
+  label: "预计结束时间:",
+  key: "estimatedEndTime",
+  isAlone: true,
+  type: "datePicker",
+  options: {
+    type: "datetime",
+    format: "yyyy-MM-dd HH:mm:ss",
+    valueFormat: "yyyy-MM-dd HH:mm:ss",
+  },
+};
+
+export const eventLevel = {
+  label: "事件等级:",
+  key: "eventLevel",
+  required: true,
+  type: "select",
+  default: 5,
+  options: {
+    options: [
+      {
+        key: 1,
+        label: "一级",
+      },
+      {
+        key: 2,
+        label: "二级",
+      },
+      {
+        key: 3,
+        label: "三级",
+      },
+      {
+        key: 4,
+        label: "四级",
+      },
+      {
+        key: 5,
+        label: "五级",
+      },
+    ],
+    disabled: true,
+  },
+};
+
+export const laneOccupancy = {
+  label: "车道占用:",
+  key: "lang",
+  type: "CheckboxGroup",
+  isAlone: true,
+  default: [],
+  options: {
+    options: [
+      { key: "1", label: "行1" },
+      { key: "2", label: "行2" },
+      { key: "3", label: "行3" },
+      { key: "4", label: "行4" },
+      { key: "0", label: "应急车道" },
+    ],
+  },
+};
+
+export const eventSources = {
+  label: "事件源:",
+  key: "eventSource",
+  type: "select",
+  options: {
+    clearable: true,
+    options: [
+      {
+        key: "1",
+        label: "96659",
+      },
+      {
+        key: "2",
+        label: "交通转接",
+      },
+      {
+        key: "3",
+        label: "道路巡查",
+      },
+      {
+        key: "4",
+        label: "视频巡查",
+      },
+      {
+        key: "5",
+        label: "视频AI",
+      },
+      {
+        key: "6",
+        label: "一键救援",
+      },
+      {
+        key: "7",
+        label: "其他",
+      },
+    ],
+  },
+};
+
+export const warningType = {
+  label: "事件源:",
+  key: "warningType",
+  type: "select",
+  options: {
+    clearable: true,
+    options: [
+      {
+        key: "1",
+        label: "交通拥堵",
+      },
+      {
+        key: "2",
+        label: "行人",
+      },
+      {
+        key: "4",
+        label: "停车",
+      },
+      {
+        key: "5",
+        label: "违规驾驶",
+      },
+      {
+        key: "6",
+        label: "路障",
+      },
+      {
+        key: "7",
+        label: "道路施工",
+      },
+      {
+        key: "99",
+        label: "其他",
+      },
+    ],
+  },
+};
+
+export const eventType = {
+  label: "事件类型:",
+  key: "eventType",
+  type: "select",
+  options: {
+    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: "服务区异常",
+      },
+      {
+        key: "9",
+        label: "设施设备隐患",
+      },
+      {
+        key: "10",
+        label: "异常天气",
+      },
+      {
+        key: "11",
+        label: "其他事件",
+      },
+    ],
+  },
+};
+
+export const vehicleCondition = (keyPrefix = "dcEventAccident") => ({
+  label: "车辆情况:",
+  key: "key25",
+  isAlone: true,
+  type: "MultipleLabelItem",
+  options: {
+    options: [
+      {
+        prefix: {
+          text: "小型车",
+        },
+        suffix: {
+          text: "辆",
+        },
+        type: "inputNumber",
+        options: {
+          min: 0,
+        },
+        key: `${keyPrefix}.smallCar`,
+      },
+      {
+        prefix: {
+          text: "货车",
+        },
+        suffix: {
+          text: "辆",
+        },
+        options: {
+          min: 0,
+        },
+        type: "inputNumber",
+        key: `${keyPrefix}.trucks`,
+      },
+      {
+        prefix: {
+          text: "客车",
+        },
+        suffix: {
+          text: "辆",
+        },
+        type: "inputNumber",
+        options: {
+          min: 0,
+        },
+        key: `${keyPrefix}.buses`,
+      },
+      {
+        prefix: {
+          text: "罐车",
+        },
+        suffix: {
+          text: "辆",
+        },
+        type: "inputNumber",
+        options: {
+          min: 0,
+        },
+        key: `${keyPrefix}.tankers`,
+      },
+    ],
+  },
+});
+
+export const casualties = (keyPrefix = "dcEventAccident") => ({
+  label: "伤亡情况:",
+  key: "key0036",
+  isAlone: true,
+
+  type: "MultipleLabelItem",
+  options: {
+    options: [
+      {
+        prefix: {
+          text: "轻伤",
+        },
+        suffix: {
+          text: "人",
+        },
+        key: `${keyPrefix}.minorInjuries`,
+      },
+      {
+        prefix: {
+          text: "重伤",
+        },
+        suffix: {
+          text: "人",
+        },
+        key: `${keyPrefix}.seriousInjuries`,
+      },
+      {
+        prefix: {
+          text: "死亡",
+        },
+        suffix: {
+          text: "人",
+        },
+        key: `${keyPrefix}.fatalities`,
+      },
+    ],
+  },
+});
+
+export const eventTitle = {
+  label: "事件标题:",
+  key: "eventTitle",
+  isAlone: true,
+  required: true,
+};
+
+export const eventDesc = {
+  label: "事件描述:",
+  key: "description",
+  isAlone: true,
+  options: {
+    type: "textarea",
+    autosize: true,
+    maxlength: 150,
+    autosize: { minRows: 6, maxRows: 6 },
+    showWordLimit: true,
+  },
+  required: true,
+};
+
+export const remark = {
+  label: "备注:",
+  key: "remark",
+  isAlone: true,
+  options: {
+    type: "textarea",
+    autosize: true,
+    maxlength: 150,
+    autosize: { minRows: 6, maxRows: 6 },
+    showWordLimit: true,
+  },
+  // required: true,
+};
+
+export const isInTunnel = {
+  label: "是否处在隧道:",
+  key: "inTunnel",
+  // isAlone: true,
+  required: true,
+  default: "0",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1",
+        label: "是",
+      },
+      {
+        key: "0",
+        label: "否",
+      },
+    ],
+  },
+};
+
+export const freeway = {
+  label: "路线:",
+  required: true,
+  key: "roadId",
+  type: "select",
+  options: {
+    options: [
+      // {
+      //   key: "1",
+      //   label: "济菏高速",
+      // },
+    ],
+  },
+};
+
+export const weatherCondition = {
+  label: "天气情况:",
+  key: "dcEventAccident.weatherCondition",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  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: "其他",
+      },
+    ],
+  },
+};
+
+export const weatherSituation = {
+  label: "天气情况:",
+  key: "dcEventAccident.weatherSituation",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1-1",
+        label: "雨雾",
+      },
+      {
+        key: "1-2",
+        label: "雨雪",
+      },
+      {
+        key: "1-3",
+        label: "中雨",
+      },
+      {
+        key: "1-4",
+        label: "小雨",
+      },
+      {
+        key: "1-5",
+        label: "大雨",
+      },
+      {
+        key: "1-6",
+        label: "暴雨",
+      },
+    ],
+  },
+  visible: (data) => {
+    if (
+      data?.eventSubclass == "10-1" ||
+      data?.eventSubclass == "10-2" ||
+      data?.eventSubclass == "10-3"
+    ) {
+      return true;
+    }
+    return false;
+  },
+};
+
+export const additionalNotes = {
+  label: "补充说明:",
+  key: "eventSourceTips",
+  isAlone: true,
+  options: {
+    type: "textarea",
+    autosize: true,
+    maxlength: 150,
+    autosize: { minRows: 6, maxRows: 6 },
+    showWordLimit: true,
+  },
+};
+
+export const callPolicePersonName = {
+  label: "报警人姓名:",
+  key: "dcEventAccident.reporterName",
+  options: {
+    placeholder: "请输入报警人姓名",
+  },
+  required: true,
+};
+
+export const callPolicePersonPhone = {
+  label: "报警人电话:",
+  key: "dcEventAccident.reporterPhoneNumber",
+  options: {
+    placeholder: "请输入报警人电话(区号+号码)",
+  },
+  required: true,
+};
+
+export const trafficAccidentType = {
+  label: "交通事故类型:",
+  key: "eventSubclass",
+  type: "select",
+  required: true,
+  options: {
+    options: [
+      {
+        value: "1-1",
+        label: "追尾",
+      },
+      {
+        value: "1-2",
+        label: "侧翻",
+      },
+      {
+        value: "1-3",
+        label: "撞护栏",
+      },
+      {
+        value: "1-4",
+        label: "自然",
+      },
+      {
+        value: "1-5",
+        label: "其他事故",
+      },
+    ],
+  },
+};
+
+export const vehicleMalfunctionType = {
+  label: "车辆故障类型:",
+  key: "eventSubclass",
+  type: "select",
+  required: true,
+  options: {
+    options: [
+      {
+        value: "2-1",
+        label: "车辆故障",
+      },
+    ],
+  },
+};
+
+export const locationMode = {
+  label: "地点方式:",
+  key: "dcEventAccident.locationType",
+  required: true,
+  type: "select",
+  default: "1",
+  options: {
+    options: [
+      { key: 1, label: "高速主线" },
+      { key: 2, label: "服务区" },
+      { key: 3, label: "立交桥" },
+      { key: 4, label: "收费站" },
+    ],
+  },
+  ons: {
+    change(value, ...args) {
+      const { data, formList } = args.slice(-1)[0];
+      if (data.dcEventAccident) {
+        data.dcEventAccident.facilityId = null;
+      }
+      if (data.dcEventVehicleAccident) {
+        data.dcEventVehicleAccident.facilityId = null;
+      }
+
+      let facilityType = 1;
+      if (value == 2) {
+        facilityType = 6;
+      } else if (value == 3) {
+        facilityType = 3;
+      } else if (value == 4) {
+        facilityType = 1;
+      }
+      if (value && value != 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 == "dcEventAccident.facilityId" ||
+                it.key == "dcEventVehicleAccident.facilityId"
+              ) {
+                it.options.options = lwss;
+              }
+            });
+          })
+          .catch((err) => {
+            console.log("err", err);
+            Message.error("查询失败1", err);
+          });
+      }
+    },
+  },
+};
+
+export const route = {
+  label: "路线:",
+  key: "dcEventAccident.route",
+  required: true,
+  type: "select",
+};
+
+export const eventHappenTime = {
+  label: "事件发生时间:",
+  key: "occurrenceTime",
+  required: true,
+  type: "datePicker",
+  default: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+  options: {
+    type: "datetime",
+    format: "yyyy-MM-dd HH:mm:ss",
+    valueFormat: "yyyy-MM-dd HH:mm:ss",
+  },
+};
+
+export const aEstimatedReleaseTime = {
+  label: "预计解除时间:",
+  key: "estimatedEndTime",
+  type: "datePicker",
+  options: {
+    type: "datetime",
+    format: "yyyy-MM-dd HH:mm:ss",
+    valueFormat: "yyyy-MM-dd HH:mm:ss",
+  },
+};
+
+export const pressure = {
+  label: "压车(公里):",
+  key: "dcEventAccident.trafficJam",
+  type: "inputNumber",
+  options: {
+    min: 0,
+  },
+  ons: {
+    change(value, ...args) {
+      const { data } = args.slice(-1)[0];
+      let dj = 5;
+      if (value < 3) {
+        dj = 5;
+      } else if (value >= 3 && value < 6) {
+        dj = 4;
+      } else if (value >= 6 && value < 9) {
+        dj = 3;
+      } else if (value >= 9 && value < 11) {
+        dj = 2;
+      } else if (value > 10) {
+        dj = 1;
+      }
+      data.eventLevel = dj;
+    },
+  },
+};
+
+export const isCongestionAhead = {
+  label: "前方是否拥堵:",
+  key: "dcEventAccident.congestionAhead",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "0",
+        label: "是",
+      },
+      {
+        key: "1",
+        label: "否",
+      },
+    ],
+  },
+};
+
+export const isForkRoad = {
+  label: "是否分岔口:",
+  key: "dcEventAccident.atIntersection",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "0",
+        label: "是",
+      },
+      {
+        key: "1",
+        label: "否",
+      },
+    ],
+  },
+};
+
+export const isCurveRoad = {
+  label: "是否处在弯道:",
+  key: "dcEventAccident.onCurve",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1",
+        label: "是",
+      },
+      {
+        key: "0",
+        label: "否",
+      },
+    ],
+  },
+};
+
+export const effect = {
+  label: "影响:",
+  key: "dcEventAccident.impactLevel",
+  type: "select",
+  options: {
+    options: [
+      { key: 1, label: "无" },
+      { key: 2, label: "危化品泄漏" },
+      { key: 3, label: "整车自燃" },
+      { key: 4, label: "车辆复燃" },
+      { key: 5, label: "散装人工倒货" },
+    ],
+  },
+};
+
+export const isArrives = {
+  label: "是否到货:",
+  key: "dcEventAccident.isReverseCargo",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1",
+        label: "是",
+      },
+      {
+        key: "0",
+        label: "否",
+      },
+    ],
+  },
+};
+
+export const isMaintenanceAccident = {
+  label: "是否养护事故:",
+  key: "dcEventAccident.isMaintenance",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1",
+        label: "是",
+      },
+      {
+        key: "0",
+        label: "否",
+      },
+    ],
+  },
+};
+
+export const trafficPolicePhone = {
+  label: "交警电话:",
+  key: "dcEventAccident.policeContact",
+};
+
+export const wreckerCalls = {
+  label: "清障电话:",
+  options: {
+    placeholder: "请输入清障电话(区号+号码)",
+  },
+  key: "dcEventAccident.towingServiceContact",
+};
+
+export const spillName = {
+  label: "洒落物名称:",
+  key: "dcEventAccident.spillageItem",
+  isAlone: true,
+  options: {
+    type: "textarea",
+    autosize: true,
+    maxlength: 50,
+    autosize: { minRows: 3, maxRows: 3 },
+    showWordLimit: true,
+  },
+};
+
+export const ownerPhone = {
+  label: "车主电话:",
+  key: "dcEventAccident.vehicleOwnerPhone",
+  isAlone: true,
+  options: {
+    placeholder: "车主电话（多个电话请以逗号分隔，不超过10个）",
+  },
+};
+
+export const emptyLine = {
+  key: "key222",
+  type: "empty",
+};
+
+export const constructionMeasurement = {
+  label: "施工措施:",
+  key: "constructionMeasurement",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  default: "0",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "0",
+        label: "无",
+      },
+      {
+        key: "1",
+        label: "并道行驶",
+      },
+      {
+        key: "2",
+        label: "临时保通",
+      },
+      {
+        key: "3",
+        label: "借路侧服务区通行",
+      },
+    ],
+  },
+};
+
+export const locationType = {
+  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: "多点",
+      },
+    ],
+  },
+};
+
+export const specialConstruction = {
+  label: "专项施工:",
+  key: "specialConstruction",
+  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: "其他专项工程施工",
+      },
+    ],
+  },
+};
+
+export const trafficCondition = {
+  label: "通行情况:",
+  key: "trafficCondition",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1",
+        label: "通行正常",
+      },
+      {
+        key: "2",
+        label: "通行受阻",
+      },
+    ],
+  },
+};
+
+export const disableFacility = {
+  label: "停用设施:",
+  key: "disableFacility",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  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: "充电桩",
+      },
+    ],
+  },
+};
+
+export const congestionCause = {
+  label: "拥堵原因:",
+  key: "congestionCause",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
+  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) {
+      // console.log(value);
+      const { formList } = args.slice(-1)[0];
+      const config = formList.find((it) => it.key == "detailedReasons");
+      let ad = {
+        1: [
+          {
+            key: "1",
+            label: "收费站广场拥堵导致出口压车",
+          },
+          {
+            key: "2",
+            label: "收费站设备故障",
+          },
+          {
+            key: "3",
+            label: "地方道路原因",
+          },
+          {
+            key: "4",
+            label: "省内非集团所辖高速原因",
+          },
+          {
+            key: "5",
+            label: "集团所辖道路拥堵",
+          },
+          {
+            key: "6",
+            label: "集团所辖枢纽立交异常导致主线压车",
+          },
+          {
+            key: "7",
+            label: "路侧起火",
+          },
+          {
+            key: "8",
+            label: "备注项添加",
+          },
+        ],
+        2: [
+          {
+            key: "1",
+            label: "主线车流量大",
+          },
+          {
+            key: "2",
+            label: "收费站出口车流量大导致主线压车",
+          },
+        ],
+      };
+      config.options.options = value != 1 ? ad[1] : ad[2];
+    },
+  },
+  visible: (data) => {
+    if (data?.eventSubclass != "4-1") {
+      return false;
+    }
+    return true;
+  },
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
new file mode 100644
index 00000000..6f046ee6
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
@@ -0,0 +1,2537 @@
+import * as PresetFormItems from "./PresetFormItems";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+
+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: "dcEventTrafficControl.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: "dcEventTrafficControl.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/perception/eventAnalysis/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/index.vue
new file mode 100644
index 00000000..964a4986
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/index.vue
@@ -0,0 +1,258 @@
+<template>
+  <Dialog v-model="modelVisible" title="交通事故录入" width="1100px" top="14%">
+    <div class="EventDetailDialog">
+      <ElTabs v-model="activeName" @tab-click="handleChange">
+        <ElTabPane v-for="(item, index) in tabConfigList" :key="index" :label="item.label" :name="item.key" />
+      </ElTabs>
+
+      <Transition name="fade">
+        <Form class="form" ref="FormConfigRef" :formList="formConfig.list" v-bind="getFormOptions" labelWidth="120px" />
+      </Transition>
+    </div>
+
+    <template #footer>
+      <Button style="background: #c9c9c9; padding: 0 24px"
+        @click.native="(modelVisible = false), (submitting = false)">取消</Button>
+      <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">保存</Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+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 { Message } from "element-ui";
+
+import { tabConfigList } from "./data.js";
+
+export default {
+  name: "EventDetailDialog",
+  components: {
+    Dialog,
+    Form,
+    Button,
+  },
+  model: {
+    prop: "visible",
+    event: "close",
+  },
+  props: {
+    visible: Boolean,
+  },
+  data() {
+    return {
+      activeName: "TrafficAccident",
+      submitting: false,
+      formConfig: {},
+      tabConfigList,
+      index: 1,
+      roads: [],
+      direction: [],
+      lwss: [],
+    };
+  },
+  created() {
+    // this.formConfig = tabConfigList[0].formConfig;
+    this.initData().then(() => {
+      this.handleChange({ index: 0 });
+    });
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("close", val);
+      },
+    },
+    getFormOptions() {
+      return {
+        column: 3,
+        ...this.formConfig.formOptions,
+      };
+    },
+  },
+  methods: {
+    initData() {
+      return 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);
+          }),
+      ]);
+    },
+    handleChange({ index }) {
+      // console.log('index',index)
+      this.index = index;
+      let formConfig = tabConfigList[index].formConfig;
+      console.log("formConfig", formConfig);
+      formConfig.list.forEach((it) => {
+        if (it.key == "direction") {
+          it.options.options = this.direction;
+        }
+        if (it.key == "roadId") {
+          it.options.options = this.roads;
+        }
+        if (index == 7 && it.key == "dcEventServiceArea.facilityId") {
+          it.options.options = this.lwss.filter((ss) => ss.type == 6);
+        }
+        // if (index == 0 || index == 1 || index == 7) {
+        //   if (it.key === 'dcEventAccident.facilityId' || it.key === 'dcEventVehicleAccident.facilityId' || it.key === 'dcEventServiceArea.facilityId') {
+        //     it.options.options = this.lwss.filter(ss => ss.type == 6);
+        //   }
+        // }
+      });
+
+      this.formConfig = formConfig;
+    },
+    handleSubmit() {
+      // return
+      this.$refs.FormConfigRef.validate().then((formData) => {
+        this.submitting = true;
+
+        if (this.index == 0 || this.index == 1) {
+          formData.lang = formData.lang.join(",");
+        } else {
+          formData.lang = "";
+        }
+        if (this.index == 2 && formData.dcEventTrafficControl.facilityId instanceof Array) {
+          let ids = formData.dcEventTrafficControl.facilityId;
+          formData.dcEventTrafficControl.facilityIds = ids
+          formData.dcEventTrafficControl.facilityId = ''
+        }
+        if (formData.endStakeMark && formData.endStakeMark[0] != null) {
+          let endStakeMark = formData.endStakeMark;
+          let strMark = endStakeMark && endStakeMark.length > 0 ? "K" + endStakeMark[0] + "+" + endStakeMark[1] : "";
+          if (this.index == 3) {
+            formData.dcEventTrafficCongestion.endStakeMark = strMark;
+          }
+          if (this.index == 6) {
+            formData.dcEventConstruction.endStakeMark = strMark;
+          }
+          if (this.index == 9) {
+            formData.dcEventAbnormalWeather.endStakeMark = strMark;
+          }
+          formData.endStakeMark = "";
+        } else {
+          formData.endStakeMark = "";
+        }
+        let stakeMark = formData.stakeMark;
+        // console.log('formData', {
+        //   ...formData,
+        //   eventType: Number(this.index) + 1,
+        //   stakeMark: (stakeMark && stakeMark[0] != null) ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
+        // })
+        // this.modelVisible = false;
+        // this.submitting = false;
+        // this.$emit('queryData',true)
+        // return;
+
+        request({
+          url: `/dc/system/event`,
+          method: "post",
+          data: {
+            ...formData,
+            eventType: Number(this.index) + 1,
+            eventState: 0,
+            stakeMark:
+              stakeMark && stakeMark[0] != null
+                ? stakeMark && stakeMark.length > 0
+                  ? "K" + stakeMark[0] + "+" + stakeMark[1]
+                  : ""
+                : "",
+          },
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            Message.success("提交成功");
+            this.modelVisible = false;
+          })
+          .catch(() => {
+            Message.error("提交失败");
+          })
+          .finally(() => {
+            this.submitting = false;
+            this.$emit("queryData", true);
+          });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.24s;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+
+.EventDetailDialog {
+  gap: 9px;
+  width: 1050px;
+  // height: 810px;
+  display: flex;
+  flex-direction: column;
+
+  .form {
+    flex: 1;
+    overflow-y: auto;
+  }
+
+  .footer {
+    display: flex;
+    justify-content: end;
+    gap: 15px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
new file mode 100644
index 00000000..5960c430
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
@@ -0,0 +1,226 @@
+import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import { merge, cloneDeep } from "lodash";
+
+const station = {
+  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]",
+      },
+    ],
+  },
+};
+
+export const tabMap = {
+  "1": {
+    state: 21,
+    textColor: "#007FF4",
+    text: "上报",
+  },
+  "2": {
+    state: 22,
+    textColor: "#007FF4",
+    text: "已完成",
+  },
+  "3": {
+    state: 23,
+    textColor: "#007FF4",
+    text: "已终止",
+  },
+  "4": {
+    state: 24,
+    textColor: "#007FF4",
+    text: "自动结束",
+  },
+};
+export const searchFormList = [
+  {
+    label: "事件状态:",
+    key: "warningState",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+        {
+          value: 1,
+          label: "上报",
+        },
+        {
+          value: 2,
+          label: "已完成",
+        },
+        {
+          value: 3,
+          label: "已终止",
+        },
+        {
+          value: 4,
+          label: "自动结束",
+        }
+      ],
+    },
+  },
+  {
+    label: "事件来源:",
+    key: "warningSource",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+        {
+          key: "1",
+          label: "视频AI",
+        },
+        {
+          key: "2",
+          label: "雷达识别",
+        },
+        {
+          key: "3",
+          label: "锥桶",
+        },
+        {
+          key: "4",
+          label: "护栏碰撞",
+        },
+        {
+          key: "5",
+          label: "扫码报警",
+        },
+        // {
+        //   key: "6",
+        //   label: "非机预警",
+        // },
+        {
+          key: "7",
+          label: "气象监测器",
+        },
+      ],
+    },
+  },
+  {
+    label: "方向:",
+    key: "direction",
+    type: "RadioGroup",
+    options: {
+      options: [
+        {
+          key: "1",
+          label: "菏泽方向",
+        },
+        {
+          key: "3",
+          label: "济南方向",
+        },
+      ],
+    },
+  },
+  {
+    label: "事件主类:",
+    key: "warningType",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+        {
+          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: "车辆故障",
+        },
+        {
+          value: 99,
+          label: "其他事件",
+        },
+      ],
+    },
+  },
+  {
+    label: "时间范围:",
+    key: "daterange",
+    required: false,
+    type: "datePicker",
+    options: {
+      style: "width: auto",
+      type: "datetimerange",
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
+    },
+  },
+  {
+    ...station,
+    label: "开始桩号:",
+    required: false,
+  },
+  merge(cloneDeep(station), {
+    options: {
+      options: [
+        {
+          key: "endStakeMark[0]",
+        },
+        {
+          key: "endStakeMark[1]",
+        },
+      ],
+    },
+    label: "结束桩号:",
+    required: false,
+  }),
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/export.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/export.svg
new file mode 100644
index 00000000..7b9c7fb6
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/export.svg
@@ -0,0 +1,14 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10065" clip-path="url(#clip0_308_1276)">
+<g id="Group 1142814551">
+<path id="Rectangle 1282" d="M1 7V11C1 12.1046 1.89543 13 3 13H11C12.1046 13 13 12.1046 13 11V7" stroke="white" stroke-linecap="round"/>
+<path id="Rectangle 1304" d="M4.27282 4.05153L7.04691 1.00002L9.81656 4.05155" stroke="white" stroke-linecap="round"/>
+<path id="Line 513" d="M7 9L7 2" stroke="white" stroke-linecap="round"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_308_1276">
+<rect width="14" height="14" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/insert.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/insert.svg
new file mode 100644
index 00000000..e8cab68e
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/insert.svg
@@ -0,0 +1,9 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814395">
+<g id="Group 1142814394">
+<circle id="Ellipse 835" cx="7" cy="7" r="6.5" stroke="white"/>
+</g>
+<path id="Line 514" d="M7 3.5L7 10.5" stroke="white" stroke-linecap="round"/>
+<path id="Line 515" d="M10.5 7L3.5 7" stroke="white" stroke-linecap="round"/>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/refresh.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/refresh.svg
new file mode 100644
index 00000000..d9640664
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/images/refresh.svg
@@ -0,0 +1,22 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814398">
+<g id="Group 1142814396">
+<path id="Rectangle 1304" d="M1.0437 2.41495L4.5636 2.01738L4.91112 6.00562" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835">
+<mask id="path-2-inside-1_290_77" fill="white">
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z"/>
+</mask>
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z" stroke="white" stroke-width="2" mask="url(#path-2-inside-1_290_77)"/>
+</g>
+</g>
+<g id="Group 1142814397">
+<path id="Rectangle 1304_2" d="M15.0437 11.585L11.5238 11.9826L11.1763 7.99438" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835_2">
+<mask id="path-4-inside-2_290_77" fill="white">
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z"/>
+</mask>
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z" stroke="white" stroke-width="2" mask="url(#path-4-inside-2_290_77)"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
new file mode 100644
index 00000000..2ee14a8f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
@@ -0,0 +1,321 @@
+<template>
+  <div class="RoadNetworkMonitoring2">
+    <!-- 搜索栏 -->
+    <div class="filter">
+      <div>
+        <ButtonGradient @click="onExport">
+
+          <template #prefix>
+            <img src="./images/export.svg" />
+          </template>
+          导出
+        </ButtonGradient>
+        <ButtonGradient @click="onRefresh">
+
+          <template #prefix>
+            <img src="./images/refresh.svg" />
+          </template>
+          刷新
+        </ButtonGradient>
+      </div>
+      <InputSearch ref="searchComp" style="width: 402px" :formList="searchFormList" @handleSearch="handleSearch" />
+    </div>
+
+    <!-- 内容 -->
+    <div class="body" v-loading>
+      <RoadStateCard v-for="(item, index) in data" :key="index" v-bind="getStateCardBind(item)"
+        @firstBtnClick="firstBtnClick" @lastBtnClick="onLastBtnClick" />
+    </div>
+
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="getData" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[12, 16, 20, 30, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
+      </Pagination>
+    </div>
+
+    <!-- "详情"弹出框 -->
+    <!-- <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName"
+      @update:value="handleClose" @queryData="queryData" />
+     -->
+  </div>
+</template>
+
+<script>
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
+import Tabs from "@screen/components/Tabs/index.vue";
+import RoadStateCard from "@screen/components/RoadStateCard/index.vue";
+import Pagination from "@screen/components/Pagination.vue";
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import EventDetailDialog from "./EventDetailDialog/index";
+import FormEvent from "./FormEvent/index";
+import { tabMap,searchFormList } from "./data";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import { Loading } from 'element-ui';
+import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping, DirectionTypes as gzDirectionMapping, warningSourceMapping, warningStateMapping } from "@screen/utils/enum.js"
+
+export default {
+  name: "RoadNetworkMonitoring2",
+  components: {
+    ButtonGradient,
+    Tabs,
+    Pagination,
+    RoadStateCard,
+    InputSearch,
+    EventDetailDialog,
+    FormEvent,
+  },
+  data() {
+    return {
+      data: [],
+      total: 0,
+      searchFormList,
+      activeName: "-1",
+      eventDetailDialogVisible: false,
+      isShowAddNew: false,
+      searchData: {
+        pageSize: 12,
+        pageNum: 1
+      },
+      detailDialogFormData: {},
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    getStateCardBind(item) {
+      const { state, textColor, text } = tabMap[item.warningState];
+      return {
+        cardData: { ...item, state },
+        lastBtnColor: textColor,
+        lastBtnText: text,
+        isShowLeft: this.activeName == '-1'
+      };
+    },
+    queryData(flag) {
+      this.getData()
+    },
+    getData() { //列表数据查询
+      request({
+          url: `/perceivedEvents/warning/perceivedEventsList`,//感知事件
+          method: "post",
+          params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize },
+          data: { ...this.searchData }
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          result.rows.forEach(it => {
+            it.stringEventSource = it?.warningSource ? warningSourceMapping[it?.warningSource] : '';
+            it.stringDirection = gzDirectionMapping[it.direction] || it.direction;
+
+            let strSub = '';
+            if (it.warningSubclass && warningSubclassTypeMapping[it.warningType][it.warningSubclass] || '') {
+              strSub = `(${warningSubclassTypeMapping[it.warningType][it.warningSubclass] || ''})`
+            }
+            it.stringEventType = warningTypeMapping[it.warningType] + strSub;
+
+            it.startTime = it.warningTime;
+
+            if (it.otherConfig) {
+              let otherConfig = JSON.parse(it.otherConfig);
+              it.pictures = otherConfig.pictures || [];
+            }
+
+          })
+          this.data = result.rows;
+
+          this.total = result.total;
+        });
+    },
+    onRefresh() {
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    onSizeChange(pageSize) {
+      this.searchData.pageSize = pageSize;
+      this.getData();
+    },
+    onExport() {
+      let url = '';
+      if (this.activeName == '-1') {
+        url = '/business/warning/export'
+      } else {
+        url = '/dc/system/event/export?eventState=' + this.searchData.eventState;
+      }
+      let loadingInstance = Loading.service({
+        fullscreen: true,
+        background: "#00000052",
+        text: "文件正在下载...",
+      });
+      // request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' })
+      request({
+        url: url,//感知事件
+        method: "post",
+        data: { ...this.searchData, warningState: 1 },
+        responseType: 'blob'
+      })
+        .then((res) => {
+          console.log(res);
+          const url = window.URL.createObjectURL(new Blob([res]));
+          let link = document.createElement("a");
+          link.style.display = "none";
+          link.href = url;
+          link.setAttribute("download", "事件信息列表.xlsx");
+          document.body.appendChild(link);
+          link.click();
+          URL.revokeObjectURL(link.href); // 释放URL 对象
+          document.body.removeChild(link);
+          link = null;
+          loadingInstance.close();
+        })
+        .catch((err) => {
+          Message.error(err);
+          loadingInstance.close();
+        });
+    },
+    firstBtnClick(id) {//点击去确认/详情/处置记录等第一个按钮
+      console.log("id", id);
+      if (this.activeName == '-1') {
+        request({
+          url: `/perceivedEvents/warning/getWarningById`,//感知事件
+          method: "post",
+          data: { id }
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          let data = result.data;
+
+          data.stringEventSource = data?.warningSource ? warningSourceMapping[data.warningSource] : '';
+          data.nickName = data.userName;
+          data.direction = gzDirectionMapping[data.direction] || data.direction;
+          data.startTime = data.warningTime;
+          data.stringEventState = warningStateMapping[data.warningState];
+          data.stringEventType = warningTypeMapping[data.warningType];
+
+          data.videoList = [];
+          if (data.otherConfig) {
+            let otherConfig = JSON.parse(data.otherConfig);
+
+            data.waterFilmThickness = otherConfig.waterFilmThickness;
+            data.windSpeed = otherConfig.windSpeed;
+            data.visibility = otherConfig.visibility;
+
+            data.pictures = otherConfig.pictures || [];
+            data.videoList = otherConfig.videoList || [];
+            // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4',
+            // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
+          }
+          data.videoType = "mp4";
+          data.component = "Video";
+          this.detailDialogFormData = data;
+          // console.log('data', this.detailDialogFormData)
+
+          this.eventDetailDialogVisible = true;
+        });
+      } else {
+        request({
+          url: `/dc/system/event/${id}`,//交通事件
+          method: "get",
+        }).then(async (result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          let data = result.data;
+          data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
+          data.startTime = data?.occurrenceTime || '';
+
+
+          data.videoList = [];
+          data.component = "VideoMulti";
+
+          // const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
+          // data.downCamId = downCamera?.camId;
+          // data.upCamId = upCamera?.camId;
+          data.videoType = "flv";
+
+          this.detailDialogFormData = data;
+
+          this.eventDetailDialogVisible = true;
+        });
+      }
+
+    },
+    onLastBtnClick(id) {
+      this.$router.push(`/control/event/commandDispatch?eventId=${id}`);
+    },
+    handleClose() {
+      this.eventDetailDialogVisible = false;
+    },
+    handleSearch(data) {
+      let daterange = data.daterange;
+
+      let dStakeMark = data.stakeMark;
+      let dendStakeMark = data.endStakeMark;
+
+      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : '';
+      let endStakeMark = '';
+      if (dendStakeMark) {
+        endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : '';
+      }
+
+      this.searchData = {
+        ...this.searchData,
+        warningState: data.warningState,
+        warningType: data.warningType,
+        warningSource: data?.warningSource || '',
+        direction: data.direction,
+        startTime: daterange && daterange.length > 0 ? daterange[0] : "",
+        endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+        completeTime: this.activeName == "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+        startStakeMark: stakeMark,
+        endStakeMark: endStakeMark,
+      };
+      console.log(this.searchData)
+      // this.getData();
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.RoadNetworkMonitoring2 {
+  padding: 0px 21px 21px 21px;
+
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  z-index: 6;
+  width: 100%;
+  height: 100%;
+
+  .filter {
+    height: 60px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    >div {
+      display: flex;
+      gap: 6px;
+    }
+  }
+
+  .body {
+    flex: 1;
+    overflow: auto;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    grid-gap: 24px;
+    // grid-row-gap: 9px;
+    // grid-column-gap: 9px;
+    grid-auto-rows: min-content;
+  }
+
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+</style>

From 42f7290689fb083ed309a936e165d22cda536149 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Mon, 20 May 2024 14:27:22 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A4=84=E7=BD=AE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TimeLine/TimeLine2/DescCard.vue  | 11 ++++++++---
 .../event/event/EventDetailDialog/index.vue     | 17 ++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
index 3ada8ecb..863021e4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
@@ -6,7 +6,7 @@
       <span class="name">{{ data.name }}</span>
       <span class="posts">{{ data.posts }}</span>
     </div>
-    <div class="desc" v-if="data.processId">节点：{{ data.processName }}</div>
+    <div class="node" v-if="data.processId">节点：{{ data.processName }}</div>
     <el-image
       style="width: 100px; height: 100px"
       v-if="
@@ -210,9 +210,9 @@
                 border: none;
               "
             >
-                
+
                   {{ formFileData.content }}
-               
+
               </textarea
             >
 
@@ -371,6 +371,11 @@ export default {
     }
   }
 
+  .node {
+    color: #ffbf00;
+    font-size: 16px;
+    line-height: 19px;
+  }
   .desc {
     font-size: 16px;
     line-height: 19px;
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 0fba9ec8..d1e1fa6e 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
@@ -171,14 +171,25 @@ export default {
 
         rows.forEach(item =>{
           this.timeLine2List.push({
-            time: moment(item.operationTime || new Date()).format(
+            id: item.processId,
+            time: item.operationTime
+              ? new Date(item.operationTime).toLocaleString()
+              : null,
+            name: item.operatorName,
+            desc: item.context,
+            source: item.source,
+            processId: item.processId,
+            processName: item.processName,
+            type: item.type,
+            processType: item.processType,
+            /*time: moment(item.operationTime || new Date()).format(
               "yyyy-MM-DD HH:mm:ss"
             ),
             name: item.operatorName,
             desc: item.context,
             source: item.source,
             posts: "",
-            direction: item.source == 1 ? "right" : "left",
+            direction: item.source == 1 ? "right" : "left",*/
           });
         })
 
@@ -275,7 +286,7 @@ export default {
           .catch((err) => {
           });
       }
-      
+
       // 2024-05-18 修改为二次确认，增加误报类型和误报原因
       // if (this.formData.id) {
       //   this.$confirm("确定误报吗？", "提示", {

From e5857edbedff1418867bada89abbff432cb89af8 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Mon, 20 May 2024 15:37:24 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E5=A4=84=E7=BD=AE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/commandDispatch/Cards/DisposalProcess/index.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 47af8e59..0ac88bea 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
@@ -326,7 +326,7 @@ export default {
           processName: this.processName,
           context: content,
           // file: this.imageUrl,
-          type: type ? type.join(",") : "text",
+          type: type && type.length > 0 ? type.join(",") : "text",
           source: 1,
           processType: this.processType,
         };

From b7dc324c3b7e7b2229fcba81f95bb5819c8f639f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Mon, 20 May 2024 18:05:22 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Dialog/index.vue               |    2 +-
 .../RoadStateCard/images/confirmed22.svg      |    3 +-
 .../RoadStateCard/images/processed24.svg      |    3 +-
 .../RoadStateCard/images/processing21.svg     |    3 +-
 .../RoadStateCard/images/toBeConfirmed23.svg  |    3 +-
 .../JiHeExpressway/components/Video/Video.vue |    2 +-
 .../JiHeExpressway/components/Video/index.vue |    3 +-
 .../components/DeviceControlDialog.vue        |    6 +-
 .../Dialogs/RoadNetworkFacilities/data.js     |   58 +-
 .../Dialogs/RoadNetworkFacilities/index.vue   |   17 +-
 .../CrowdnessIndicatorRankings/index.vue      |    1 +
 .../Cards/DispatchLiaison/index.vue           |    4 +-
 .../DisposalProcess/DialogVisible/index.vue   |   45 +-
 .../Cards/DisposalProcess/index.vue           |    4 +-
 .../EditEventInformationDialog/data.js        | 4635 +++++++++--------
 .../EditEventInformationDialog/index.vue      |   77 +-
 .../EventInformation/images/congestion.svg    |    2 +-
 .../AddControlEventInfoDialog/data.js         |    2 +-
 .../control/event/commandDispatch/index.vue   |    2 +-
 .../control/event/event/FormEvent/data.js     |    2 +-
 .../eventPlanDialog/index.vue                 |  521 --
 .../EventDetailDialog/formTable/index.vue     |  336 --
 .../eventAnalysis/EventDetailDialog/index.vue |  323 +-
 .../EventDetailDialog/qbbDialog/index.vue     |  381 --
 .../eventAnalysis/FormEvent/data.js           |    2 +-
 .../pages/perception/eventAnalysis/index.vue  |   44 +-
 26 files changed, 2419 insertions(+), 4062 deletions(-)
 delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue
 delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue
 delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
index 8aa137f6..59094591 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@@ -211,7 +211,7 @@ export default {
   }
 
   .dialog-content {
-    padding: 9px 21px 27px 21px;
+    padding: 9px 21px 9px 21px;
     max-height: 95vh;
     overflow-y: auto;
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg
index e38d7fde..e797e069 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/confirmed22.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 70 67" style="enable-background:new 0 0 70 67;" xml:space="preserve">
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="69" height="67" viewBox="0 0 69 67" fill="none" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:url(#Rectangle_3543_00000027573242941979377840000008498132700452433310_);}
 	.st1{fill:url(#Rectangle_3545_00000108306831714505799710000016481210161124509350_);}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg
index 9a6ff56c..96fc0377 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processed24.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 69 67" style="enable-background:new 0 0 69 67;" xml:space="preserve">
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="69" height="67" viewBox="0 0 69 67" fill="none" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:url(#Rectangle_3543_00000135670463380124271900000010923522838896704945_);}
 	.st1{fill:url(#Rectangle_3545_00000149381956171071755920000000984320330230580101_);}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg
index 8623846e..1919d131 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/processing21.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 68 67" style="enable-background:new 0 0 68 67;" xml:space="preserve">
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="69" height="67" viewBox="0 0 69 67" fill="none" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:url(#Rectangle_3543_00000053538272738649842960000009181435203724315524_);}
 	.st1{fill:url(#Rectangle_3545_00000042731925473050420680000005354543093107188619_);}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg
index 9a0317bb..226eab3e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/images/toBeConfirmed23.svg
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 71 67" style="enable-background:new 0 0 71 67;" xml:space="preserve">
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="69" height="67" viewBox="0 0 69 67" fill="none" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:url(#Rectangle_3543_00000051376741410994204160000013762924089411596164_);}
 	.st1{fill:url(#Rectangle_3545_00000044885868572866352330000017989187333113817249_);}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
index a0212bd4..40db6693 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
@@ -33,7 +33,7 @@ export default {
       default: 'flv'
     },
     rangeIndex: {
-      default: 0
+      type: [String,Number],
     }
   },
   watch: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
index 5353882a..1b2b2d3d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
@@ -49,8 +49,7 @@ export default {
       default: 'flv'
     },
     rangeIndex: {
-      type: Number,
-      default: 0
+      type: [String,Number]
     },
     showHeader: {
       type: Boolean,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue
index 658580c6..08476aed 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue
@@ -103,15 +103,15 @@ export default {
       qsData.rows.forEach(item => {
         if (lastPath == 'deviceHour') {
           times.push(item.date);
+          datas.push(this.btnType == 1 ? item.temperature : item.visibility)
         } else if (lastPath == 'deviceDay') {
           times.push(new Date(item.date).format('dd'));
+          datas.push(this.btnType == 1 ? item.avgTemperature : item.avgVisibility)
         } else if (lastPath == 'deviceYears') {
           times.push(new Date(item.month).format('MM'));
+          datas.push(this.btnType == 1 ? item.avgTemperature : item.avgVisibility)
         }
-
-        datas.push(this.btnType == 1 ? item.temperature : item.visibility)
       })
-      // console.log('datas',datas)
 
       if (lastPath == 'deviceHour') {
         lineChartOption.xAxis.name = '时'
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
index 45eda2bb..d5291305 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
@@ -419,19 +419,9 @@ export const tabList = {
       labelWidth: "70px",
       list: [
         {
-          label: "道路编码",
-          key: "roadCode",
-          gridColumn: "3",
-        },
-        {
-          label: "道路名称",
-          key: "roadName",
-          gridColumn: "3",
-        },
-        {
-          label: "变坡点桩号",
-          key: "stakeMark1",
-          gridColumn: "3",
+          label:"名称",
+          key: "crossingType",
+          gridColumn: "3"
         },
         {
           label: "方向",
@@ -439,13 +429,8 @@ export const tabList = {
           gridColumn: "3",
         },
         {
-          label: "起点桩号",
-          key: "startPileNumber",
-          gridColumn: "3",
-        },
-        {
-          label: "终点桩号",
-          key: "endPileNumber",
+          label: "桩号",
+          key: "end_mark",
           gridColumn: "3",
         },
         {
@@ -458,31 +443,40 @@ export const tabList = {
           key: "latitude",
           gridColumn: "3",
         },
+        
+      ],
+    },
+    {
+      name: "边坡测点数据",
+      key: "second",
+      labelWidth: "70px",
+      list: [
         {
-          label: "直坡段长",
-          key: "segmentLength",
-          gridColumn: "3",
+          label:"醒目编号",
+          key: "pro_code",
+          gridColumn: "3"
         },
         {
-          label: "横坡",
-          key: "lateralSlope",
+          label: "标段编号",
+          key: "con_code",
           gridColumn: "3",
         },
         {
-          label: "竖曲线半径",
-          key: "verticalCurveRadius",
+          label: "项目单位工程编号",
+          key: "unit_code",
           gridColumn: "3",
         },
         {
-          label: "纵坡",
-          key: "longitudinalSlope",
+          label: "测点编号",
+          key: "meaPointnum",
           gridColumn: "3",
         },
         {
-          label: "管养单位",
-          key: "managementAndMaintenanceUnit",
-          gridColumn: "6",
+          label: "测点名称",
+          key: "meaPointName",
+          gridColumn: "3",
         },
+        
       ],
     },
   ],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
index c60bfeb7..b68749bb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
@@ -5,7 +5,6 @@
         <Video class="video-stream" :pileNum="dialogData.stakeMark" rangeIndex="upCamera" :showHeader="false" />
         <!-- <Video class="video-stream" :pileNum="dialogData.stakeMark" /> -->
       </div>
-
       <div class="SolarEnergy">
         <ElTabs v-model="activeName" class="tabs">
           <ElTabPane v-for="item in formList" :key="item.key" :label="item.name" :name="item.key">
@@ -27,6 +26,8 @@ import Video from "@screen/components/VideoMulti";
 import request from "@/utils/request";
 import { dialogDelayVisible } from "./../mixin";
 import { tabList } from './data'
+import { DirectionTypes } from "@screen/utils/enum.js"
+
 
 // 所有交通事件的详情
 export default {
@@ -61,7 +62,19 @@ export default {
       if (dData.otherConfig) {
         let otherConfig = JSON.parse(dData.otherConfig);
         dData.latitude = otherConfig.dimension
-        dData = { ...dData, ...otherConfig }
+        if(dData.direction){
+          dData.direction = DirectionTypes[dData.direction]
+        }
+        let resPointList = await request({
+                url: `dc/sideSlope/GetMeasurePointList`,
+                method: "get",
+            });
+            if (resPointList.code != 200) return Message.error(result?.msg);
+            let pointList = {};
+           if(resPointList.data && resPointList.data.result && resPointList.data.result.length > 0){
+            pointList = resPointList.data.result[0]
+           }
+        dData = { ...dData, ...otherConfig,...pointList }
       }
     this.data = dData;
     // console.log('this.data', this.data)
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 0314e34e..11a517ba 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
@@ -288,6 +288,7 @@ export default {
       const self = this;
       setTimeout(() => {
         // 获取map接口
+        console.log(self.detailData,'----------')
         const { AMap, mapIns } = self.$refs.AMapContainerRef.getMapInstance();
         const { longitude, dimension, eventName } = self.detailData;
         const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`);
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 6e3654f9..99f71e17 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
@@ -100,7 +100,7 @@ export default {
   watch: {
     "provideData.detail"(newValue, oldValue) {
       this.provideDetail = newValue;
-      this.getCommandDispatch();
+      
       this.getVehicleTypeList();
       // console.log("建亭侯", this.provideDetail);
     },
@@ -130,7 +130,6 @@ export default {
           }
         });
         this.dispatchList = res.data.listData;
-        console.log("调度联络返回============", res.data);
         this.dispatchData = res.data.resource ? res.data.resource : {};
         this.staff = [];
         this.vehicle = [];
@@ -174,6 +173,7 @@ export default {
         .then(({ data, code }) => {
           if (code != 200) return; //Message.error("详情获取失败");
           this.vehicleTypeList = data;
+          this.getCommandDispatch();
         })
         .catch((err) => {});
     },
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
index 9108070e..46a243d9 100644
--- 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
@@ -574,7 +574,7 @@ import htmlDocx from "html-docx-js/dist/html-docx";
 import Dialog from "@screen/components/Dialog/index";
 import Form from "@screen/components/FormConfig";
 import { formList, reportList } from "./data";
-import { tabConfigList } from "../../EventInformation/components/EditEventInformationDialog/data.js";
+import { configList } from "../../EventInformation/components/EditEventInformationDialog/data.js";
 import Button from "@screen/components/Buttons/Button.vue";
 import request from "@/utils/request";
 import Pagination from "@screen/components/Pagination.vue";
@@ -680,7 +680,7 @@ export default {
         url: `/dc/system/event/eventSubclass/${this.eventId}`, //交通事件
         method: "get",
       });
-
+      
       if (infoData.code != 200) return Message.error(infoData?.msg);
       let info = infoData.data;
       if (typeof info.stakeMark == "string") {
@@ -689,42 +689,9 @@ export default {
       }
       this.fData = info;
 
-      let configList = tabConfigList.find(
-        (item) => item.label == this.fData.eventName
-      );
-      this.formConfigList = configList.formConfig.list;
+      this.formConfigList = configList[info.eventName];
 
       await Promise.all([
-        //道路
-        request({
-          url: `/business/road/query`,
-          method: "get",
-        })
-          .then((result) => {
-            if (result.code != 200) return Message.error(result?.msg);
-            this.roads = [];
-            result.data.forEach((it) => {
-              this.roads.push({ key: it.id, label: it.roadName });
-            });
-          })
-          .catch((err) => {
-            Message.error("查询失败4", err);
-          }),
-        //方向字典
-        request({
-          url: `/system/dict/data/type/iot_event_direction`,
-          method: "get",
-        })
-          .then((result) => {
-            if (result.code != 200) return Message.error(result?.msg);
-            this.direction = [];
-            result.data.forEach((it) => {
-              this.direction.push({ key: it.dictValue, label: it.dictLabel });
-            });
-          })
-          .catch((err) => {
-            Message.error("查询失败5", err);
-          }),
         //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
         request({
           url: `/business/facility/query`,
@@ -747,12 +714,6 @@ export default {
       ]);
 
       this.formConfigList.forEach((it) => {
-        if (it.key == "direction") {
-          it.options.options = this.direction;
-        }
-        if (it.key == "roadId") {
-          it.options.options = this.roads;
-        }
         if (it.key == "dcEventServiceArea.facilityId") {
           it.options.options = this.lwss.filter((ss) => ss.type == 6);
         }
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 47af8e59..2ffd968f 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
@@ -133,12 +133,12 @@
       </div>
     </Card>
     <DialogVisible
+      v-if="dialogVisible !== null"
       :visible="dialogVisible"
       @update:value="handleClose"
       @update:type="handleUpdate"
       :eventId="eventId"
     />
-    <!--     :data="dispatchList" -->
   </div>
 </template>
 
@@ -181,7 +181,7 @@ export default {
     return {
       provideDetail: {},
       dialogType: "",
-      dialogVisible: false,
+      dialogVisible: null,
       eventId: "",
       test: null,
       testRadio: "input",
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 b8294fd2..1391de20 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,7 +1,32 @@
 import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
 import request from "@/utils/request";
 import { Message } from "element-ui";
-
+const directionName = {
+  label: "方向:",
+  key: "direction",
+  required: true,
+  type: "select",
+  options: {
+    options: [
+      { value: "济南方向", label: "济南方向" },
+      { value: "菏泽方向", label: "菏泽方向" },
+    ],
+  },
+};
+const freeway = {
+  label: "路线:",
+  required: true,
+  key: "roadName",
+  type: "select",
+  options: {
+    options: [
+      {
+        key: "济菏高速",
+        label: "济菏高速",
+      },
+    ],
+  },
+}
 const locationSelect = [
   {
     value: "1",
@@ -48,1713 +73,1675 @@ const locationSelect = [
     label: "出口内广场",
   },
 ];
+const  inTunnel = {
+  label: "是否处在隧道:",
+  key: "inTunnel",
+  required: true,
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: 1,
+        label: "是",
+      },
+      {
+        key: 0,
+        label: "否",
+      },
+    ],
+  },
+}
 
-export const tabConfigList = [
-  {
-    key: "TrafficAccident",
-    label: "交通事故",
-    formConfig: {
-      list: [
-        {
-          ...PresetFormItems.callPolicePersonName,
-          key: "dcEventAccident.reporterName",
-        },
-        {
-          ...PresetFormItems.callPolicePersonPhone,
-          key: "dcEventAccident.reporterPhoneNumber",
+const isCongestionAhead = {
+  label: "前方是否拥堵:",
+  key: "dcEventAccident.congestionAhead",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: 0,
+        label: "是",
+      },
+      {
+        key: 1,
+        label: "否",
+      },
+    ],
+  },
+};
+const isForkRoad = {
+  label: "是否分岔口:",
+  key: "dcEventAccident.atIntersection",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: 0,
+        label: "是",
+      },
+      {
+        key: 1,
+        label: "否",
+      },
+    ],
+  },
+};
+const isCurveRoad = {
+  label: "是否处在弯道:",
+  key: "dcEventAccident.onCurve",
+  type: "RadioGroup",
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: 1,
+        label: "是",
+      },
+      {
+        key: 0,
+        label: "否",
+      },
+    ],
+  },
+};
+
+export const configList = {
+  车辆故障: [
+    {
+      ...PresetFormItems.callPolicePersonName,
+      key: "dcEventVehicleAccident.reporterName",
+    },
+    {
+      ...PresetFormItems.callPolicePersonPhone,
+      key: "dcEventVehicleAccident.reporterPhoneNumber",
+    },
+    PresetFormItems.vehicleMalfunctionType,
+    PresetFormItems.eventLevel,
+    {
+      ...PresetFormItems.locationMode,
+      key: "dcEventVehicleAccident.locationType",
+    },
+    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);
+            });
         },
-        PresetFormItems.trafficAccidentType,
-        PresetFormItems.eventLevel,
-        {
-          ...PresetFormItems.locationMode,
-          key: "dcEventAccident.locationType",
+      },
+    },
+    {
+      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;
+      },
+    },
+    directionName,
+    { ...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",
+    },
+    {
+      ...isCongestionAhead,
+      key: "dcEventVehicleAccident.congestionAhead",
+    },
+    {
+      ...isForkRoad,
+      key: "dcEventVehicleAccident.atIntersection",
+    },
+    {
+      ...isCurveRoad,
+      key: "dcEventVehicleAccident.onCurve",
+    },
+    {
+      ...inTunnel,
+      key: "dcEventVehicleAccident.inTunnel",
+    },
+    PresetFormItems.laneOccupancy,
+    PresetFormItems.vehicleCondition("dcEventVehicleAccident"),
+    PresetFormItems.casualties("dcEventVehicleAccident"),
+    PresetFormItems.eventTitle,
+    PresetFormItems.eventDesc,
+    PresetFormItems.source,
+  ],
+  交通事故:  [
+    {
+      ...PresetFormItems.callPolicePersonName,
+      key: "dcEventAccident.reporterName",
+    },
+    {
+      ...PresetFormItems.callPolicePersonPhone,
+      key: "dcEventAccident.reporterPhoneNumber",
+    },
+    PresetFormItems.trafficAccidentType,
+    PresetFormItems.eventLevel,
+    {
+      ...PresetFormItems.locationMode,
+      key: "dcEventAccident.locationType",
+    },
+    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);
+            });
         },
-        PresetFormItems.freeway,
-        {
-          label: "服务区:",
-          key: "dcEventAccident.facilityId",
-          type: "select",
-          isAlone: false,
-          required: true,
-          options: {
-            options: [
+      },
+    },
+    {
+      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;
+      },
+    },
+    directionName,
+    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",
+    },
+    {
+      ...isCongestionAhead,
+      key: "dcEventAccident.congestionAhead",
+    },
+    {
+      ...isForkRoad,
+      key: "dcEventAccident.atIntersection",
+    },
+    { ...isCurveRoad, key: "dcEventAccident.onCurve" },
+    { ...inTunnel, 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,
+  ],
+  交通管制: [
+    {
+      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: [
               {
-                value: "选项1",
-                label: "黄金糕",
+                key: "1",
+                label: `${ss[value]}关闭`,
               },
             ],
-          },
-          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: [
+            2: [
               {
-                value: "选项1",
-                label: "黄金糕",
+                key: "2",
+                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: "黄金糕",
+                key: "3",
+                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: "黄金糕",
+                key: "4",
+                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: "黄金糕",
+                key: "5",
+                label: "主线限速",
               },
             ],
-          },
-          visible: (data) => {
-            if (data?.dcEventVehicleAccident?.locationType == 3) {
-              return true;
-            }
-            return false;
-          },
-          ons: {
-            change(value, ...args) {
-              const { formList } = args.slice(-1)[0];
+          };
+          classify.options.options =
+            ad[data.dcEventTrafficControl.controlType];
 
-              //匝道
-              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);
+          if (data.dcEventTrafficControl) {
+            data.dcEventTrafficControl.facilityId = null;
+          }
+          let facilityType = 1;
+          if (value == "3-2") {
+            facilityType = 1;
+          } else if (value == "3-3") {
+            facilityType = 4;
+          } 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;
+                  }
                 });
-            },
-          },
-        },
-        {
-          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",
+              })
+              .catch((err) => {
+                console.log("err", err);
+                Message.error("查询失败1", err);
+              });
+          }
         },
-        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: "主线",
-              },
+    {
+      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: "3-2",
-                label: "收费站",
+                key: "1",
+                label: `${ss[data.eventSubclass]}关闭`,
               },
+            ],
+            2: [
               {
-                key: "3-3",
-                label: "立交",
+                key: "2",
+                label: "主线限行",
               },
               {
-                key: "3-4",
-                label: "服务区",
+                key: "3",
+                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: "4",
+                label: "主线并道",
               },
               {
-                key: "2",
-                label: "限行",
+                key: "5",
+                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: [
+          };
+          let cs = {
+            1: [
               {
-                key: "1",
-                label: "主线关闭",
+                value: "1",
+                label: "临时关闭",
               },
             ],
-          },
-        },
-        {
-          label: "分类原因:",
-          key: "dcEventTrafficControl.controlCause",
-          type: "RadioGroup",
-          isAlone: true,
-          required: true,
-          default: "1",
-          options: {
-            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
-            options: [
+            2: [
               {
-                key: "1",
-                label: "车流量大",
+                value: "2",
+                label: "限行车辆",
               },
               {
-                key: "2",
-                label: "交通事故",
+                value: "3",
+                label: "限行车道",
               },
               {
-                key: "3",
-                label: "恶劣天气",
+                value: "4",
+                label: "限行车道且限行车辆",
               },
               {
-                key: "4",
-                label: "施工",
+                value: "5",
+                label: "间隔放行",
               },
               {
-                key: "5",
-                label: "警备任务",
+                value: "6",
+                label: "并道行驶",
               },
               {
-                key: "6",
-                label: "其他",
+                value: "7",
+                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;
-          },
+          };
+          measure.options.options = cs[value];
+          classify.options.options = ad[value];
         },
-        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: "出口",
+      },
+    },
+    {
+      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: "雨",
               },
               {
-                key: "2",
-                label: "入口",
+                value: "3-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: "临时关闭",
+                value: "3-3",
+                label: "雾",
               },
-            ],
-          },
-        },
-        {
-          label: "限制类型:",
-          key: "dcEventTrafficControl.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: "dcEventTrafficControl.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: "四轴及四轴以上货车(运送生鲜果蔬、抗疫物资车辆除外)",
+                value: "3-4",
+                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]",
+                value: "3-5",
+                label: "道路湿滑",
               },
               {
-                prefix: {
-                  text: "+",
-                  style: {
-                    color: "#3DE8FF",
-                  },
-                },
-                key: "stakeMark[1]",
+                value: "3-6",
+                label: "道路结冰",
               },
-            ],
-          },
-          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: "道路拥堵",
+                value: "3-7",
+                label: "沙尘暴",
               },
+            ],
+            4: [
               {
-                key: "4-2",
-                label: "立交拥堵",
+                value: "4-1",
+                label: "专项工程施工",
               },
               {
-                key: "4-3",
-                label: "收费站拥堵",
+                value: "4-2",
+                label: "改扩建工程施工",
               },
               {
-                key: "4-4",
-                label: "服务区拥堵",
+                value: "4-3",
+                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);
-                });
-            },
-          },
+          };
+          config.options.options = ad[value];
         },
-        {
-          ...PresetFormItems.congestionCause,
-          key: "dcEventTrafficCongestion.congestionCause",
+      },
+    },
+    inTunnel,
+    {
+      label: "原因类型:",
+      key: "dcEventTrafficControl.causeType",
+      type: "select",
+      options: {
+        options: [],
+      },
+      visible: (data) => {
+        if (
+          data?.dcEventTrafficControl.controlCause == "3" ||
+          data?.dcEventTrafficControl.controlCause == "4"
+        ) {
+          return true;
+        }
+        return false;
+      },
+    },
+    freeway,
+    directionName,
+    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: "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: "备注项添加",
+      },
+    },
+    {
+      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: "dcEventTrafficControl.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: "dcEventTrafficControl.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",
               },
-            ],
-          },
-          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);
-                  });
-              }
             },
+            key: "stakeMark[0]",
           },
-          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: "黄金糕",
+          {
+            prefix: {
+              text: "+",
+              style: {
+                color: "#3DE8FF",
               },
-            ],
-          },
-          visible: (data) => {
-            if (data?.eventSubclass == "4-4") {
-              return true;
-            }
-            return false;
+            },
+            key: "stakeMark[1]",
           },
+        ],
+      },
+      visible: (data) => {
+        if (data?.eventSubclass == "3-1") {
+          return true;
+        }
+        return false;
+      },
+    },
+    PresetFormItems.startTime,
+    PresetFormItems.expectedEndTime,
+    PresetFormItems.remark,
+    PresetFormItems.source,
+  ],
+  交通拥堵:  [
+    {
+      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);
+            });
         },
-        {
-          label: "地点:",
-          key: "dcEventTrafficCongestion.location",
-          isAlone: false,
-          required: true,
-          options: {
-            placeholder: "地点描述",
-          },
-          visible: (data) => {
-            if (data?.eventSubclass == "4-4") {
-              return true;
-            }
-            return false;
-          },
+      },
+    },
+    {
+      ...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);
+              });
+          }
         },
-        {
-          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" &&
+          (data?.dcEventTrafficCongestion?.congestionCause == 1 ||
+            data?.dcEventTrafficCongestion?.congestionCause == 6)
+        ) {
+          return true;
+        }
+        return false;
+      },
+    },
+    { ...inTunnel, 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",
               },
-            ],
-          },
-          visible: (data) => {
-            if (data?.eventSubclass == "4-1") {
-              return true;
-            }
-            return false;
+            },
+            key: "stakeMark[0]",
           },
-        },
-        {
-          label: "桩号:",
-          key: "stakeMark",
-          required: true,
-          type: "MultipleLabelItem",
-          options: {
-            options: [
-              {
-                prefix: {
-                  text: "K",
-                  style: {
-                    color: "#3DE8FF",
-                  },
-                },
-                key: "stakeMark[0]",
+          {
+            prefix: {
+              text: "+",
+              style: {
+                color: "#3DE8FF",
               },
-              {
-                prefix: {
-                  text: "+",
-                  style: {
-                    color: "#3DE8FF",
-                  },
-                },
-                key: "stakeMark[1]",
-              },
-            ],
-          },
-          visible: (data) => {
-            if (data?.eventSubclass == "4-1" && data?.locationType == 1) {
-              return true;
-            }
-            return false;
+            },
+            key: "stakeMark[1]",
           },
-        },
-        {
-          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 == 1) {
+          return true;
+        }
+        return false;
+      },
+    },
+    {
+      label: "起止桩号:",
+      key: "stakeMark",
+      required: true,
+      isAlone: true,
+      type: "MultipleLabelItem",
+      options: {
+        options: [
+          {
+            prefix: {
+              text: "K",
+              style: {
+                color: "#3DE8FF",
               },
-            ],
-          },
-          visible: (data) => {
-            if (data?.eventSubclass == "4-1" && data?.locationType == 2) {
-              return true;
-            }
-            return false;
+            },
+            key: "stakeMark[0]",
           },
-        },
-        {
-          label: "立交桥:",
-          key: "dcEventTrafficCongestion.facilityId",
-          type: "select",
-          isAlone: false,
-          required: true,
-          options: {
-            options: [
-              {
-                value: "选项1",
-                label: "黄金糕",
+          {
+            prefix: {
+              text: "+",
+              style: {
+                color: "#3DE8FF",
               },
-            ],
-          },
-          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);
-                });
             },
+            key: "stakeMark[1]",
           },
-        },
-        {
-          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",
+          {
+            prefix: {
+              text: "至K",
+              style: {
+                color: "#3DE8FF",
               },
-            ],
+            },
+            key: "endStakeMark[0]",
           },
-        },
-        {
-          label: "最大拥堵里程:",
-          key: "dcEventTrafficCongestion.maxCongestionMileage",
-          required: true,
-          type: "MultipleLabelItem",
-          options: {
-            options: [
-              {
-                suffix: {
-                  text: "千米",
-                },
-                type: "InputNumber",
-                key: "dcEventTrafficCongestion.maxCongestionMileage",
+          {
+            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);
+            });
         },
-        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,
-      ],
+    {
+      label: "匝道:",
+      key: "dcEventTrafficCongestion.rampId",
+      type: "select",
+      isAlone: false,
+      required: true,
+      options: {
+        options: [],
+      },
+      visible: (data) => {
+        if (data?.eventSubclass == "4-2") {
+          return true;
+        }
+        return false;
+      },
     },
-  },
-  {
-    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: "其他",
-              },
-            ],
+
+    {
+      label: "拥堵里程:",
+      key: "dcEventTrafficCongestion.congestionMileage",
+      required: true,
+      type: "MultipleLabelItem",
+      options: {
+        options: [
+          {
+            suffix: {
+              text: "千米",
+            },
+            type: "InputNumber",
+            key: "dcEventTrafficCongestion.congestionMileage",
           },
-        },
-        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: "dcEventTrafficCongestion.maxCongestionMileage",
+      required: true,
+      type: "MultipleLabelItem",
+      options: {
+        options: [
+          {
+            suffix: {
+              text: "千米",
             },
+            type: "InputNumber",
+            key: "dcEventTrafficCongestion.maxCongestionMileage",
           },
-        },
-        {
-          label: "施工分类:",
-          key: "eventSubclass",
-          type: "RadioGroup",
-          isAlone: true,
-          required: true,
-          default: "7-1",
-          options: {
-            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
-            options: [
+        ],
+      },
+    },
+    PresetFormItems.startTime,
+    PresetFormItems.expectedEndTime,
+    PresetFormItems.remark,
+    PresetFormItems.source,
+  ],
+  非法上路:[
+    PresetFormItems.illegalTriggeringType,
+    PresetFormItems.additionalNotes,
+    freeway,
+    directionName,
+    PresetFormItems.station,
+    inTunnel,
+    PresetFormItems.startTime,
+    PresetFormItems.expectedEndTime,
+    PresetFormItems.problemDescription,
+    PresetFormItems.source,
+  ],
+  路障清除: [
+    {
+      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,
+    freeway,
+    directionName,
+    PresetFormItems.station,
+    inTunnel,
+    PresetFormItems.startTime,
+    PresetFormItems.expectedEndTime,
+    PresetFormItems.problemDescription,
+    PresetFormItems.source,
+  ],
+  施工建设: [
+    {
+      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: "道路养护施工",
@@ -1776,763 +1763,783 @@ export const tabConfigList = [
                 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: [
+            2: [
               {
-                key: "1",
-                label: "车道",
+                key: "7-6",
+                label: "道路建设施工",
               },
               {
-                key: "2",
-                label: "其他",
+                key: "7-7",
+                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: "7-8",
+                label: "服务区建设施工",
               },
               {
-                key: "2",
-                label: "车辆谨慎慢行",
+                key: "7-9",
+                label: "枢纽立交匝道建设施工",
               },
               {
-                key: "3",
-                label: "车辆正常通行",
+                key: "7-10",
+                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;
-          },
+          };
+          config.options.options = ad[value] || [];
         },
-        {
-          ...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];
+      },
+    },
+    {
+      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 })
+                );
 
-              //匝道
-              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);
+                formList.forEach((it) => {
+                  if (it.key == "dcEventConstruction.facilityId") {
+                    it.options.options = lwss;
+                  }
                 });
-            },
-          },
-        },
-        {
-          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;
-          },
+              })
+              .catch((err) => {
+                console.log("err", err);
+                Message.error("查询失败1", err);
+              });
+          }
         },
-        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: "入口",
-              },
-            ],
-          },
+    {
+      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: "不封闭",
+          },
+        ],
+      },
+    },
+    inTunnel,
+    {
+      //地点类型
+      ...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;
+      },
+    },
+    freeway,
+    directionName,
+    {
+      ...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);
+            });
         },
-        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: [
+    {
+      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,
+  ],
+  服务区异常: [
+    {
+      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: "其他异常",
+          },
+        ],
+      },
+    },
+    freeway,
+    directionName,
+    {
+      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,
+  ],
+  设施设备隐患:  [
+    {
+      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,
+    },
+    freeway,
+    directionName,
+    PresetFormItems.station,
+    inTunnel,
+    PresetFormItems.startTime,
+    PresetFormItems.expectedEndTime,
+    PresetFormItems.problemDescription,
+    PresetFormItems.source,
+  ],
+  异常天气: [
+    {
+      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: "9-1",
-                label: "摄像机",
+                key: "1-1",
+                label: "雨雾",
               },
               {
-                key: "9-2",
-                label: "护栏",
+                key: "1-2",
+                label: "雨雪",
               },
               {
-                key: "9-3",
-                label: "隔离栅",
+                key: "1-3",
+                label: "中雨",
               },
               {
-                key: "9-4",
-                label: "情报板",
+                key: "1-4",
+                label: "小雨",
               },
               {
-                key: "9-5",
-                label: "防眩板",
+                key: "1-5",
+                label: "大雨",
               },
               {
-                key: "9-6",
-                label: "其他",
+                key: "1-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: [
+            "10-2": [
               {
-                key: "10-1",
-                label: "雨",
+                key: "2-1",
+                label: "小雪",
               },
               {
-                key: "10-2",
-                label: "雪",
+                key: "2-2",
+                label: "中雪",
               },
               {
-                key: "10-3",
-                label: "雾",
+                key: "2-3",
+                label: "大雪",
               },
               {
-                key: "10-4",
-                label: "大风",
+                key: "2-4",
+                label: "暴雪",
               },
               {
-                key: "10-5",
-                label: "低温寒潮",
+                key: "2-5",
+                label: "大暴雪",
               },
               {
-                key: "10-6",
-                label: "路面积雪",
+                key: "2-6",
+                label: "特大暴雪",
               },
+            ],
+            "10-3": [
               {
-                key: "10-7",
-                label: "路面结冰",
+                key: "3-1",
+                label: "轻雾",
               },
               {
-                key: "10-8",
-                label: "路面积水",
+                key: "3-2",
+                label: "大雾",
               },
               {
-                key: "10-9",
-                label: "其他",
+                key: "3-3",
+                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: "一般",
+                key: "3-4",
+                label: "强浓雾",
               },
               {
-                value: "2",
-                label: "紧急",
+                key: "3-5",
+                label: "团雾",
               },
             ],
-          },
+          };
+          config.options.options = ad[value];
         },
-        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,
-      ],
+    {
+      ...PresetFormItems.weatherSituation,
+      key: "dcEventAbnormalWeather.weatherSituation",
     },
-  },
-];
+    PresetFormItems.additionalNotes,
+    freeway,
+    directionName,
+    PresetFormItems.startEndStation,
+    {
+      label: "紧急级别:",
+      key: "dcEventAbnormalWeather.emergencyLevel",
+      required: true,
+      type: "select",
+      options: {
+        options: [
+          {
+            value: "1",
+            label: "一般",
+          },
+          {
+            value: "2",
+            label: "紧急",
+          },
+        ],
+      },
+    },
+    inTunnel,
+    PresetFormItems.startTime,
+    PresetFormItems.expectedEndTime,
+    PresetFormItems.problemDescription,
+    PresetFormItems.source,
+  ],
+  其他事件:  [
+    {
+      label: "事件说明:",
+      key: "eventSourceTips",
+      isAlone: true,
+      options: {
+        type: "textarea",
+        autosize: true,
+        maxlength: 150,
+        autosize: { minRows: 6, maxRows: 6 },
+        showWordLimit: true,
+      },
+    },
+    freeway,
+    directionName,
+    PresetFormItems.station,
+    inTunnel,
+    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 13fd8319..1f95610d 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,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="修改事件信息" width="1100px" top="10%">
+  <Dialog v-model="modelVisible" title="修改事件信息" width="1100px" top="5%">
     <div class="EditEventInformationDialog">
       <Form
         class="form"
@@ -24,7 +24,7 @@ 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 { configList } from "./data.js";
 import { Message } from "element-ui";
 import { provideMixin } from "./../../../../mixin";
 
@@ -65,7 +65,6 @@ export default {
         return this.visible;
       },
       set(val) {
-        console.log("val", val);
         this.$emit("close", val);
       },
     },
@@ -77,57 +76,29 @@ export default {
         url: `/dc/system/event/eventSubclass/${this.detailData.id}`, //交通事件
         method: "get",
       });
-
+      
+      console.log('-----',infoData)
       if (infoData.code != 200) return Message.error(infoData?.msg);
       this.resultEventData = { ...infoData.data };
-
+     
       let info = infoData.data;
       if (typeof info.stakeMark == "string") {
-        let numbers = info.stakeMark.match(/\d+/g).map(Number);
-        // console.log('numbers', numbers);
+        let numbers = info.stakeMark.match(/\d+/g).map(String);
         info.stakeMark = numbers;
       }
       if (typeof info.lang == "string") {
         info.lang = info.lang.split(",");
       }
+      if(info.eventSource){
+        info.eventSource = info.eventSource.toString()
+      }
+      if(info.dcEventVehicleAccident && info.dcEventVehicleAccident.weatherCondition){
+        info.dcEventVehicleAccident.weatherCondition = info.dcEventVehicleAccident.weatherCondition.toString()
+      }
       this.fData = info;
-
-      let configList = tabConfigList.find(
-        (item) => item.label == this.fData.eventName
-      );
-      this.formConfigList = configList.formConfig.list;
+      this.formConfigList = configList[info.eventName];
 
       await Promise.all([
-        //道路
-        request({
-          url: `/business/road/query`,
-          method: "get",
-        })
-          .then((result) => {
-            if (result.code != 200) return Message.error(result?.msg);
-            this.roads = [];
-            result.data.forEach((it) => {
-              this.roads.push({ key: it.id, label: it.roadName });
-            });
-          })
-          .catch((err) => {
-            Message.error("查询失败4", err);
-          }),
-        //方向字典
-        request({
-          url: `/system/dict/data/type/iot_event_direction`,
-          method: "get",
-        })
-          .then((result) => {
-            if (result.code != 200) return Message.error(result?.msg);
-            this.direction = [];
-            result.data.forEach((it) => {
-              this.direction.push({ key: it.dictValue, label: it.dictLabel });
-            });
-          })
-          .catch((err) => {
-            Message.error("查询失败5", err);
-          }),
         //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
         request({
           url: `/business/facility/query`,
@@ -149,14 +120,7 @@ export default {
             Message.error("查询失败6", err);
           }),
       ]);
-
       this.formConfigList.forEach((it) => {
-        if (it.key == "direction") {
-          it.options.options = this.direction;
-        }
-        if (it.key == "roadId") {
-          it.options.options = this.roads;
-        }
         if (it.key == "dcEventServiceArea.facilityId") {
           it.options.options = this.lwss.filter((ss) => ss.type == 6);
         }
@@ -164,10 +128,10 @@ export default {
     },
     onSubmit() {
       this.$refs.FormConfigRef.validate().then((formData) => {
+      
         this.submitting = true;
         let eventType = this.resultEventData.eventType;
         formData.eventType = eventType;
-
         if (
           (eventType == 1 || eventType == 2) &&
           Array.isArray(formData.lang)
@@ -189,7 +153,7 @@ export default {
           let endStakeMark = formData.endStakeMark;
           let strMark =
             endStakeMark && endStakeMark.length > 0
-              ? "K" + endStakeMark[0] + "+" + endStakeMark[1]
+              ? "K" + endStakeMark[0].padStart(3,'0') + "+" + endStakeMark[1]
               : "";
           if (eventType == 4) {
             formData.dcEventTrafficCongestion.endStakeMark = strMark;
@@ -210,11 +174,10 @@ export default {
         //   ...formData,
         //   id: this.resultEventData.id,
         //   eventState: this.resultEventData.eventState,
-        //   stakeMark: (stakeMark && stakeMark[0] != null) ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
+        //   stakeMark: (stakeMark && stakeMark[0] != null) ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0].padStart(3,'0') + '+' + stakeMark[1]) : '') : '',
         // })
         // this.submitting = false;
-        // return;
-
+    
         request({
           url: `/dc/system/event`,
           method: "put",
@@ -250,11 +213,10 @@ export default {
 <style lang="scss" scoped>
 .EditEventInformationDialog {
   gap: 9px;
-  width: 1050px;
-  height: 850px;
+  width: 100%;
+  height: 700px;
   display: flex;
   flex-direction: column;
-
   .form {
     flex: 1;
     overflow-y: auto;
@@ -264,6 +226,7 @@ export default {
     display: flex;
     justify-content: end;
     gap: 15px;
+    margin-top: 9px;
   }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/images/congestion.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/images/congestion.svg
index a4c5e64f..b9b0c4d4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/images/congestion.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/images/congestion.svg
@@ -1,3 +1,3 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path id="Vector" d="M9 0C4.02945 0 0 4.02942 0 9C0 13.9706 4.02945 18 9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9707 0 9 0ZM13.9486 6.84275L8.15496 12.7718C7.88844 13.0446 7.45606 13.0446 7.18957 12.7718L4.05145 9.56015C3.78475 9.28735 3.78475 8.84498 4.05145 8.5721C4.31795 8.2992 4.75035 8.2992 5.01684 8.5721L7.67229 11.2896L12.983 5.85462C13.2497 5.58174 13.6821 5.58174 13.9486 5.85462C14.2153 6.12747 14.2153 6.56987 13.9486 6.84275H13.9486Z" fill="#FF5F5F"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18ZM13.5184 4.429C13.782 4.67715 13.7889 5.09389 13.5337 5.35067L9.90677 8.99979L13.5341 12.6493C13.7894 12.9061 13.7824 13.3229 13.5188 13.571C13.2651 13.8098 12.8674 13.8032 12.6218 13.5561L9 9.9121L5.37816 13.5561C5.13256 13.8032 4.73487 13.8098 4.48119 13.571C4.21758 13.3229 4.21065 12.9061 4.46586 12.6493L8.09323 8.99979L4.46628 5.35067C4.21107 5.09389 4.218 4.67715 4.48161 4.429C4.73529 4.19021 5.13298 4.19682 5.37857 4.44392L9 8.08748L12.6214 4.44392C12.867 4.19682 13.2647 4.19021 13.5184 4.429Z" fill="#FF5F5F"/>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js
index 90c35ee7..e85a7360 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js
@@ -91,7 +91,7 @@ export const tabConfigList = [
               if (value == "3-2") {
                 facilityType = 1;
               } else if (value == "3-3") {
-                facilityType = 3;
+                facilityType = 4;
               } else if (value == "3-4") {
                 facilityType = 6;
               }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
index 45497256..9fbab5d2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
@@ -83,7 +83,7 @@ export default {
       })
         .then((result) => {
           if (result.code != 200) return;
-
+          console.log(result,'###########')
           this.provideData.detail = result.data;
           console.log("这里是事件详情", this.provideData.detail);
           if (
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 6f046ee6..1e0550c1 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
@@ -546,7 +546,7 @@ export const tabConfigList = [
               if (value == "3-2") {
                 facilityType = 1;
               } else if (value == "3-3") {
-                facilityType = 3;
+                facilityType = 4;
               } else if (value == "3-4") {
                 facilityType = 6;
               }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue
deleted file mode 100644
index efc4f08c..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/eventPlanDialog/index.vue
+++ /dev/null
@@ -1,521 +0,0 @@
-<template>
-  <Dialog v-model="modelVisible" :title="title" width="880px">
-    <div class="EventAddPlanDialog">
-      <div class="first">
-        <el-radio-group v-model="planName" @input="changeRadio">
-          <el-radio-button
-            v-for="item in info"
-            :key="item.id"
-            :label="item.planName"
-          ></el-radio-button>
-        </el-radio-group>
-      </div>
-
-      <div class="second">
-        <el-row>
-          <el-col :span="2">
-            <div class="text">联动设备:</div>
-          </el-col>
-          <el-col :span="22">
-            <FormTable
-              ref="secondFormTable"
-              :tableData="secondFormData"
-              :type="1"
-            ></FormTable>
-          </el-col>
-        </el-row>
-      </div>
-      <div class="third">
-        <el-row>
-          <el-col :span="2">
-            <div class="text">恢复操作:</div>
-          </el-col>
-          <el-col :span="22">
-            <FormTable
-              ref="thirdFormTable"
-              :tableData="thirdFormData"
-              :type="2"
-            ></FormTable>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-
-    <template #footer>
-      <!-- <Button v-if="isDisBtn" style="padding:0 24px;  pointer-events: none; background-color: #C9C9C9;"
-                @click.native="handleRestore" :loading="submitting">强制恢复</Button> -->
-      <Button
-        style="padding: 0 24px"
-        @click.native="handleSubmit(2)"
-        :loading="submitting"
-        >强制恢复</Button
-      >
-      <Button
-        style="padding: 0 24px"
-        @click.native="handleSubmit(1)"
-        :loading="submitting"
-        >确认</Button
-      >
-      <Button
-        style="background: #c9c9c9; padding: 0 24px"
-        @click.native="(modelVisible = false), (submitting = false)"
-        >取消</Button
-      >
-    </template>
-  </Dialog>
-</template>
-
-<script>
-import Dialog from "@screen/components/Dialog/index";
-import FormTable from "../formTable/index.vue";
-import Button from "@screen/components/Buttons/Button.vue";
-import request from "@/utils/request";
-import { Message } from "element-ui";
-import { throttle } from "lodash";
-
-export default {
-  name: "eventPlanDialog",
-  components: {
-    Dialog,
-    Button,
-    FormTable,
-  },
-  model: {
-    prop: "visible",
-    event: "close",
-  },
-  provide() {
-    return {
-      loadData: throttle(this.loadData, 1000),
-      getAutomatic: this.getTemplateAutomatic,
-      getOriginal: this.getBoardOriginal,
-    };
-  },
-  props: {
-    visible: Boolean,
-    activeName: String,
-    info: {
-      type: Array,
-      default: () => [],
-    },
-    eventFormData: {
-      type: Object,
-      default: () => {},
-    },
-  },
-  data() {
-    return {
-      title: "事件确认",
-      isDisBtn: true,
-      dialogType: 1,
-      planId: 0,
-      planInfo: {},
-      submitting: false,
-      secondFormData: [
-        {
-          deviceType: 1,
-          searchRule: 1,
-          qbb: "",
-        },
-      ],
-      thirdFormData: [
-        {
-          deviceType: 1,
-          searchRule: 1,
-          qbb: "",
-        },
-      ],
-      planName: "",
-      automaticInfo: {},
-      dcExecuteAction: [],
-      deviceData: [],
-      automaticData: {},
-      boardOriginalData: {},
-      eventOptions: [
-        {
-          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: "路障清除",
-        },
-      ],
-      mechanismOptions: [
-        {
-          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: "其他",
-        },
-      ],
-      conditionOptions: [
-        // {
-        //     value: 1,
-        //     label: '大于(>)'
-        // },
-        {
-          value: 1,
-          label: "小于(<)",
-        },
-      ],
-    };
-  },
-  mounted() {},
-  computed: {
-    modelVisible: {
-      get() {
-        if (this.visible) {
-          if (this.info.length > 0) {
-            this.planName = this.info[0]?.planName || "";
-            this.planInfo = this.info[0];
-            this.initData(this.info[0]);
-          }
-        }
-        return this.visible;
-      },
-      set(val) {
-        this.$emit("close", val);
-      },
-    },
-  },
-  methods: {
-    initData(data) {
-      console.log("data", data);
-      if (!data) return;
-      // this.planId = data.id;
-      let dcExecuteAction = data.dcExecuteAction;
-      let secondFormData = [];
-      let thirdFormData = [];
-      dcExecuteAction.forEach((it) => {
-        let action = { ...it };
-        if (it.otherConfig) {
-          let config = JSON.parse(it.otherConfig);
-          let qbb = "";
-          if (config.id) {
-            qbb = config.content;
-            config = { dcInfoBoardTemplate: config };
-          }
-          // if (config.state) {
-          //     config.gzms = config.state
-          // }
-          action = { ...it, ...config, qbb: qbb };
-        }
-        if (it.deviceList) {
-          action.deviceList = it.deviceList
-            .split(",")
-            .map((str) => Number(str));
-        }
-        if (it.actionType == 1) {
-          secondFormData.push(action);
-        } else if (it.actionType == 2) {
-          thirdFormData.push({
-            ...action,
-            qbb: "默认恢复该情报板上次常态化信息",
-          });
-        }
-      });
-      this.secondFormData = secondFormData;
-      this.thirdFormData = thirdFormData;
-    },
-    async loadData() {
-      if (this.deviceData.length <= 0) {
-        let result = await request({
-          url: `business/device/query?deviceType=2`,
-          method: "get",
-        });
-        if (result.code != 200) return Message.error(result?.msg);
-        // console.log('123');
-        this.deviceData = result.data;
-        // return result.data;
-      }
-      return this.deviceData;
-    },
-    async getTemplateAutomatic() {
-      let url = "";
-      let data = {};
-      let otherConfig = {};
-      let plan = this.info.find((it) => it.planName == this.planName);
-      console.log("plan", plan);
-      let action = plan.dcExecuteAction.find(
-        (it) => it.actionType == 1 && it.deviceType == 2
-      );
-      if (action) {
-        otherConfig = JSON.parse(action.otherConfig);
-        if (this.activeName == "-1") {
-          //感知
-          url = "/business/plans/warning/confirm";
-          data = {
-            dcInfoBoardTemplate: otherConfig,
-            dcWarning: this.eventFormData,
-          };
-        } else {
-          //交通
-          url = "/business/plans/event/automatic";
-          data = {
-            dcInfoBoardTemplate: otherConfig,
-            dcEvent: this.eventFormData,
-          };
-        }
-        const result = await request({
-          url: url,
-          method: "post",
-          data: data,
-        });
-        if (result.code != 200) return Message.error(result?.msg);
-        this.automaticData = result.data;
-      } else {
-        console.log("没有情报板，不调用接口");
-        this.automaticData = {};
-      }
-      return this.automaticData;
-    },
-    async getBoardOriginal() {
-      let url = "";
-      let data = {};
-      let plan = this.info.find((it) => it.planName == this.planName);
-      console.log("plan1", plan);
-      let action = plan.dcExecuteAction.find(
-        (it) => it.actionType == 1 && it.deviceType == 2
-      );
-      if (action) {
-        if (this.activeName == "-1") {
-          //感知
-          url = "/business/plans/warning/board/confirm";
-          data = {
-            dcEmergencyPlans: {
-              ...plan,
-              executeAction: action,
-            },
-            dcWarning: this.eventFormData,
-          };
-        } else {
-          //交通
-          url = "/business/plans/event/board/confirm";
-          data = {
-            dcEmergencyPlans: {
-              ...plan,
-              executeAction: action,
-            },
-            dcEvent: this.eventFormData,
-          };
-        }
-        const result = await request({
-          url: url,
-          method: "post",
-          data: data,
-        });
-        if (result.code != 200) return Message.error(result?.msg);
-        this.boardOriginalData = result.data;
-      } else {
-        console.log("没有情报板，不调用接口");
-        this.boardOriginalData = {};
-      }
-      return this.boardOriginalData;
-    },
-    changeRadio(value) {
-      let plan = this.info.find((it) => it.planName == value);
-      this.planInfo = plan;
-      this.initData(plan);
-    },
-    formatData(it, value = 1) {
-      let data = { ...it, actionType: value, emergencyPlansId: id };
-      if (
-        it.deviceList &&
-        typeof it.deviceList !== "string" &&
-        it.deviceList.length > 0
-      ) {
-        data.deviceList = it.deviceList.join(",");
-      } else {
-        data.deviceList = "";
-      }
-      if (it.content) {
-        data.otherConfig = JSON.stringify({ content: it.content });
-      }
-      if (it.controlModel) {
-        let other = {
-          controlModel: it.controlModel,
-          controlModelName: inducerModeDic[it.controlModel],
-          state: it.state,
-          name: inducerWorkTypeDic[it.state],
-        };
-        if (it.time && it?.time[0]) {
-          other = {
-            controlModel: it.controlModel,
-            controlModelName: inducerModeDic[it.controlModel],
-            state: it.state,
-            name: inducerWorkTypeDic[it.state],
-            startTime: it.time[0],
-            endTime: it.time[1],
-          };
-        }
-        data.otherConfig = JSON.stringify(other);
-      }
-      if (it.gzms) {
-        data.otherConfig = JSON.stringify({
-          state: it.gzms,
-          name: gzmsMap[it.gzms],
-          operationDuration: it.operationDuration,
-        });
-      }
-      return data;
-    },
-    handleSubmit(value = 1) {
-      // this.submitting = false;
-      let plan = { ...this.planInfo };
-      let actions = plan.dcExecuteAction.filter((it) => it.actionType == value);
-      plan.dcExecuteAction = actions;
-
-      let reqData = {
-        operationType: value, //1-执行操作 2-恢复操作
-        dcEmergencyPlans: plan,
-        dcEvent: this.eventFormData,
-      };
-
-      let url = "";
-      if (this.activeName == "-1") {
-        //感知
-        url = "/business/plans/warning/confirm";
-        reqData = { ...reqData, dcWarning: { ...reqData.dcEvent } };
-      } else {
-        //交通
-        url = "/business/plans/event/confirm";
-      }
-      console.log("reqData", reqData);
-      // return;
-      request({
-        url: url,
-        method: "post",
-        data: reqData,
-      })
-        .then((result) => {
-          if (result.code != 200) return Message.error(result?.msg);
-          Message.success("提交成功");
-          this.$emit("close", false);
-          setTimeout(() => {
-            this.$emit("reInitData", true);
-          }, 100);
-        })
-        .catch(() => {
-          Message.error("提交失败");
-        })
-        .finally(() => {
-          this.submitting = false;
-        });
-    },
-    handleRestore() {},
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.24s;
-}
-
-.fade-enter,
-.fade-leave-to {
-  opacity: 0;
-}
-
-.EventAddPlanDialog {
-  gap: 9px;
-  width: 1280px;
-  height: 310px;
-  display: flex;
-  flex-direction: column;
-
-  .first,
-  .second,
-  .third {
-    padding: 5px 10px 8px;
-    background-color: #296887;
-    margin-bottom: 15px;
-
-    .text {
-      margin-top: 12px;
-    }
-  }
-
-  .form {
-    flex: 1;
-    overflow-y: auto;
-  }
-
-  .footer {
-    display: flex;
-    justify-content: end;
-    gap: 15px;
-  }
-
-  // .disabledBtn {
-  //     height: 24px;
-  //     border-radius: 48px;
-  //     background: #C9C9C9;
-  //     padding: 0 24px;
-  //     color: white !important;
-  //     display: flex;
-  //     align-items: center;
-  //     justify-content: center;
-  // }
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue
deleted file mode 100644
index f9865651..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/formTable/index.vue
+++ /dev/null
@@ -1,336 +0,0 @@
-<template>
-    <div class="EventDetail">
-        <Table :data="tableData" :show-header="false">
-            <ElTableColumn prop="deviceType" width="160">
-                <template slot-scope="scope">
-                    <el-select v-model="scope.row.deviceType" placeholder="请选择设备类型" @change="changeDeviceType">
-                        <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </ElTableColumn>
-
-            <ElTableColumn prop="searchRule" width="230">
-                <template slot-scope="scope">
-                    <div class="plhx">
-                        <el-select v-model="scope.row.searchRule" placeholder="检索规则条件">
-                            <el-option v-for="item in zyOptions" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-
-                        <el-input-number v-if="scope.row.searchRule == 2 || scope.row.searchRule == 3"
-                            v-model="scope.row.number" :min="0" :max="9999" style="width: 130px;"></el-input-number>
-                        <p v-if="scope.row.searchRule == 2 || scope.row.searchRule == 3">个</p>
-
-                        <el-input-number v-if="scope.row.searchRule == 4" v-model="scope.row.number" :min="0"
-                            :max="9999" style="width: 130px;"></el-input-number>
-                        <p v-if="scope.row.searchRule == 4" style="width: 56px;">公里</p>
-                    </div>
-
-                </template>
-            </ElTableColumn>
-
-            <ElTableColumn prop="deviceList" width="400">
-                <template slot-scope="scope">
-                    <div class="mjs">
-                        <el-select v-if="scope.row.searchRule == 1" v-model="scope.row.deviceList" placeholder="请选择设备"
-                            multiple collapse-tags>
-                            <el-option v-for="item in sbOptions" :key="item.id" :label="item.deviceName"
-                                :value="item.id">
-                            </el-option>
-                        </el-select>
-                        <!-- 情报板 -->
-                        <el-input @click.native="clickQbb(scope.$index)" v-if="scope.row.deviceType == 2"
-                            placeholder="请选择" v-model="scope.row.qbb" readonly>
-                            <i slot="suffix" class="el-input__icon el-icon-search"></i>
-                        </el-input>
-
-                        <el-select v-if="scope.row.deviceType == 10" v-model="scope.row.gzms" placeholder="工作模式">
-                            <el-option v-for="item in gzmsOptions" :key="item.value" :label="item.label"
-                                :value="item.value"></el-option>
-                        </el-select>
-                        <el-input-number v-if="scope.row.deviceType == 10" placeholder="时长(分钟)"
-                            v-model="scope.row.operationDuration" :min="0" :max="999"></el-input-number>
-
-                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.controlModel"
-                            placeholder="请选择模式">
-                            <el-option label="手动模式" value="00"></el-option>
-                            <el-option label="自动模式" value="01"></el-option>
-                            <el-option label="万年历" value="02"></el-option>
-                        </el-select>
-                        <el-time-picker v-if="scope.row.controlModel == '01' && scope.row.deviceType == 12"
-                            v-model="scope.row.time" is-range style="" range-separator="-" placeholder="选择时间"
-                            value-format="HH:mm" format="HH:mm">
-                        </el-time-picker>
-                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.state" placeholder="工作状态">
-                            <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
-                                :value="item.value"></el-option>
-                        </el-select>
-
-                        <el-input v-if="scope.row.deviceType == 5" v-model="scope.row.content"
-                            placeholder="请输入发布内容"></el-input>
-
-                    </div>
-                </template>
-            </ElTableColumn>
-
-
-            <ElTableColumn label="操作" width="100">
-                <template slot-scope="scope">
-                    <ElButton class="elButton" icon="el-icon-plus" plain size="mini"
-                        @click.native="onAdd(scope.row.id)" />
-                    <ElButton class="elButton" icon="el-icon-delete" plain size="mini"
-                        @click.native="onDel(scope.$index)" />
-                </template>
-            </ElTableColumn>
-        </Table>
-
-        <!-- 情报板弹窗 -->
-        <QbbDialog :visible="isShowDialog" :info="qbbData" :type="type" @close="onCloseDialog"
-            @dialogSubmit="dialogSubmit" />
-    </div>
-</template>
-
-<script>
-import Table from '@screen/components/Table.vue';
-import Button from '@screen/components/Buttons/Button.vue';
-import request from "@/utils/request";
-import QbbDialog from "../qbbDialog/index.vue";
-import { Message } from 'element-ui'
-import { planDeviceOptions } from "@screen/utils/enum.js";
-
-
-export default {
-    name: 'formTable',
-    components: {
-        Button,
-        Table,
-        QbbDialog
-    },
-    // model: {
-    //     prop: 'visible',
-    //     event: 'update:value'
-    // },
-    inject: ['loadData'],
-    props: {
-        eventType: Number,
-        type: Number,
-        tableData: {
-            type: Array,
-            default: () => [{
-                deviceType: 1,
-                searchRule: 1,
-                qbb: ''
-            }]
-        }
-    },
-    data() {
-        return {
-            // tableData: [
-            //     {
-            //         deviceType: 1,
-            //         searchRule: 1,
-            //         qbb: '安全行驶'
-            //     }
-            // ],
-            isShowDialog: false,
-            deviceOptions: planDeviceOptions,
-            zyOptions: [
-                {
-                    value: 1,
-                    label: '指定设备资源'
-                },
-                {
-                    value: 2,
-                    label: '事发上游最近'
-                },
-                {
-                    value: 3,
-                    label: '事发下游最近'
-                },
-                {
-                    value: 4,
-                    label: '最近公里数'
-                },
-            ],
-            gzztOptions: [
-                {
-                    value: "01",
-                    label: "常亮"
-                },
-                {
-                    value: "02",
-                    label: "流水"
-                },
-                {
-                    value: "03",
-                    label: "闪烁"
-                },
-                {
-                    value: "04",
-                    label: "关闭",
-                }
-            ],
-            gzmsOptions: [
-                {
-                    value: "SETMD0",
-                    label: "激光关闭"
-                },
-                {
-                    value: "SETMD1",
-                    label: "常亮模式"
-                },
-                {
-                    value: "SETMD2",
-                    label: "间隔100ms闪烁模式"
-                },
-                {
-                    value: "SETMD3",
-                    label: "间隔200ms闪烁模式",
-                },
-                {
-                    value: "SETMD4",
-                    label: "间隔500ms闪烁模式",
-                },
-                {
-                    value: "SETMD5",
-                    label: "2次闪烁模式"
-                },
-                {
-                    value: "SETMD6",
-                    label: "SOS模式"
-                },
-                {
-                    value: "SETMD7",
-                    label: "自定义模式1",
-                },
-                {
-                    value: "SETMD8",
-                    label: "自定义模式2",
-                },
-                {
-                    value: "SETMD9",
-                    label: "自定义模式3",
-                }
-            ],
-            qbbData: {},
-            sbOptions: [],
-            deviceType: 1,
-            index: 1
-        }
-    },
-    async created() {
-        let loadData = await this.loadData(1);
-        // console.log('aa',loadData)
-        this.sbOptions = loadData;
-    },
-    methods: {
-        initData() {
-            // request({
-            //     url: `business/device/query?deviceType=2`,
-            //     method: "get",
-            // }).then((result) => {
-            //     if (result.code != 200) return Message.error(result?.msg);
-            //     this.sbOptions = result.data;
-
-            // }).catch(() => {
-            //     Message.error("查询可变信息标识失败");
-            // })
-
-        },
-        async changeDeviceType(value) {
-            this.deviceType = value;
-            console.log('value', value)
-            this.sbOptions = await this.loadData(value);
-        },
-        onAdd(id) {
-            this.tableData.push({
-                deviceType: 1,
-                searchRule: 1,
-                qbb: ''
-            })
-        },
-        onDel(index) {
-            if (this.tableData.length <= 1) {
-                return Message.warning('最后一项不可删除！');
-            }
-            this.tableData.splice(index, 1)
-        },
-        clickQbb(index) {
-            this.index = index;
-            // this.qbbData = this.tableData[index].dcInfoBoardTemplate;
-            console.log('this.type', this.type)
-            this.isShowDialog = true;
-        },
-        onCloseDialog() {
-            this.isShowDialog = false;
-        },
-        dialogSubmit(data) {
-            this.tableData[this.index].qbb = data.content;
-            this.tableData[this.index].otherConfig = JSON.stringify(data);
-        }
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.EventDetail {
-    display: flex;
-    gap: 9px;
-    width: 100%;
-    // height: 768px;
-    min-height: 50px;
-    margin-top: 5px;
-    flex-direction: column;
-
-    ::v-deep {
-        .el-table .el-table__cell {
-            padding: 0 5px;
-        }
-    }
-
-    .mjs {
-        display: flex;
-
-        >div {
-            margin-right: 10px;
-        }
-    }
-
-    .ms {
-        width: 160px;
-    }
-
-    .plhx {
-        display: flex;
-    }
-
-    ::v-deep {
-        .el-tag.el-tag--info {
-            max-width: 100px;
-        }
-
-        .el-range-editor--medium .el-range__icon,
-        .el-range-editor--medium .el-range__close-icon {
-            display: none;
-        }
-    }
-
-}
-
-.elButton {
-    background: #2ba8c3;
-    border-radius: 2px 2px 2px 2px;
-    color: #FFFFFF;
-}
-
-.elButton:hover,
-.elButton:focus {
-    background: #2ba8c3;
-    border-radius: 2px 2px 2px 2px;
-    border-color: #FFFFFF;
-    color: #FFFFFF;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue
index 0fba9ec8..81f931dc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/index.vue
@@ -1,88 +1,51 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
-    <div class="EventDetail" :style="{
-    height: activeName == '-1' || activeName == '0' ? '380px' : '698px',
-  }">
+    <div class="EventDetail" style="height:380px">
       <Form ref="FormConfigRef" :formList="formList" :dFormData="formData" label-width="100px" />
 
       <div class="video-pic" :style="{
     height: formData.component === 'VideoMulti' ? '242px' : undefined,
   }">
-        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
-          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
-    ? formData.videoList[0]
-    : ''
-    " :camId="formData.upCamId" :pileNum="formData.stakeMark" rangeIndex="upCamera" :videoType="formData.videoType" />
-
-        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
+        <component :is="formData.component" style="height: 100%; width: 380px"
           :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
     ? formData.videoList[1]
     : ''
     " :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
           :videoType="formData.videoType" />
 
-        <Carousel v-if="activeName == '-1'" style="flex: 1" :videos="formData.videoList" :pictures="[]" />
-        <Carousel v-if="activeName == '-1'" style="flex: 1" :pictures="formData.pictures" :videos="[]" />
+        <Carousel style="flex: 1" :videos="formData.videoList" :pictures="[]" />
+        <Carousel style="flex: 1" :pictures="formData.pictures" :videos="[]" />
       </div>
-      <!-- <div>{{ formData.videoList[0] }}</div> -->
-      <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
-      <TimeLine2 v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" style="flex: 1" />
+    
     </div>
 
-    <!-- 确认弹窗 -->
-    <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="formData" :activeName="activeName"
-      @reInitData="() => {
-    this.$emit('update:value', false);
-    this.$emit('queryData', true);
-  }
-    " @close="onCloseAddNew" />
 
     <template #footer>
-      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
-        @click.native="onDelete">误报</Button>
-      <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
-        @click.native="modelVisible = false">取消</Button>
-      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
-        @click.native="onSubmit">确认</Button>
+      <Button :style="{ padding: '0 24px' }"
+        @click.native="modelVisible = false">关闭</Button>
     </template>
   </Dialog>
 </template>
 
 <script>
 import Dialog from "@screen/components/Dialog/index";
-import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index";
-import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index";
 import Form from "@screen/components/FormConfig";
 import { _formList } from "./data";
-// import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js"
 import Video from "@screen/components/Video";
 import VideoMulti from "@screen/components/VideoMulti";
 import Carousel from "./Carousel/index.vue";
-import EventPlanDialog from "./eventPlanDialog/index.vue";
 import Button from "@screen/components/Buttons/Button.vue";
-import request from "@/utils/request";
-import { Message } from "element-ui";
 var moment = require("moment");
-import {
-  getProcessNode,
-  getProcessList,
-  postProcess,
-  postCompleteEvent,
-  postNoSkipClear,
-} from "@/api/commandDispatch";
 
 export default {
   name: "EventDetail",
   components: {
     Dialog,
     Form,
-    TimeLine1,
-    TimeLine2,
     Video,
     VideoMulti,
     Carousel,
     Button,
-    EventPlanDialog,
   },
   model: {
     prop: "visible",
@@ -90,7 +53,7 @@ export default {
   },
   props: {
     visible: Boolean,
-    activeName: String,
+    
     formData: {
       type: Object,
       default: () => { },
@@ -101,289 +64,21 @@ export default {
       formList:[..._formList],
       isShowDialog: false,
       info: [],
-      timeLine1List: [
-        {
-          time: "",
-          label: "",
-          isActive: false,
-        },
-      ],
-      timeLine2List: [
-        {
-          time: "",
-          name: "",
-          desc: "",
-          posts: "",
-          direction: "left",
-        },
-      ],
     };
   },
   computed: {
     modelVisible: {
       get() {
-        if (this.visible) {
-          this.getProcess();
-        }
         return this.visible;
       },
       set(val) {
-        console.log(111)
         this.formList = [..._formList]
         this.$emit("update:value", val);
       },
     },
   },
   methods: {
-    getProcess() {
-      if (this.activeName == "-1" || this.activeName == "0") {
-        this.timeLine1List = [];
-        this.timeLine2List = [];
-        return;
-      }
-
-      let directionFlg = true;
-      getProcessList(this.formData.id).then((rows) => {
-        console.log('rows', rows)
-        // if (result.code != 200) return Message.error(result?.msg);
-        // const rows = result.rows;
-        this.timeLine1List = [];
-        this.timeLine2List = [];
-
-        this.formData?.processConfigList.forEach((it) => {
-          const process = rows.find((row) => it.nodeNode == row.processId && row.processType === 1);
-
-          if (process) {
-            this.timeLine1List.push({
-              time: moment(process.operationTime || new Date()).format("HH:mm"),
-              label: it.processNode,
-              isActive: true,
-            });
-            directionFlg = !directionFlg;
-          } else {
-            this.timeLine1List.push({
-              time: "",
-              label: it.processNode,
-              isActive: false,
-            });
-          }
-        });
-
-        rows.forEach(item =>{
-          this.timeLine2List.push({
-            time: moment(item.operationTime || new Date()).format(
-              "yyyy-MM-DD HH:mm:ss"
-            ),
-            name: item.operatorName,
-            desc: item.context,
-            source: item.source,
-            posts: "",
-            direction: item.source == 1 ? "right" : "left",
-          });
-        })
-
-      });
-    },
-    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;
-    },
-    onDelete() {
-      if(this.formList[this.formList.length-1].key !== 'relieveReason' ){
-        this.formList.push({
-          label: "解除类型:",
-          key: "relieveType",
-          type: "RadioGroup",
-          isAlone: true,
-          required: true,
-          options: {
-            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
-            options: [
-              {
-                key: "1",
-                label: "误报解除",
-              },
-              {
-                key: "2",
-                label: "事件已结束",
-              },
-              {
-                key: "3",
-                label: "无需处理事件",
-              },
-              {
-                key: "4",
-                label: "其它",
-              }
-            ],
-          },
-        })
-        this.formList.push({
-          label: "解除原因:", // 标题
-          key: "relieveReason", //数据存储字段
-          isAlone: true, //  单独一行
-          type: "input", //组件类型(el-input 去掉el-即可) 不填默认为input
-          options: {  //element原生formItem属性
-            type: "textarea",
-            autosize: true,
-            maxlength: 200,
-            autosize: { minRows: 3, maxRows: 3 },
-            showWordLimit: true,
-          }
-        })
-      } else {
-        this.$refs.FormConfigRef.validate()
-          .then((result) => {
-            request({
-              url: `/business/warning/falseAlarm`,
-              method: "post",
-              data: {
-                id: this.formData.id,
-                relieveType: result.relieveType,
-                relieveReason: result.relieveReason
-              },
-            }).then((result) => {
-              if (result.code == 200) Message.success("成功！");
-              else Message.error(result?.msg);
-              this.modelVisible = false;
-              this.$emit("queryData", true);
-              //触发全局监听事件
-              this.$root.$emit('delete-event');
-            });
-          })
-          .catch((err) => {
-          });
-      }
-      
-      // 2024-05-18 修改为二次确认，增加误报类型和误报原因
-      // if (this.formData.id) {
-      //   this.$confirm("确定误报吗？", "提示", {
-      //     confirmButtonText: "确定",
-      //     cancelButtonText: "取消",
-      //     type: "warning",
-      //   }).then(() => {
-      //     if (this.activeName == "-1") {
-      //       request({
-      //         url: `/business/warning/delete`,
-      //         method: "post",
-      //         data: { id: this.formData.id },
-      //       }).then((result) => {
-      //         if (result.code == 200) Message.success("成功！");
-      //         else Message.error(result?.msg);
-      //         this.modelVisible = false;
-      //         this.$emit("queryData", true);
-      //         //触发全局监听事件
-      //         this.$root.$emit('delete-event');
-      //       });
-      //     } else {
-      //       request({
-      //         url: `dc/system/event/${this.formData.id}`,
-      //         method: "delete",
-      //       }).then((result) => {
-      //         if (result.code == 200) Message.success("成功！");
-      //         else Message.error(result?.msg);
-      //         this.modelVisible = false;
-      //         this.$emit("queryData", true);
-      //         //触发全局监听事件
-      //         this.$root.$emit('delete-event');
-      //       });
-      //     }
-      //   });
-      // }
-    },
-    onSubmit() {
-      // let url = "/business/plans/list/warning/type";
-      // if (this.activeName == "-1") {
-      //   url = "/business/plans/list/warning/type";
-      // } else {
-      //   url = "/business/plans/list/event/type";
-      // }
-      // request({
-      //   url: url,
-      //   method: "post",
-      //   data: this.formData,
-      // }).then((result) => {
-      //   if (result.code != 200) return Message.error(result?.msg);
-      //   this.info = result.data;
-      //   this.isShowDialog = true;
-      // });
-
-      let reData = {
-        id: this.formData.id,
-        stakeMark: this.formData.stakeMark,
-        direction: this.formData.direction == '济南方向' ? 3 : 1,
-        warningType: this.formData.warningType,
-        warningSource: this.formData.warningSource,
-        deptId: this.formData.deptId,
-        warningTime: this.formData.warningTime,
-        warningLevel: this.formData.warningLevel,
-        warningSubclass: this.formData.warningSubclass,
-        warningTitle: this.formData.warningTitle,
-        lane: this.formData.lane,
-        remark: this.formData.remark,
-      }
-      if (this.activeName == '-1') {
-        request({
-          url: '/business/warning/updateWarningConvert',
-          method: "post",
-          data: reData,
-        }).then((result) => {
-          if (result.code != 200) return Message.error(result?.msg);
-          else Message.success("成功！");
-
-          this.modelVisible = false;
-          this.$emit("queryData", true);
-        });
-      } else if (this.activeName == '0') {
-        request({
-          url: `/dc/system/event/dcEventState/${this.formData.id}/1`,
-          method: "put",
-          data: reData,
-        }).then((result) => {
-          if (result.code != 200) return Message.error(result?.msg);
-          else Message.success("成功！");
-
-          this.modelVisible = false;
-          this.$emit("queryData", true);
-        });
-      } else {
-        let eventId = this.formData.id;
-        this.modelVisible = false;
-
-        setTimeout(() => {
-          this.$router.push(`/control/event/commandDispatch?eventId=${eventId}`);
-          // this.$router.push(`/control/event/commandDispatch`);
-        })
-
-      }
-
-    },
-    reInitData() {
-      console.log("reInitData");
-      this.$emit("update:value", false);
-      this.$emit("queryData", true);
-    },
+  
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue
deleted file mode 100644
index 33333f72..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/EventDetailDialog/qbbDialog/index.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-<template>
-    <div>
-
-
-        <Dialog v-model="modelVisible" title="情报板确认">
-            <div v-if="type == 1" class="EventAddPlanDialog">
-                <h4>预案内容</h4>
-                <dev class="listBox disPid">
-                    <div class="tplItem">
-                        <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="automaticData"></BoardTplPreview>
-                        <div class="infoBtnBox infoBtnBoxSm">
-                            <p class="btn">
-                                <el-radio v-model="radio1" :label="1" @input="changeRadio(automaticData)" />
-                            </p>
-                            <!-- <p @click="____onEditTemplate(automaticData)" class="btn btnEdit" /> -->
-                        </div>
-                    </div>
-                </dev>
-                <h4>自动生成</h4>
-                <dev class="listBox disPid">
-                    <div class="tplItem">
-                        <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="automaticData"></BoardTplPreview>
-                        <div class="infoBtnBox infoBtnBoxSm">
-                            <p class="btn">
-                                <el-radio v-model="radio1" :label="2" @input="changeRadio(automaticData)" />
-                            </p>
-                            <!-- <p @click="____onEditTemplate(automaticData)" class="btn btnEdit" /> -->
-                        </div>
-                    </div>
-                </dev>
-                <h4>情报板模版</h4>
-                <vuescroll :ops="scrollOptions" class="listBox">
-                    <div v-for="(item) in templateAvailable" :key="item.dictValue">
-                        <h5>{{ item.dictLabel }}</h5>
-                        <div v-for="(itm, indx) in item.list" :key="indx" class="tplItem">
-                            <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="itm"></BoardTplPreview>
-                            <div class="infoBtnBox infoBtnBoxSm">
-                                <!-- <p class="btn">
-                                    <el-radio v-model="radio1" :label="itm.id" @input="changeRadio(itm)" />
-                                </p> -->
-                                <p @click="____onEditTemplate(itm)" class="btn btnEdit" />
-                            </div>
-                        </div>
-                    </div>
-                </vuescroll>
-            </div>
-            <div v-if="type == 2" class="EventAddPlanDialog">
-                <div v-for="(item, index) in Object.keys(originalData)" :key="index">
-                    <h4>{{ item }}</h4>
-                    <dev class="listBox disPid">
-                        <div v-for="(it, idx) in originalData[item]" :key="idx" class="tplItem">
-                            <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="it"></BoardTplPreview>
-                        </div>
-                    </dev>
-                </div>
-
-            </div>
-            <template #footer v-if="type == 1">
-                <Button style="background: #C9C9C9;padding:0 24px;"
-                    @click.native="modelVisible = false, submitting = false">取消</Button>
-                <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">确认</Button>
-            </template>
-        </Dialog>
-
-        <BoardInfoEditor @afterSubmit="____onEditSubmit" :mode="editDialog.mode" :type="editDialog.type"
-            :visible.sync="editDialog.visible" :screenSize="selectedSize" :tpl="editDialog.tpl"></BoardInfoEditor>
-    </div>
-</template>
-
-<script>
-import vuescroll from "vuescroll";
-import scrollOptions from "@/common/scrollbar.js";
-import BoardTplPreview from "@screen/components/infoBoard/BoardTplPreview.vue";
-import BoardInfoEditor from "@screen/components/infoBoard/BoardInfoEditor";
-import Dialog from "@screen/components/Dialog/index";
-import Button from '@screen/components/Buttons/Button.vue';
-import { getTemplateList } from "@/api/board/template";
-
-export default {
-    name: 'qbbDialog',
-    components: {
-        Dialog,
-        Button,
-        vuescroll,
-        BoardTplPreview,
-        BoardInfoEditor
-    },
-    model: {
-        prop: 'visible',
-        event: 'close'
-    },
-    inject: ['getAutomatic', 'getOriginal'],
-    props: {
-        visible: Boolean,
-        type: {
-            type: Number,
-            default: 1
-        },
-        info: {
-            type: Object,
-            default: () => { }
-        }
-    },
-    data() {
-        return {
-            submitting: false,
-            selectedSize: "",
-            scrollOptions,
-            templateAvailable: null,
-            tplCategory: [],
-            templateAll: [],
-            radio1: '',
-            itmData: {},
-            automaticData: {},
-            originalData: {},
-            editDialog: {
-                mode: "",
-                type: "",
-                visible: false,
-                tpl: {},
-            },
-        }
-    },
-    mounted() {
-        if (this.type == 1) {
-            this.initData();
-        } else if (this.type == 2) {
-            this.getBoardOriginal();
-        }
-    },
-    computed: {
-        modelVisible: {
-            get() {
-                // if (this.visible2) {
-                //     if (this.info && this.info.id) {
-                //         this.radio1 = Number(this.info.id);
-                //     }
-                // console.log('123', this.getTemplateAutomatic());
-                // }
-                return this.visible;
-            },
-            set(val) {
-                this.$emit('close', val)
-            }
-        },
-    },
-    methods: {
-        initData() {
-            if (this.tplCategory.length && this.templateAll.length) {
-                this.____setAvailableTemplate();
-            } else {
-                Promise.all([
-                    this.____getTemplateCategory(),
-                    this.____getAllTemplate(),
-                ]).then((res) => {
-                    this.____setAvailableTemplate();
-                });
-                this.getTemplateAutomatic();
-            }
-
-        },
-        // 获取信息模板分类
-        ____getTemplateCategory() {
-            return this.getDicts("iot_template_category").then((res) => {
-                this.tplCategory = res.data;
-            });
-        },
-        //获取全部模版
-        ____getAllTemplate() {
-            return getTemplateList().then((res) => {
-                this.templateAll = res.data;
-            });
-        },
-        // 设置当前设备可用的模板
-        ____setAvailableTemplate() {
-            this.templateAvailable = [];
-            this.tplCategory.forEach((item, index) => {
-                let arr = this.templateAll["" + index];
-                if (arr.length > 0) {
-                    let temp = [];
-                    arr.forEach((tpl) => {
-                        if (tpl.screenSize) {
-                            temp.push(tpl);
-                        }
-                    });
-                    if (temp.length > 0) {
-                        this.templateAvailable.push({
-                            ...item,
-                            list: temp,
-                        });
-                    }
-                }
-            });
-        },
-        ____onEditTemplate(tpl) {
-            this.editDialog = {
-                visible: true,
-                mode: "edit",
-                type: "template",
-                tpl,
-            };
-        },
-        //提交之后的回调
-        ____onEditSubmit(para) {
-            this.editDialog.tpl = {};
-            this.editDialog.visible = false;
-
-            if (para.type == "device") {
-                if (para.mode == "edit") {
-                    this.selectedBdMsg[this.boardItemEdtingIndex] = para.data;
-                } else {
-                    this.selectedBdMsg.push(_.cloneDeep(para.data));
-                }
-            } else if (para.mode == "toDevice") {
-                this.selectedBdMsg.push(_.cloneDeep(para.data));
-            } else {
-                this.____refreshPageData(para);
-            }
-        },
-        ____refreshPageData(para) {
-            if (para.type == "template") {
-                this.____getAllTemplate().then((res) => {
-                    this.____setAvailableTemplate();
-                });
-            } else {
-            }
-        },
-        async getTemplateAutomatic() {
-            let data = await this.getAutomatic();
-            console.log('dataaaa', data);
-            this.automaticData = data;
-        },
-        async getBoardOriginal() {
-            let data = await this.getOriginal();
-            console.log('datbbbbb', data);
-            this.originalData = data;
-        },
-        changeRadio(data) {
-            this.itmData = data;
-        },
-        handleSubmit() {
-            this.modelVisible = false;
-            this.$emit('dialogSubmit', this.itmData);
-        }
-
-
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-.listBox {
-    padding: 20px;
-
-    .tplItem {
-        margin-right: 14px;
-        display: flex;
-        align-items: stretch;
-        padding-bottom: 10px;
-
-        .boardPreview {
-            border: 1px solid rgba(61, 232, 255, 0.5);
-            // width: 560px;
-            // height:80px;
-            flex: 1;
-        }
-
-        .infoBtnBox {
-            &.infoBtnBoxSm {
-                width: 60px;
-            }
-
-            width: 110px;
-            height: 80px;
-            display: flex;
-            margin-left: 10px;
-            /* // border: solid 1px #05afe3; */
-            border: 1px solid rgba(61, 232, 255, 0.5);
-            display: flex;
-            justify-content: space-around;
-            align-items: center;
-
-            .btn {
-                background-repeat: no-repeat;
-                background-size: 100% 100%;
-                width: 15px;
-                height: 30px;
-
-                &.btnApply {
-                    background-image: url(~@/assets/jihe/images/button/toLeft.svg);
-                }
-
-                &.btnEdit {
-                    background-image: url(~@/assets/jihe/images/button/edit.svg);
-                }
-
-                &.btnDelete {
-                    background-image: url(~@/assets/jihe/images/button/delete.svg);
-                }
-            }
-
-            i {
-                font-size: 24px;
-                color: #666;
-                padding-left: 4px;
-                cursor: pointer;
-                caret-color: rgba(0, 0, 0, 0);
-                user-select: none;
-            }
-
-            i:hover {
-                color: #05afe3;
-            }
-
-            .disabledClass {
-                pointer-events: none;
-                cursor: auto !important;
-                color: #ccc;
-            }
-        }
-    }
-
-    .controlBox {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        display: flex;
-        justify-content: center;
-    }
-
-    .el-collapse {
-        max-height: 100% !important;
-        overflow: auto;
-        border-bottom: none;
-        border-top: none;
-        padding: 0 0.5vw;
-    }
-}
-
-.disPid {
-    padding: 0 20px !important;
-}
-
-.fade-enter-active,
-.fade-leave-active {
-    transition: opacity .24s;
-}
-
-.fade-enter,
-.fade-leave-to {
-    opacity: 0;
-}
-
-.EventAddPlanDialog {
-    gap: 9px;
-    width: 650px;
-    height: 700px;
-    display: flex;
-    flex-direction: column;
-
-    h4 {
-        margin: 0 0 5px 0;
-    }
-
-    ::v-deep {
-        .el-radio__label {
-            display: none;
-        }
-    }
-
-    .form {
-        flex: 1;
-        overflow-y: auto;
-    }
-
-    .footer {
-        display: flex;
-        justify-content: end;
-        gap: 15px;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
index 6f046ee6..1e0550c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
@@ -546,7 +546,7 @@ export const tabConfigList = [
               if (value == "3-2") {
                 facilityType = 1;
               } else if (value == "3-3") {
-                facilityType = 3;
+                facilityType = 4;
               } else if (value == "3-4") {
                 facilityType = 6;
               }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
index 2ee14a8f..96b43006 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
@@ -36,9 +36,7 @@
     </div>
 
     <!-- "详情"弹出框 -->
-    <!-- <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName"
-      @update:value="handleClose" @queryData="queryData" />
-     -->
+    <EventDetailDialog @update:value="handleDialogClose" :visible="eventDetailDialogVisible" :formData="detailDialogFormData" />
   </div>
 </template>
 
@@ -72,7 +70,6 @@ export default {
       data: [],
       total: 0,
       searchFormList,
-      activeName: "-1",
       eventDetailDialogVisible: false,
       isShowAddNew: false,
       searchData: {
@@ -92,7 +89,6 @@ export default {
         cardData: { ...item, state },
         lastBtnColor: textColor,
         lastBtnText: text,
-        isShowLeft: this.activeName == '-1'
       };
     },
     queryData(flag) {
@@ -138,12 +134,8 @@ export default {
       this.getData();
     },
     onExport() {
-      let url = '';
-      if (this.activeName == '-1') {
-        url = '/business/warning/export'
-      } else {
-        url = '/dc/system/event/export?eventState=' + this.searchData.eventState;
-      }
+      let url ='/business/warning/export'
+      
       let loadingInstance = Loading.service({
         fullscreen: true,
         background: "#00000052",
@@ -177,8 +169,7 @@ export default {
     },
     firstBtnClick(id) {//点击去确认/详情/处置记录等第一个按钮
       console.log("id", id);
-      if (this.activeName == '-1') {
-        request({
+      request({
           url: `/perceivedEvents/warning/getWarningById`,//感知事件
           method: "post",
           data: { id }
@@ -213,36 +204,11 @@ export default {
 
           this.eventDetailDialogVisible = true;
         });
-      } else {
-        request({
-          url: `/dc/system/event/${id}`,//交通事件
-          method: "get",
-        }).then(async (result) => {
-          if (result.code != 200) return Message.error(result?.msg);
-          let data = result.data;
-          data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
-          data.startTime = data?.occurrenceTime || '';
-
-
-          data.videoList = [];
-          data.component = "VideoMulti";
-
-          // const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
-          // data.downCamId = downCamera?.camId;
-          // data.upCamId = upCamera?.camId;
-          data.videoType = "flv";
-
-          this.detailDialogFormData = data;
-
-          this.eventDetailDialogVisible = true;
-        });
-      }
-
     },
     onLastBtnClick(id) {
       this.$router.push(`/control/event/commandDispatch?eventId=${id}`);
     },
-    handleClose() {
+    handleDialogClose() {
       this.eventDetailDialogVisible = false;
     },
     handleSearch(data) {

From 9a8d1409ebd4ced68a6a50bbf98c69f9a4c3bd99 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 21 May 2024 11:13:22 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/perception/eventAnalysis/data.js    | 49 +++++++++++++++++++
 .../pages/perception/eventAnalysis/index.vue  |  8 +--
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
index 5960c430..26ebccb4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
@@ -16,6 +16,19 @@ const station = {
           },
         },
         key: "stakeMark[0]",
+        rules: [
+          {
+            message: "请补全桩号",
+            callback(value, data) {
+              if (value || data.stakeMark[1]){
+                return /^0\d{2}|\d{3}$/.test(value);
+              } else {
+                return true
+              }
+            },
+          }
+        ],
+
       },
       {
         prefix: {
@@ -25,6 +38,18 @@ const station = {
           },
         },
         key: "stakeMark[1]",
+        rules: [
+          {
+            message: "请补全桩号",
+            callback(value, data) {
+              if (value || data.stakeMark[0]){
+                return /^0\d{2}|\d{3}$/.test(value);
+              } else {
+                return true
+              }
+            },
+          }
+        ],
       },
     ],
   },
@@ -214,9 +239,33 @@ export const searchFormList = [
       options: [
         {
           key: "endStakeMark[0]",
+          rules: [
+            {
+              message: "请补全桩号",
+              callback(value, data) {
+                if (value || data.endStakeMark[1]){
+                  return /^0\d{2}|\d{3}$/.test(value);
+                } else {
+                  return true
+                }
+              },
+            }
+          ],
         },
         {
           key: "endStakeMark[1]",
+          rules: [
+            {
+              message: "请补全桩号",
+              callback(value, data) {
+                if (value || data.endStakeMark[0]){
+                  return /^0\d{2}|\d{3}$/.test(value);
+                } else {
+                  return true
+                }
+              },
+            }
+          ],
         },
       ],
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
index 96b43006..4391926f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
@@ -135,7 +135,7 @@ export default {
     },
     onExport() {
       let url ='/business/warning/export'
-      
+
       let loadingInstance = Loading.service({
         fullscreen: true,
         background: "#00000052",
@@ -230,13 +230,13 @@ export default {
         warningSource: data?.warningSource || '',
         direction: data.direction,
         startTime: daterange && daterange.length > 0 ? daterange[0] : "",
-        endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
-        completeTime: this.activeName == "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+        // endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+        completeTime: daterange && daterange.length > 0 ? daterange[1] : "",
         startStakeMark: stakeMark,
         endStakeMark: endStakeMark,
       };
       console.log(this.searchData)
-      // this.getData();
+      this.getData();
     }
   },
 };

From 303075db55ca2bf9986a954d3c9402720142593d Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 21 May 2024 12:00:04 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E8=B7=AF=E6=AE=B5=E3=80=81=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=A0=E6=B3=95=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IndicatorAnalysis/components/trafficIndicators/index.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
index 094b123b..4be74ea1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
@@ -456,6 +456,7 @@ export default {
     align-items: center;
     flex-direction: column;
     --keep-ratio: scaleX(1);
+    pointer-events: auto;
 
     .body-l {
       width: 70%;

From e13509367ff6bd97fcdd67ed0fdcefbf400554fa Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 21 May 2024 14:52:43 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=85=AC=E4=BC=97=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nucleusThrough/assets/charts3.js          | 54 ++++++++++---------
 .../components/nucleusThrough/index.vue       | 19 ++++---
 .../components/postTrendsDay/assets/charts.js |  2 +-
 .../postTrendsMonth/assets/charts.js          |  2 +-
 .../components/postTrendsMonth/index.vue      |  2 +-
 .../publicService/components/record/index.vue | 13 ++---
 6 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js
index cd2e240c..f7f7718d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/assets/charts3.js
@@ -36,7 +36,7 @@ const series = event_channel.map((name, sid) => {
         } else {
           return Math.round(params.value * 1000) / 10 + '%'
         }
-        
+
       }
     },
     data: []
@@ -68,7 +68,11 @@ var options = {
     containLabel: true,
   },
   yAxis: {
-    type: 'value'
+    type: 'value',
+    axisLabel: {
+      fontSize: 10,
+      color: "#fff",
+    },
   },
 
 
@@ -84,30 +88,30 @@ var options = {
         fontSize: 10,
         color: "#fff",
       },
-      formatter:function(value)  
-      {  
-        var ret = "";//拼接加\n返回的类目项  
-        var maxLength = 2;//每项显示文字个数  
-        var valLength = value.length;//X轴类目项的文字个数  
-        var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数  
-        if (rowN > 1)//如果类目项的文字大于3,  
-        {  
-            for (var i = 0; i < rowN; i++) {  
-                var temp = "";//每次截取的字符串  
-                var start = i * maxLength;//开始截取的位置  
-                var end = start + maxLength;//结束截取的位置  
-                //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧  
-                temp = value.substring(start, end) + "\n";  
-                ret += temp; //凭借最终的字符串  
-            }  
-            return ret;  
-        }  
-        else {  
-            return value;  
-        }  
-      }  
+      formatter:function(value)
+      {
+        var ret = "";//拼接加\n返回的类目项
+        var maxLength = 2;//每项显示文字个数
+        var valLength = value.length;//X轴类目项的文字个数
+        var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
+        if (rowN > 1)//如果类目项的文字大于3,
+        {
+            for (var i = 0; i < rowN; i++) {
+                var temp = "";//每次截取的字符串
+                var start = i * maxLength;//开始截取的位置
+                var end = start + maxLength;//结束截取的位置
+                //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
+                temp = value.substring(start, end) + "\n";
+                ret += temp; //凭借最终的字符串
+            }
+            return ret;
+        }
+        else {
+            return value;
+        }
+      }
     },
   },
   series
 };
-export default options;
\ No newline at end of file
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
index 8fa4f6ef..aa9aef5c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
@@ -25,13 +25,15 @@
           size="mini"
           class="btnSearch"
           icon="el-icon-search"
+          @click="bindEventTypePublishManageMonth"
           >查询</el-button
         >
         <el-button class="btnReset" size="mini" icon="el-icon-refresh-left"
-          >重置</el-button
+                   @click="init"
+        >重置</el-button
         >
       </div>
-      <div class="charts keep-ratio" id="nucleusThrough"></div>
+      <div class="charts" id="nucleusThrough"></div>
     </div>
   </div>
 </template>
@@ -59,6 +61,9 @@ export default {
       this.bindEventTypePublishManageMonth();
     },
     bindEventTypePublishManageMonth(){
+      if (!this.dateTime){
+        return this.$modal.msgWarning("请选择日期");
+      }
       request({
           url: `/business/manage/eventTypePublishManageMonth`,
           method: "post",
@@ -88,11 +93,11 @@ export default {
           // });
           // var myChart = echarts.init(document.getElementById("postTrendsMonth"));
           // myChart.setOption(chartsStatistics);
-      }) 
+      })
     },
   },
   mounted() {
-    
+
     this.init();
     // setTimeout(() => {
     //   this.$nextTick(() => {
@@ -131,11 +136,11 @@ export default {
       display: flex;
       align-items: center;
       height: 40px;
-      width: 50%;
+      width: 35%;
       font-size: 14px;
       margin-bottom: 10px;
-      left: 20px;
-      top: 2px;
+      left: 10px;
+      top: 5px;
       z-index: 9;
 
       div {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js
index 0f33f352..6ce1d42f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/assets/charts.js
@@ -92,7 +92,7 @@ var options = {
   grid: {
     top: "75px", //上边距
     right: "0", //右边距
-    left: "0", //左边距
+    left: "3px", //左边距
     bottom: "20px", //下边距
     containLabel: true,
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
index 090f6794..f6e044a3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
@@ -91,7 +91,7 @@ var options = {
   grid: {
     top: "80px", //上边距
     right: "0", //右边距
-    left: "0", //左边距
+    left: "3px", //左边距
     bottom: "20px", //下边距
     containLabel: true,
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
index bdef0ab3..1182b7df 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
@@ -65,7 +65,7 @@ export default {
           });
           var myChart = echarts.init(document.getElementById("postTrendsMonth"));
           myChart.setOption(chartsStatistics);
-      }) 
+      })
     },
     init(){
       this.dateTime = new Date();
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
index 0609ad9f..51c2f956 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
@@ -20,10 +20,10 @@
         :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
     </div>
     <!-- 内容 -->
-    <Table :data="tableData" height="100%"  style="width:500">
+    <Table :data="tableData" height="100%"  style="width:1880px">
         <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
           header-align="center" />
-        
+
         <ElTableColumn label="发布渠道" prop="publishChannels" width="120" align="center" header-align="center">
           <template slot-scope="scope">
             {{ enum_channels[scope.row.publishChannels-1] }}
@@ -114,7 +114,7 @@ export default {
     },
     onDelete(id){
       const self = this;
-      this.$confirm("是否删除?"+id, "警告", {
+      this.$confirm("是否删除?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -152,7 +152,7 @@ export default {
             responseType: 'blob',
           }).then((res) => {
             console.log(res)
-           
+
             const url = window.URL.createObjectURL(new Blob([res]));
             let link = document.createElement("a");
             link.style.display = "none";
@@ -173,7 +173,7 @@ export default {
     },
     handleSearch(data) {
       let daterange = data.daterange;
-      
+
       let _searchData = {
         pageSize: 20,
         pageNum: 1
@@ -201,6 +201,7 @@ export default {
       request({
         url: `/business/manage/statisticsList`,
         method: "post",
+        params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize },
         data: this.searchData,
       }).then((result) => {
         if (result.code != 200) return Message.error(result?.msg);
@@ -208,7 +209,7 @@ export default {
         this.total = result.total;
       });
     },
- 
+
     onSizeChange(pageSize) {
       this.tableData = [];
       this.searchData.pageSize = pageSize;

From a8b748bfd284c42e1b21076ee64dcafc8d86dc40 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 21 May 2024 16:55:21 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E3=80=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=9B=BE=E9=81=AE=E6=8C=A1=E7=BC=96=E5=86=99=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue | 3 +++
 1 file changed, 3 insertions(+)

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 11a517ba..401ff6a1 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
@@ -409,6 +409,9 @@ export default {
     }
   }
 }
+::v-deep .el-popover {
+  z-index: 2 !important; /* 请根据你的项目需求设置合适的值 */
+}
 .weather {
   width: 435px;
   span {

From 68a95d2777fd8b242cd6cdfc3751a4a80a2a1b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Tue, 21 May 2024 17:12:40 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/common/PresetFormItems.js  |    1 -
 .../views/JiHeExpressway/components/Table.vue |    2 +-
 .../Home/components/Dialogs/Camera/index.vue  |    1 -
 .../Dialogs/RoadNetworkFacilities/chart.js    |  146 +
 .../Dialogs/RoadNetworkFacilities/data.js     |   12 +-
 .../Dialogs/RoadNetworkFacilities/index.vue   |   92 +-
 .../Dialogs/TrafficIncidents/index.vue        |    5 +-
 .../pages/Home/components/Dialogs/mixin.js    |   10 +-
 .../Home/components/RoadAndEvents/index.vue   |    1 -
 .../CrowdnessIndicatorRankings/index.vue      |    3 -
 .../DeviceControl/components/ScopeTable.vue   |   21 +-
 .../Cards/DeviceControl/index.vue             |   28 +-
 .../EditEventInformationDialog/data.js        |    5 +-
 .../EditEventInformationDialog/data_back.js   | 2572 +++++++++++++++++
 .../AddControlEventInfoDialog/data.js         |    4 +-
 .../control/event/commandDispatch/index.vue   |    3 +-
 .../event/event/FormEvent/PresetFormItems.js  |    5 +-
 .../control/event/event/FormEvent/data.js     |    4 +-
 .../control/event/event/FormEvent/index.vue   |   19 +-
 .../plan/addAndEditDialog/ScopeTable.vue      |    2 +-
 .../smart/analysis/index.vue                  |  301 +-
 .../FormEvent/PresetFormItems.js              |    1 -
 .../eventAnalysis/FormEvent/data.js           |    3 +-
 .../components/eventQuery/ElQuarterPicker.vue |    3 -
 .../trafficIndicators/ElQuarterPicker.vue     |    3 -
 .../components/postTrendsDay/index.vue        |    1 -
 .../publicService/components/record/index.vue |   25 +-
 27 files changed, 3173 insertions(+), 100 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js

diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
index cee3f96d..51e08685 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
@@ -806,7 +806,6 @@ export const locationMode = {
   key: "dcEventAccident.locationType",
   required: true,
   type: "select",
-  default: "1",
   options: {
     options: [
       { key: "1", label: "高速主线" },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue
index 6927af95..e0aeb9f5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Table.vue
@@ -32,7 +32,7 @@ div.Table {
   font-size: 16px;
   background-color: unset;
   color: #fff;
-
+  width:100%;
   ::v-deep {
     tr {
       background-color: rgba(6, 66, 88, 0);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index 72848b7f..8fc6ae1e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -171,7 +171,6 @@ export default {
     }, 150),
     visibleClose(bool) {
       if (bool) return;
-
       this.controlDialogVisible = false;
     },
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js
new file mode 100644
index 00000000..faf755c5
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js
@@ -0,0 +1,146 @@
+import * as echarts from "echarts";
+
+export const chartOption ={
+  color: ["#2AD9FD"],
+  xAxis: {
+    name: "日",
+    type: "category",
+    // boundaryGap: ["15%", "15%"],
+    nameTextStyle: {
+      color: "#2AD9FD",
+      align: "right",
+      fontSize: 15,
+      padding: [0, -15, 0, 0],
+    },
+    boundaryGap: false,
+    data: ['00:00','02:00','04:00','06:00'],
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: "#fff",
+      fontSize: 12,
+    },
+    axisLine: {
+      lineStyle: {
+        color: "#668598",
+      },
+    },
+  },
+  yAxis: [{
+    name: "雨量日计",
+    type: "value",
+    nameTextStyle: {
+      color: "#2AD9FD",
+      // align: "right",
+      fontSize: 15,
+      // padding: [0, -15, 0, 0],
+    },
+    // nameGap: 24,
+    splitLine: {
+      lineStyle: {
+        type: [6, 9],
+        color: "rgba(255,255,255, .3)",
+        // dashOffset: [10, 10],
+        // cap: 21,
+        // width: 2
+      },
+    },
+    axisLabel: {
+      color: "#fff",
+      fontSize: 12,
+      formatter: "{value}",
+    },
+  },{
+    name: "雨量累计",
+    type: "value",
+    nameTextStyle: {
+      color: "#2AD9FD",
+      // align: "right",
+      fontSize: 15,
+      // padding: [0, -15, 0, 0],
+    },
+    // nameGap: 24,
+    splitLine: {
+      lineStyle: {
+        type: [6, 9],
+        color: "rgba(255,255,255, .3)",
+        // dashOffset: [10, 10],
+        // cap: 21,
+        // width: 2
+      },
+    },
+    axisLabel: {
+      color: "#fff",
+      fontSize: 12,
+      formatter: "{value}",
+    },
+  }],
+  grid: {
+    left: 33,
+    top: 33,
+    bottom: 24,
+    right: 36,
+  },
+  tooltip: {
+    trigger: "axis",
+    backgroundColor: "rgba(0,0,0,0.36)",
+    borderWidth: 0,
+    textStyle: {
+      color: "#fff",
+    },
+    formatter: "{b}：{c}",
+  },
+  legend: {
+    textStyle: {
+      color: '#2AD9FD'
+    }
+  },
+  series: [
+    {
+      data: [1,2,3,4],
+      type: "line",
+      showSymbol: false,
+      smooth: true,
+      name: '计数',
+      lineStyle: {
+        color: "#2AD9FD",
+      },
+      areaStyle: {
+        opacity: 0.8,
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "rgb(90, 227, 255, .9)",
+          },
+          {
+            offset: 1,
+            color: "rgba(42,217,253,0)",
+          },
+        ]),
+      },
+    }, {
+      data: [1,2,3,4],
+      type: "line",
+      showSymbol: false,
+      smooth: true,
+      name: '计数',
+      lineStyle: {
+        color: "#2AD9FD",
+      },
+      areaStyle: {
+        opacity: 0.8,
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "rgb(90, 227, 255, .9)",
+          },
+          {
+            offset: 1,
+            color: "rgba(42,217,253,0)",
+          },
+        ]),
+      },
+    },
+  ],
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
index d5291305..c69a6134 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
@@ -428,6 +428,16 @@ export const tabList = {
           key: "direction",
           gridColumn: "3",
         },
+        {
+          label: "所属机构",
+          key: "branchCenterFullName",
+          gridColumn: "3",
+        },
+        {
+          label: "单位",
+          key: "groupCompany",
+          gridColumn: "3",
+        },
         {
           label: "桩号",
           key: "end_mark",
@@ -468,7 +478,7 @@ export const tabList = {
         },
         {
           label: "测点编号",
-          key: "meaPointnum",
+          key: "meaPointNum",
           gridColumn: "3",
         },
         {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
index b68749bb..6991dcd6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
@@ -10,6 +10,19 @@
           <ElTabPane v-for="item in formList" :key="item.key" :label="item.name" :name="item.key">
             <Descriptions :labelWidth="item.labelWidth" :list="item.list" :data="data" style="gap: 12px" column="6" />
           </ElTabPane>
+          <ElTabPane label="测点历史数据">
+      <el-date-picker
+            v-model="daterangeChangeTime"
+            size="mini"
+            style="width: 320px;float:right;margin-bottom: 10px;"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+            <div class='chart LineChart' ref="chartRef" />
+          </ElTabPane>
         </ElTabs>
       </div>
 
@@ -27,7 +40,9 @@ import request from "@/utils/request";
 import { dialogDelayVisible } from "./../mixin";
 import { tabList } from './data'
 import { DirectionTypes } from "@screen/utils/enum.js"
-
+import * as echarts from "echarts";
+import { chartOption } from "./chart"
+import moment from "moment";
 
 // 所有交通事件的详情
 export default {
@@ -51,13 +66,24 @@ export default {
         deviceState: "0",
         deviceVendors: "XXX厂家",
       },
-      formList: []
+      formList: [],
+      dateRange:[],
+      daterangeChangeTime:[]
     };
   },
+  watch: {
+    daterangeChangeTime: {
+      handler(val) {
+        this.dateRange = [moment(val[0]).valueOf(),moment(val[1]).valueOf()];
+
+     this.bindListAsync();
+      },
+    },
+  },
   async created() {
     let dData = { ...this.dialogData };
     this.formList = tabList[dData.facilityType]
-
+  
     if (dData.facilityType)
       if (dData.otherConfig) {
         let otherConfig = JSON.parse(dData.otherConfig);
@@ -66,25 +92,65 @@ export default {
           dData.direction = DirectionTypes[dData.direction]
         }
         let resPointList = await request({
-                url: `dc/sideSlope/GetMeasurePointList`,
-                method: "get",
-            });
-            if (resPointList.code != 200) return Message.error(result?.msg);
-            let pointList = {};
-           if(resPointList.data && resPointList.data.result && resPointList.data.result.length > 0){
-            pointList = resPointList.data.result[0]
-           }
+            url: `sideSlope/GetMeasurePointList`,
+            method: "get",
+        });
+        if (resPointList.code != 200) return Message.error(resPointList?.msg);
+        let pointList = {};
+        if(resPointList.data && resPointList.data.result && resPointList.data.result.length > 0){
+        pointList = resPointList.data.result[0]
+        }
         dData = { ...dData, ...otherConfig,...pointList }
+        //获取历史数据echart
+
+        
       }
     this.data = dData;
-    // console.log('this.data', this.data)
+    this.daterangeChangeTime = [moment().startOf('months').format('YYYY-MM-DD'),moment().endOf('months').format('YYYY-MM-DD')]
+    
+    console.log('this.data', this.data)
   },
   methods: {
+    async bindListAsync(){
+      let res = await request({
+            url: `sideSlope/GetPointDataListAsync`,
+            method: "get",
+            params:{
+              projCode: this.data.pro_code,
+              unitCode: this.data.unit_code,
+              meaPointNum: this.data.meaPointNum,
+              starttime: this.dateRange[0],
+              endtime: this.dateRange[1],
+            }
+      });
+      if (res.code != 200) return Message.error(res?.msg);
+      const cdata = [];
+      const cseries1 = [];
+      const cseries2 = [];
+      res.data.forEach(e => {
+        cdata.push((moment(e.measureTime).format('YYYY-MM-DD')))
+        cseries1.push(e.data[0].value)
+        cseries2.push(e.data[0].cum)
+      });
+      chartOption.xAxis.data = cdata;
+      chartOption.series[0].data = cseries1;
+      chartOption.series[1].data = cseries2;
+      const chartIns = echarts.init(this.$refs.chartRef);
+      chartIns.setOption(chartOption);
+    }
   },
 };
 </script>
 
 <style lang="scss" scoped>
+
+
+
+.LineChart {
+  width: 450px !important;
+  height: 160px;
+  overflow: hidden;
+}
 .RoadNetworkFacilities {
   width: 452px;
   color: #fff;
@@ -116,7 +182,7 @@ export default {
     flex: 1;
     display: flex;
     flex-direction: column;
-
+    height: 260px;
     ::v-deep {
       .el-tabs__content {
         flex: 1;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
index 824b4f4c..4d8046e6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
@@ -163,7 +163,6 @@ export default {
           // let data = new FormData();
           // data.append("eventId", this.dialogData.id);
           // postCompleteEvent(data).then((result) => {
-          //   console.log('--------', result)
           //   if (result.code != 200) return [];
           //   this.$message.success("成功");
           //   this.$emit('traffic-relieve', this.data);
@@ -190,6 +189,7 @@ export default {
 <style lang="scss" scoped>
 .TrafficIncidents {
   width: 600px;
+  
   color: #fff;
   display: flex;
   flex-direction: column;
@@ -244,7 +244,8 @@ export default {
   gap: 9px;
   width: 100%;
   justify-content: flex-end;
-  margin: 20px 0px -20px 0px;
+  // margin: 20px 0px -20px 0px;
+  height: 40px;
 
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js
index c118c862..b1fb3932 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js
@@ -25,13 +25,9 @@ export const dialogDelayVisible = {
   computed: {
     obverseVisible: {
       set(bool) { 
-        if(this.visibleClose){
-          try {
-            typeof this.visibleClose === "function" && this.visibleClose?.(bool);
-          } catch (error) {}
-  
-        }
-        
+        try {
+          typeof this.visibleClose === "function" && this.visibleClose?.(bool);
+        } catch (error) {}
         setTimeout(() => {
           this.$emit("change", bool);
         }, 180);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 169cbc77..354faf09 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -248,7 +248,6 @@ export default {
       const key = getHandleDeviceType(item) || `${this.active}/${item.title}`;
 
       const status = item.status;
-      console.log(item.status,'------------')
       if (!status) { //开启
         this.nowSelected = item.title;
         this.nowSelectedCompleted = false;
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 11a517ba..4583f0cf 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
@@ -288,7 +288,6 @@ export default {
       const self = this;
       setTimeout(() => {
         // 获取map接口
-        console.log(self.detailData,'----------')
         const { AMap, mapIns } = self.$refs.AMapContainerRef.getMapInstance();
         const { longitude, dimension, eventName } = self.detailData;
         const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`);
@@ -298,8 +297,6 @@ export default {
         );
         self.addMarker(center, icon, 1);
         mapIns.setZoomAndCenter(12, center);
-        //
-        // console.log(self.detailData,mapIns, AMap,  "############");
       }, 500);
     },
     addMarker(position, icon, state, fn = null) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
index b3473899..3ffbe92c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
@@ -4,7 +4,7 @@
             <el-col :span="7">
                 <!-- 设备类型 -->
                 <el-select v-model="tableInfo.deviceType" placeholder="" @change="changeDeviceType" transfer="true"
-                    style="width: 123px;">
+                    style="width: 120px;">
                     <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
@@ -13,7 +13,7 @@
             </el-col>
             <el-col :span="7">
                 <!-- 规则条件 -->
-                <el-select v-model="tableInfo.searchRule" placeholder="" style="width: 123px;">
+                <el-select v-model="tableInfo.searchRule" placeholder="" style="width: 120px;">
                     <el-option v-for="item in zyOptions" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
@@ -27,9 +27,9 @@
                 <!-- 公里 -->
                 <el-input-number v-if="tableInfo.searchRule == 4" v-model="tableInfo.number" :min="0" :max="9999"
                     style="width: 75px;"></el-input-number>
-                <span v-if="tableInfo.searchRule == 4" style="width: 56px;">公里</span>
+                <span v-if="tableInfo.searchRule == 4" style="width: 56px;">㎞</span>
             </el-col>
-            <el-col :span="4" v-if="tableInfo.isDefault === true && (tableInfo.deviceType == '2' || tableInfo.deviceType == 5)">
+            <el-col :span="4" v-if=" (tableInfo.deviceType == '2' || tableInfo.deviceType == 5)">
                 <div class="firstBtns">
                     <ButtonGradient class="title-button" @click.native="$emit('onConfirm', index)">
                         <i class="el-icon-check"></i>
@@ -79,7 +79,7 @@
             </el-col>
             <!-- 可变信息标识 -->
             <el-col v-if="tableInfo.deviceType == 2" :span="8">
-                <el-select v-model="tableInfo.zx_operationType" placeholder="请选择">
+                <el-select v-model="tableInfo.zx_operationType" disabled placeholder="请选择">
                     <el-option label="自定义发布" :value="1"></el-option>
                     <el-option label="智能发布" :value="2"></el-option>
                 </el-select>
@@ -120,15 +120,16 @@
             </el-col>
             <!-- 语音广播 -->
             <el-col v-if="tableInfo.deviceType == 5" :span="8">
-                <el-select v-model="tableInfo.zx_operationType" placeholder="请选择">
+                <el-select v-model="tableInfo.zx_operationType" disabled placeholder="请选择">
                     <el-option label="自定义发布" :value="1"></el-option>
                     <el-option label="智能发布" :value="2"></el-option>
                 </el-select>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 5 && tableInfo.zx_operationType == 1" :span="10">
+            <!-- <el-col v-if="tableInfo.deviceType == 5 && tableInfo.zx_operationType == 1" :span="10">
                 <el-input v-model="tableInfo.zx_content" placeholder="请输入发布内容"></el-input>
-            </el-col>
+            </el-col> -->
         </el-row>
+
         <el-row v-if="(tableInfo.deviceType == 2 || tableInfo.deviceType == 5) && tableInfo.executeConfig && tableInfo.executeConfig.contentList">
             <el-col :span="24">
                <div class="keep-ratio" origin="top" v-for="(itm,idx) of tableInfo.executeConfig.contentList">
@@ -157,7 +158,7 @@
             </el-col>
             <!-- 可变信息标识 -->
             <el-col v-if="tableInfo.deviceType == 2" :span="8">
-                <el-select v-model="tableInfo.hf_operationType" placeholder="请选择">
+                <el-select v-model="tableInfo.hf_operationType" disabled placeholder="请选择">
                     <el-option label="自定义发布" :value="1"></el-option>
                     <el-option label="还原上次" :value="2"></el-option>
                 </el-select>
@@ -261,7 +262,7 @@ export default {
                     label: '事发上游最近'
                 },
                 {
-                    value: 3,
+                    value: 4,
                     label: '最近公里数'
                 },
             ],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
index abd21e9b..e0449a82 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/index.vue
@@ -73,7 +73,6 @@ export default {
             this.tableData = [{ ...defaultTableInfo }];
             return Message.warning("该事件暂无处置预案");
           }
-
           let dcExecuteAction = data[0].dcExecuteAction || [];
           this.planId = data[0].id;
 
@@ -82,13 +81,14 @@ export default {
             let action = { ...it };
             if (it.executeConfig) {
               let executeConfig = JSON.parse(it.executeConfig);
+
               let execute = this.mapKeys(executeConfig, "zx_");
-              action = { ...action, ...execute };
+              action = { ...action, ...execute,...{executeConfig} };
             }
             if (it.recoverConfig) {
               let recoverConfig = JSON.parse(it.recoverConfig);
               let recover = this.mapKeys(recoverConfig, "hf_");
-              action = { ...action, ...recover };
+              action = { ...action, ...recover,...{recoverConfig} };
             }
             if (it.deviceList) {
               action.devList = it.deviceList.split(",").map((str) => str);
@@ -123,13 +123,7 @@ export default {
     },
     onConfirm(index){
         const param = {
-            "dcEvent": {
-                "eventType": this.detailData.eventType,
-                "direction": this.detailData.direction,
-                "id": this.detailData.id,
-                "stakeMark": this.detailData.stakeMark,
-                "subclass": this.detailData.subclass
-            },
+            "dcEvent": this.detailData,
             "dcExecuteAction": {
                 "id": "",
                 "emergencyPlansId": "",
@@ -141,18 +135,25 @@ export default {
                 "recoverConfig": "{\"operationType\":2}"
             }
         }
+        if(this.tableData[index].isDefault !== true){
+          param['dcExecuteAction']['executeConfig'] = JSON.stringify(this.tableData[index]['executeConfig'])
+          param['dcExecuteAction']['recoverConfig'] = JSON.stringify(this.tableData[index]['recoverConfig'])
+          
+        }
         request({
           url: `business/plans/list/event/emergencyPlans`,
           method: "post",
           data: param,
         }).then(result=>{
           if (result.code != 200) return Message.error(result?.msg);
-          console.log(param,result,'===============')
+          console.log(this.tableData[index])
           let data = result.data;
           this.tableData[index].executeConfig = JSON.parse(data.executeConfig)
           this.tableData[index].recoverConfig = JSON.parse(data.recoverConfig)
-          this.tableData[index].zx_operationType = this.tableData[index].executeConfig?.operationType;
-          this.tableData[index].hf_operationType = this.tableData[index].recoverConfig?.operationType;
+          if(this.tableData[index].isDefault === true){
+            this.tableData[index].zx_operationType = this.tableData[index].executeConfig?.operationType;
+            this.tableData[index].hf_operationType = this.tableData[index].recoverConfig?.operationType;
+          }
           this.tableData = _.cloneDeep(this.tableData)
         })
     },
@@ -222,7 +223,6 @@ export default {
       };
       console.log("reqData", reqData);
 
-      return;
       request({
         url: "/business/plans/event/confirm",
         method: "post",
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 1391de20..05d53346 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
@@ -937,8 +937,7 @@ export const configList = {
       isAlone: false,
       required: true,
       options: {
-        options: [],
-        multiple: true,
+        options: []
       },
       visible: (data) => {
         if (data?.eventSubclass == "3-3") {
@@ -984,6 +983,8 @@ export const configList = {
       required: true,
       options: {
         options: [],
+        multiple: true,
+        
       },
       visible: (data) => {
         if (data?.eventSubclass == "3-3") {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js
new file mode 100644
index 00000000..d0bae20c
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/data_back.js
@@ -0,0 +1,2572 @@
+import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+const directionName = {
+  label: "方向:",
+  key: "direction",
+  required: true,
+  type: "select",
+  options: {
+    options: [
+      { value: "济南方向", label: "济南方向" },
+      { value: "菏泽方向", label: "菏泽方向" },
+    ],
+  },
+};
+const freeway = {
+  label: "路线:",
+  required: true,
+  key: "roadName",
+  type: "select",
+  options: {
+    options: [
+      {
+        key: "济菏高速",
+        label: "济菏高速",
+      },
+    ],
+  },
+}
+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",
+        },
+        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;
+          },
+        },
+        directionName,
+        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",
+        },
+        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;
+          },
+        },
+        {
+          label: "方向:",
+          key: "direction",
+          required: true,
+          type: "select",
+          options: {
+            options: [
+              { key: "济南方向", label: "济南方向e" },
+              { key: "菏泽方向", label: "菏泽方向2" },
+            ],
+          },
+        },
+        { ...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 = 4;
+              } 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;
+          },
+        },
+        freeway,
+        directionName,
+        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: []
+          },
+          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: "dcEventTrafficControl.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: "dcEventTrafficControl.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,
+        freeway,
+        directionName,
+        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,
+        freeway,
+        directionName,
+        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;
+          },
+        },
+        freeway,
+        directionName,
+        {
+          ...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: "其他异常",
+              },
+            ],
+          },
+        },
+        freeway,
+        directionName,
+        {
+          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,
+        },
+        freeway,
+        directionName,
+        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,
+        freeway,
+        directionName,
+        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,
+          },
+        },
+        freeway,
+        directionName,
+        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/TrafficControl/components/AddControlEventInfoDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js
index e85a7360..d448735a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/data.js
@@ -404,8 +404,7 @@ export const tabConfigList = [
           isAlone: false,
           required: true,
           options: {
-            options: [],
-            multiple: true,
+            options: []
           },
           visible: (data) => {
             if (data?.eventSubclass == "3-3") {
@@ -451,6 +450,7 @@ export const tabConfigList = [
           required: true,
           options: {
             options: [],
+            multiple: true,
           },
           visible: (data) => {
             if (data?.eventSubclass == "3-3") {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
index 9fbab5d2..a0187096 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
@@ -78,12 +78,11 @@ export default {
     getDetail() {
       // 指挥调度 - 只有交通事件没有感知事件，感知事件完成后自动转为交通事件
       request({
-        url: `/dc/system/event/${this.detailId}`,
+        url: `/dc/system/event/eventSubclass/${this.detailId}`,
         method: "GET",
       })
         .then((result) => {
           if (result.code != 200) return;
-          console.log(result,'###########')
           this.provideData.detail = result.data;
           console.log("这里是事件详情", this.provideData.detail);
           if (
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 93c2b120..af3b7db9 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
@@ -540,11 +540,11 @@ export const isInTunnel = {
     activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
     options: [
       {
-        key: "1",
+        key: 1,
         label: "是",
       },
       {
-        key: "0",
+        key: 0,
         label: "否",
       },
     ],
@@ -728,7 +728,6 @@ export const locationMode = {
   key: "dcEventAccident.locationType",
   required: true,
   type: "select",
-  default: "1",
   options: {
     options: [
       { key: 1, label: "高速主线" },
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 1e0550c1..6417c9b1 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
@@ -858,8 +858,7 @@ export const tabConfigList = [
           isAlone: false,
           required: true,
           options: {
-            options: [],
-            multiple: true,
+            options: []
           },
           visible: (data) => {
             if (data?.eventSubclass == "3-3") {
@@ -905,6 +904,7 @@ export const tabConfigList = [
           required: true,
           options: {
             options: [],
+            multiple: true,
           },
           visible: (data) => {
             if (data?.eventSubclass == "3-3") {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
index 964a4986..1f74cea3 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
@@ -4,16 +4,18 @@
       <ElTabs v-model="activeName" @tab-click="handleChange">
         <ElTabPane v-for="(item, index) in tabConfigList" :key="index" :label="item.label" :name="item.key" />
       </ElTabs>
-
-      <Transition name="fade">
-        <Form class="form" ref="FormConfigRef" :formList="formConfig.list" v-bind="getFormOptions" labelWidth="120px" />
-      </Transition>
+      <div class="fader">
+        <Transition name="fade">
+          <Form class="form" ref="FormConfigRef" :formList="formConfig.list" v-bind="getFormOptions"
+            labelWidth="120px" />
+        </Transition>
+      </div>
     </div>
 
     <template #footer>
-      <Button style="background: #c9c9c9; padding: 0 24px"
+      <Button style="background: #c9c9c9; padding: 0 24px;margin-top: 24px;"
         @click.native="(modelVisible = false), (submitting = false)">取消</Button>
-      <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">保存</Button>
+      <Button style="padding: 0 24px;margin-top: 24px;" @click.native="handleSubmit" :loading="submitting">保存</Button>
     </template>
   </Dialog>
 </template>
@@ -244,6 +246,11 @@ export default {
   display: flex;
   flex-direction: column;
 
+  .fader {
+    height: 500px;
+    overflow-y: auto;
+  }
+
   .form {
     flex: 1;
     overflow-y: auto;
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 daf5a5d1..b48f5fb3 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
@@ -214,7 +214,7 @@ export default {
                     label: '事发上游最近'
                 },
                 {
-                    value: 3,
+                    value: 4,
                     label: '最近公里数'
                 },
             ],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
index bd094ed2..186e9b0e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
@@ -1,34 +1,315 @@
 <template>
-  <div class='board_record'>
-    TODO
+  <div class='content'>
+    <div class="left">
+
+      <WgtTitle :title="'设备列表'"></WgtTitle>
+      <el-form :model="form" class="formSearch keep-ratio" size="mini">
+        <el-form-item>
+          <el-col :span="11">
+            <el-input v-model="form.deviceName" size="medium" placeholder="设备名称" class="direction"></el-input>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-checkbox-group v-model="form.deviceState" style="height:26px">
+              <el-checkbox :label="1">在线</el-checkbox>
+              <el-checkbox :label="0">异常</el-checkbox>
+            </el-checkbox-group>
+          </el-col>
+        </el-form-item>
+        <el-form-item style="display: flex; justify-content: center;">
+          <el-button class="btnInfoBoard" type="add" @click.native="onSearch()">搜索</el-button>
+          <el-button type="publish" @click.native="onResetSearch()">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="body">
+        <vuescroll :ops="scrollOptions">
+          <div class="device keep-ratio" v-for="(item, index) of list">
+            <div>{{ item.deviceName }}</div>
+            <el-tooltip :content="(item.deviceState == 0 || item.deviceState == null) ? '异常' : '在线'" placement="top">
+              <img src="@/assets/jihe/images/offline.svg" class="state"
+                v-if="item.deviceState == '0' || item.deviceState == null">
+              <img src="@/assets/jihe/images/online.svg" class="state" v-else>
+            </el-tooltip>
+          </div>
+          <div v-if="list.length === 0" style="color: #fff; text-align: center; line-height: 60px">
+            暂无数据
+          </div>
+        </vuescroll>
+      </div>
+      <div class="footer">
+        <ElPagination @current-change="bindList" @size-change="onSizeChange" width="'100%'"
+          :page-sizes="[10, 20, 30, 40, 50]" :page-size="page.pageSize" :current-page.sync="page.pageNum"
+          layout="total, prev, pager, next" :total="total" class="Pagination">
+        </ElPagination>
+      </div>
+    </div>
+    <div class="right">
+      <div class="top">
+        <div class="search">
+          <el-date-picker
+            size="small"
+            type="date"
+            class="selectDate"
+            v-model="date"
+            style="width: 140px"
+            placeholder="请选择"
+          />
+        </div>
+      </div>
+      <div class="bottom"></div>
+    </div>
   </div>
 </template>
 
 <script>
 import request from "@/utils/request";
+import vuescroll from "vuescroll";
+import scrollOptions from "@/common/scrollbar.js";
+import { Message } from "element-ui";
+import WgtTitle from "@screen/pages/perception/widgets/title";
 export default {
-  name: 'boardRecord',
+  name: 'smartAnalysis',
   components: {
-    
+    vuescroll,
+    WgtTitle
   },
   data() {
     return {
-     
+      form: {
+        deviceName: '',
+        deviceState: [1, 0]
+      },
+      page: {
+        pageNum: 0,
+        pageSize: 20
+      },
+      total: 0,
+      list: [],
+      scrollOptions,
+      date:''
     }
   },
   created() {
-    
+
   },
-  mounted(){
-     
+  mounted() {
+    this.bindList();
+    this.date = moment().format('YYYY-MM-DD')
   },
   methods: {
+    onSizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.bindList();
+    },
+    bindList() {
+      const params = {
+        ...this.form, ...this.page,
+      };
+      if (params.deviceState.length === 2) {
+        delete params.deviceState;
+      } else {
+        params.deviceState = params.deviceState.join('')
+      }
+      if (params.deviceName === '') {
+        delete params.deviceName
+      }
+      request({
+        url: 'business/device/selectDeviceNameList',
+        method: 'get',
+        params
+      }).then(result => {
+        if (result.code != 200) return Message.error(result?.msg);
+        this.list = result.rows;
+        this.total = result.total;
+      })
+    },
+    onResetSearch() {
+      this.form = {
+        deviceName: '',
+        deviceState: [1, 0]
+      };
+      this.pageNum = 0;
+      this.bindList();
+    },
+    onSearch() {
+      this.pageNum = 0;
+      this.bindList();
+    },
   }
 }
 </script>
 
 <style lang='scss' scoped>
-.board_record {
-  
+.content {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+  background-color: #101d23;
+  padding: 20px;
+
+  .left {
+    width: 400px;
+    background-color: #112533;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+    .body {
+      flex: 1;
+      height: 0;
+      padding: 0 10px 10px;
+    }
+
+    .footer {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 10px;
+    }
+  }
+
+  .right {
+    flex: 1;
+    margin-left: 30px;
+  }
+}
+
+::v-deep .formSearch {
+  padding: 20px 20px 0;
+
+  .el-form-item__label {
+    color: #fff;
+  }
 }
+
+.direction {
+  ::v-deep .el-input {
+    .el-input__inner {
+      font-size: 14px !important;
+      padding: 8px 5px;
+    }
+  }
+}
+
+.device {
+  padding: 7.5px 15px;
+  cursor: pointer;
+  display: flex;
+  justify-content: space-between;
+}
+
+.device:hover {
+  background-color: #1d647f;
+}
+
+.state {
+  width: 18px;
+  height: 18px;
+}
+.top{
+  .search{
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.Pagination {
+  // color: #fff;
+
+  ::v-deep {
+
+    >button,
+    >ul li {
+      background: #064258;
+      border-radius: 2px 2px 2px 2px;
+      opacity: 1;
+      color: #fff;
+    }
+
+    >button {
+      padding: 0 3px;
+      border: 1px solid #00b3cc;
+    }
+
+    >ul li {
+      background: linear-gradient(180deg, #004960 0%, #004b62 100%);
+      margin: 0 1.5px;
+
+      &.active {
+        background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+      }
+    }
+
+    .el-pagination__total {
+      color: #fff;
+    }
+
+    .el-pagination__sizes {
+      .el-select {
+        .el-input {
+          width: 81px;
+
+          .el-input__inner {
+            font-size: 12px;
+            height: 23px;
+            background-color: #064258 !important;
+          }
+        }
+
+        .el-input__suffix {
+          .el-input__icon {
+            line-height: 23px;
+          }
+        }
+      }
+    }
+
+    .el-pagination__jump {
+      margin-left: 10px;
+      color: #fff;
+      font-size: 12px;
+
+      .el-input {
+        width: 27px;
+        margin: 0 3px;
+
+        .el-input__inner {
+          font-size: 12px;
+          background-color: #064258 !important;
+          border-radius: 2px 2px 2px 2px;
+        }
+      }
+    }
+
+    .btn-next {
+      margin-left: 6px;
+    }
+
+    .btn-prev {
+      margin-right: 6px;
+    }
+  }
+
+  ::v-deep .el-pagination__total {
+    margin-left: 10px;
+  }
+}
+
+.selectDate {
+        width: 89px;
+        border: 1px solid #00b3cc;
+        
+        ::v-deep {
+          .el-input__prefix{
+            top:-4px;
+          }
+          .el-input__inner {
+            
+            background-color: #064258 !important;
+            border-width: 0px !important;
+          }
+        }
+      }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js
index 93c2b120..65ba1656 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/PresetFormItems.js
@@ -728,7 +728,6 @@ export const locationMode = {
   key: "dcEventAccident.locationType",
   required: true,
   type: "select",
-  default: "1",
   options: {
     options: [
       { key: 1, label: "高速主线" },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
index 1e0550c1..e1119726 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/FormEvent/data.js
@@ -858,8 +858,7 @@ export const tabConfigList = [
           isAlone: false,
           required: true,
           options: {
-            options: [],
-            multiple: true,
+            options: []
           },
           visible: (data) => {
             if (data?.eventSubclass == "3-3") {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue
index 65cd0296..767693bc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/ElQuarterPicker.vue
@@ -101,7 +101,6 @@
     },
     watch: {
       value(val) {
-        // console.log('change-------', val)
         this.changeValue(val)
       },
       readonly(val) {
@@ -131,7 +130,6 @@
       }
     },
     mounted() {
-      // console.log('mounted--------', this.value)
       this.changeValue(this.value)
    
       // 设置文本框是否可编辑
@@ -345,7 +343,6 @@
       },
       // 季度选择
       clickItem(item) {
-        // console.log('select--------', item)
         if (this.viewType === 1) {
           // 选择季度
           this.$emit('change', this.formatTo([item.year, item.quarter], this.valueFormat))
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue
index 65cd0296..767693bc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/ElQuarterPicker.vue
@@ -101,7 +101,6 @@
     },
     watch: {
       value(val) {
-        // console.log('change-------', val)
         this.changeValue(val)
       },
       readonly(val) {
@@ -131,7 +130,6 @@
       }
     },
     mounted() {
-      // console.log('mounted--------', this.value)
       this.changeValue(this.value)
    
       // 设置文本框是否可编辑
@@ -345,7 +343,6 @@
       },
       // 季度选择
       clickItem(item) {
-        // console.log('select--------', item)
         if (this.viewType === 1) {
           // 选择季度
           this.$emit('change', this.formatTo([item.year, item.quarter], this.valueFormat))
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue
index 2f4af1bc..e380e36b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue
@@ -35,7 +35,6 @@ export default {
         })
           .then((result) => {
         if (result.code != 200) return;
-          // console.log(result,'-----------------')
           let sdata = [[],[],[],[],[],[],[]]
           for(let i of result.data){
             sdata[i.publishChannels-1].push(i.number)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
index 0609ad9f..422b8f73 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
@@ -20,7 +20,8 @@
         :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
     </div>
     <!-- 内容 -->
-    <Table :data="tableData" height="100%"  style="width:500">
+    <div class="body">
+    <Table :data="tableData">
         <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
           header-align="center" />
         
@@ -31,7 +32,7 @@
         </ElTableColumn>
         <ElTableColumn label="发布时间" prop="publishTime" align="center" width="200"  header-align="center" />
         <ElTableColumn label="位置/设备" prop="position" align="center" width="200"  header-align="center" />
-        <ElTableColumn label="发布内容" prop="contentDetails" align="center" header-align="center" />
+        <ElTableColumn label="发布内容" prop="contentDetails"  align="center" header-align="center" />
         <ElTableColumn label="发布人" prop="publisher" width="120" align="center" header-align="center" />
         <ElTableColumn label="发布结果" prop="status" width="140" align="center" header-align="center">
           <template slot-scope="scope">
@@ -45,7 +46,7 @@
           </template>
         </ElTableColumn>
       </Table>
-
+    </div>
     <!-- 分页 -->
     <div class="footer">
       <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
@@ -199,7 +200,7 @@ export default {
       },
     initData() {
       request({
-        url: `/business/manage/statisticsList`,
+        url: `/business/manage/statisticsList?pageNum=${this.searchData.pageNum}&pageSize=${this.searchData.pageSize}`,
         method: "post",
         data: this.searchData,
       }).then((result) => {
@@ -222,7 +223,7 @@ export default {
 <style lang='scss' scoped>
 .board_record {
   padding: 0 14px 14px;
-  width:100%;
+  width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -240,9 +241,17 @@ export default {
   }
 
   .body {
-    flex:1;
-    height: 0;
-  }
+        flex: 1;
+        position: relative;
+        overflow-y: auto;
+        overflow-x: hidden;
+        .content {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            overflow: auto;
+        }
+    }
 
   .footer {
     margin-top: 15px;