From e75da5aba41023692035f26a12e10b8514e435ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Mon, 27 May 2024 17:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A6=85=E9=81=93BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/commandDispatch/index.js     |   7 ++
 ruoyi-ui/src/api/menu.js                      |   2 +-
 ruoyi-ui/src/common/getBoardBaseData.js       |   8 +-
 .../components/Dialog/index.vue               |   2 +-
 .../components/HeaderMenu/UserArea.vue        |  19 ++-
 ruoyi-ui/src/views/JiHeExpressway/index.vue   |   5 -
 .../components/DeviceControlDialog.vue        |  93 +++++++++-----
 .../components/Dialogs/SolarEnergy/index.vue  |   2 +-
 .../components/HomeFrameControl/index.vue     |  35 ++++--
 .../Home/components/InfoBoard/InfoBoard.vue   |  50 +++-----
 .../strategy/components/AddNEditDialog.vue    |   2 +-
 .../device/strategy/components/TaskItem.vue   |   2 +-
 .../CrowdnessIndicatorRankings/index.vue      | 118 ++++++------------
 .../Cards/DeviceControl/index.vue             |   5 +-
 .../{DialogVisible => DialogProcess}/data.js  |   0
 .../index.vue                                 |  78 +++++++-----
 .../Cards/DisposalProcess/index.vue           |  52 +++++---
 .../EditEventInformationDialog/index.vue      |  13 +-
 .../Cards/EventInformation/index.vue          |   4 +-
 .../Cards/ReleaseInformation/images/1.svg     |  11 +-
 .../ReleaseInformation/images/1_blue.svg      |  11 ++
 .../Cards/ReleaseInformation/images/2.svg     |  11 +-
 .../Cards/ReleaseInformation/images/3.svg     |   8 +-
 .../Cards/ReleaseInformation/images/4.svg     |   6 -
 .../Cards/ReleaseInformation/images/5.svg     |   8 ++
 .../Cards/ReleaseInformation/index.vue        |  33 ++---
 .../event/event/EventDetailDialog/index.vue   |   4 +-
 .../pages/control/manual/events/data.js       |   3 +-
 .../pages/control/manual/events/index.vue     |  14 ---
 .../pages/datav/roadNet/index.vue             |  10 ++
 .../smart/manage/index.vue                    |   3 +-
 .../components/heightway/index.vue            |  33 +++--
 .../Cards/AuditDetails/DetailCard.vue         |  10 +-
 .../Cards/AuditDetails/index.vue              |  15 ++-
 .../components/AddNEditDialog.vue             |  12 +-
 .../components/Card.vue                       |   2 +-
 .../PublishingChannelManagement/index.vue     |   2 -
 .../pages/service/board/editInfo.vue          |   1 -
 .../pages/service/board/index.vue             |   5 +-
 .../pages/service/broadcast/editInfo.vue      |   1 -
 .../pages/service/broadcast/index.vue         |   2 +-
 .../publicService/components/record/index.vue |   9 +-
 .../utils/enum_event/PresetFormItems.js       |  10 +-
 .../JiHeExpressway/utils/enum_event/data.js   |  12 +-
 ruoyi-ui/src/views/event/event/dispatch.vue   |   1 -
 .../src/views/event/event/dispatchYuan.vue    |   1 -
 .../src/views/information/board/index.vue     |   2 +-
 ruoyi-ui/src/views/login.vue                  |   2 +-
 .../config/components/catCurveModal.vue       |   1 -
 ruoyi-ui/vue.config.js                        |  15 +--
 50 files changed, 405 insertions(+), 350 deletions(-)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/{DialogVisible => DialogProcess}/data.js (100%)
 rename ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/{DialogVisible => DialogProcess}/index.vue (94%)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1_blue.svg
 delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/4.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/5.svg

diff --git a/ruoyi-ui/src/api/commandDispatch/index.js b/ruoyi-ui/src/api/commandDispatch/index.js
index 970ec5e0..b04d2938 100644
--- a/ruoyi-ui/src/api/commandDispatch/index.js
+++ b/ruoyi-ui/src/api/commandDispatch/index.js
@@ -29,6 +29,13 @@ export function postUpdateSource(data) {
     data,
   });
 }
+// 处置过程节点
+export function getImportantFileStatus(eventId) {
+  return request({
+    url: "/business/eventImportantFile/getImportantFileStatus/" + eventId,
+    method: "get",
+  });
+}
 
 // 处置过程节点
 export function getProcessNode(eventId) {
diff --git a/ruoyi-ui/src/api/menu.js b/ruoyi-ui/src/api/menu.js
index 8fa64c51..faef101c 100644
--- a/ruoyi-ui/src/api/menu.js
+++ b/ruoyi-ui/src/api/menu.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取路由
 export const getRouters = () => {
   return request({
-    url: '/getRouters/1',
+    url: '/getRouters',
     method: 'get'
   })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/common/getBoardBaseData.js b/ruoyi-ui/src/common/getBoardBaseData.js
index 7aec0b3d..bb08b1c3 100644
--- a/ruoyi-ui/src/common/getBoardBaseData.js
+++ b/ruoyi-ui/src/common/getBoardBaseData.js
@@ -1,8 +1,6 @@
 import Vue from "vue";
 import { getDicts } from "@/api/system/dict/data";
 export default function () {
-
-
     return Promise.all([
         getDicts('iot_device_font_type'),
         getDicts('iot_board_pixel'),
@@ -26,11 +24,13 @@ export default function () {
         function initListAndDic(idx, namePrefix, labelField) {
             let dic = {};
             let list = [];
+            
             resArr[idx].data.forEach(item => {
-                dic[item.dictValue] = item[labelField];
+                let dictValue = item[labelField].substr(item[labelField].search(/\d/))
+                dic[dictValue] = item[labelField];
                 list.push({
                     label: item[labelField],
-                    value: item.dictValue
+                    value: dictValue
                 });
             });
             Vue.prototype[namePrefix + "Dic"] = dic;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
index 5deb0555..5ed780b8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@@ -190,7 +190,7 @@ export default {
     font-family: PingFang SC, PingFang SC;
     font-weight: 500;
     color: #3de8ff;
-
+    
     .title-icon {
       position: absolute;
       top: -1px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue
index 2c11a6cf..b9427dad 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue
@@ -17,7 +17,7 @@
             ><i class="menuIcon el-icon-arrow-down el-icon--right"></i>
           </p>
         </span>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu slot="dropdown" style="background-color: #102833; color:white;border: solid 1px #0b5575;">
           <el-dropdown-item>
             <router-link to="/user/profile">
               <el-dropdown-item>个人中心</el-dropdown-item>
@@ -141,6 +141,23 @@ export default {
 };
 </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>
 .operations {
   display: flex;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/index.vue
index 456f4ff9..6aa9ce68 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/index.vue
@@ -59,14 +59,9 @@ export default {
     }
   },
   mounted(){
-
-    // this.$store.commit("menu/resetRecent");
     getBoardBaseData().then(res => {
       this.isShowContent = true;
     });
-    // Promise.all()getBoardBaseData().then(()=>{
-    //   this.isShowContent = true ;
-    // });
     window.addEventListener(
       "resize",
       _.debounce(this.calcHeaderScale.bind(this), 360)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/components/DeviceControlDialog.vue
index 29470a62..eb9eee06 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/components/DeviceControlDialog.vue
@@ -6,7 +6,6 @@
         <el-select
           v-model="eventType"
           style="width: 180px"
-          @change="initData"
         >
           <el-option
             v-for="item in eventTypeOption"
@@ -24,6 +23,7 @@
             style="width: 200px"
             value-format="yyyy-MM-dd"
             type="daterange"
+            :clearable="false"
             range-separator="-"
             unlink-panels
             start-placeholder="开始日期"
@@ -32,34 +32,32 @@
         <Button @click.native="bindData" style="margin-left: 10px;"> 查询 </Button>
         <Button
             style="background-color: rgba(0, 179, 204, 0.3)"
-            @click.native="handleResetForm"
+            @click.native="initData"
           >
             重置
           </Button>
       </div>
           <div class="body">
-          <Table :data="tableData">
-            <ElTableColumn label="" width="60" />
-            <ElTableColumn prop="eventName" label="事件类型" width="240" />
-            <ElTableColumn prop="processConfig" label="处置流程" />
-            <ElTableColumn label="操作" width="210">
+          <Table :data="data"  v-loading="loading">
+            <ElTableColumn prop="typename" label="事件类型" width="110" />
+            <ElTableColumn prop="stakeMark" label="桩号" width="90"></ElTableColumn>
+            <ElTableColumn prop="remark" label="描述" />
+            <ElTableColumn label="状态" width="70">
               <template slot-scope="scope">
-                <!--<ElButton type="text" style="color: #00D1FF;" @click="showDisposal(scope.row.eventType)">流程配置</ElButton>-->
-                <ElButton
-                  type="text"
+                <span
                   style="color: #00ebc1"
-                  @click="showPhrases(scope.row)"
-                  >常用语</ElButton
+                  >{{ scope.row.stateName }}</span
                 >
               </template>
             </ElTableColumn>
+            <ElTableColumn prop="warningTime" label="发生时间" width="160" />
           </Table>
         </div>
 
     <!-- 分页 -->
     <div class="footer">
       <Pagination
-        @current-change="initData"
+        @current-change="getData"
         @size-change="onSizeChange"
         width="'100%'"
         :page-sizes="[10, 20, 30, 40, 50]"
@@ -81,6 +79,7 @@ import request from "@/utils/request";
 import Pagination from "@screen/components/Pagination.vue";
 import Table from "@screen/components/Table.vue";
 import { Message } from "element-ui";
+import { warningStateMapping, WarningSubclass } from "@screen/utils/enum.js";
 
 export default {
   name: "DeviceControlDialog",
@@ -105,18 +104,22 @@ export default {
       eventType:'all',
       eventTypeOption:[
         {key:'all',label:'全部'},
-        {key:'RADAR_TOPIC',label:'雷达目标检测事件'},
-        {key:'trafficAnalysis',label:'交通事件'},
-        {key:'timeRange',label:'交通统计'},
-        {key:'realTime',label:'交通状态数据'},
+        {key:'1-1',label:'拥堵'},
+        {key:'4-1',label:'停车'},
+        {key:'5-1',label:'逆行'},
+        {key:'5-4',label:'超速'},
+        {key:'5-5',label:'机动车低速行驶'},
+        {key:'5-6',label:'违规变道'},
+        {key:'5-7',label:'未保持安全距离'}
       ],
-      
+      loading: false,
       dateRange: [],
       searchData: {
         pageSize: 10,
-        pageIndex: 0
+        pageNum: 1
       },
-      tableData:[]
+      data: [],
+      total: 0,
     };
   },
   computed: {
@@ -140,29 +143,53 @@ export default {
     },
   },
   mounted() {
-    this.time = new Date().format('yyyy-MM-dd')
   },
   methods: {
     initData(){
-      this.dateRange = [];
+    let time = new Date().format('yyyy-MM-dd')
+    this.dateRange = [time,time];
+     this.bindData();
+    },
+    bindData(){
       this.searchData = {
         pageSize: 10,
-        pageIndex: 0
+        pageNum: 1
       }
-      this.bindData();
+      this.getData();
     },
-    async bindData() {
+    async getData() {
+      const search = { 
+        warningSource: 2 
+      };
+      if(this.dateRange && this.dateRange.length ===2){
+        search['startTime'] = this.dateRange[0]+' 00:00:00'
+        search['completeTime'] = this.dateRange[1] + ' 23:59:59'
+      }
+      if(this.eventType !== 'all'){
+        search['warningSubclass'] = this.eventType;
+      }
+      this.loading = true;
       request({
-        url: `business/device/events/history/${this.deviceId}/type/${this.eventType}`,
-        method: "get",
-        params:{
-          ...this.searchData
-        }
+        url: `perceivedEvents/warning/perceivedEventsList`,
+        method: "post",
+        params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize },
+        data: search
       }).then(res=>{
+        this.loading = false;
         if (res.code != 200) return Message.error(res?.msg);
-        console.log(res)
+          res.rows.forEach(e => {
+            e.typename = WarningSubclass[e.warningType][e.warningSubclass]
+            e.stateName = warningStateMapping[e.warningState]
+          });
+          console.log(res.rows,'--------')
+        this.data = res.rows;
+          this.total = res.total;
       })
     },
+    onSizeChange(pageSize) {
+      this.searchData.pageSize = pageSize;
+      this.getData();
+    },
 
   },
 };
@@ -170,8 +197,8 @@ export default {
 
 <style lang="scss" scoped>
 .DeviceControlDialog {
-  max-height: 78vh;
-  height: 410px;
+  
+  height: 460px;
   display: flex;
   flex-direction: column;
   gap: 15px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
index 92f756ba..a5e4e6bf 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
@@ -9,7 +9,7 @@
           <Descriptions :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">
-          <DeviceParams disabled :dialogData="dialogData" />
+          <DeviceParams disabled :dialogData="dialogData"  style="height: 180px" />
         </ElTabPane>
         <ElTabPane label="在线率统计" name="third">
           <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
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 fb4b94ad..4ffc4a95 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
@@ -11,7 +11,7 @@
       </el-tooltip>
 
       <el-tabs v-model="tabAction" @tab-click="tabClick">
-        <el-tab-pane label="批量管控" name="1">{{ }}</el-tab-pane>
+        <el-tab-pane label="批量管控" name="1"></el-tab-pane>
         <el-tab-pane label="定时管控" name="2"></el-tab-pane>
         <el-tab-pane label="管控记录" name="3"></el-tab-pane>
       </el-tabs>
@@ -21,7 +21,7 @@
           <i class="el-icon-close" />
         </span>
         <!-- 批量管控 -->
-        <div v-if="tabAction === '1'" style="width:800px; min-height: 350px;">
+        <div v-if="tabAction === '1'" style="width:1000px; min-height: 350px;">
           <!-- 通用表单 -->
           <Form v-model="data" labelWidth="90px" column="2" class="form" ref="FormConfigRef" :formList="formList" />
           <!-- 设备管控表单 -->
@@ -29,7 +29,7 @@
             :is="componentMap[DeviceTopics[data.deviceType]]" 
             :isMultiControl="true"
             :visible="true" 
-            :selectItems="data.childType" 
+            :selectItems="data.childType"
             :selectedSizeMutl="data.screenSizeName"
             @update:activeIcon="(val) => { this.activeIcon = val }"
             @update:submitting="(val) => { submitting = val }"></component>
@@ -43,7 +43,7 @@
           </div>
         </div>
         <!-- 定时管控 -->
-        <div v-if="tabAction === '2'" style="width:800px; height: 350px; overflow-y:auto" class="cardPanel">
+        <div v-if="tabAction === '2'" style="width:1000px; height: 350px; overflow-y:auto" class="cardPanel">
           <Empty v-if="!data2.length" class="no-data" style="position: absolute">暂无数据</Empty>
           <div v-else style="display: flex;width:100%;flex-direction: column;">
             <div style="height:300px;width:100%;overflow-y: auto;display: flex;flex-wrap: wrap;">
@@ -77,17 +77,21 @@
         </div>
         <!-- 管控记录 -->
         <div v-if="tabAction === '3'"
-          style="width:800px;height: 350px;display: flex;flex-direction: column; justify-content: center;align-items: flex-start;">
+          style="width:1000px;height: 350px;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 20px 0px 20px;width:95%">
             <ElTableColumn label="管控时间" prop="operTime" width="200" />
-            <ElTableColumn label="设备名称" prop="dcDeviceName" />
+            <ElTableColumn label="设备名称" prop="dcDeviceName">
+              <template slot-scope="scope">
+               {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
+              </template>
+            </ElTableColumn>
             <ElTableColumn label="管控方式" prop="operType" width="100" />
             <ElTableColumn label="操作人" prop="operName" width="100" />
-            <ElTableColumn label="执行结果" prop="remark" width="80">
+            <ElTableColumn label="执行结果" prop="remark" width="200">
               <template slot-scope="scope">
-                <el-popover placement="top-start" width="120" trigger="hover" :content="scope.row.remark || '暂无结果'">
+                <el-popover placement="top-start" width="200" trigger="hover" :content="scope.row.remark || '暂无结果'">
                   <el-button slot="reference" class="btnResult">查看</el-button>
                 </el-popover>
               </template>
@@ -493,11 +497,16 @@ export default {
   },
 
   mounted() {
-    changeHandle(this.data, this.formList);
+    const self = this;
+    setTimeout(() => {
+      changeHandle(self.data, self.formList);  
+    }, 500);
+    
   },
   methods: {
     onHide() {
-      // TODO
+      this.tabAction = -1;
+      console.log(this.data,'-------********')
     },
     submitClick() {
       this.$refs.ControlComponent?.handleSubmit();
@@ -517,8 +526,12 @@ export default {
     handleClick(type) {
       this.activeIcon = this.activeIcon === type ? null : type;
       if (this.activeIcon) {
+        this.tabAction = 0;
         this.data['deviceType'] = deviceTypeDefault;
         changeHandle(this.data, this.formList);
+        this.tabAction = '1';
+      } else {
+        this.tabAction = -1;
       }
     },
 
@@ -633,7 +646,7 @@ div.el-popper.global-input-search-popover {
   // margin-top: 6vh;
 
   .body2 {
-    width: 800px;
+    width: 1000px;
 
     .title {
       background: linear-gradient(90deg,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/InfoBoard.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/InfoBoard.vue
index 9ffbd500..5d60882c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/InfoBoard.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/InfoBoard.vue
@@ -76,15 +76,8 @@
                         {{ selectedDevice.deviceState == 1 ? "在线" : "离线" }}
                       </div>
                     </div>
-                    <!-- <div class="deviceInfo" v-for="item in tabDataInfoList" :key="item.id">
-                      <div class="deviceInfo_l">{{ item.tit }}: </div>
-                      <div class="deviceInfo_r" :style="{ 'color': item.col }"> {{ item.txt }}</div>
-                    </div> -->
                   </div>
                 </el-tab-pane>
-                <!-- <el-tab-pane label="设备参数" name="second"
-                    >设备参数</el-tab-pane
-                  > -->
                 <el-tab-pane label="在线率统计" name="third">
                   <LineChart v-if="activeTab === 'third'" :productId="selectedDevice.id" style="height: 160px" />
                 </el-tab-pane>
@@ -92,8 +85,11 @@
             </div>
             <div class="dialogContent_bottom_btn">
               <el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()">添加信息</el-button>
-              <el-button class="btnInfoBoard" type="publish" @click="____publishInfo" :disabled="selectedBdMsg.length <= 0 ||
-    (!isMultiControl && [undefined, null].indexOf(selectedDevice.iotDeviceId) !== -1)
+              <el-button class="btnInfoBoard" type="publish" @click="____publishInfo" 
+                :disabled="selectedBdMsg.length <= 0 ||
+                          (isMultiControl && selectItems.length === 0) ||
+                          (!isMultiControl && [undefined, null].indexOf(selectedDevice.iotDeviceId) !== -1
+              )
     ">发布信息</el-button>
             </div>
             <div class="sideSwitch" @click="____onShowTemplate">
@@ -260,7 +256,7 @@ export default {
       immediate: true,
     },selectedSizeMutl:{
       handler(v){
-        this.screenSize = v;
+        this.selectedSize = v;
         this.____initData();
       }
     }
@@ -281,51 +277,46 @@ export default {
   async mounted() {
     // if (this.isMultiControl) {
     //   await this.____getBoardPixel();
-    //   console.log(this.boardSizeArr, "boardSizeArr");
-    //   this.selectedSize = this.boardSizeArr?.[0]?.value;
+    // //   console.log(this.boardSizeArr, "boardSizeArr");
+    //   this.selectedSize = this.selectedSizeMutl;
     //   this.____initData();
     // }
   },
   methods: {
     // 获取信息模板分类
-    ____getTemplateCategory() {
-      return this.getDicts("iot_template_category").then((res) => {
-        this.tplCategory = res.data;
-      });
+    async ____getTemplateCategory() {
+      const res = await this.getDicts("iot_template_category");
+      this.tplCategory = res.data;
     },
     //获取全部模版
-    ____getAllTemplate() {
-      return getTemplateList().then((res) => {
-        this.templateAll = res.data;
-      });
+    async ____getAllTemplate() {
+      const res = await getTemplateList()
+      this.templateAll = res.data;
     },
     async ____getBoardPixel() {
       // this.boardSizeDic = {};
       const res = await this.getDicts("iot_board_pixel");
       res.data.forEach((item) => {
+        let dictValue = item.dictLabel.substr(item.dictLabel.search(/\d/))
         this.boardSizeArr.push({
           label: item.dictLabel,
-          value: item.dictValue
+          value: dictValue
         });
       });
 
     },
     //初始化数据
-    ____initData() {
+    async ____initData() {
       if(this.selectedDevice?.otherConfig){
         this.selectedSize = JSON.parse(this.selectedDevice.otherConfig).screenSize;
       }
       if (this.tplCategory.length && this.templateAll.length) {
         this.____setAvailableTemplate();
       } else {
-        Promise.all([
-          this.____getTemplateCategory(),
-          this.____getAllTemplate(),
-        ]).then((res) => {
-          this.____setAvailableTemplate();
-        });
+        await this.____getTemplateCategory();
+        await this.____getAllTemplate();
+        this.____setAvailableTemplate();
       }
-
       if (!this.isMultiControl){
         this.____getDeviceInfo();
       }
@@ -351,7 +342,6 @@ export default {
     ____setAvailableTemplate() {
       this.templateAvailable = [];
       this.tplCategory.forEach((item, index) => {
-        
         let arr = this.templateAll["" + index];
         if (arr.length > 0) {
           let temp = [];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
index d9285f95..51de787c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
@@ -241,7 +241,7 @@ export default {
       this.isShowTimeEdit = true;
     },
     onDeleteTaskGroup(taskG) {
-      this.$confirm("确定要删除该任务组么？", "操作确认", {
+      this.$confirm("确定要删除任务组？", "操作确认", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
index 98812695..ef3be0b5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
@@ -148,7 +148,7 @@ export default {
       // this.$emit("onModify", {devices});
     },
     onDelete(){
-      this.$confirm("确定要删除该任务么？", "操作确认", {
+      this.$confirm("确定要删除任务？", "操作确认", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
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 2d7eb518..a591730e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/index.vue
@@ -1,77 +1,43 @@
 <template>
   <Card class="CrowdnessIndicatorRankings border" title="拥挤度指标排名情况">
     <div class="map">
-      <AMapContainer
-        ref="AMapContainerRef"
-        v-if="delayLoad"
-        @update:isGisCompleted="
-          (data) => {
-            this.bindMap(data);
-          }
-        "
-        style="z-index: 9"
-      />
+      <AMapContainer ref="AMapContainerRef" v-if="delayLoad" @update:isGisCompleted="(data) => {
+          this.bindMap(data);
+        }
+        " style="z-index: 9" />
     </div>
     <div class="right border">
-      <div
-        :class="['item', { active: isActive(item) }]"
-        v-for="item in operation"
-        :key="item.key"
-        @click="handleClick(item)"
-      >
-        <div
-          v-if="['bar', 'level', 'camera'].indexOf(item.key) !== -1"
-          class="label"
-          slot="reference"
-          :style="{
-            backgroundImage: `url(${require(`./images/${item.key}${
-              isActive(item) ? '-active' : ''
-            }.svg`)})`,
-          }"
-        />
-        <ElPopover
-          v-else
-          trigger="manual"
-          :value="isActive(item)"
-          placement="left"
-          :popper-class="`popover-0`"
-          :popper-style="{ zIndex: 999 }"
-        >
+      <div :class="['item', { active: isActive(item) }]" v-for="item in operation" :key="item.key"
+        @click="handleClick(item)">
+        <el-tooltip effect="light" v-if="['bar', 'level', 'camera'].indexOf(item.key) !== -1" :content="item.label"
+          placement="left">
+          <div class="label" :style="{
+        backgroundImage: `url(${require(`./images/${item.key}${isActive(item) ? '-active' : ''
+          }.svg`)})`,
+      }"></div>
+        </el-tooltip>
+
+        <ElPopover v-else trigger="manual" :value="isActive(item)" placement="left" :popper-class="`popover-0`"
+          :popper-style="{ zIndex: 999 }">
           <div v-if="item.key === 'weather'" class="weather">
             <span>天气：{{ weatherData.text }}</span>
             <span>能见度：{{ weatherData.vis }}公里</span>
             <span>风向：{{ weatherData.windDir }}</span>
             <span>风力：{{ weatherData.windScale }}级</span>
           </div>
-          <div
-            v-else-if="item.key === 'pie'"
-            class="statistics"
-            id="statChartRef"
-          ></div>
-          <div
-            class="label"
-            
-            slot="reference"
-            :style="{
-              zIndex:999,
-              backgroundImage: `url(${require(`./images/${item.key}${
-                isActive(item) ? '-active' : ''
-              }.svg`)})`,
-            }"
-          />
+          <div v-else-if="item.key === 'pie'" class="statistics" id="statChartRef"></div>
+          <el-tooltip effect="light" slot="reference" :content="item.label" placement="left">
+            <div class="label" :style="{
+        zIndex: 999,
+        backgroundImage: `url(${require(`./images/${item.key}${isActive(item) ? '-active' : ''
+          }.svg`)})`,
+      }"></div>
+          </el-tooltip>
         </ElPopover>
       </div>
     </div>
-    <DialogBoard
-      :visible="dialogVisible"
-      @close="handledDialogBoard(false)"
-      :data="dialogData"
-    />
-    <DialogCamera
-      :visible="dialogVisibleCamera"
-      @close="handledDialogCamera(false)"
-      :data="dialogDataCamera"
-    />
+    <DialogBoard :visible="dialogVisible" @close="handledDialogBoard(false)" :data="dialogData" />
+    <DialogCamera :visible="dialogVisibleCamera" @close="handledDialogCamera(false)" :data="dialogDataCamera" />
   </Card>
 </template>
 
@@ -151,9 +117,9 @@ export default {
         if (!bool) return;
       },
     },
-    // "provideData.detail"(newValue, oldValue) {
-    //   this.provideDetail = newValue;
-    // },
+    async "provideData.detail"(newValue, oldValue) {
+      this.bindMap();
+    },
   },
   methods: {
     handleClick(item) {
@@ -342,27 +308,24 @@ export default {
     },
   },
   mounted() {
-    this.bindMap();
+    // this.bindMap();
   },
 };
 </script>
 <style>
-
 ::v-deep {
   .el-popover {
-    z-index: 99 !important; /* 请根据你的项目需求设置合适的值 */
-}
+    z-index: 99 !important;
+    /* 请根据你的项目需求设置合适的值 */
+  }
 }
 </style>
 <style lang="scss" scoped>
 .border {
   border: 1px solid;
-  border-image: linear-gradient(
-      360deg,
+  border-image: linear-gradient(360deg,
       rgba(55, 231, 255, 0.42),
-      rgba(55, 231, 255, 0)
-    )
-    1 1;
+      rgba(55, 231, 255, 0)) 1 1;
 }
 
 .CrowdnessIndicatorRankings {
@@ -384,11 +347,9 @@ export default {
     height: 100%;
     top: 0;
     width: 34px;
-    background: linear-gradient(
-      180deg,
-      rgba(25, 40, 52, 0.6) 0%,
-      rgba(28, 50, 60, 0.6) 100%
-    );
+    background: linear-gradient(180deg,
+        rgba(25, 40, 52, 0.6) 0%,
+        rgba(28, 50, 60, 0.6) 100%);
     border-right: 0;
     border-bottom: 0;
 
@@ -417,13 +378,16 @@ export default {
     }
   }
 }
+
 .weather {
   width: 435px;
+
   span {
     margin-right: 20px;
     display: inline-block;
   }
 }
+
 .statistics {
   width: 300px;
   height: 180px;
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 9e13e8f2..ed52ec15 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
@@ -14,6 +14,7 @@
     </div>
     <div class="foot">
       <ButtonGradient
+        v-if="detailData.eventState != 2"
         class="special-button"
         style="background: rgb(229, 68, 73)"
         @click.native="handleSubmit(1)"
@@ -21,6 +22,7 @@
         一键控制
       </ButtonGradient>
       <ButtonGradient
+        v-if="detailData.eventState != 2"
         class="special-button"
         style="background: rgb(250, 152, 56)"
         @click.native="handleSubmit(2)"
@@ -78,8 +80,7 @@ export default {
           let data = result.data;
           if (data.length == 0) {
             this.tableData = [{ ...defaultTableInfo }];
-            return;
-            // return Message.warning("该事件暂无处置预案");
+            return Message.warning("该事件暂无处置预案");
           }
           let dcExecuteAction = data[0].dcExecuteAction || [];
           this.planId = data[0].id;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/data.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/data.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/data.js
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/DialogProcess/index.vue
similarity index 94%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/index.vue
index 46a243d9..c97d4145 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/DialogProcess/index.vue
@@ -573,8 +573,8 @@ import FileSaver from "file-saver";
 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 { configList } from "../../EventInformation/components/EditEventInformationDialog/data.js";
+import { reportList } from "./data";
+import { formatEvent, configList } from "@screen/utils/enum_event/data.js";
 import Button from "@screen/components/Buttons/Button.vue";
 import request from "@/utils/request";
 import Pagination from "@screen/components/Pagination.vue";
@@ -591,7 +591,7 @@ import {
 import { delay, exportFile, confirm } from "@screen/utils/common";
 var moment = require("moment");
 export default {
-  name: "EventDetail",
+  name: "DialogProcessVisible",
   components: {
     Dialog,
     Form,
@@ -655,7 +655,6 @@ export default {
     "provideData.detail"(newValue, oldValue) {
       this.provideDetail = newValue;
       this.eventId = newValue.id;
-      console.log("+++++++++++++++");
       this.initData();
       this.getReportData();
       this.getImportantFileStatus();
@@ -687,37 +686,54 @@ export default {
         let numbers = info.stakeMark.match(/\d+/g).map(Number);
         info.stakeMark = numbers;
       }
-      this.fData = info;
 
-      this.formConfigList = configList[info.eventName];
 
-      await Promise.all([
-        //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
-        request({
-          url: `/business/facility/query`,
-          method: "get",
+      let _confirgList = _.cloneDeep(configList[info.eventName]);
+
+      const facilityResult = await request({ url: `/business/facility/query`,method: "get"})
+      if (facilityResult.code != 200) return Message.error(facilityResult?.msg);
+      this.lwss = [];
+      facilityResult.data.forEach((it) =>
+        this.lwss.push({
+          key: it.id,
+          label: it.facilityName,
+          type: it.facilityType,
         })
-          .then((result) => {
-            if (result.code != 200) return Message.error(result?.msg);
-            this.lwss = [];
-            result.data.forEach((it) =>
-              this.lwss.push({
-                key: it.id,
-                label: it.facilityName,
-                type: it.facilityType,
-              })
-            );
-          })
-          .catch((err) => {
-            Message.error("查询失败", err);
-          }),
-      ]);
+      );
+      
+      _confirgList.forEach(async (it) => {
+        if (it.label==='服务区:' && it.type==='select' ) { //服务区
+          it.options.options = this.lwss.filter((x) => x.type == 6);
+        }
+        if (it.label==='立交桥:' && it.type==='select' ) { //立交桥
+          it.options.options = this.lwss.filter((x) => x.type == 4);
+          let aryKey = it.key.split('.')
+          const v = info[aryKey[0]][aryKey[1]]
+          if(v){
 
-      this.formConfigList.forEach((it) => {
-        if (it.key == "dcEventServiceArea.facilityId") {
-          it.options.options = this.lwss.filter((ss) => ss.type == 6);
+            const zdResult = await request({ url: `/system/ramp/listAll?facilityId=${v}`,method: "get"})
+            if (zdResult.code != 200) return Message.error(zdResult?.msg);
+            console.log
+            let zd = [];
+            zdResult.rows.forEach((it) =>
+              zd.push({ key: it.id, label: it.rampName })
+            );
+            _confirgList.filter(x=>x.label==='匝道:' && x.type==='select').forEach(f=>{
+              f.options.options = zd
+            })
+          }
+        }
+        if (it.label==='收费站:' && it.type==='select' ) { //收费站
+          it.options.options = this.lwss.filter((x) => x.type == 1);
+        }
+        if (it.label==='停车区:' && it.type==='select' ) { //停车区
+          it.options.options = this.lwss.filter((x) => x.type == 7);
         }
+
+
       });
+      this.formConfigList = _confirgList;
+      this.fData = info;
     },
     getReportData() {
       getEventImportant(this.eventId).then((res) => {
@@ -790,11 +806,9 @@ export default {
     },
     // 获取事件状态
     getImportantFileStatus() {
-      console.log("getImportantFileStatus");
       importantFileStatus(this.eventId).then((res) => {
         this.type = res.data;
         this.$emit("update:type", this.type);
-        console.log("事件状态", res.data);
       });
     },
 
@@ -904,7 +918,7 @@ export default {
   display: flex;
   gap: 9px;
   width: 100%;
-  height: 768px;
+  height: 600px;
   flex-direction: column;
   .title {
     margin: 10px 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 5489c67f..cca59504 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
@@ -31,13 +31,7 @@
           class="title-button"
           @click="handleClick"
         >
-          {{
-            dialogType == "0"
-              ? "重要事件上报"
-              : dialogType == "1" || dialogType == "2"
-              ? "已初报待续报"
-              : "重要事件已送报"
-          }}
+          {{ENUM_ImportantFileStatus[dialogType]}}
         </ButtonGradient>
 
         <!-- <ButtonGradient class="title-button"> 路赔 </ButtonGradient> -->
@@ -122,19 +116,20 @@
         </ElSelect>
         <ButtonGradient
           v-if="detailData.eventState != 2"
+          disabled
           class="title-button special-button"
           @click="onSubmit"
         >
           发送
         </ButtonGradient>
+        <Button v-else disabled style="border:0" class="title-button special-button">发送</Button>
         <!-- <ButtonGradient class="title-button special-button">
         调度预案
       </ButtonGradient> -->
       </div>
     </Card>
-    <DialogVisible
-      v-if="dialogVisible !== null"
-      :visible="dialogVisible"
+    <DialogProcess
+      v-model="dialogProcessVisible"
       @update:value="handleClose"
       @update:type="handleUpdate"
       :eventId="eventId"
@@ -145,14 +140,16 @@
 <script>
 import Card from "@screen/components/Card2/Card.vue";
 import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
+import Button from "@screen/components/Buttons/Button.vue";
 import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
 import { getToken } from "@/utils/auth";
 import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index";
 import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index";
-import DialogVisible from "./DialogVisible/index.vue";
+import DialogProcess from "./DialogProcess/index.vue";
 import {
   getProcessNode,
   getProcessList,
+  getImportantFileStatus,
   postProcess,
   postCompleteEvent,
   postNoSkipClear,
@@ -162,6 +159,7 @@ import {
 import { timeLine2List } from "./data";
 import request from "@/utils/request";
 import { provideMixin } from "./../../mixin";
+import { result } from "lodash";
 
 export default {
   name: "DisposalProcess",
@@ -174,14 +172,14 @@ export default {
     TimeLine1,
     TimeLine2,
     RadioGroup,
-    DialogVisible,
+    DialogProcess,
   },
   emit: ["fullHeight"],
   data() {
     return {
       provideDetail: {},
-      dialogType: "",
-      dialogVisible: null,
+      dialogType: -1,
+      dialogProcessVisible: null,
       eventId: "",
       test: null,
       testRadio: "input",
@@ -203,12 +201,19 @@ export default {
       fileType: ["bmp", "gif", "jpg", "jpeg", "png", "mp4", "avi", "xmvb"],
       imageUrl: "",
       imageName: "点击上传",
+      ENUM_ImportantFileStatus: [
+        '重要事件上报',
+        '已初报待续报',
+        '已续报待终报',
+        '重要事件已报送'
+      ],
     };
   },
   watch: {
     processId(newVlaue, oldValue) {
       if(newVlaue === ''){
         this.processName = ''
+        this.processType = ''
       }
       this.options.forEach((element) => {
         if (newVlaue == element.nodeNode) {
@@ -234,9 +239,11 @@ export default {
       this.provideDetail = newValue;
       this.eventId = newValue.id;
       this.getProcess();
+      this.getImportantStatus();
       await this.disposalRecords(this.eventId);
+      // 获取重要事件状态
 
-      // console.log("建亭侯", this.provideDetail);
+      
     },
   },
   methods: {
@@ -250,6 +257,15 @@ export default {
       this.$emit("fullHeight", "CrowdnessIndicatorRankings");
     },
 
+    // 
+    getImportantStatus(){
+      getImportantFileStatus(this.eventId).then(result=>{
+        if (result.code === 200){
+          this.dialogType = result.data
+        };
+      })
+    },
+
     // 处置过程节点
     getProcess() {
       getProcessNode(this.eventId).then((result) => {
@@ -338,6 +354,7 @@ export default {
           this.disposalRecords(this.eventId);
           this.processId = "";
           this.processName = "";
+          this.processType = "";
           this.testRadio = "input";
           this.context = "";
           this.imageUrl = "";
@@ -390,14 +407,13 @@ export default {
     },
 
     handleClick() {
-      this.dialogVisible = true;
+      this.dialogProcessVisible = true;
     },
     handleClose() {
-      this.dialogVisible = false;
+      this.dialogProcessVisible = false;
     },
     handleUpdate(val) {
       this.dialogType = val;
-      console.log("传过来的状态", val);
     },
   },
   async mounted() {
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 3a414207..2b46b281 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
@@ -73,14 +73,13 @@ export default {
         info.stakeMark = numbers;
       }
       if (typeof info.lang == "string") {
-        info.lang = info.lang.split(",");
+        info.lang = info.lang.split(",")
       }
 
       for(let i in info){
         if(typeof info[i] === 'object' && info[i]){
-          
           for(let j in info[i]){
-            if(j === 'rampId'){
+            if(j === 'rampId' && info[i][j] !== null){
               let aryZd = info[i][j].split(',');
               let numZd = []
               aryZd.forEach(e => {
@@ -90,13 +89,10 @@ export default {
             }
           }
         }
-        
       }
 
-      //==================
-
+      //修改事件信息===============开始
       let _confirgList = _.cloneDeep(configList[info.eventName]);
-
       const facilityResult = await request({ url: `/business/facility/query`,method: "get"})
       if (facilityResult.code != 200) return Message.error(facilityResult?.msg);
       this.lwss = [];
@@ -140,7 +136,6 @@ export default {
 
       });
       this.formConfigList = _confirgList;
-      console.log(info,'---------------')
       this.fData = info;
     },
     onSubmit() {
@@ -151,7 +146,7 @@ export default {
         formData.eventType = eventType;
 
         let f = formatEvent(formData);
-
+        console.log(f,'-------')
         request({
           url: `/dc/system/event`,
           method: "put",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue
index a8558788..47809633 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/index.vue
@@ -21,13 +21,13 @@
         <img
           v-if="
             i != 6 &&
-            (!detailData.lang || !detailData.lang.includes(i.toString()))
+            (!detailData.lang || !detailData.lang.includes((i-1).toString()))
           "
           src="./images/normal.svg"
         />
         <img
           v-if="
-            i != 6 && detailData.lang && detailData.lang.includes(i.toString())
+            i != 6 && detailData.lang && detailData.lang.includes((i-1).toString())
           "
           src="./images/congestion.svg"
         />
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1.svg
index 95bef83b..3d20f936 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1.svg
@@ -1,8 +1,11 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814980">
-<g id="&#195;&#165;&#194;&#190;&#194;&#174;&#195;&#164;&#194;&#191;&#194;&#161;">
-<path id="Rectangle 3686" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#10C95A"/>
-<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M2.18164 6.54635C2.18164 4.58717 4.03574 3.04395 6.30022 3.04395C8.32491 3.04395 10.1005 4.27692 10.4547 5.93264C10.3232 5.91747 10.1909 5.90943 10.0585 5.90853C8.10179 5.90853 6.55671 7.36834 6.55671 9.16682C6.55768 9.45984 6.60055 9.75118 6.68403 10.0321C6.55671 10.0419 6.42878 10.0488 6.2996 10.0488C5.86702 10.0488 5.50712 9.97475 5.09826 9.89067C5.01996 9.8746 4.93986 9.85809 4.85712 9.84173L3.4171 10.5635L3.82932 9.32747C2.79968 8.60566 2.18164 7.67736 2.18164 6.54635ZM4.34414 5.30966C4.34414 5.61806 4.65316 5.8251 4.96218 5.8251C5.27058 5.8251 5.47638 5.6193 5.47638 5.31028C5.47638 5.00126 5.2712 4.79545 4.96218 4.79545C4.65316 4.79545 4.34414 5.00126 4.34414 5.30966ZM7.22604 5.30966C7.22604 5.61806 7.53502 5.8251 7.84404 5.8251C8.1543 5.8251 8.35953 5.6193 8.35953 5.31028C8.35953 5.00126 8.15306 4.79545 7.84404 4.79545C7.53502 4.79545 7.22604 5.00126 7.22604 5.30966ZM10.3193 6.13286C12.1697 6.13286 13.8168 7.47525 13.8168 9.12042L13.818 9.11984C13.818 10.0487 13.2024 10.8726 12.3761 11.4906L12.6851 12.5203L11.5554 11.9022C11.1425 12.0054 10.7291 12.1086 10.3193 12.1086C8.36142 12.1086 6.8163 10.7657 6.8163 9.12042C6.8163 7.47525 8.35953 6.13286 10.3193 6.13286ZM9.01895 8.57896C9.0708 8.59867 9.12608 8.60776 9.1815 8.60565C9.49299 8.60565 9.69699 8.39918 9.69699 8.19402C9.69699 7.98885 9.49051 7.7818 9.1815 7.7818C9.12608 7.77962 9.0708 7.78871 9.01895 7.80842C8.9671 7.8282 8.91975 7.85816 8.87975 7.89664C8.83982 7.93511 8.80797 7.98122 8.78622 8.03227C8.76455 8.08333 8.75335 8.13824 8.75335 8.19373C8.75335 8.24915 8.76455 8.30405 8.78622 8.35511C8.80797 8.40616 8.83982 8.45235 8.87975 8.49075C8.91975 8.52922 8.9671 8.55925 9.01895 8.57896ZM11.1655 8.47947C11.2394 8.55627 11.3401 8.60151 11.4466 8.60565C11.7556 8.60565 11.9621 8.39918 11.9621 8.19402C11.9621 7.98885 11.7556 7.7818 11.4466 7.7818C11.3401 7.78587 11.2394 7.83111 11.1655 7.90791C11.0916 7.98471 11.0504 8.08711 11.0504 8.19373C11.0504 8.30027 11.0916 8.40267 11.1655 8.47947Z" fill="white"/>
+<g id="Group 1142814973">
+<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;">
+<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#A2C847"/>
+<g id="Group 1142814681">
+<path id="Vector 553" d="M4.72656 12.0228V9.81738H8.82896L5.30054 12.3195C5.05974 12.4902 4.72656 12.318 4.72656 12.0228Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1_blue.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1_blue.svg
new file mode 100644
index 00000000..53329e6a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/1_blue.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814973">
+<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;">
+<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
+<g id="Group 1142814681">
+<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/2.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/2.svg
index 53329e6a..95bef83b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/2.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/2.svg
@@ -1,11 +1,8 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814973">
-<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;">
-<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
-<g id="Group 1142814681">
-<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
-</g>
+<g id="Group 1142814980">
+<g id="&#195;&#165;&#194;&#190;&#194;&#174;&#195;&#164;&#194;&#191;&#194;&#161;">
+<path id="Rectangle 3686" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#10C95A"/>
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M2.18164 6.54635C2.18164 4.58717 4.03574 3.04395 6.30022 3.04395C8.32491 3.04395 10.1005 4.27692 10.4547 5.93264C10.3232 5.91747 10.1909 5.90943 10.0585 5.90853C8.10179 5.90853 6.55671 7.36834 6.55671 9.16682C6.55768 9.45984 6.60055 9.75118 6.68403 10.0321C6.55671 10.0419 6.42878 10.0488 6.2996 10.0488C5.86702 10.0488 5.50712 9.97475 5.09826 9.89067C5.01996 9.8746 4.93986 9.85809 4.85712 9.84173L3.4171 10.5635L3.82932 9.32747C2.79968 8.60566 2.18164 7.67736 2.18164 6.54635ZM4.34414 5.30966C4.34414 5.61806 4.65316 5.8251 4.96218 5.8251C5.27058 5.8251 5.47638 5.6193 5.47638 5.31028C5.47638 5.00126 5.2712 4.79545 4.96218 4.79545C4.65316 4.79545 4.34414 5.00126 4.34414 5.30966ZM7.22604 5.30966C7.22604 5.61806 7.53502 5.8251 7.84404 5.8251C8.1543 5.8251 8.35953 5.6193 8.35953 5.31028C8.35953 5.00126 8.15306 4.79545 7.84404 4.79545C7.53502 4.79545 7.22604 5.00126 7.22604 5.30966ZM10.3193 6.13286C12.1697 6.13286 13.8168 7.47525 13.8168 9.12042L13.818 9.11984C13.818 10.0487 13.2024 10.8726 12.3761 11.4906L12.6851 12.5203L11.5554 11.9022C11.1425 12.0054 10.7291 12.1086 10.3193 12.1086C8.36142 12.1086 6.8163 10.7657 6.8163 9.12042C6.8163 7.47525 8.35953 6.13286 10.3193 6.13286ZM9.01895 8.57896C9.0708 8.59867 9.12608 8.60776 9.1815 8.60565C9.49299 8.60565 9.69699 8.39918 9.69699 8.19402C9.69699 7.98885 9.49051 7.7818 9.1815 7.7818C9.12608 7.77962 9.0708 7.78871 9.01895 7.80842C8.9671 7.8282 8.91975 7.85816 8.87975 7.89664C8.83982 7.93511 8.80797 7.98122 8.78622 8.03227C8.76455 8.08333 8.75335 8.13824 8.75335 8.19373C8.75335 8.24915 8.76455 8.30405 8.78622 8.35511C8.80797 8.40616 8.83982 8.45235 8.87975 8.49075C8.91975 8.52922 8.9671 8.55925 9.01895 8.57896ZM11.1655 8.47947C11.2394 8.55627 11.3401 8.60151 11.4466 8.60565C11.7556 8.60565 11.9621 8.39918 11.9621 8.19402C11.9621 7.98885 11.7556 7.7818 11.4466 7.7818C11.3401 7.78587 11.2394 7.83111 11.1655 7.90791C11.0916 7.98471 11.0504 8.08711 11.0504 8.19373C11.0504 8.30027 11.0916 8.40267 11.1655 8.47947Z" fill="white"/>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/3.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/3.svg
index 6732973f..17a8d944 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/3.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/3.svg
@@ -1,8 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814974">
-<g id="&#195;&#167;&#194;&#189;&#194;&#145;&#195;&#167;&#194;&#171;&#194;&#153;-&#195;&#167;&#194;&#129;&#194;&#176;">
-<path id="Rectangle 3689" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#5981E3"/>
-<path id="Vector" d="M8.00009 2.90918C6.9932 2.90918 6.00892 3.20775 5.17173 3.76715C4.33454 4.32655 3.68202 5.12164 3.29671 6.05189C2.91138 6.98213 2.81057 8.00576 3.007 8.99325C3.20343 9.98082 3.6883 10.8879 4.40028 11.5999C5.11225 12.3119 6.01936 12.7967 7.0069 12.9932C7.99442 13.1896 9.01805 13.0888 9.94831 12.7035C10.8786 12.3181 11.6736 11.6656 12.233 10.8285C12.7925 9.99122 13.091 9.007 13.091 8.00009C13.091 6.64989 12.5546 5.35501 11.5999 4.40027C10.6452 3.44554 9.35027 2.90918 8.00009 2.90918ZM5.96644 4.08701C6.18891 3.97024 6.42112 3.87303 6.66044 3.79649C6.38277 4.2212 6.16872 4.68423 6.02509 5.1709C5.77204 5.00799 5.62434 4.81576 5.62434 4.60615C5.62434 4.41609 5.75412 4.2396 5.96644 4.08701ZM4.97867 4.79295C5.05741 5.19099 5.36965 5.54885 5.85675 5.81656C5.7244 6.42362 5.64932 7.04177 5.63248 7.66285H3.6048C3.68792 6.56735 4.17802 5.54259 4.97867 4.79023V4.79295ZM4.97867 11.2127C4.17851 10.4608 3.68845 9.43696 3.6048 8.3422H5.63194C5.64894 8.96329 5.7242 9.58147 5.85675 10.1885C5.36965 10.4524 5.05741 10.8119 4.97867 11.2099V11.2127ZM5.96644 11.9159C5.75412 11.7633 5.62434 11.5868 5.62434 11.3967C5.62434 11.1871 5.77204 10.9927 6.02509 10.8314C6.16872 11.3183 6.38277 11.7815 6.66044 12.2064C6.42113 12.1298 6.18892 12.0326 5.96644 11.9159ZM7.66067 12.3258C7.23442 12.1016 6.86733 11.457 6.62242 10.5703C6.96021 10.4694 7.30867 10.4087 7.66067 10.3894V12.3226V12.3258ZM7.66067 9.71929C7.25839 9.74198 6.8605 9.81493 6.47635 9.93653C6.3792 9.41122 6.32364 8.879 6.31018 8.34489H7.66067V9.71929ZM7.66067 7.66394H6.31018C6.32364 7.12987 6.3792 6.59768 6.47635 6.07233C6.86065 6.19335 7.25846 6.26631 7.66067 6.28954V7.66394ZM7.66067 5.61347C7.30896 5.59443 6.96052 5.53485 6.62242 5.4359C6.86733 4.54479 7.23442 3.90238 7.66067 3.67703V5.61347ZM11.0215 4.79349C11.8219 5.54501 12.3117 6.56914 12.3943 7.66394H10.3677C10.3507 7.04284 10.2754 6.42469 10.1429 5.81765C10.6316 5.55102 10.9428 5.19207 11.0215 4.79349ZM10.0338 4.08701C10.2461 4.2396 10.3759 4.41554 10.3759 4.60615C10.3759 4.81576 10.2276 5.00908 9.97507 5.1709C9.83151 4.68412 9.61725 4.22105 9.33922 3.79649C9.57871 3.87305 9.81107 3.97026 10.0338 4.08701ZM8.33951 3.67703C8.76627 3.90238 9.13391 4.54587 9.37776 5.43264C9.03965 5.53177 8.69129 5.59154 8.33951 5.61076V3.67703ZM8.33951 6.28357C8.74176 6.26061 9.13958 6.18765 9.5238 6.06636C9.62074 6.59156 9.67631 7.12355 9.68998 7.65747H8.33951V6.28357ZM8.33951 8.33842H9.68998C9.67623 8.87267 9.62067 9.40496 9.5238 9.93056C9.13958 9.80925 8.74176 9.73623 8.33951 9.71333V8.33842ZM8.33951 12.3221V10.3894C8.69129 10.4077 9.03972 10.4671 9.37776 10.5664C9.13391 11.4549 8.76627 12.0989 8.33951 12.3231V12.3221ZM10.0338 11.9121C9.81121 12.0289 9.579 12.1263 9.33972 12.2031C9.61754 11.7782 9.83194 11.315 9.97616 10.8282C10.2287 10.9911 10.3764 11.1839 10.3764 11.3935C10.3759 11.5841 10.2461 11.7606 10.0338 11.9132V11.9121ZM11.0215 11.2089C10.9428 10.8103 10.63 10.4519 10.1429 10.1853C10.2754 9.5782 10.3507 8.96009 10.3677 8.33893H12.3949C12.3118 9.43376 11.8218 10.4573 11.0215 11.2089Z" fill="white"/>
-</g>
+<g id="Group 1142814981">
+<path id="Rectangle 3687" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#E94D4E"/>
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M10.5526 2.9168C10.5526 2.9168 12.0718 2.76339 13.2039 3.83331L13.203 3.83577C14.335 4.90816 13.9808 6.68396 13.9808 6.68396C13.9631 6.82268 13.8958 6.95031 13.7914 7.04332C13.6995 7.12513 13.5844 7.1753 13.4628 7.18729C13.4555 7.18643 13.448 7.18537 13.4407 7.18414C13.3277 7.16428 13.2272 7.1004 13.1613 7.00653C13.0954 6.91267 13.0694 6.79648 13.089 6.68346C13.089 6.68346 13.3677 5.60466 12.6885 4.63044C12.0092 3.65622 10.5501 3.82443 10.5501 3.82443C10.4837 3.82527 10.4178 3.81297 10.3563 3.7882C10.2947 3.76345 10.2385 3.72673 10.1912 3.68018C10.1439 3.63364 10.1062 3.57817 10.0805 3.51699C10.0616 3.4722 10.0493 3.42501 10.044 3.37689C10.0567 3.26081 10.1084 3.15185 10.1916 3.06843C10.2873 2.97243 10.417 2.91796 10.5526 2.9168ZM10.044 3.37689C10.0421 3.39438 10.0411 3.41205 10.0411 3.4298V3.32375C10.0411 3.34154 10.0421 3.35928 10.044 3.37689ZM13.4995 7.19006H13.4125C13.4294 7.18986 13.4462 7.18894 13.4628 7.18729C13.475 7.18872 13.4872 7.18964 13.4995 7.19006ZM13.5295 7.19006H13.4995C13.5095 7.19039 13.5195 7.19039 13.5295 7.19006ZM12.0511 4.94465C11.8736 4.78314 11.6603 4.66613 11.4288 4.60326C11.1972 4.5404 10.954 4.53348 10.7192 4.58308C10.6268 4.59756 10.5423 4.64398 10.4805 4.71426C10.4292 4.77262 10.3962 4.84438 10.385 4.92061C10.3823 4.90364 10.3809 4.88644 10.3809 4.86917V4.96783C10.3814 4.95196 10.3827 4.93619 10.385 4.92061C10.3892 4.94698 10.3966 4.9728 10.4071 4.99749C10.4243 5.03807 10.4496 5.07478 10.4812 5.10542C10.5129 5.13607 10.5505 5.16003 10.5916 5.17588C10.6328 5.19173 10.6767 5.19915 10.7208 5.19769C10.7208 5.19769 11.3107 5.10693 11.6397 5.50156C11.9688 5.89617 11.7339 6.42793 11.7339 6.42793C11.6821 6.60896 11.7922 6.75448 11.983 6.75448H12.0171C12.1122 6.75294 12.2038 6.71862 12.2766 6.65733C12.3492 6.59604 12.3986 6.51152 12.4161 6.41806C12.4161 6.41806 12.6712 5.50156 12.0521 4.94366L12.0511 4.94465ZM8.95728 9.04081C8.77822 8.11492 7.73102 7.5398 6.61965 7.75536C5.50829 7.97092 4.7521 8.89776 4.93215 9.82365C5.11219 10.7495 6.15992 11.3262 7.27077 11.1096C8.38164 10.8931 9.13786 9.96765 8.95728 9.04081ZM6.51902 10.1917C6.17718 10.351 5.80328 10.272 5.6839 10.0155C5.56453 9.759 5.74408 9.42358 6.08642 9.26278C6.42875 9.10198 6.80118 9.1814 6.92203 9.4379C7.04288 9.69441 6.86086 10.0298 6.51902 10.1917ZM7.30826 9.41223C7.24069 9.41165 7.17479 9.39107 7.11888 9.3531C7.06298 9.31514 7.01956 9.26147 6.99411 9.19892C6.96865 9.1363 6.96229 9.06758 6.97583 9.00132C6.98937 8.93514 7.02221 8.87441 7.0702 8.82685C7.11819 8.77921 7.1792 8.74692 7.24552 8.73398C7.31182 8.72096 7.38055 8.72794 7.44288 8.7539C7.50528 8.77994 7.55859 8.8238 7.59604 8.88001C7.63357 8.9363 7.65357 9.00234 7.65357 9.0699C7.65357 9.11514 7.64462 9.15987 7.62724 9.20161C7.60986 9.24336 7.58433 9.28118 7.55226 9.31303C7.52011 9.34489 7.48208 9.37005 7.44019 9.38707C7.3983 9.40409 7.3535 9.41267 7.30826 9.41223ZM10.839 7.23664C10.7891 7.30576 10.7543 7.35376 10.7543 7.37303C10.7543 7.39354 10.8354 7.4099 10.9649 7.43601C11.4782 7.53943 12.7516 7.79616 12.7516 9.0699C12.7516 10.9582 10.4031 12.4874 7.47793 12.4874C4.55283 12.4874 2.18164 10.9567 2.18164 9.0699C2.18164 7.18313 5.73323 4.20374 7.09172 4.20374C7.66099 4.20374 8.77822 4.62894 7.99735 5.97263C7.98506 5.99406 8.06753 5.9663 8.21415 5.91697C8.71902 5.74709 9.98404 5.32142 10.7543 5.76792C11.5624 6.23637 11.0564 6.93602 10.839 7.23664ZM3.9234 9.71412C4.09408 10.9316 5.74704 11.703 7.61604 11.4406C9.48462 11.1782 10.8638 9.98547 10.6922 8.76801C10.5205 7.55063 8.86753 6.77865 6.99849 7.04156C5.12947 7.30445 3.75273 8.49674 3.9234 9.71412Z" fill="white"/>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/4.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/4.svg
deleted file mode 100644
index 17a8d944..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/4.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814981">
-<path id="Rectangle 3687" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#E94D4E"/>
-<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M10.5526 2.9168C10.5526 2.9168 12.0718 2.76339 13.2039 3.83331L13.203 3.83577C14.335 4.90816 13.9808 6.68396 13.9808 6.68396C13.9631 6.82268 13.8958 6.95031 13.7914 7.04332C13.6995 7.12513 13.5844 7.1753 13.4628 7.18729C13.4555 7.18643 13.448 7.18537 13.4407 7.18414C13.3277 7.16428 13.2272 7.1004 13.1613 7.00653C13.0954 6.91267 13.0694 6.79648 13.089 6.68346C13.089 6.68346 13.3677 5.60466 12.6885 4.63044C12.0092 3.65622 10.5501 3.82443 10.5501 3.82443C10.4837 3.82527 10.4178 3.81297 10.3563 3.7882C10.2947 3.76345 10.2385 3.72673 10.1912 3.68018C10.1439 3.63364 10.1062 3.57817 10.0805 3.51699C10.0616 3.4722 10.0493 3.42501 10.044 3.37689C10.0567 3.26081 10.1084 3.15185 10.1916 3.06843C10.2873 2.97243 10.417 2.91796 10.5526 2.9168ZM10.044 3.37689C10.0421 3.39438 10.0411 3.41205 10.0411 3.4298V3.32375C10.0411 3.34154 10.0421 3.35928 10.044 3.37689ZM13.4995 7.19006H13.4125C13.4294 7.18986 13.4462 7.18894 13.4628 7.18729C13.475 7.18872 13.4872 7.18964 13.4995 7.19006ZM13.5295 7.19006H13.4995C13.5095 7.19039 13.5195 7.19039 13.5295 7.19006ZM12.0511 4.94465C11.8736 4.78314 11.6603 4.66613 11.4288 4.60326C11.1972 4.5404 10.954 4.53348 10.7192 4.58308C10.6268 4.59756 10.5423 4.64398 10.4805 4.71426C10.4292 4.77262 10.3962 4.84438 10.385 4.92061C10.3823 4.90364 10.3809 4.88644 10.3809 4.86917V4.96783C10.3814 4.95196 10.3827 4.93619 10.385 4.92061C10.3892 4.94698 10.3966 4.9728 10.4071 4.99749C10.4243 5.03807 10.4496 5.07478 10.4812 5.10542C10.5129 5.13607 10.5505 5.16003 10.5916 5.17588C10.6328 5.19173 10.6767 5.19915 10.7208 5.19769C10.7208 5.19769 11.3107 5.10693 11.6397 5.50156C11.9688 5.89617 11.7339 6.42793 11.7339 6.42793C11.6821 6.60896 11.7922 6.75448 11.983 6.75448H12.0171C12.1122 6.75294 12.2038 6.71862 12.2766 6.65733C12.3492 6.59604 12.3986 6.51152 12.4161 6.41806C12.4161 6.41806 12.6712 5.50156 12.0521 4.94366L12.0511 4.94465ZM8.95728 9.04081C8.77822 8.11492 7.73102 7.5398 6.61965 7.75536C5.50829 7.97092 4.7521 8.89776 4.93215 9.82365C5.11219 10.7495 6.15992 11.3262 7.27077 11.1096C8.38164 10.8931 9.13786 9.96765 8.95728 9.04081ZM6.51902 10.1917C6.17718 10.351 5.80328 10.272 5.6839 10.0155C5.56453 9.759 5.74408 9.42358 6.08642 9.26278C6.42875 9.10198 6.80118 9.1814 6.92203 9.4379C7.04288 9.69441 6.86086 10.0298 6.51902 10.1917ZM7.30826 9.41223C7.24069 9.41165 7.17479 9.39107 7.11888 9.3531C7.06298 9.31514 7.01956 9.26147 6.99411 9.19892C6.96865 9.1363 6.96229 9.06758 6.97583 9.00132C6.98937 8.93514 7.02221 8.87441 7.0702 8.82685C7.11819 8.77921 7.1792 8.74692 7.24552 8.73398C7.31182 8.72096 7.38055 8.72794 7.44288 8.7539C7.50528 8.77994 7.55859 8.8238 7.59604 8.88001C7.63357 8.9363 7.65357 9.00234 7.65357 9.0699C7.65357 9.11514 7.64462 9.15987 7.62724 9.20161C7.60986 9.24336 7.58433 9.28118 7.55226 9.31303C7.52011 9.34489 7.48208 9.37005 7.44019 9.38707C7.3983 9.40409 7.3535 9.41267 7.30826 9.41223ZM10.839 7.23664C10.7891 7.30576 10.7543 7.35376 10.7543 7.37303C10.7543 7.39354 10.8354 7.4099 10.9649 7.43601C11.4782 7.53943 12.7516 7.79616 12.7516 9.0699C12.7516 10.9582 10.4031 12.4874 7.47793 12.4874C4.55283 12.4874 2.18164 10.9567 2.18164 9.0699C2.18164 7.18313 5.73323 4.20374 7.09172 4.20374C7.66099 4.20374 8.77822 4.62894 7.99735 5.97263C7.98506 5.99406 8.06753 5.9663 8.21415 5.91697C8.71902 5.74709 9.98404 5.32142 10.7543 5.76792C11.5624 6.23637 11.0564 6.93602 10.839 7.23664ZM3.9234 9.71412C4.09408 10.9316 5.74704 11.703 7.61604 11.4406C9.48462 11.1782 10.8638 9.98547 10.6922 8.76801C10.5205 7.55063 8.86753 6.77865 6.99849 7.04156C5.12947 7.30445 3.75273 8.49674 3.9234 9.71412Z" fill="white"/>
-</g>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/5.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/5.svg
new file mode 100644
index 00000000..6732973f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/5.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814974">
+<g id="&#195;&#167;&#194;&#189;&#194;&#145;&#195;&#167;&#194;&#171;&#194;&#153;-&#195;&#167;&#194;&#129;&#194;&#176;">
+<path id="Rectangle 3689" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#5981E3"/>
+<path id="Vector" d="M8.00009 2.90918C6.9932 2.90918 6.00892 3.20775 5.17173 3.76715C4.33454 4.32655 3.68202 5.12164 3.29671 6.05189C2.91138 6.98213 2.81057 8.00576 3.007 8.99325C3.20343 9.98082 3.6883 10.8879 4.40028 11.5999C5.11225 12.3119 6.01936 12.7967 7.0069 12.9932C7.99442 13.1896 9.01805 13.0888 9.94831 12.7035C10.8786 12.3181 11.6736 11.6656 12.233 10.8285C12.7925 9.99122 13.091 9.007 13.091 8.00009C13.091 6.64989 12.5546 5.35501 11.5999 4.40027C10.6452 3.44554 9.35027 2.90918 8.00009 2.90918ZM5.96644 4.08701C6.18891 3.97024 6.42112 3.87303 6.66044 3.79649C6.38277 4.2212 6.16872 4.68423 6.02509 5.1709C5.77204 5.00799 5.62434 4.81576 5.62434 4.60615C5.62434 4.41609 5.75412 4.2396 5.96644 4.08701ZM4.97867 4.79295C5.05741 5.19099 5.36965 5.54885 5.85675 5.81656C5.7244 6.42362 5.64932 7.04177 5.63248 7.66285H3.6048C3.68792 6.56735 4.17802 5.54259 4.97867 4.79023V4.79295ZM4.97867 11.2127C4.17851 10.4608 3.68845 9.43696 3.6048 8.3422H5.63194C5.64894 8.96329 5.7242 9.58147 5.85675 10.1885C5.36965 10.4524 5.05741 10.8119 4.97867 11.2099V11.2127ZM5.96644 11.9159C5.75412 11.7633 5.62434 11.5868 5.62434 11.3967C5.62434 11.1871 5.77204 10.9927 6.02509 10.8314C6.16872 11.3183 6.38277 11.7815 6.66044 12.2064C6.42113 12.1298 6.18892 12.0326 5.96644 11.9159ZM7.66067 12.3258C7.23442 12.1016 6.86733 11.457 6.62242 10.5703C6.96021 10.4694 7.30867 10.4087 7.66067 10.3894V12.3226V12.3258ZM7.66067 9.71929C7.25839 9.74198 6.8605 9.81493 6.47635 9.93653C6.3792 9.41122 6.32364 8.879 6.31018 8.34489H7.66067V9.71929ZM7.66067 7.66394H6.31018C6.32364 7.12987 6.3792 6.59768 6.47635 6.07233C6.86065 6.19335 7.25846 6.26631 7.66067 6.28954V7.66394ZM7.66067 5.61347C7.30896 5.59443 6.96052 5.53485 6.62242 5.4359C6.86733 4.54479 7.23442 3.90238 7.66067 3.67703V5.61347ZM11.0215 4.79349C11.8219 5.54501 12.3117 6.56914 12.3943 7.66394H10.3677C10.3507 7.04284 10.2754 6.42469 10.1429 5.81765C10.6316 5.55102 10.9428 5.19207 11.0215 4.79349ZM10.0338 4.08701C10.2461 4.2396 10.3759 4.41554 10.3759 4.60615C10.3759 4.81576 10.2276 5.00908 9.97507 5.1709C9.83151 4.68412 9.61725 4.22105 9.33922 3.79649C9.57871 3.87305 9.81107 3.97026 10.0338 4.08701ZM8.33951 3.67703C8.76627 3.90238 9.13391 4.54587 9.37776 5.43264C9.03965 5.53177 8.69129 5.59154 8.33951 5.61076V3.67703ZM8.33951 6.28357C8.74176 6.26061 9.13958 6.18765 9.5238 6.06636C9.62074 6.59156 9.67631 7.12355 9.68998 7.65747H8.33951V6.28357ZM8.33951 8.33842H9.68998C9.67623 8.87267 9.62067 9.40496 9.5238 9.93056C9.13958 9.80925 8.74176 9.73623 8.33951 9.71333V8.33842ZM8.33951 12.3221V10.3894C8.69129 10.4077 9.03972 10.4671 9.37776 10.5664C9.13391 11.4549 8.76627 12.0989 8.33951 12.3231V12.3221ZM10.0338 11.9121C9.81121 12.0289 9.579 12.1263 9.33972 12.2031C9.61754 11.7782 9.83194 11.315 9.97616 10.8282C10.2287 10.9911 10.3764 11.1839 10.3764 11.3935C10.3759 11.5841 10.2461 11.7606 10.0338 11.9132V11.9121ZM11.0215 11.2089C10.9428 10.8103 10.63 10.4519 10.1429 10.1853C10.2754 9.5782 10.3507 8.96009 10.3677 8.33893H12.3949C12.3118 9.43376 11.8218 10.4573 11.0215 11.2089Z" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
index 4b935a94..ad9a9a5b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/index.vue
@@ -2,7 +2,7 @@
   <Card class="ReleaseInformation" title="信息发布">
     <Form :formList="formList" column="1" ref="FormMsgRef">
       <template #type="{ formData, data }">
-        <CheckboxGroup :options="checkboxList" v-model="formData[data.key]">
+        <CheckboxGroup :options="checkboxList" v-model="checkboxValues">
           <template v-for="item in checkboxList" #[item.key]="{ data }">
             <div class="checkbox-content">
               <img :src="require(`./images/${item.key}.svg`)" />
@@ -12,7 +12,6 @@
         </CheckboxGroup>
       </template>
     </Form>
-
     <!-- <div class="line"></div>
 
     <Descriptions :list="list" style="flex: 1;" column="1" titleStyle="align-self: flex-start;">
@@ -72,6 +71,7 @@ export default {
   },
   data() {
     return {
+      
       list: [
         {
           label: "情报板",
@@ -80,11 +80,12 @@ export default {
         },
       ],
       checkboxValues: [],
+      formData:{},
       checkboxList: [
-        { key: "1", label: "微信" },
-        { key: "2", label: "短信" },
-        { key: "3", label: "网站" },
-        { key: "4", label: "新浪" },
+        { key: "2", label: "微信" },
+        { key: "1", label: "短信" },
+        { key: "5", label: "网站" },
+        { key: "3", label: "新浪" },
       ],
       submitting: false,
       formList: [
@@ -122,6 +123,9 @@ export default {
         })
           .then((result) => {
             // console.log(result,'信息发布：eventPublishChannels')
+            if(result.code === 200 && result.data && result.data.publishChannels.length > 0){
+              this.checkboxValues = result.data.publishChannels.split(',')
+            }
         })
       }, 1000);
       
@@ -129,25 +133,26 @@ export default {
     async handleSubmit() {
       await this.$refs.FormMsgRef.validate()
         .then(async (res) => {
-          const { content, type } = res;
-          if (content === null) {
+          let data = _.cloneDeep(res);
+          data.type = this.checkboxValues;
+
+          if (data.content === null) {
             this.$message.warning(`未输入发布内容`);
             return;
           }
-          if (type.length === 0) {
+          if (data.type.length === 0) {
             this.$message.warning(`未选择发布平台`);
             return;
           }
-          if (type.indexOf("1") !== -1) {
-            res.phone = "13589019062";
+          if (data.type.indexOf("1") !== -1) {
+            data.phone = "13589019062";
           }
-          res.eventId = this.detailData.id;
+          data.eventId = this.detailData.id;
           this.submitting = true;
-
           await request({
             url: `/business/sms/pushAll`,
             method: "post",
-            data: res,
+            data: data,
           })
             .then((result) => {
               if (result.code != 200) return this.$message.error(result?.msg);
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 c71b6d52..7fef5de8 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
@@ -1,7 +1,7 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
     <div class="EventDetail" :style="{
-    height: activeName == '-1' || activeName == '0' ? '480px' : '698px',
+    height: activeName == '-1' || activeName == '0' ? '480px' : '598px',
   }">
       <Form ref="FormConfigRef" :formList="formList" :dFormData="formData" label-width="100px" />
 
@@ -123,11 +123,11 @@ export default {
       get() {
         if (this.visible) {
           this.getProcess();
+          console.log(this.activeName,'--------')
         }
         return this.visible;
       },
       set(val) {
-        console.log(111)
         this.formList = [..._formList]
         this.$emit("update:value", val);
       },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js
index eb25c777..e6519c64 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js
@@ -31,7 +31,8 @@ export const searchFormList = [
     required: true,
     type: "datePicker",
     options: {
-      type: "daterange",
+      style:{width:'100%'},
+      type: "datetimerange",
       format: "yyyy-MM-dd HH:mm:ss",
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue
index a07a4b19..4096e255 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue
@@ -127,22 +127,8 @@ export default {
             }
           });
           this.data = res.rows;
-          console.log("darta", this.data);
         }
       );
-      // request({
-      //   // url: `/dc/system/event/dispatchEventList`,
-      //   url: "/dc/system/event/list",
-      //   method: "get",
-      //   params: this.searchData,
-      // }).then((result) => {
-      //   if (result.code != 200) return Message.error(result?.msg);
-      //   this.total = result.total;
-      //   result.rows.forEach((it) => {
-      //     it.stringDirection = directionMapping[it.direction] || it.direction;
-      //   });
-      //   this.data = result.rows;
-      // });
     },
     onSizeChange(pageSize) {
       this.pageSize = pageSize;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
index 200a0273..ca1c1e36 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
@@ -119,6 +119,7 @@
 <script>
 import bgBtn from "@screen/components/Decorations/bg-btn.vue"
 import sensors from "./sensors.vue"
+import request from '@/utils/request'
 export default {
     name: 'dataVRoadNet',
     data(){
@@ -240,6 +241,15 @@ export default {
                 { title: '', value: '' },
                 { title: '', value: '' },
             ];
+
+            //设备调用次数查询
+            // 
+            request({
+                url: 'business/dcOperLog/count/deviceType',
+                method: 'get'
+            }).then(res=>{
+              console.log(res,'----------')  
+            })
             this.apply = [
                 { title : "设备资产",value : 45},
                 { title : "智能行车诱导系统",value : 1},
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 9a312ff6..c2ae50d2 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
@@ -54,7 +54,7 @@
         </ElTableColumn>
         <ElTableColumn label="设备图片" prop="deviceImg" align="center" header-align="center">
           <template slot-scope="scope">
-            <img :src="scope.row.deviceImg" style="width: 30px;height: 30px;" />
+            <img :src="urlRoot+ scope.row.deviceImg" style="width: 30px;height: 30px;" />
           </template>
         </ElTableColumn>
         <el-table-column
@@ -144,6 +144,7 @@ export default {
         pageNum: 1,
         dcDeviceType: "2"
       },
+      urlRoot: process.env.VUE_APP_BASE_API, // 上传的图片服务器地址
       // 表单参数
       modelVisible:false,
       submitting: false,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue
index 155d0401..02a4c272 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue
@@ -51,14 +51,27 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            ><el-button type="primary" class="btnSearch" @click="onSubmit"
+          <el-form-item>
+            <!-- <el-button type="primary" class="btnSearch" @click="onSubmit"
               >搜索</el-button
             >
             <el-button class="btnReset" @click="onClose"
               >重置</el-button
-            ></el-form-item
-          >
+            > -->
+            <el-button
+              type="primary"
+              size="mini"
+              class="btnSearch"
+              @click="onSubmit"
+              >搜索</el-button
+            >
+            <el-button
+              class="btnReset"
+              size="mini"
+              @click="onClose"
+              >重置</el-button
+            >
+          </el-form-item>
         </el-form>
 
         <!-- <div>路段方向：</div> -->
@@ -256,17 +269,13 @@ export default {
         }
       }
       .btnSearch {
-        background-color: #00b3cc;
-        // margin-left: 10px;
-        padding: 6px 13px;
-        font-size: 13px;
+        background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+        border-color: transparent;
       }
       .btnReset {
-        background-color: transparent;
-        border-color: #00b3cc;
+        background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+        border-color: transparent;
         color: white;
-        padding: 6px 15px;
-        font-size: 13px;
       }
     }
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue
index 40088810..be765244 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/DetailCard.vue
@@ -29,7 +29,7 @@
       </div> -->
       <div class="suffix share-with">
         分享至
-        <img v-for="(item,index) in shareWithData" :key="item" :src="require(`@screen/images/shareWith/${data.channel.indexOf((index+1).toString())===-1?item:(item+'-active')}.svg`)">
+        <img v-for="(item,index) in shareWithData" :key="item.key" :src="require(`@screen/images/shareWith/${data.channel.indexOf(item.key.toString())===-1?item.icon:(item.icon+'-active')}.svg`)">
       </div>
     </div>
     <!-- <div class="footer">
@@ -65,10 +65,10 @@ export default {
   data() {
     return {
       shareWithData: [
-        'weChat',
-        'message',
-        'website',
-        'weibo'
+        { key: "2", label: "微信",icon:'weChat' },
+        { key: "1", label: "短信",icon:'message' },
+        { key: "5", label: "网站",icon:'website' },
+        { key: "3", label: "新浪",icon:'weibo' },
       ],//shareWith.keys().map(item => item.match(/[^./]+/)[0]),
       status: {
         0: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
index 6ce82e59..0d4e3775 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
@@ -35,7 +35,8 @@ export default {
         console.log(id, res)
         let list = []
         let temp = res.data;
-        // let temp = [...res.data, ...res.data, ...res.data];
+        
+        
         temp.forEach(e => {
           list.push({
             source: "1",
@@ -49,6 +50,18 @@ export default {
             channel:e.publishChannels.toString(),
             state: e.eventState,
           })
+          list.push({
+            source: "1",
+            onlyright:true,
+            time: e.createTime,
+            name: e.createBy,
+            descTitle: "事件详情",
+            desc: e.contentDetails,
+            facilityName: e.facilityName,
+            publisher:e.publisher,
+            channel:e.publishChannels.toString(),
+            state: e.eventState,
+          })
         });
           this.timeLine2List = list;
        
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
index aec8da58..169b1b97 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
@@ -225,10 +225,6 @@ export default {
   },
   methods: {
     handleSubmit() {
-      // if (this.formData && this.formData.publishChannels) {
-      //   this.formData.publishChannels =
-      //     this.formData.publishChannels.toString();
-      // }
       this.$refs.FormConfigRef.validate().then((data) => {
         this.submitting = true;
 
@@ -240,8 +236,9 @@ export default {
           };
           editChannels(params).then((res) => {
             this.modelVisible = false;
-            this.submitting = false;
             this.$parent.handleSearch();
+          }).finally(()=>{
+            this.submitting = false;
           });
         } else {
           let params = {
@@ -250,9 +247,10 @@ export default {
           };
           addChannels(params).then((res) => {
             this.modelVisible = false;
-            this.submitting = false;
             this.$parent.handleSearch();
-          });
+          }).finally(()=>{
+            this.submitting = false;
+          });;
         }
       });
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
index 0546059c..31186654 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
@@ -63,7 +63,7 @@ export default {
       this.$parent.handleOpenDialogAddEdit(this.data);
     },
     handleDelete(item) {
-      this.$confirm("确定要删除么？", "操作确认", {
+      this.$confirm("确定删除该渠道？", "操作确认", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
index 4f86989c..2157b567 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
@@ -88,7 +88,6 @@ export default {
   },
   methods: {
     handleOpenDialogAddEdit(data) {
-      console.log(77777, data);
       this.addNEditDialogVisible = true;
       if (data) {
         data.publishChannels = data.publishChannels.toString().split(",");
@@ -107,7 +106,6 @@ export default {
       if (data && data.date) {
         data.startDate = data.date[0];
         data.endDate = data.date[1];
-        // data.date = "";
       }
       data = { ...this.searchData, ...data };
       getChannelsList(
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue
index 9c2f25bc..1d469d88 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue
@@ -486,7 +486,6 @@ export default {
       this.dataForm = JSON.parse(JSON.stringify(this.boardEmitItem))
       this.dataForm.COLOR = this.getColorValue(this.boardEmitItem.COLOR)
       console.log(this.dataForm, 'this.dataForm')
-      // console.log('数据回显111111111', this.boardEmitItem)
       // this.dataForm.FONT = this.getFont(this.boardEmitItem.FONT)
       this.dataForm.CONTENT = JSON.parse(JSON.stringify(this.boardEmitItem.CONTENT.replace('<br>', '\n').replace(/ /g, ' ').replace('<r><n>', '\n')))
       this.dataForm.STAY = JSON.parse(JSON.stringify(Number(this.boardEmitItem.STAY) / 10))
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
index f3e8b960..c6fccf36 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -248,7 +248,7 @@ import InfoBoard from "@screen/mixins/InfoBoard";
 import { initSearch } from "@screen/utils/enum/common.js"
 
 export default {
-  name: "Device",
+  name: "DeviceBord",
   mixins: [InfoBoard],
   components: {
     draggable,
@@ -400,7 +400,8 @@ export default {
       this.boardSizeDic = {};
       return this.getDicts("iot_board_pixel").then((res) => {
         res.data.forEach((item) => {
-          this.boardSizeDic[item.dictValue] = {
+          let dictValue = item.dictLabel.substr(item.dictLabel.search(/\d/))
+          this.boardSizeDic[dictValue] = {
             label: item.dictLabel,
             list: []
           };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/editInfo.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/editInfo.vue
index 9c2f25bc..1d469d88 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/editInfo.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/editInfo.vue
@@ -486,7 +486,6 @@ export default {
       this.dataForm = JSON.parse(JSON.stringify(this.boardEmitItem))
       this.dataForm.COLOR = this.getColorValue(this.boardEmitItem.COLOR)
       console.log(this.dataForm, 'this.dataForm')
-      // console.log('数据回显111111111', this.boardEmitItem)
       // this.dataForm.FONT = this.getFont(this.boardEmitItem.FONT)
       this.dataForm.CONTENT = JSON.parse(JSON.stringify(this.boardEmitItem.CONTENT.replace('<br>', '\n').replace(/ /g, ' ').replace('<r><n>', '\n')))
       this.dataForm.STAY = JSON.parse(JSON.stringify(Number(this.boardEmitItem.STAY) / 10))
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
index c40b3334..9383fd65 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
@@ -186,7 +186,7 @@ import broadcast from "@screen/mixins/broadcast";
 import { initSearch } from "@screen/utils/enum/common.js"
 import BroadcastTplList from "@screen/components/broadcast/BroadcastTplList.vue";
 export default {
-  name: "Device",
+  name: "DeviceCast",
   mixins: [broadcast],
   components: {
     BroadcastTplList,
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 c382e144..a600a8ad 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
@@ -32,8 +32,13 @@
           </template>
         </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="position" align="center" width="200"  header-align="center">
+          <template slot-scope="scope">
+            {{ scope.row.position.replace(/\[/,'').replace(/\]/,'') }}
+          </template>
+        </ElTableColumn>
+        <ElTableColumn label="发布内容" prop="contentDetails"  align="center" header-align="center">
+        </ElTableColumn>
         <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">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js
index 9a096a1f..4152feba 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js
@@ -251,11 +251,11 @@ export const laneOccupancy = {
   default: [],
   options: {
     options: [
-      { key: 1, label: "行1" },
-      { key: 2, label: "行2" },
-      { key: 3, label: "行3" },
-      { key: 4, label: "行4" },
-      { key: 0, label: "应急车道" },
+      { key: '1', label: "行1" },
+      { key: '2', label: "行2" },
+      { key: '3', label: "行3" },
+      { key: '4', label: "行4" },
+      { key: '0', label: "应急车道" },
     ],
   },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js
index bf0cac8a..87126839 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js
@@ -192,7 +192,7 @@ export const configList = {
       key: "dcEventAccident.atIntersection",
     },
     { ...PresetFormItems.isCurveRoad, key: "dcEventAccident.onCurve" },
-    { ...PresetFormItems.inTunnel, key: "dcEventAccident.inTunnel" },
+    PresetFormItems.inTunnel,
     { ...PresetFormItems.spillName, key: "dcEventAccident.spillageItem" },
     {
       ...PresetFormItems.ownerPhone,
@@ -392,10 +392,7 @@ export const configList = {
       ...PresetFormItems.isCurveRoad,
       key: "dcEventVehicleAccident.onCurve",
     },
-    {
-      ...PresetFormItems.inTunnel,
-      key: "dcEventVehicleAccident.inTunnel",
-    },
+    PresetFormItems.inTunnel,
     PresetFormItems.laneOccupancy,
     PresetFormItems.vehicleCondition("dcEventVehicleAccident"),
     PresetFormItems.casualties("dcEventVehicleAccident"),
@@ -2375,13 +2372,11 @@ export const formatEvent = (f) => {
     }else{
       delete formData.stakeMark
     }
-    
   } 
-
   for(let i in formData){
     if(typeof formData[i] === 'object' && formData[i]){
       for(let j in formData[i]){
-        if(j === 'rampId'){
+        if(j === 'rampId' && formData[i][j]){
           formData[i][j] = formData[i][j].join(',')
         }
       }
@@ -2399,7 +2394,6 @@ export const getFacilities = async (facilityType, config, key="dcEventTrafficCon
   })
   if (result.code != 200) return Message.error(result?.msg);
   let lwss = [];
-  console.log(result.data,'---------------')
   result.data.forEach((it) =>
       lwss.push({ key: it.id, label: it.facilityName })
   );
diff --git a/ruoyi-ui/src/views/event/event/dispatch.vue b/ruoyi-ui/src/views/event/event/dispatch.vue
index 433096b4..cd6e720a 100644
--- a/ruoyi-ui/src/views/event/event/dispatch.vue
+++ b/ruoyi-ui/src/views/event/event/dispatch.vue
@@ -1957,7 +1957,6 @@ export default {
           id: this.$route.query.id,
         };
         await listEvent(param).then((response) => {
-          console.log(response.rows, "事件详情");
           this.workBenchProp = {
             tunnelStationName: response.rows[0].tunnelStationName,
             tunnelName: response.rows[0].tunnelName,
diff --git a/ruoyi-ui/src/views/event/event/dispatchYuan.vue b/ruoyi-ui/src/views/event/event/dispatchYuan.vue
index 4f4d1e07..05add76d 100644
--- a/ruoyi-ui/src/views/event/event/dispatchYuan.vue
+++ b/ruoyi-ui/src/views/event/event/dispatchYuan.vue
@@ -1022,7 +1022,6 @@ export default {
           id: this.$route.query.id,
         };
         await listEvent(param).then((response) => {
-          console.log(response, "事件详情");
           this.eventForm = response.rows[0];
           this.eventForm.iconUrlList = response.rows[0].iconUrlList.splice(0,4)
           this.getVideoList()
diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue
index d2f4ed27..ee7bf339 100644
--- a/ruoyi-ui/src/views/information/board/index.vue
+++ b/ruoyi-ui/src/views/information/board/index.vue
@@ -266,7 +266,7 @@
   };
 
   export default {
-    name: "Device",
+    name: "Bord",
     components: {
       addinfo,
       editInfo,
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 010f3298..3be6a9f2 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -3,7 +3,7 @@
     <div class="login-content">
       <div class="login-l">
         <div class="logo"><img src="../assets/images/login/logo.png" /></div>
-        <span>山东高速</span>
+        <span>齐鲁高速</span>
         <span>济菏数智运营管理平台</span>
       </div>
       <div class="login-r">
diff --git a/ruoyi-ui/src/views/workbench/config/components/catCurveModal.vue b/ruoyi-ui/src/views/workbench/config/components/catCurveModal.vue
index b9cdd2b0..13fd0c2b 100644
--- a/ruoyi-ui/src/views/workbench/config/components/catCurveModal.vue
+++ b/ruoyi-ui/src/views/workbench/config/components/catCurveModal.vue
@@ -1033,7 +1033,6 @@
       },
       //车辆 修改隧道名称查看不同隧道 车来灯亮照明配置
       catChangeEvent() {
-        console.log(this.catFilesModel.tunnelId,this.catFilesModel.direction,"1111")
         if (!!this.catFilesModel.tunnelId && !!this.catFilesModel.direction) {
           let tunnel = this.tunnelData.find(
             (tunnelItem) => tunnelItem.tunnelId == this.catFilesModel.tunnelId
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index b818a945..1627531e 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -42,23 +42,12 @@ module.exports = {
         // target: `http://192.168.0.182:8080`,
         // target: `http://192.168.0.194:8080`,
         // target: `http://10.0.81.201:8080`,
-        // target: `http://10.168.73.36:8080`, // 周乐
-        // target: `http://10.168.77.209:8087`, // 刘朋
-        // target: `http://10.168.66.196:8087`, //刘文阁
-        // target: `http://10.168.56.206:8087`, //孟
-        // target: `http://10.168.78.135:8087`, //孟
-        // target: `http://10.168.78.135:8087`,
-        // target: `http://10.0.81.202:8087`, //现场后台s
-        // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
-        // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
-        // target: `http://10.168.78.135:8087`,  //王钦
-        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        target: `http://10.168.66.196:8087`, //刘文阁
         // target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.72.174:8087`, //赵祥龙
-        // target: `http://10.168.65.156:8097`, //孟
+        // target: `http://10.168.65.156:8097`, //孟凡峰
         // target: `http://10.168.76.181:8089`, //王家宝
         // target: `http://10.168.77.128:8087`, //王兴琳
-        // target: `http://10.168.65.103:8097`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",