diff --git a/ruoyi-ui/public/static/fonts/尔雅风华楷书.ttf b/ruoyi-ui/public/static/fonts/尔雅风华楷书.ttf
new file mode 100644
index 00000000..74e32f0a
Binary files /dev/null and b/ruoyi-ui/public/static/fonts/尔雅风华楷书.ttf differ
diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue
index 5f828743..5021a7fc 100644
--- a/ruoyi-ui/src/App.vue
+++ b/ruoyi-ui/src/App.vue
@@ -9,16 +9,15 @@
 <template>
   <div id="app">
     <router-view />
-    <!-- <websocket @newEvent="onNewEvent"/> -->
+    <websocket @newEvent="onNewEvent"/>
     <WarningNotify ref="notifyShow" />
-      <!-- <websocket_phone /> -->
   </div>
 </template>
 
 <script>
 import websocket from "@/views/websocket";
 import WarningNotify from "@screen/components/WarningNotify.vue";
-// import websocket_phone from "@/views/websocket_phone";
+
 export default {
   name: "App",
   data() {
@@ -54,9 +53,7 @@ export default {
   },
   methods:{
     onNewEvent(para){
-      if (para.subEvent == "0" || para.subEvent == "1"){
-        this.$refs["notifyShow"].showNotify(para);
-      }
+      this.$refs["notifyShow"].showNotify(para);
     }
   }
 };
@@ -78,6 +75,10 @@ export default {
   src: url("/static/fonts/庞门正道标题体3.ttf");
 }
 
+@font-face {
+  font-family: "ErYaFenghua";
+  src: url("/static/fonts/尔雅风华楷书.ttf");
+}
 .amap-marker-label {
   border: 0;
   background-color: transparent;
diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js
index 030cbb7f..eae1e9fd 100644
--- a/ruoyi-ui/src/api/MonthlyEquipment/index.js
+++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js
@@ -38,13 +38,22 @@ export function getSystemStatusType() {
 export function getSystemStatusExport(query) {
   //system/status/export
   //return download('/system/status/export',query,"file.xlsx");
-  return request.post(
-    "/system/status/export?startTime=" +
+  let url = "/system/status/export?startTime=" +
       query.startTime +
       "&time=" +
       query.time +
       "&type=" +
-      query.type,
+      query.type;
+      if(query.deviceName){
+        url += "&deviceName=" +
+      query.deviceName
+      }
+      if(query.direction){
+        url += "&direction=" +
+      query.direction
+      }
+  return request.post(
+    url,
     {},
     {
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
diff --git a/ruoyi-ui/src/api/perception/meteorologyCheck.js b/ruoyi-ui/src/api/perception/meteorologyCheck.js
index 6613d948..a26175f8 100644
--- a/ruoyi-ui/src/api/perception/meteorologyCheck.js
+++ b/ruoyi-ui/src/api/perception/meteorologyCheck.js
@@ -43,7 +43,7 @@ export function getListLatest() {
 // 统计气象设备信息列表
 export function getDeviceNameListLatest(name) {
   return request({
-    url: "/dc/system/meteorologicalDetector/" + name,
+    url: "/dc/system/meteorologicalDetector/deviceName?deviceName=" + name,
     method: "get",
   });
 }
diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index d3777fc1..638b7996 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -306,3 +306,24 @@
     }
 
 }
+
+.el-image-viewer__wrapper{
+  position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 999999 !important;
+}
+.el-message-box__wrapper{
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  text-align: center;
+  z-index: 999999 !important;
+}
+.el-message--warning,.el-message--error,.el-message--success{
+  z-index: 999999 !important;
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 2f68291d..f951eec1 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -20,13 +20,13 @@ export default [
         component: "perception/eventDetection/index.vue",
       },
       {
-        title: "交通流检测",
+        title: "交通流监测",
         path: "/perception/trafficFlow",
         name: "perceptionTrafficFlow",
         component: "perception/trafficFlow/index.vue",
       },
       {
-        title: "交通气象监测",
+        title: "交通气象检测",
         path: "/perception/meteorologyCheck",
         name: "perceptionMeteorologyCheck",
         component: "perception/meteorologyCheck/index.vue",
@@ -36,6 +36,12 @@ export default [
         path: "/perception/trafficSituation",
         name: "perceptionTrafficSituation",
         component: "perception/trafficSituation/index.vue",
+      },
+      {
+        title: "预警记录",
+        path: "/perception/noStakeWaning",
+        name: "perceptionNoStakeWaning",
+        component: "perception/noStakeWaning/index.vue",
       }
     ],
   },
@@ -60,22 +66,16 @@ export default [
           },
           {
             title: "事件列表",
-            path: "/control/event/event",
+            path: "/control/Event/Event",
             name: "controlEventEvent",
             component: "control/event/event/index.vue",
           },
           {
             title: "事件预案",
             path: "/control/event/plan",
-            name: "controlEventPlam",
+            name: "controlEventPlan",
             component: "control/event/plan/index.vue",
           },
-          {
-            title: "协调调度记录",
-            path: "/control/event/coordinateSchedulingRecords",
-            name: "coordinateSchedulingRecords",
-            component: "control/event/coordinateSchedulingRecords/index.vue",
-          },
           {
             title: "业务数据管理",
             path: "/control/event/businessDataManagement",
@@ -113,6 +113,11 @@ export default [
             path: "/control/device/strategy",
             name: "controlDeviceStrategy",
             component: "control/device/strategy/index.vue",
+          }, {
+            title: "管控记录",
+            path: "/control/device/record",
+            name: "controlDeviceRecord",
+            component: "control/device/record/index.vue",
           },
         ],
       },
@@ -159,7 +164,7 @@ export default [
         name: "smart",
         children: [
           {
-            title: "统计分析",
+            title: "设备在线分析",
             name: "smartStatistic",
             path: "/maintain/smart/statistic",
             component:
@@ -185,12 +190,18 @@ export default [
           },
         ],
       },
-      {
-        title: "边坡光伏",
-        name: "photovoltaic",
-        path: "/maintain/photovoltaic",
-        component: "developing.vue",
-      },
+      // {
+      //   title: "边坡光伏",
+      //   name: "photovoltaic",
+      //   path: "/maintain/photovoltaic",
+      //   component: "developing.vue",
+      // },
+      // {
+      //   title: "桥梁监测",
+      //   name: "photovoltaic",
+      //   path: "/maintain/photovoltaic",
+      //   component: "developing.vue",
+      // },
     ],
   },
   {
@@ -201,17 +212,17 @@ export default [
     redirect: "serviceBoard",
     children: [
       {
-        title: "情报板",
+        title: "情报板发布",
         name: "serviceBoard",
         path: "/service/board",
         component: "service/board/index.vue",
       },
-      {
-        title: "情报板记录",
-        name: "boardRecord",
-        path: "/service/boardRecord",
-        component: "service/boardRecord/index.vue",
-      },
+      // {
+      //   title: "情报板记录",
+      //   name: "boardRecord",
+      //   path: "/service/boardRecord",
+      //   component: "service/boardRecord/index.vue",
+      // },
       {
         title: "敏感词",
         name: "sensitive",
@@ -224,12 +235,12 @@ export default [
         path: "/service/broadcast",
         component: "service/broadcast/index.vue",
       },
-      {
-        title: "发布渠道管理",
-        name: "PublishingChannelManagement",
-        path: "/service/PublishingChannelManagement",
-        component: "service/PublishingChannelManagement/index.vue",
-      },
+      // {
+      //   title: "发布渠道管理",
+      //   name: "PublishingChannelManagement",
+      //   path: "/service/PublishingChannelManagement",
+      //   component: "service/PublishingChannelManagement/index.vue",
+      // },
       {
         title: "信息发布管理",
         name: "InformationReleaseManagement",
@@ -286,10 +297,17 @@ export default [
   },
   {
     title: "安全生产",
-    name: "config",
+    name: "safe",
     position: "right",
-    path: "/config",
-    component: "developing.vue",
+    path: "/safe",
+    children: [
+      {
+        title: "文件管理",
+        name: "safeFiles",
+        path: "/safe/safeFiles",
+        component: "safe/files/index.vue",
+      },
+    ]
   },
   {
     title: "系统管理",
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index e00ef484..decfb635 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -801,7 +801,7 @@ export default {
           this.getAlarmInfo();
           this.$modal.msgSuccess("已成功忽略");
         } else {
-          this.$modal.msgError("忽略失败！！！");
+          this.$modal.msgError("忽略失败！！");
         }
       });
     },
@@ -935,7 +935,7 @@ export default {
           this.getAlarmInfo();
           this.cancel();
         } else {
-          this.$modal.msgError("忽略失败！！！");
+          this.$modal.msgError("忽略失败！！");
         }
       });
     },
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 9c4d9936..28f626aa 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -54,6 +54,11 @@ import eventDialog from "@/components/eventDialogTable/eventDialog.vue";
 import eventDialogTable from "@/components/eventDialogTable";
 import evtDialogOneThing from "@/components/eventDialogTable/evtDialogOneThing.vue";
 import evtDialogVideo from "@/components/eventDialogTable/video.vue";
+
+// 时间弹窗
+import EventDetailDialog from "@screen/pages/control/event/event/EventDetailDialog/index";
+
+
 import mitt from "mitt";
 const emitter = mitt();
 
@@ -129,6 +134,9 @@ Vue.component("eventDialogTable", eventDialogTable);
 Vue.component("evtDialogOneThing", evtDialogOneThing);
 Vue.component("evtDialogVideo", evtDialogVideo);
 
+
+Vue.component("EventDetailDialog", EventDetailDialog);
+
 Vue.component(CollapseTransition.name, CollapseTransition);
 // Vue.component('reproductionImage', reproductionImage)
 
diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js
index b8f03c60..268ea7f7 100644
--- a/ruoyi-ui/src/router/routerCreater.js
+++ b/ruoyi-ui/src/router/routerCreater.js
@@ -35,16 +35,14 @@ function processNode(node) {
       name: item.name,
       meta: { menuId: prev + "_" + ids.join("-"), title: item.title },
     };
-
     if (item.redirect) {
       temp.redirect = {
         name: item.redirect,
       };
     }
-    if (!item.component) {
+   if (!item.component) {
       temp.component = compX;
     } else {
-      // console.log(item.component);
       temp.component = (resolve) =>
         require(["@/views/JiHeExpressway/pages/" + item.component], resolve); //views/visualization/pages/${item.component}
     }
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index acf4252f..d4e953ab 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -66,9 +66,9 @@ service.interceptors.request.use(config => {
       const s_time = sessionObj.time;                // 请求时间
       const interval = 10;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        // const message = '数据正在处理，请勿重复提交';
+        // const message = '数据正在处理，请勿重复提交'; new Error(message)
         console.log('数据重复提交：'+s_url)
-        // return Promise.reject(new Error(message))
+        return Promise.reject()
       } else {
         cache.session.setJSON('sessionObj', requestObj)
       }
@@ -133,7 +133,9 @@ service.interceptors.response.use(res => {
     }
   },
   error => {
-    console.log('err' + error)
+    if(!error){
+      return
+    }
     let { message } = error;
     if (message === "Network Error") {
       message = "后端接口连接异常";
diff --git a/ruoyi-ui/src/utils/requestThree.js b/ruoyi-ui/src/utils/requestThree.js
index ea5c86bf..1e30c58c 100644
--- a/ruoyi-ui/src/utils/requestThree.js
+++ b/ruoyi-ui/src/utils/requestThree.js
@@ -72,7 +72,6 @@ service.interceptors.response.use(res => {
     }
   },
   error => {
-    console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "后端接口连接异常";
diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
index 9cf5dbcb..c5f33f56 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
@@ -15,7 +15,7 @@ export const source = {
       },
       {
         key: "2",
-        label: "交通转接",
+        label: "交警转接",
       },
       {
         key: "3",
@@ -369,7 +369,7 @@ export const eventSources = {
       },
       {
         key: "2",
-        label: "交通转接",
+        label: "交警转接",
       },
       {
         key: "3",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue
index fe9b7d92..d297c435 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/CameraController.vue
@@ -5,7 +5,7 @@
       <div class="compCttCon">
         <div class="compHead">
           <!-- <img src="@/assets/jihe/images/button/btnClose.svg" @click="onClose"> -->
-          <i class="iconfont icon-guanbi" @click="onClose"></i>
+          <i class="iconfont icon-guanbi" style="cursor: pointer;" @click="onClose"></i>
         </div>
         <div class='compCon'>
           <div class="direction">
@@ -36,6 +36,35 @@
             </div>
           </div>
         </div>
+
+      <div class="position">
+
+
+        <div class="ptitle accessEvent">
+          预置位列表
+          <el-popover v-model="addVisible" placement="bottom" width="200" trigger="manual">
+            <div style="display: flex;">
+              <el-input placeholder="请输入名称" v-model="pName" style="flex:1"></el-input>
+              <ButtonGradient @click.native="addName">确认</ButtonGradient>
+            </div>
+            <div class="add" slot="reference" @click="addVisible= !addVisible">
+              新增 <i class="el-icon-plus"></i> 
+            </div>
+          </el-popover>
+        </div>
+        <div class="plist accessEvent">
+          <div v-if="pList.length === 0" class="nodata">暂无数据</div>
+          <div v-for="(item,index) in pList" class="pItem">
+            <div>{{ item.presetName }}</div>
+            <el-tooltip class="item" effect="dark" content="转到预置位" placement="top">
+              <i class="el-icon-view" @click="onControl(item.presetId, 39)"></i>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="覆盖预置位" placement="top">
+            <i class="el-icon-setting" @click="onControl(item.presetId, 8)"></i>
+            </el-tooltip>
+          </div>
+        </div>
+        </div>
       </div>
     </div>
   </div>
@@ -45,9 +74,12 @@
 import { controlCamera } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
 import { throttle } from "lodash"
 import { moveable } from "@screen/utils/moveable"
+import request from '@/utils/request'
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 export default {
   name: 'CameraController',
   components: {
+    ButtonGradient
   },
   props: {
     visible: Boolean,
@@ -55,12 +87,15 @@ export default {
   },
   data() {
     return {
+      pName: '',
+      pList: [],
+      addVisible: false,
       options: [
         {
           label: "变倍",
           key: "zoom",
-          add: "12",
-          sub: "11"
+          add: "11",
+          sub: "12"
         },
         {
           label: "光圈",
@@ -88,10 +123,9 @@ export default {
           if (!bool) return this.destroyMoveable?.()
 
           const container = this.$refs.DialogContentRef;
-          console.log(container);
-
           this.destroyMoveable = moveable(container, { target: container.querySelector(".compCttBg") });
-
+          
+          this.bindPosition();
           this.$once("hook:beforeDestroy", () => this.destroyMoveable?.());
         })
       }
@@ -103,7 +137,38 @@ export default {
     }, 150),
     onClose(){
       this.$emit("update:visible" , false);
-    }
+    },
+
+    addName() {
+      if(this.pName === ''){
+        this.$message.error('请输入预置位名称')
+        return
+      }
+      request({
+        url: `/video/addPreset?camId=${this.deviceId}&presetName=${this.pName}`,
+        method: 'get'
+      }).then(result=>{
+        if (result.code != 200) return this.$message.error(result?.msg);
+        this.bindPosition();
+        this.addVisible = false;
+      })
+    },
+    onControl(speed,type){
+      controlCamera(this.deviceId, type, false, speed);
+      this.$message.success(type===8?'保存成功':'指令已发送')
+    },
+    bindPosition(){
+      if(this.deviceId){
+        request({
+          url: `/video/presetList?camId=${this.deviceId}`,
+          method: 'get'
+        }).then(result=>{
+          if (result.code != 200) return this.$message.error(result?.msg);
+          this.pList = result.data;
+        })
+      }
+      
+    },
   },
 }
 </script>
@@ -113,7 +178,7 @@ export default {
 .compBox{
   .compCtt{
     
-    .compCttBg{ width: 340px; height: 200px; background-color: #29647D;}
+    .compCttBg{ width: 550px; height: 200px; background-color: #29647D;}
     .compCttCon{
        position: absolute;
        left: 0;
@@ -121,9 +186,12 @@ export default {
        width: 100%;
        height: 100%;
        box-sizing: border-box;
-       padding: 10px 15px 30px;
+       padding: 10px 15px;
        pointer-events: none;
+       display: flex;
       .compHead{
+        position: absolute;
+        margin-left: 500px;
         display: flex; justify-content: flex-end; padding-bottom: 20px;
         // img{ width: 20px; height: 20px; pointer-events: all;}
         .iconfont{font-size: 18px; pointer-events: all; color: #3DE8FF;}
@@ -236,4 +304,62 @@ export default {
     }
   }
 }
+
+.nodata{
+    width:100%;
+    text-align: center;
+    line-height: 50px;
+  }
+
+.position {
+    margin-left: 20px;
+    width: 220px;
+    display: flex;
+    font-size: 14px;
+    flex-direction: column;
+
+    .ptitle {
+      width: 100%;
+      background-color: #3c6a93;
+      padding: 10px 10px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .add {
+        cursor: pointer;
+        background-color: #379df1;
+        border-radius: 5px;
+        padding: 1px 10px;
+      }
+    }
+
+    .plist {
+      margin-top: 10px;
+      height: 150px;
+      width: 100%;
+      overflow-y: auto;
+      background-color: #3c6a93;
+      .pItem{
+        display: flex;
+        padding: 5px 10px;
+        cursor: pointer;
+        justify-content: space-between;
+        align-items: center;
+        > div{
+          width: 140px;
+        }
+        > i{
+          color: #379df1;
+          font-weight: bold;
+        }
+      }
+      .pItem:hover{
+        background-color: #379df1;
+        > i{
+          color: #fff;
+        }
+      }
+    }
+  }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue
index bcca3e9b..46cedd19 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/CameraShower/index.vue
@@ -174,8 +174,8 @@ $colorLabel: #3DE8FF;
 
   .cameraControl {
     position: absolute;
-    right: -2px;
-    top: -2px;
+    right: 260px;
+    top: 36px;
     transform: translateX(100%);
   }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Card3/Card.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Card3/Card.vue
new file mode 100644
index 00000000..b35c6d91
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Card3/Card.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="Card3">
+    <Title :title="title">
+      <template #prefix>
+        <slot name="title-prefix" />
+      </template>
+      <template #suffix>
+        <slot name="title-suffix" />
+      </template>
+    </Title>
+    <div class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import Title from "@screen/components/Title/index.vue";
+
+export default {
+  name: "Card",
+  components: {
+    Title,
+  },
+  props: {
+    title: {
+      type: String,
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.Card3 {
+  width: 100%;
+  background: linear-gradient(
+    180deg,
+    rgba(6, 66, 88, 0) 0%,
+    rgba(6, 66, 88, 0.4) 93%
+  );
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-height: 0px;
+  .content {
+    padding: 9px;
+    flex: 1;
+    min-height: 0px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/ChartExport/chartDl.png b/ruoyi-ui/src/views/JiHeExpressway/components/ChartExport/chartDl.png
new file mode 100644
index 00000000..20893017
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/components/ChartExport/chartDl.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/ChartExport/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/ChartExport/index.vue
new file mode 100644
index 00000000..3f2618f3
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/ChartExport/index.vue
@@ -0,0 +1,57 @@
+<template>
+ <img :src="require('./chartDl.png')" class="iconDl" @click="$emit('export')" />
+</template>
+
+<script>
+
+export default {
+  name: "ChartExport",
+  props: {
+   
+  },
+  components: {
+  },
+  provide() {
+    return {
+      
+    }
+  },
+  data() {
+    return {
+     
+    }
+  },
+  computed: {
+    
+  },
+  watch: {
+    
+  },
+  methods: {
+    //点击事件回调
+    exportClick() {
+      // let type = para.type;
+      console.log(111)
+    },
+    
+  },
+  mounted() {
+  },
+};
+</script>
+
+<style lang="scss">
+.iconDl{
+  margin-left: 10px;
+  cursor: pointer;
+  z-index: 2049;
+  width: 18px;
+  height: 18px;
+  padding: 3px;
+}
+.iconDl:hover{
+   border: 2px solid #55d2b5;
+   border-radius: 50%;
+   
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
index 4be2b1c3..fb28d8f2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="Descriptions keep-ratio" origin="left" :style="getStyle()">
+  <div class="Descriptions " :style="getStyle()">
     <div class="item" v-for="(item, index) in getResolveList" :key="`${item.key || item.label}${index}`"
       :style="[gridStyle(item, index), transformStyle(itemStyle)]" v-if="item.visible != false">
       <div v-if="!item.labelHidden" class="text title" :style="{ ...transformStyle(titleStyle), width: labelWidth }">
@@ -116,11 +116,11 @@ export default {
   gap: 9px;
 
   .text {
-    font-size: 15px;
+    font-size: 13px;
     font-family: PingFang SC, PingFang SC;
     font-weight: 400;
     color: #fff;
-    line-height: 18px;
+    line-height: 14px;
     gap: 3px;
     display: flex;
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
index 5ed780b8..ac0689b8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@@ -91,7 +91,6 @@ export default {
           if (!bool) return this.destroyMoveable?.();
 
           const container = this.$refs.DialogContentRef.$el;
-
           this.destroyMoveable = moveable(container, {
             target: container.querySelector(".dialog-title"),
           });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
index 994b44ff..39ecc731 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
@@ -13,8 +13,8 @@
 
             <!-- 第三层菜单 -->
             <template v-for="(item2, index2) in item1.children">
-              <component :index="prefix + '_' + index + '-' + index1 + '-' + index2" is="el-menu-item" :class="{ 'menuActive': activeIndex && activeIndex.includes(prefix + '_' + index + '-' + index1 + '-' + index2) }">{{
-                item2.title }}
+              <component :index="prefix + '_' + index + '-' + index1 + '-' + index2" is="el-menu-item" :class="{ 'menuActive': activeIndex && activeIndex.includes(prefix + '_' + index + '-' + index1 + '-' + index2) }">
+                {{item2.title }}
               </component>
             </template>
 
@@ -84,15 +84,16 @@ export default {
           node = node.children;
         }
       }
-      // this.$emit("onChange", node, key);
-
       if(node.title === '系统管理'){
-        // window.open('https://10.0.111.11:91/index')
+        this.activeIndex = key
         getConfigKey("backgroundUrl").then((res) => {
           window.open(res.msg)
         });
-      } else {
-        this.$route.path != node.path && this.$router.push(node.path);
+      } else if(node.title==='桥梁监测'){
+        this.activeIndex = key
+        window.open('http://iot.sdhscloud.com/home?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6MTc1MSwidWlkIjoiM2M2NTZjOGUtMzgwZC0xMWVmLWFhNmItYmVhNGE2MDZhMzE2IiwidXNlcm5hbWUiOiJKSFpIR1MiLCJuaWNrbmFtZSI6Ilx1NmQ0ZVx1ODNjZlx1NjY3YVx1NjE2N1x1OWFkOFx1OTAxZiIsImVtYWlsIjoiMjU4NTQwMjg0MEBxcS5jb20iLCJ0ZWwiOiIiLCJpc19zdXBlcnVzZXIiOmZhbHNlLCJpc19tYXN0ZXIiOmZhbHNlLCJpc19hY3RpdmUiOnRydWUsInRlbmFudF9pZCI6NDUsImF0dHJzIjp7Imdyb3VwIjoiIn0sImhhc3VyYSI6eyJ4LWhhc3VyYS11c2VyLWlkIjoiM2M2NTZjOGUtMzgwZC0xMWVmLWFhNmItYmVhNGE2MDZhMzE2IiwieC1oYXN1cmEtdGVuYW50Ijo0NSwieC1oYXN1cmEtYWN0aXZlIjp0cnVlLCJ4LWhhc3VyYS1tYXN0ZXIiOmZhbHNlLCJ4LWhhc3VyYS1yb2xlX2lkIjo1MjcsIngtaGFzdXJhLWFwcF9pZCI6NTIsIngtaGFzdXJhLXNlcnZpY2VfaWQiOjQsIngtaGFzdXJhLXN1cGVydXNlciI6ZmFsc2V9LCJhcHBfaWQiOjUyLCJyb2xlX2lkIjo1MjcsInNlcnZpY2VfaWQiOjQsImNsaWVudF9pZCI6IjA1ZTI1NzU4LTBhYTQtMTFlYS1iYTM0LTAyNDJhYzEwMDExZiIsImV4cCI6NDg3MzUxMzk1M30.JR5dwFCmNfaDFkSISOF5ZhRyPBulzDwG1bg4BA-Jqog')
+      } else if (this.$route.path != node.path){
+          this.$router.push(node.path);
       }
       
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue
index e2f9fc52..502b8f8b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="early_warning">
+    <div @click="onShowCtt" class="warningNum" v-if="warningNum > 0">{{ warningNum>99?'99+':warningNum }}</div>
     <p @click="onShowCtt">
       <i class="el-icon-message-solid" v-if="isShowCtt"></i>
       <i class="el-icon-bell" v-else></i>
     </p>
-    <Dialog v-model="isShowCtt" title="事件预警" width="600px" top="100px" right="30px" noneMask>
-      <WarningList></WarningList>
+    <Dialog v-model="isShowCtt" style="z-index: 2049;" title="事件预警" width="600px" top="70px" right="30px" noneMask>
+      <WarningList v-if="isShowCtt"></WarningList>
     </Dialog>
   </div>
 </template>
@@ -13,18 +14,38 @@
 <script>
 import Dialog from "@screen/components/Dialog/index.vue";
 import WarningList from "./WarningList.vue";
+import request from '@/utils/request'
 export default {
   data() {
     return {
-      isShowCtt:false
+      isShowCtt:false,
+      warningNum:0
     };
   },
   components: {
-    Dialog, WarningList
+    Dialog, 
+    WarningList
   },
   computed: {
   },
+  
+  mounted(){
+    this.$root.$on('update-warning', this.setWarningNum);
+    this.$nextTick(()=>{
+      request({
+          url:'/dc/system/event/getCountNum',
+          method: 'get',
+      })
+    })
+  },
+  beforeDestroy() {
+    // 在实例销毁前移除事件监听，防止内存泄漏
+    this.$root.$off('update-warning', this.getMainData);
+  },
   methods: {
+    setWarningNum(num){
+      this.warningNum = num
+    },
     onShowCtt(){
       this.isShowCtt = !this.isShowCtt;
     }
@@ -36,4 +57,26 @@ export default {
 .early_warning{
   &:hover{ cursor: pointer;}
 }
+.billing{
+  position: absolute;
+  z-index: 9999;
+  margin-top: -45px;
+  right: 70px;
+  img{
+    width: 25px;
+    height: 25px;
+    cursor: pointer;
+  }
+}
+.warningNum{
+  background-color: #df5f5f;
+  padding: 1px 4px;
+  font-size: 10px;
+  font-weight: bold;
+  border-radius: 2px;
+  position: absolute;
+  z-index: 999;
+  margin-left: 10px;
+  margin-top: -5px;
+}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue
index 624f7e99..888615f0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue
@@ -1,22 +1,28 @@
 <template>
   <div class="warning_list">
     <el-tabs v-model="activeTab" @tab-click="onChangeTab">
-      <el-tab-pane label="告警事件" name="first" />
+      <el-tab-pane label="预警事件" name="four" />
+      <el-tab-pane label="感知事件" name="first" />
       <el-tab-pane label="待确认事件" name="second" />
+      <el-tab-pane label="处置中事件" name="third" />
     </el-tabs>
-
     <div>
       <Table :data="tableData" :show-header="false" @cell-click="onCellClick">
-        <ElTableColumn prop="remark" width="280">
+        <ElTableColumn prop="remark" width="550">
           <template slot-scope="scope">
-            <div class="leftColumn">
-              <div class="device-icon"
-                :style="{ backgroundImage: `url(${require(`@screen/images/event/${activeTab == 'first' ? ('交通拥堵') : '交通拥堵'}.svg`)})` }" />
-              <p>{{ activeTab == 'first' ? WarningType[scope.row.warningType] : scope.row.stringEventType }}</p>
-            </div>
-            <P> {{ scope.row.remark }}</P>
-          </template>
 
+            <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top-start">  
+              <div class="markPanel">
+                <div class="leftColumn">
+                  <div class="device-icon" :style="{ backgroundImage: `url(${require(`@screen/images/event/${scope.row.icon? scope.row.icon : '交通拥堵'}.svg`)})` }" />
+                  <p>{{ activeTab == 'first' ? WarningType[scope.row.warningType] : scope.row.stringEventType }}</p>
+                </div>
+                <p class="rightRemark"> 
+                  {{ scope.row.remark }}
+                </p>
+              </div>
+          </el-tooltip>
+          </template>
         </ElTableColumn>
       </Table>
     </div>
@@ -31,28 +37,29 @@
     <!-- "详情"弹出框 -->
     <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName"
       @update:value="handleDialogClose" @queryData="reData" />
-
+    <DialogWarning ref="refDigWarn" v-model="dialogWarningVisible"></DialogWarning>
   </div>
 </template>
 
 <script>
 import request from "@/utils/request";
-import EventDetailDialog from "@screen/pages/control/event/event/EventDetailDialog/index";
 import Table from '@screen/components/Table.vue';
 import Pagination from '@screen/components/Pagination.vue';
 import { WarningType } from "@screen/utils/enum.js";
 import { Message } from "element-ui";
 import { WarningType as warningTypeMapping, DirectionTypes as gzDirectionMapping, warningSourceMapping, warningStateMapping } from "@screen/utils/enum.js"
 
+import DialogWarning from './dialogWarn/DialogWarning.vue'
+import {mokStakeWarning} from './dialogWarn/mock.js'
 export default {
   components: {
     Table,
     Pagination,
-    EventDetailDialog
+    DialogWarning
   },
   data() {
     return {
-      activeTab: "first",
+      activeTab: "four",
       WarningType,
       eventDetailDialogVisible: false,
       detailDialogFormData: {},
@@ -63,6 +70,8 @@ export default {
         pageSize: 10,
         pageNum: 1,
       },
+      
+      dialogWarningVisible: false,
     };
   },
   computed: {
@@ -78,13 +87,25 @@ export default {
   },
   methods: {
     onChangeTab(tab, event) {
-      console.log(tab, event);
       this.getMainData();
     },
     onCellClick(row, column, cell, event) {
-      // console.log('55', row, column, cell, event)
-      if (this.activeTab == 'first') {
+      if(this.activeTab === 'four'){
+         if(row.warningType === '1'){
+          
+          this.dialogWarningVisible = true;
+          this.$refs.refDigWarn.bind(row.id,row.remark)
+        }
+        return;
+        // setTimeout(() => {
+        //   this.dialogWarningData = mokStakeWarning
+        // }, 500);
+        // return;
+       
+      } else if (this.activeTab == 'first') {
         this.activeName = '-1'
+      } else if(this.activeTab == 'third'){
+        this.activeName = '1'
       } else {
         this.activeName = '0'
       }
@@ -112,25 +133,41 @@ export default {
             this.tableData = result.rows;
             this.total = result.total;
           })
-      } else if (this.activeTab == 'second') {
+      } else if (this.activeTab == 'second' || this.activeTab == 'third') {
         request({
-          url: `dc/system/event/list?eventState=0&pageSize=${this.searchData.pageSize}&pageNum=${this.searchData.pageNum}`,
+          url: `dc/system/event/list?eventState=${this.activeTab == 'second'?0:1}&pageSize=${this.searchData.pageSize}&pageNum=${this.searchData.pageNum}`,
           method: "GET",
           // params: {}
         })
           .then((result) => {
             if (result.code != 200) return;
             result.rows.forEach(item => {
-              item.remark = (item.occurrenceTime || '') + " " + (item.stakeMark || '') + " " + (item.direction || '') + " 发生" + (item.stringEventType || '') + "( " + (item.eventSubclassName || '') + ")事件"
+              item.remark = (item.occurrenceTime || '') + " " + (item.stakeMark || '') + " " + (item.direction==='1'?'菏泽方向':'济南方向') + " 发生" + (item.stringEventType || '') + "( " + (item.eventSubclassName || '') + ")事件"
               // item.remark = item.stakeMark + " " + item.direction + " 发生" + item.stringEventType + "( " + item.eventSubclass + ")事件"
             })
             this.tableData = result.rows;
             this.total = result.total;
           })
+      } else if(this.activeTab === 'four'){
+        request({
+          url: `business/dcNoStakeWarningTable/list?pageSize=${this.searchData.pageSize}&pageNum=${this.searchData.pageNum}`,
+          method: "GET",
+        })
+          .then((result) => {
+            if (result.code != 200) return;
+            result.rows.forEach(item => {
+              item.remark = item.warningDescription
+              item.stringEventType = item.warningType === '1'?'交通流预警':'气象预警';
+              if(item.warningType === '2'){
+                item.icon = '气象检测器'
+              }
+            })
+            this.tableData = result.rows;
+            this.total = result.total;
+          })
       }
     },
     firstBtnClick(id) {//点击去确认/详情/处置记录等第一个按钮
-      console.log("id", id);
       if (this.activeName == '-1') {
         request({
           url: `/perceivedEvents/warning/getWarningById`,//感知事件
@@ -142,11 +179,11 @@ export default {
 
           data.stringEventSource = data?.warningSource ? warningSourceMapping[data.warningSource] : '';
           data.nickName = data.userName;
-          data.direction = gzDirectionMapping[data.direction] || data.direction;
+          // data.direction = gzDirectionMapping[data.direction] || data.direction;
           data.startTime = data.warningTime;
           data.stringEventState = warningStateMapping[data.warningState];
           data.stringEventType = warningTypeMapping[data.warningType];
-
+          data.actionSource = this.activeName
           data.videoList = [];
           if (data.otherConfig) {
             let otherConfig = JSON.parse(data.otherConfig);
@@ -162,6 +199,8 @@ export default {
           }
           data.videoType = "mp4";
           data.component = "Video";
+
+          data.description = data.remark;
           this.detailDialogFormData = data;
           // console.log('data', this.detailDialogFormData)
 
@@ -203,13 +242,26 @@ export default {
 
 <style lang="scss" scoped>
 .warning_list {
+  .markPanel{
+    display: flex;
+
+    justify-content: center;
+    align-items: center;
+  }
+  .rightRemark{
+    flex: 1;
+    white-space: nowrap; 
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
   .leftColumn {
     display: flex;
     justify-content: center;
+    align-items: center;
     margin-right: 8px;
-    border: 1px solid #FF5F5F;
-    float: left;
-
+    border: 1px solid #FF5F5F;    
+    width: 120px;
+    height: 28px;
     p {
       color: #FF5F5F;
       font-size: 15px;
@@ -220,7 +272,7 @@ export default {
       height: 22px;
       width: 22px;
       background-repeat: no-repeat;
-      background-size: auto;
+      background-size: 100% 100%;
       background-position: center;
     }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/DialogWarning.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/DialogWarning.vue
new file mode 100644
index 00000000..94f3e3f5
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/DialogWarning.vue
@@ -0,0 +1,218 @@
+<template>
+  <Dialog v-model="modelVisible" title="交通流预警" style="z-index: 2050;" width="655px" top="100px" right="640px">
+    <div class="title">{{ title }}</div>
+    <div class="DialogWarning">
+      <div class="actions">
+        <div :class="actIndex===0?'act':''" @click="bindTag(0)">收费站车流量预测</div>
+        <div :class="actIndex===1?'act':''" @click="bindTag(1)">全路段车流量预测</div>
+      </div>
+      <div class="chartsPanel">
+          <div v-if="showChart" class="tag1">{{actIndex===0?'入口':'济南'}}</div>
+          <div v-if="showChart" class="tag2">{{actIndex===0?'出口':'菏泽'}}</div>
+          <div class="feeTChart" id="feeTChart"></div>
+      </div>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import * as echarts from "echarts";
+import OptionsFee from "./chartsFee";
+import request from '@/utils/request'
+
+
+// 广播发布
+export default {
+  name: "DialogWarning",
+  components: {
+    Dialog,
+    Button,
+  },
+
+  data() {
+    return {
+      actIndex:0,
+      title:'交通流预警',
+      showChart: false
+    };
+  },
+  props: {
+    visible: Boolean,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      },
+    },
+  },
+  watch: {
+    modelVisible: {
+      immediate: true,
+      handler(bool) {
+        if (!bool) return;
+      },
+    },
+  },
+  methods: {
+    bind(id,remark){
+      this.title = remark
+      request({
+        url: `/business/dcNoStakeWarningTable/${id}`,
+        method: "get"
+      })
+      .then((result) => {
+        if (result.code != 200) return;
+        this.source = JSON.parse(result.data.otherConfig)
+        this.drawChart();
+      })
+    },
+    bindTag(idx){
+      this.actIndex=idx;
+      this.drawChart();
+    },
+    drawChart(){
+      const v = this.source
+      let info = {
+        name: 'facilityName',
+        val:'trafficVolume',
+        s1: 4,
+        s2: 5
+      }
+      if(this.actIndex === 1){
+        info = {
+          name: 'name',
+          val:'volume',
+          s1: 1,
+          s2: 3
+        }
+      }
+      //bindfee
+      this.feeTChart = echarts.init(document.getElementById("feeTChart"));
+      const xname = [];
+      const legend = [];
+      const s1Data = [];
+      const s2Data = [];
+      let isFirst = true;
+      for(let i in v[info.s1]){
+        // X轴
+        xname.push(i)
+        // 上行数据
+        for(let j = 0; j < v[info.s1][i].length; j++){
+          const tmp = v[info.s1][i][j];
+          if(isFirst){
+            legend.push(tmp[info.name])
+            s1Data.push([tmp[info.val]])
+            s2Data.push([])
+          } else {
+            s1Data[j].push(tmp[info.val])
+          }
+        }
+        isFirst = false;
+      }
+      for(let i in v[info.s2]){
+        for(let j = 0; j < v[info.s2][i].length; j++){
+          const tmp = v[info.s2][i][j];
+          s2Data[j].push(tmp[info.val])
+        }
+      }
+      console.log(s2Data,'---------')
+      OptionsFee.legend.data = legend;
+      OptionsFee.xAxis[0].data =xname;
+      OptionsFee.xAxis[1].data =xname;
+      const series = [];
+      for(let i =0 ; i < legend.length;i++){
+        series.push({
+          name: legend[i],
+          type: "line",
+          data: s1Data[i],
+        })
+        series.push({
+          name: legend[i],
+          type: "line",
+          data: s2Data[i],
+          xAxisIndex: 1,
+          yAxisIndex: 1,
+        })
+      }
+      OptionsFee.series = series;
+      this.feeTChart.setOption(OptionsFee);
+      this.showChart = true;
+      
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.DialogWarning {
+  width: 600px;
+  height: 300px;
+  overflow: hidden;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  .actions{
+    display: flex;
+    margin: 10px 0px;
+    .act{
+      background:linear-gradient(to bottom, #996c1e, #e1ae53) !important;
+    }
+    div{
+      font-size: 14px;
+      padding: 4px 10px;
+      background:linear-gradient(to bottom, #315266, #5288a9) ;
+      margin-right: 10px;
+      border-radius: 2px;
+      cursor: pointer;
+    }
+  }
+}
+.title{
+  background-color: #21445a;
+  font-size: 14px;
+  padding: 4px 6px;
+}
+.chartsPanel{
+  width: 100%;
+  height: 400px;
+
+
+  .tag1 {
+    position: absolute;
+    margin-top: 56px;
+    margin-left: 50px;
+    font-size: 12px;
+    span{
+      color: #8be8fe;
+      font-weight: bold;
+      margin-left: 10px;
+    }
+  }
+
+  .tag2 {
+    position: absolute;
+    font-size: 12px;
+    margin-top: 240px;
+    margin-left: 550px;
+    span{
+      color: #8be8fe;
+      font-weight: bold;
+      margin-right: 10px;
+    }
+  }
+.feeTChart {
+    width: 100%;
+    height: 100%;
+}
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/chartsFee.js b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/chartsFee.js
new file mode 100644
index 00000000..41f08237
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/chartsFee.js
@@ -0,0 +1,133 @@
+import * as echarts from "echarts";
+var options = {
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    formatter: (params) => {
+      let name = params[0].axisValue + (params[0].axisIndex === 0?'　入口':'　出口') ;
+      for(let i =0; i < params.length; i++){
+        if(i%2===0){
+          name+='<br />'
+        } else{
+          name+='<span style="margin-left:10px;"></span>'
+        }
+        name += `${params[i].marker}${params[i].seriesName}: <span style="font-weight:bold;"> ${params[i].value}  辆</span>`
+        
+      }
+      return name;
+    }
+  },
+  axisPointer: {
+    link: [
+      {
+        yAxisIndex: "all",
+      },
+    ],
+  },
+  legend: {
+    top: 0,
+    right: 0,
+    icon:'rect',
+    textStyle: {
+      color: "#fff",
+    },
+    itemHeight: 5,
+    itemWidth: 10,
+    data: [],
+  },
+  grid: [
+    {
+      left: 40,
+      right: 10,
+      top: '25%',
+      height: "35%",
+    },
+    {
+      left: 40,
+      right: 10,
+      top: "60%",
+      height: "35%",
+    },
+  ],
+  xAxis: [
+    {
+      type: "category",
+      data: [],
+      axisLabel: {
+        color: "#ffffff",
+        show: false
+      },
+      z: 10,
+      splitLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+    },
+    {
+      onZero: true,
+      axisLine: { show: false },
+      gridIndex: 1,
+      type: "category",
+      z: 10,
+      data: [],
+      position: "top",
+      axisLabel: {
+        color: "#fff",
+        margin: -20,
+        formatter: function (params) {
+          return `${params}`;
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+    },
+  ],
+  yAxis: [
+    {
+      name: "车流量",
+      type: "value",
+      axisLabel: {
+        color: "#FFF",
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: "#00D1FF",
+        },
+      },
+      splitLine: {
+        show: false,
+      },
+    },
+    {
+      gridIndex: 1,
+      name: "",
+      type: "value",
+      inverse: true,
+      axisLabel: {
+        color: "#FFF",
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: "#00D1FF",
+        },
+      },
+      splitLine: {
+        show: false,
+      },
+    },
+  ],
+  series: [
+    {
+      name: "本期车流量",
+      type: "line",
+      data: [],
+    }
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/mock.js b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/mock.js
new file mode 100644
index 00000000..6b5e983c
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/dialogWarn/mock.js
@@ -0,0 +1,2210 @@
+export const mokStakeWarning = {
+    "1": {
+        "2024-07-02": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-06": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-05": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-04": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-03": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ]
+    },
+    "3": {
+        "2024-07-02": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-06": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-05": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-04": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ],
+        "2024-07-03": [
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K173+950",
+                "typeTruckFlow": 0,
+                "stake_make": "K155+652",
+                "name": "东平湖枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K155+652",
+                "typeTruckFlow": 0,
+                "stake_make": "K145+933",
+                "name": "东平立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K202+979",
+                "typeTruckFlow": 0,
+                "stake_make": "K190+495",
+                "name": "嘉祥西立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K072+847",
+                "typeTruckFlow": 0,
+                "stake_make": "K059+289",
+                "name": "大学城立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K126+233",
+                "typeTruckFlow": 0,
+                "stake_make": "K117+878",
+                "name": "孔村枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K099+750",
+                "typeTruckFlow": 0,
+                "stake_make": "K086+499",
+                "name": "孝里立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K105+904",
+                "typeTruckFlow": 0,
+                "stake_make": "K099+750",
+                "name": "平阴北立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K145+933",
+                "typeTruckFlow": 0,
+                "stake_make": "K126+233",
+                "name": "平阴南立交-",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K117+878",
+                "typeTruckFlow": 0,
+                "stake_make": "K105+904",
+                "name": "平阴立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K086+499",
+                "typeTruckFlow": 0,
+                "stake_make": "K083+835",
+                "name": "松竹枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K179+396",
+                "typeTruckFlow": 0,
+                "stake_make": "K173+950",
+                "name": "梁山东立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K190+495",
+                "typeTruckFlow": 0,
+                "stake_make": "K179+396",
+                "name": "梁山立交",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K059+289",
+                "typeTruckFlow": 0,
+                "stake_make": "K054+394",
+                "name": "殷家林枢纽",
+                "totalPassengerFlow": 0
+            },
+            {
+                "volume": 0,
+                "typeSpecialVehicleFlow": 0,
+                "end_make": "K083+835",
+                "typeTruckFlow": 0,
+                "stake_make": "K072+847",
+                "name": "长清立交",
+                "totalPassengerFlow": 0
+            }
+        ]
+    },
+    "4": {
+        "2024-07-02": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 4,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 6,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 10,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 30,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 50,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 20,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-06": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-05": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-04": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-03": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ]
+    },
+    "5": {
+        "2024-07-02": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 10,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-06": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-05": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 10,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 30,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 20,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-04": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ],
+        "2024-07-03": [
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "大学城收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "长清收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "孝里收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴北收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "平阴南收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "东平收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山东收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "梁山收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            },
+            {
+                "tollStationCode": "",
+                "statisticalDate": "",
+                "facilityName": "嘉祥西收费站",
+                "id": "",
+                "trafficVolume": 0,
+                "accessType": 0,
+                "periodType": 0
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
index ed06ad56..f2943606 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
@@ -19,7 +19,7 @@
       <EarlyWarning class="early_warning"></EarlyWarning>
       <UserArea class="topButton"></UserArea>
     </div>
-    <RecentPages class="recent"></RecentPages>
+    <RecentPages :style="{display: isRecent?'flex':'none'}" class="recent"></RecentPages>
   </div>
 </template>
 <script>
@@ -37,9 +37,15 @@ export default {
     return {
       menuLeft: [],
       menuRight: [],
-      activeIndex: "l-0"
+      activeIndex: "l-0",
     };
   },
+  props: {
+    isRecent: {
+      default: true,
+      type: Boolean
+    },
+  },
   components: {
     EarlyWarning,
     CustomMenu,
@@ -49,7 +55,6 @@ export default {
   },
   // emit: ["change"],
   created() {
-    // console.log(store.getters.menus,'---------------')
     const menus = _.cloneDeep(store.getters.menus);
     const _menuLeft = [];
     const _menuRight = [];
@@ -175,6 +180,7 @@ export default {
   }
   .recent{
     height: 32px;
+    transition: all ease-out 0.3s;
   }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
index 00dc66c9..302eb23c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
@@ -166,11 +166,15 @@ export default {
       this.$refs.FormConfigRef?.reset();
       this.$refs.FormConfigRef?.$refs.ElFormRef.resetFields();
       // this.$refs.PopoverRef.doClose();
-      // console.log(this.$refs.FormConfigRef?.formData , "fdddddddd");
+      
+      const param = cloneDeep(this.$refs.FormConfigRef?.formData);
+      if (this.types === "input") {
+        param[this.params] = null
+      }
       console.log(this.$refs.FormConfigRef?.formData , "重置后");
       this.$emit(
         "handleSearch",
-        cloneDeep(this.$refs.FormConfigRef?.formData),
+        param,
         "reset"
         );
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
index f14cbdb4..ab66e2c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
@@ -17,7 +17,7 @@
         </p>
       </div>
       <div class="controls">
-        <Button :style="{ background: firstBtnColor, width: isShowLeft ? '50%' : '25%' }"
+        <Button :style="{ background: firstBtnColor, width: isShowLeft ? '50%' : '30%' }"
           @click.native="$emit('firstBtnClick', cardData.id)">{{ getFirstBtnText(cardData.state) }}</Button>
         <Button v-if="cardData.state == 4" :style="{ background: lastBtnColor, width: isShowLeft ? '50%' : '25%' }"
           @click.native="$emit('lastBtnClick', cardData.id)">{{ getLastBtnText(cardData.state) }}</Button>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue
index b4c5603d..d071743b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/LineClick/index.vue
@@ -239,7 +239,7 @@ div.auto-size {
     flex-direction: column;
     gap: 3px;
     min-width: 90px;
-
+    cursor: pointer;
     .top-label {
       line-height: 16px;
       height: 24px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue
index 37f0652e..e0ba5ec8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine1/index.vue
@@ -36,7 +36,7 @@
             }.svg`)})`,
           }"
         >
-          {{ item.label }}
+          {{ item.label  }}
         </div>
       </slot>
     </div>
@@ -102,6 +102,16 @@ export default {
       default: null,
     },
   },
+  computed:{
+    colorAction:function(){
+      const linearColor =this.lineActiveColor || `${this.activeColor}, ${this.activeColor}`
+      return `linear-gradient(90deg,${linearColor}) 2 2`
+    },
+    colorUnAction:function(){
+      const  linearColor = this.lineNormalColor || `${this.normalColor}, ${this.normalColor}`;
+      return `linear-gradient(90deg,${linearColor}) 2 2`
+    }
+  },
   data() {
     return {
       nodeLinesWidth: {},
@@ -230,7 +240,7 @@ div.auto-size {
 
     .top-label {
       line-height: 12px;
-      height: 35px;
+      height: 18px;
       font-size: 12px;
       text-align: center;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
index 84f46904..a2ddab05 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/TimeLine/TimeLine2/DescCard.vue
@@ -31,20 +31,26 @@
     <div v-if="data.type == 'text'">
       <div class="desc" v-html="data.desc" />
     </div>
-    <el-popover
+    <div class="detailsBox" v-if="data.processType == '3'">
+        <div class="item" v-for="item in data.controlResult" :key="item.deviceName">
+          <span class="label"> {{ item.deviceName }}：</span>
+          <span class="value"> {{ item.content+(item.result.code===200? '　　✅':'　　❌️')+item.result.msg }}</span>
+        </div>
+      </div>
+    <!-- <el-popover
       trigger="click"
       placement="right"
       v-if="data.processType == '3'"
-      style="color: red; cursor: pointer"
+      style="color: red; cursor: pointer;"
     >
-      <span slot="reference" @click="handleDetails(data)">详情</span>
+      <span slot="reference">详情</span>
       <div class="detailsBox" v-if="data.processType == '3'">
-        <div class="item" v-for="item in controlResult" :key="item.deviceName">
+        <div class="item" v-for="item in data.controlResult" :key="item.deviceName">
           <span class="label"> {{ item.deviceName }}：</span>
-          <span class="value"> {{ item.content }}</span>
+          <span class="value"> {{ item.content+(item.result.code===200? '　　✅':'　　❌️')+item.result.msg }}</span>
         </div>
       </div>
-    </el-popover>
+    </el-popover> -->
     <div
       v-if="data.processType == '4'"
       style="color: red; cursor: pointer"
@@ -52,7 +58,7 @@
     >
       详情
     </div>
-    <Dialog style="" v-model="detailsDialog" width="1085px" top="10px">
+    <Dialog v-model="detailsDialog" width="1085px" top="20px" style="z-index: 9999;">
       <div v-if="data.processType == '4'" class="docx-wrapper" style="height:800px;overflow-y: auto;overflow-x: hidden;">
         <section
           ref="initFile"
@@ -261,7 +267,7 @@
             </p>
           </article>
         </section>
-        <!-- <button @click="handleDownload">下载</button> -->
+        <button @click="handleDownload">下载</button>
       </div>
       <div></div>
     </Dialog>
@@ -271,6 +277,7 @@
 <script>
 import Video from "@screen/components/VideoMulti";
 import Dialog from "@screen/components/Dialog/index";
+import { delay, exportFile2, confirm } from "@screen/utils/common";
 import {
   eventDetails,
   getEventImportantFileDetails,
@@ -317,24 +324,33 @@ export default {
     };
   },
   methods: {
-    handleDetails(data) {
-      eventDetails(data.id).then((res) => {
-        if (res.data?.controlResult) {
-          this.controlResult = JSON.parse(res.data.controlResult);
-        }
-      });
-    },
     openDetailsDialog(data) {
       this.detailsDialog = true;
       getEventImportantFileDetails(data.id).then((res) => {
         this.formFileData = res.data;
       });
     },
+    // 下载
+    handleDownload() {
+      exportFile2({
+        url: "/business/eventImportantFile/download",
+        filename: this.data.desc,
+        data: this.formFileData,
+        ext: "docx",
+      });
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+.detailsBox{
+  max-height:160px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  background-color: #123742;
+  padding: 3px 8px;
+}
 .DescCard {
   font-size: 14px;
   // font-family: PingFang SC, PingFang SC;
@@ -353,7 +369,7 @@ export default {
   border: 1px solid #00b3cc;
 
   padding: 9px 15px;
-
+  
   .time {
   }
 
@@ -380,6 +396,8 @@ export default {
   .desc {
     font-size: 16px;
     line-height: 19px;
+    word-wrap: break-word; /* 允许在边界内断词 */
+    word-break: break-all; /* 如果需要，还可以设置此属性来允许任意位置断词 */
   }
 }
 .videoClass {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
index e9ad16f8..3c8d672c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
@@ -102,7 +102,7 @@ async function getUrl({ camId, url, pileNum, rangeIndex } = {}) {
 
   if (!url) {
     // Message.warning("未获取到当前相机的播放地址");
-    return Promise.reject("获取 url 失败!");
+    return Promise.reject("获取 url 失败");
   }
 
   return url;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
index 4d37f3ae..21b20078 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
@@ -16,7 +16,7 @@
       <video controls autoplay muted class="video-stream" v-bind="$attrs" ref="videoContainerRef" />
     </Transition>
 
-    <CameraControlDialog :deviceId="dialogData.iotDeviceId" :dialogData="dialogData" v-model="controlDialogVisible" />
+    <CameraControlDialog :deviceId="dialogData.iotDeviceId" :dialogData="dialogData" :visible="controlDialogVisible" @update:value="handleClose" />
   </div>
 </template>
 
@@ -64,8 +64,8 @@ export default {
     this.$once("hook:beforeDestroy", () => this.player?.destroy());
   },
   methods: {
-    closeContrl(){
-      this.controlDialogVisible =false
+    handleClose() {
+      this.controlDialogVisible = false;
     },
     cameraChange() {
       const changeItem = find(this.urls, { iotDeviceId: this.cameraId });
@@ -86,7 +86,7 @@ export default {
         code != 200 ||
         (Array.isArray(data) ? !data?.length : !Object.keys(data || {}).length)
       ) {
-        Message.warning("未获取到附近的相机信息");
+        this.$message.warning("未获取到附近的相机信息");
         return;
       }
       if (data[this.rangeIndex]) {
@@ -105,10 +105,12 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+
+
 .video-container {
   position: relative;
   background-color: #000;
-  height: 240px;
+  height: 100%;
   overflow: hidden;
   display: flex;
   flex-direction: column;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js
index 75beddbc..c8ec14fe 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/videoStream.js
@@ -78,7 +78,7 @@ async function getUrl({ camId} = {}) {
   let url = data.liveUrl;
   if (!url) {
     // Message.warning("未获取到当前相机的播放地址");
-    return Promise.reject("获取 url 失败!");
+    return Promise.reject("获取 url 失败");
   }
 
   return url;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
index 548f436f..eba59941 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
@@ -1,23 +1,40 @@
 <template>
   <div>
+
+    <!-- "详情"弹出框 -->
+    <EventDetailDialog  :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName"
+      @update:value="handleDialogClose"  />
+
   </div>
 </template>
 
 <script>
 import moment from "moment";
+import Cookies from 'js-cookie'
+
+import request from "@/utils/request";
+import { WarningType as warningTypeMapping, DirectionTypes as gzDirectionMapping, warningSourceMapping, warningStateMapping } from "@screen/utils/enum.js"
+import { param } from "../../../utils";
+
 export default {
   name: "WarningNotify",
   props: {
    
+  },
+  components: {
   },
   provide() {
     return {
+      
     }
   },
   data() {
     return {
       notifications: [],
       notifyIndex: 0,
+      activeName: '-1',
+      eventDetailDialogVisible: false,
+      detailDialogFormData: {},
     }
   },
   computed: {
@@ -34,17 +51,48 @@ export default {
     },
     showNotify(para){
       let _this = this;
-      let eventType = ["trafficAccident", "vehicleBroken", "trafficControl", "trafficJam", "illegalVehicle", "barrierClear", "construction", "serviceAreaAbnormal", "equipmentTrouble", "abnormalWeather", "otherEvent"];
-      let time = para.subEvent == "0" ? para.content.event.occurrenceTime : para.content.event.warningTime;
-      let obj = {
-        content: para.content.content,
-        time,
-        // moment().format("yyyy-MM-DD hh:mm"),
-        type: para.subEvent == '1' ? "signal" : eventType[para.content.event.eventType*1-1],
-        level: ["danger", "info"][para.subEvent*1],
-        duration: para.subEvent == "0" ? 0 : 4000
+      let obj = {};
+      if( para.subEvent == "0"){
+        let eventType = ["trafficAccident", "vehicleBroken", "trafficControl", "trafficJam", "illegalVehicle", "barrierClear", "construction", "serviceAreaAbnormal", "equipmentTrouble", "abnormalWeather", "otherEvent"];
+        obj = {
+          content: para.content.content,
+          time:para.content.event.occurrenceTime,
+          type: eventType[para.content.event.eventType*1-1],
+          level: "danger",
+          duration: 0
+        }
+      } else if(para.subEvent === '1'){
+        obj = {
+          content: para.content.content,
+          time:para.content.event.warningTime,
+          type: "signal",
+          level: "info",
+          duration: 4000 
+        }
+      } else if(para.subEvent === 'trafficFlowDataEarlyWarning'){
+        obj = {
+          content: para.content.content,
+          time:'',
+          type: "trafficJam",
+          level: "warning",
+          duration: 4000 
+        }
+      } else if(para.subEvent === '3'){
+        para.content.content = para.content.earlyWorningContent
+        obj = {
+          content: para.content.earlyWorningContent,
+          time:'',
+          type: "abnormalWeather",
+          level: "warning",
+          duration: 4000 
+        }
+      }
+        
+
+      this.speak(obj.time + '' + para.content.content);
+      if(Cookies.get('warning-notify') === 'off'){
+        return;
       }
-      this.speak(time + '' + para.content.content);
       _this.notifications[_this.notifyIndex] = _this.$notify({
         title: '',
         dangerouslyUseHTMLString: true,
@@ -52,6 +100,10 @@ export default {
         customClass: 'notify_whole',
         offset: 50,
         showClose: false,
+        onClick:function(){
+          // _this.showDialog(para)
+          // _this.notifications[idx].close();
+        },
         message: _this.$createElement(
           "div",
           { class: "notify_box " + obj.level },
@@ -70,7 +122,7 @@ export default {
                     ), _this.$createElement(
                       "span",
                       { class: 'text' },
-                      "告警"
+                      obj.level === 'warning' ? '预警':"告警"
                     )
                   ]
                 )
@@ -87,7 +139,13 @@ export default {
             ),
             _this.$createElement(
               "div",
-              { class: 'nofify_content' },
+              { class: 'nofify_content',
+                on: {
+                  click: function(){
+                    _this.showDialog(para)
+                  }
+                } 
+              },
               [
                 _this.$createElement(
                   "span",
@@ -126,7 +184,83 @@ export default {
       });
       _this.notifyIndex++;
     },
+    showDialog(info,idx){
+      if (info.subEvent == '1') {
+        this.activeName = '-1' //感知事件
+        request({
+          url: `/perceivedEvents/warning/getWarningById`,//感知事件
+          method: "post",
+          data: { id:info.content.event.id }
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          let data = result.data;
+
+          data.stringEventSource = data?.warningSource ? warningSourceMapping[data.warningSource] : '';
+          data.nickName = data.userName;
+          // data.direction = gzDirectionMapping[data.direction] || data.direction;
+          data.startTime = data.warningTime;
+          data.stringEventState = warningStateMapping[data.warningState];
+          data.stringEventType = warningTypeMapping[data.warningType];
+          data.actionSource = this.activeName
+
+          data.videoList = [];
+          if (data.otherConfig) {
+            let otherConfig = JSON.parse(data.otherConfig);
+
+            data.waterFilmThickness = otherConfig.waterFilmThickness;
+            data.windSpeed = otherConfig.windSpeed;
+            data.visibility = otherConfig.visibility;
+
+            data.pictures = otherConfig.pictures || [];
+            data.videoList = otherConfig.videoList || [];
+            // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4',
+            // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
+          }
+          data.videoType = "mp4";
+          data.component = "Video";
+          data.description = data.remark;
+
+          this.detailDialogFormData = data;
+          this.eventDetailDialogVisible = true;
+        });
+      } else {
+        this.activeName = info.eventState
+        request({
+          url: `/dc/system/event/${info.content.event.id}`,//交通事件
+          method: "get",
+        }).then(async (result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          let data = result.data;
+          data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
+          data.startTime = data?.occurrenceTime || '';
+
+
+          data.videoList = [];
+          data.component = "VideoMulti";
+
+          // const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
+          // data.downCamId = downCamera?.camId;
+          // data.upCamId = upCamera?.camId;
+          data.videoType = "flv";
+
+          this.detailDialogFormData = data;
+
+          this.eventDetailDialogVisible = true;
+        });
+      }
+
+    },
+
+    handleDialogClose() {
+      this.eventDetailDialogVisible = false;
+      this.$root.$emit('refresh-event-list');
+    },
     speak(text){
+      // 判断是否开启声音
+      if(Cookies.get('warning-sound') === 'off'){
+        return;
+      }
+
       // 创建SpeechSynthesisUtterance实例  
       const utterance = new SpeechSynthesisUtterance(text);
 
@@ -215,7 +349,7 @@ export default {
     display: flex;
     align-items: center;
     padding: 20px 20px 16px 0;
-
+    cursor: pointer;
     .type_icon {
       width: 80px;
       display: flex;
@@ -251,7 +385,7 @@ export default {
 
 $infoColor: #3DE8FF;
 $dangerColor: #FF5F5F;
-
+$warningColor: #FFD294;
 .notify_box.info {
   background-image: linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%);
   border-image: linear-gradient(180deg, rgba(78, 174, 204, 1), rgba(78, 174, 204, 0)) 2 2;
@@ -325,4 +459,42 @@ $dangerColor: #FF5F5F;
     }
   }
 }
+
+
+.notify_box.warning {
+  background: linear-gradient( 180deg, #573101 0%, #A46003 100%);
+  border-image: linear-gradient(180deg, rgba(237, 147, 128, 1), rgba(239, 146, 157, 0)) 2 2;
+
+  .nofify_head {
+    border-bottom: 1px solid #FFFFFF33;
+
+    .title {
+      .icon {
+        color: $warningColor;
+      }
+
+      .text {
+        color: $warningColor;
+      }
+    }
+
+    .btn_close {
+      color: $warningColor;
+    }
+  }
+
+  .nofify_content {
+    .type_icon {
+      .iconfont {
+        color: $warningColor;
+      }
+    }
+
+    .info {
+      .content {}
+
+      .time {}
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue
index 2006b91c..201e6de8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue
@@ -9,7 +9,11 @@
                 <h3>{{ item.dictLabel }}</h3>
                 <div v-for="(itm, indx) in item.list" :key="indx" class="tplItem" :class="page!='home' ? 'item_sub' : 'item_home'" >
                     <!-- 模板内容 -->
-                    <BroadcastTplShower class=" boardPreview" :text="itm.content" />
+                    <BroadcastTplShower class=" boardPreview" 
+                    :sound="itm.outVol" 
+                    :repeat="itm.repeatTimes"
+                    :priority="itm.priority"
+                    :text="itm.content" />
                 <div class="infoBtnBox">
                     <el-tooltip content="加入待下发信息" placement="top">
                         <p @click="____onTplToDevice(itm)" class="btn btnApply">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplShower.vue b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplShower.vue
index e5caa57c..130e4d77 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplShower.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplShower.vue
@@ -1,16 +1,37 @@
 <template>
     <div class="broadcast_tpl_shower">
-        <p class="text">{{ text }}</p>
+        <div class="bpanel">
+            <div class="text">{{ text }}</div>
+            <div class="option" v-if="sound">
+                <img :src="require('./sound.png')" />{{ sound }}
+                <img :src="require('./circle.png')" />{{ repeat }}
+                <!-- <span class="jinjidu">{{ broadcastPriority['3'] }}</span> -->
+            </div>
+        </div>
     </div>
 </template>
 <script>
+import { broadcastPriority } from "@screen/utils/enum.js";
 export default {
     name:"BoardPreview",
     data(){
         return {
+            broadcastPriority
         }
     },
     props:{
+        repeat:{
+            type: String,
+            default: null
+        },
+        priority:{
+            type: String,
+            default: null
+        },
+        sound:{
+            type: String,
+            default: null
+        },
         text: {
             type: String,
             default: "测试文字"
@@ -35,10 +56,32 @@ export default {
     flex-direction: row;
     justify-content: flex-start;
     align-items: center; padding: 4px 12px;
-    .text {
-        color: #0E0;
-        font-size: 16px; line-height: 18px; max-height: 36px; overflow: hidden;
-        word-break: break-all;
+    .bpanel{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 100%;
+        .text {
+            color: #0E0;
+            font-size: 16px; line-height: 18px; max-height: 36px; overflow: hidden;
+            word-break: break-all;
+        }
+        .option{
+            width: 80px;
+            color: #ffff00;
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            img{
+                width: 16px;
+                height: 16px;
+                margin:0px 2px 0px 12px;
+            }
+            .jinjidu{
+                font-size: 14px;
+                margin-left: 10px;
+            }
+        }
     }
 }
 </style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue
index d14ece18..7e33e528 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue
@@ -268,7 +268,6 @@ export default {
         }
       });
       let doNext = () => {
-        console.log(this.dataForm , "this.dataForm++++")
         let data = {
           outVol: ''+this.dataForm.outVol,
           repeatTimes: ''+this.dataForm.repeatTimes,
@@ -308,7 +307,7 @@ export default {
         }
 
         const afterSave = (para) => {
-          this.$message.success(para + "成功!");
+          this.$message.success(para + "成功");
           this.loading = false;
           // this.dialogVisible = false
           this.$emit("afterSubmit", { type: this.type, mode: this.mode });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/circle.png b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/circle.png
new file mode 100644
index 00000000..67509efb
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/circle.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/sound.png b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/sound.png
new file mode 100644
index 00000000..f591a5b0
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/sound.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
index c82cb99c..77beff39 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
@@ -2,7 +2,7 @@
   <el-dialog
     :title="calcTitle"
     :visible.sync="dialogVisible"
-    width="800px"
+    width="820px"
     append-to-body
     :close-on-click-modal="false"
   >
@@ -566,7 +566,7 @@ export default {
         }
 
         const afterSave = (para) => {
-          this.$message.success(para + "成功!");
+          this.$message.success(para + "成功");
           this.loading = false;
           // this.dialogVisible = false
           this.$emit("afterSubmit", { type: this.type, mode: this.mode });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
index b3b7d445..4bca7df4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
@@ -7,6 +7,8 @@
     </div>
 </template>
 <script>
+import { forEach } from 'lodash';
+
 export default {
     name:"BoardPreview",
     data(){
@@ -70,12 +72,11 @@ export default {
                         scale = boxW / arr[0];
                     }
                 }
-
                 this.boardStyle =  {
                     width: `${arr[0] * scale}px`,
                     height: `${arr[1] * scale}px`,
                     "background-color":`${this.tpl.backgroundColor}`,
-                    "align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.verticalAlignment]  //模板的字段为为formatStyle
+                    // "align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.verticalAlignment]  //模板的字段为为formatStyle
                 }
                 let fontSize = 0;
                 if (_.isString(this.tpl.fontSize)) {
@@ -87,8 +88,30 @@ export default {
                     "color": "#" + this.tpl.foregroundColor,  //模板的字段为fontColor
                     "font-size": `${fontSize*scale}px`,
                     "font-family": this.fontTypeDic[this.tpl.font || '3'],   //模板的字段为fontType
-                    "min-height": `${fontSize * scale}px`
+                    "min-height": `${fontSize * scale}px`,
+                    "text-align" : ['left', 'right', 'center'][this.tpl.verticalAlignment],
                 }
+                // this.contentArr = this.tpl.textContent.replaceAll(/\\\\n/g, '\n').replaceAll(/\\=/g, '=').replaceAll(/\\,/g, ',').replaceAll(/ /g, '&nbsp').split('\n');
+                // const fontLength = (Math.ceil(arr[0]/fontSize)-1)*2; //中文占2个字符
+                // const aryContent = this.tpl.textContent.split('\n');
+                // const _content = [];
+                // aryContent.forEach(e => {
+                //     let txtLength = e.length;
+                //     // 获取数字数量
+                //     let aryCn = e.match(/[\u4e00-\u9fff]*/g)
+                //     let cnNum = 0;
+                //     aryCn.forEach(c=>{
+                //         cnNum += c.length
+                //     })
+                //     // 默认全中文，如果有英文的话需要增加字符数量
+                //     txtLength = txtLength + cnNum
+                    
+                //     e = (txtLength>fontLength? e.substr(0,fontLength):e)
+                //     e = e.replaceAll(/\\\\n/g, '\n').replaceAll(/\\=/g, '=').replaceAll(/\\,/g, ',').replaceAll(/ /g, '&nbsp')
+                //     _content.push(e)
+                // });
+                // this.contentArr = _content;
+
                 this.lineTotal = Math.floor(arr[1] / fontSize);
                 this.isReady = true;
                 
@@ -115,6 +138,8 @@ export default {
             margin-bottom: 0;
             word-break: keep-all;
             white-space: nowrap;
+            overflow: hidden;
+            width: 100%;
         }
     }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue
index 473dbb38..e9ff2da0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue
@@ -69,11 +69,13 @@ export default {
                         scale = boxW/arr[0];
                     }
                 }
-
+                if(scale > 0.98){
+                    scale = 1;
+                }
                 this.boardStyle =  {
                     width: `${arr[0] * scale}px`,
                     height: `${arr[1] * scale}px`,
-                    "align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.formatStyle]
+                    // "align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.formatStyle]
                 }
                 let fontSize = 0;
                 if(_.isString(this.tpl.fontSize)){
@@ -82,13 +84,16 @@ export default {
                     fontSize = this.tpl.fontSize;
                 }
                 this.boardTxtStyle = {
+                    "text-align" : ['left', 'right', 'center'][this.tpl.formatStyle],
                     "color": "#" + this.tpl.fontColor, 
                     "font-size": `${fontSize*scale}px`,
                     "font-family": this.fontTypeDic[this.tpl.fontType || '3'],
                     "min-height": `${fontSize * scale}px`,
                 }
+
                 this.lineTotal = Math.floor(arr[1]/ fontSize);
                 this.isReady = true;
+                
             })
         }
     }
@@ -112,6 +117,8 @@ export default {
             margin-bottom: 0;
             word-break: keep-all;
             white-space: nowrap;
+            overflow: hidden;
+            width: 100%;
         }
     }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballb_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballb_active.svg
new file mode 100644
index 00000000..b719b0f1
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballb_active.svg
@@ -0,0 +1,57 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2620)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2620)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2620)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2620)">
+<path d="M21.0002 18.4508C21.3331 18.451 21.6584 18.5499 21.9351 18.7351C22.2118 18.9202 22.4274 19.1832 22.5546 19.4908C22.6819 19.7985 22.715 20.1369 22.6499 20.4634C22.5848 20.7899 22.4244 21.0897 22.1889 21.325C21.9534 21.5603 21.6535 21.7206 21.3269 21.7854C21.0004 21.8503 20.662 21.8169 20.3545 21.6894C20.0469 21.562 19.7841 21.3462 19.5991 21.0694C19.4142 20.7926 19.3155 20.4671 19.3155 20.1342C19.3158 19.6876 19.4935 19.2594 19.8094 18.9438C20.1253 18.6281 20.5536 18.4508 21.0002 18.4508ZM21.0002 17.1079C20.4014 17.1079 19.8161 17.2855 19.3182 17.6181C18.8203 17.9508 18.4323 18.4236 18.2031 18.9769C17.974 19.5301 17.914 20.1388 18.0308 20.7261C18.1476 21.3134 18.436 21.8528 18.8594 22.2762C19.2828 22.6996 19.8223 22.988 20.4095 23.1048C20.9968 23.2216 21.6056 23.1617 22.1588 22.9325C22.712 22.7034 23.1848 22.3153 23.5175 21.8174C23.8502 21.3196 24.0277 20.7342 24.0277 20.1354C24.0277 19.3325 23.7087 18.5624 23.141 17.9947C22.5732 17.4269 21.8031 17.1079 21.0002 17.1079Z" fill="#FFDB82"/>
+<path d="M21.0006 11C15.9558 11 11.8662 15.0896 11.8662 20.1343C11.8662 25.1791 15.9563 29.2684 21.0006 29.2684C26.0448 29.2684 30.1347 25.1791 30.1347 20.1343C30.1347 15.0896 26.0453 11 21.0006 11ZM21.0006 12.5169C21.1633 12.5169 21.3225 12.5652 21.4578 12.6556C21.5932 12.7461 21.6987 12.8746 21.761 13.025C21.8232 13.1754 21.8395 13.3409 21.8078 13.5006C21.776 13.6602 21.6976 13.8069 21.5825 13.922C21.4674 14.0371 21.3208 14.1155 21.1611 14.1472C21.0015 14.179 20.836 14.1627 20.6856 14.1004C20.5352 14.0381 20.4067 13.9326 20.3162 13.7972C20.2258 13.6619 20.1775 13.5028 20.1775 13.34C20.1775 13.2319 20.1987 13.1249 20.2401 13.025C20.2814 12.9251 20.3421 12.8344 20.4185 12.7579C20.4949 12.6815 20.5857 12.6209 20.6856 12.5795C20.7854 12.5382 20.8925 12.5169 21.0006 12.5169ZM21.0006 24.5655C20.1241 24.5656 19.2673 24.3057 18.5385 23.8188C17.8097 23.3319 17.2417 22.6398 16.9063 21.83C16.5708 21.0203 16.483 20.1293 16.654 19.2696C16.825 18.41 17.2471 17.6204 17.8668 17.0006C18.4866 16.3809 19.2762 15.9588 20.1358 15.7878C20.9955 15.6168 21.8865 15.7046 22.6963 16.04C23.506 16.3755 24.1981 16.9435 24.685 17.6723C25.1719 18.4011 25.4318 19.2579 25.4317 20.1343C25.4317 20.7163 25.3171 21.2925 25.0944 21.8301C24.8717 22.3677 24.5453 22.8562 24.1339 23.2677C23.7224 23.6791 23.2339 24.0055 22.6963 24.2282C22.1587 24.4509 21.5825 24.5655 21.0006 24.5655Z" fill="#FFDB82"/>
+<path d="M20.9997 30.4203C19.1167 30.4232 17.2693 29.9068 15.6608 28.9277L13.5889 30.9999H28.4106L26.3384 28.9277C24.73 29.9068 22.8827 30.4233 20.9997 30.4203Z" fill="#FFDB82"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2620" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2620"/>
+</filter>
+<filter id="filter1_i_1302_2620" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2620"/>
+</filter>
+<filter id="filter2_i_1302_2620" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2620"/>
+</filter>
+<clipPath id="clip0_1302_2620">
+<rect width="20" height="20" fill="white" transform="translate(11 11)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballb_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballb_fault.svg
new file mode 100644
index 00000000..af8b5d16
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballb_fault.svg
@@ -0,0 +1,57 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2621)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2621)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2621)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2621)">
+<path d="M21.0002 18.4508C21.3331 18.451 21.6584 18.5499 21.9351 18.7351C22.2118 18.9202 22.4274 19.1832 22.5546 19.4908C22.6819 19.7985 22.715 20.1369 22.6499 20.4634C22.5848 20.7899 22.4244 21.0897 22.1889 21.325C21.9534 21.5603 21.6535 21.7206 21.3269 21.7854C21.0004 21.8503 20.662 21.8169 20.3545 21.6894C20.0469 21.562 19.7841 21.3462 19.5991 21.0694C19.4142 20.7926 19.3155 20.4671 19.3155 20.1342C19.3158 19.6876 19.4935 19.2594 19.8094 18.9438C20.1253 18.6281 20.5536 18.4508 21.0002 18.4508ZM21.0002 17.1079C20.4014 17.1079 19.8161 17.2855 19.3182 17.6181C18.8203 17.9508 18.4323 18.4236 18.2031 18.9769C17.974 19.5301 17.914 20.1388 18.0308 20.7261C18.1476 21.3134 18.436 21.8528 18.8594 22.2762C19.2828 22.6996 19.8223 22.988 20.4095 23.1048C20.9968 23.2216 21.6056 23.1617 22.1588 22.9325C22.712 22.7034 23.1848 22.3153 23.5175 21.8174C23.8502 21.3196 24.0277 20.7342 24.0277 20.1354C24.0277 19.3325 23.7087 18.5624 23.141 17.9947C22.5732 17.4269 21.8031 17.1079 21.0002 17.1079Z" fill="#FF5F5F"/>
+<path d="M21.0006 11C15.9558 11 11.8662 15.0896 11.8662 20.1343C11.8662 25.1791 15.9563 29.2684 21.0006 29.2684C26.0448 29.2684 30.1347 25.1791 30.1347 20.1343C30.1347 15.0896 26.0453 11 21.0006 11ZM21.0006 12.5169C21.1633 12.5169 21.3225 12.5652 21.4578 12.6556C21.5932 12.7461 21.6987 12.8746 21.761 13.025C21.8232 13.1754 21.8395 13.3409 21.8078 13.5006C21.776 13.6602 21.6976 13.8069 21.5825 13.922C21.4674 14.0371 21.3208 14.1155 21.1611 14.1472C21.0015 14.179 20.836 14.1627 20.6856 14.1004C20.5352 14.0381 20.4067 13.9326 20.3162 13.7972C20.2258 13.6619 20.1775 13.5028 20.1775 13.34C20.1775 13.2319 20.1987 13.1249 20.2401 13.025C20.2814 12.9251 20.3421 12.8344 20.4185 12.7579C20.4949 12.6815 20.5857 12.6209 20.6856 12.5795C20.7854 12.5382 20.8925 12.5169 21.0006 12.5169ZM21.0006 24.5655C20.1241 24.5656 19.2673 24.3057 18.5385 23.8188C17.8097 23.3319 17.2417 22.6398 16.9063 21.83C16.5708 21.0203 16.483 20.1293 16.654 19.2696C16.825 18.41 17.2471 17.6204 17.8668 17.0006C18.4866 16.3809 19.2762 15.9588 20.1358 15.7878C20.9955 15.6168 21.8865 15.7046 22.6963 16.04C23.506 16.3755 24.1981 16.9435 24.685 17.6723C25.1719 18.4011 25.4318 19.2579 25.4317 20.1343C25.4317 20.7163 25.3171 21.2925 25.0944 21.8301C24.8717 22.3677 24.5453 22.8562 24.1339 23.2677C23.7224 23.6791 23.2339 24.0055 22.6963 24.2282C22.1587 24.4509 21.5825 24.5655 21.0006 24.5655Z" fill="#FF5F5F"/>
+<path d="M20.9997 30.4203C19.1167 30.4232 17.2693 29.9068 15.6608 28.9277L13.5889 30.9999H28.4106L26.3384 28.9277C24.73 29.9068 22.8827 30.4233 20.9997 30.4203Z" fill="#FF5F5F"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2621" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2621"/>
+</filter>
+<filter id="filter1_i_1302_2621" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2621"/>
+</filter>
+<filter id="filter2_i_1302_2621" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2621"/>
+</filter>
+<clipPath id="clip0_1302_2621">
+<rect width="20" height="20" fill="white" transform="translate(11 11)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/event/气象检测器.svg b/ruoyi-ui/src/views/JiHeExpressway/images/event/气象检测器.svg
new file mode 100644
index 00000000..4774f572
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/event/气象检测器.svg
@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
+<g id="Frame">
+<g id="Group 1142814034">
+<path id="Vector" d="M17.7726 14.1068L17.5926 14.4367C19.0726 16.5967 19.5926 18.6267 18.7526 19.4367C17.6526 20.4367 14.6526 19.0367 12.0526 16.2567C9.45265 13.4767 8.24265 10.3767 9.34265 9.34675C10.2426 8.50675 12.4226 9.34675 14.6026 11.1568C14.6627 11.1939 14.732 11.2136 14.8026 11.2136C14.8733 11.2136 14.9426 11.1939 15.0026 11.1568L15.1926 11.0767L15.4326 9.52675C15.4404 9.45893 15.4307 9.39025 15.4045 9.32723C15.3782 9.26422 15.3363 9.20897 15.2826 9.16675C12.5526 7.16675 9.58265 6.28675 7.94265 7.91675C5.87265 9.98675 4.62264 16.4168 8.61265 20.4068C9.35778 21.1611 10.2358 21.7713 11.2026 22.2068V24.7367H9.12265C8.87599 24.7367 8.63944 24.8347 8.46504 25.0091C8.29063 25.1835 8.19265 25.4201 8.19265 25.6667C8.19265 25.9134 8.29063 26.15 8.46504 26.3244C8.63944 26.4988 8.87599 26.5968 9.12265 26.5968H16.5326C16.7793 26.5968 17.0158 26.4988 17.1903 26.3244C17.3647 26.15 17.4626 25.9134 17.4626 25.6667C17.4626 25.4201 17.3647 25.1835 17.1903 25.0091C17.0158 24.8347 16.7793 24.7367 16.5326 24.7367H13.0526V22.7367C14.3199 22.9808 15.6259 22.9349 16.8728 22.6024C18.1197 22.2699 19.2752 21.6594 20.2526 20.8167C21.8126 19.2567 21.1926 16.2568 19.4426 13.5268L17.7726 14.0667V14.1068Z" fill="#FF5F5F"/>
+<path id="Vector_2" d="M13.7532 14.8967L13.9632 15.1067C14.0652 15.2044 14.1867 15.2793 14.3198 15.3266C14.4528 15.374 14.5944 15.3926 14.7352 15.3812C14.8759 15.3699 15.0127 15.3289 15.1365 15.2609C15.2602 15.1929 15.3682 15.0994 15.4532 14.9867L17.2532 12.7967C17.3844 12.6254 17.4697 12.4235 17.5012 12.21C17.5327 11.9965 17.5093 11.7786 17.4332 11.5767C17.6118 11.72 17.8342 11.7976 18.0632 11.7967C18.2795 11.8127 18.4956 11.7633 18.6834 11.6548C18.8712 11.5463 19.022 11.3838 19.1162 11.1884C19.2103 10.993 19.2434 10.7738 19.2112 10.5593C19.1791 10.3449 19.083 10.145 18.9357 9.98589C18.7883 9.82674 18.5965 9.71565 18.3851 9.66708C18.1737 9.61851 17.9526 9.6347 17.7506 9.71356C17.5485 9.79241 17.3749 9.93028 17.2523 10.1092C17.1297 10.2881 17.0638 10.4998 17.0632 10.7167C17.061 10.9581 17.1383 11.1935 17.2832 11.3867C17.0808 11.31 16.862 11.2872 16.6481 11.3205C16.4343 11.3538 16.2327 11.4421 16.0632 11.5767L13.8632 13.3667C13.7446 13.4523 13.6462 13.5628 13.5749 13.6905C13.5037 13.8183 13.4613 13.9601 13.4508 14.106C13.4403 14.2519 13.462 14.3983 13.5142 14.5349C13.5665 14.6715 13.6481 14.795 13.7532 14.8967Z" fill="#FF5F5F"/>
+<path id="Vector_3" d="M17.0225 6.44678V7.98678C17.507 7.98796 17.9862 8.0889 18.43 8.28331C18.8739 8.47771 19.273 8.76143 19.6025 9.11678C20.2917 9.84658 20.6746 10.813 20.6725 11.8168H22.1725C22.1966 10.4232 21.6688 9.07652 20.704 8.07055C19.7393 7.06458 18.4159 6.48089 17.0225 6.44678Z" fill="#FF5F5F"/>
+<path id="Vector_4" d="M17.0225 3.66675V5.23675C18.7306 5.2813 20.3516 6.00082 21.5304 7.23779C22.7093 8.47476 23.3501 10.1284 23.3125 11.8367H24.8125C24.8581 9.72165 24.0641 7.67457 22.6042 6.14344C21.1443 4.6123 19.1373 3.72179 17.0225 3.66675Z" fill="#FF5F5F"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png b/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png
index fa12035a..0bfac37a 100644
Binary files a/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png and b/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/logoMean.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/weather.svg b/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/weather.svg
new file mode 100644
index 00000000..fe18f3b0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/home-Frame/weather.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="23" viewBox="0 0 27 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321314666">
+<path id="Vector" d="M3.94702 6.97571C3.99964 6.9642 4.04705 6.93513 4.08183 6.89303C4.11661 6.85094 4.1368 6.7982 4.13924 6.74308C4.20267 4.93238 4.985 3.23897 6.34206 1.97236C7.70489 0.700823 9.49829 0 11.3926 0C12.8784 0 14.3076 0.428774 15.5253 1.24197C16.6414 1.97728 17.5266 3.02779 18.0741 4.26704C18.0973 4.3184 18.1366 4.36035 18.1857 4.38624C18.2348 4.41213 18.2909 4.42048 18.3451 4.40996C18.6171 4.35772 18.893 4.33111 19.1688 4.33111C20.1799 4.33111 21.1554 4.68004 21.9156 5.31581C22.6061 5.88452 23.0858 6.67874 23.2746 7.56613M3.94702 6.97669L21.7628 8.59617L21.7147 8.59519C21.7108 8.75602 21.7685 8.91203 21.8754 9.02977C21.9823 9.14752 22.1299 9.21762 22.2866 9.22504M3.94702 6.97669C2.88501 7.2172 1.90758 7.85001 1.19733 8.75684C0.417991 9.76272 -0.00434194 11.0107 -0.0001894 12.2955C-0.0001894 15.2693 2.19111 17.697 4.89946 17.7266H9.87119L9.85389 17.6635L9.84428 17.629C9.82714 17.5542 9.81621 17.478 9.8116 17.4013C9.78187 16.9956 9.78508 16.5881 9.82122 16.183L9.82506 16.1534L9.82987 16.0982H4.94848C3.12241 16.0982 1.6279 14.3979 1.6279 12.2955C1.6279 11.2733 1.9787 10.3142 2.61398 9.59172C3.23869 8.88202 4.06235 8.49169 4.93021 8.49169L5.27717 8.49268C5.43767 8.49268 5.59145 8.42368 5.69813 8.30343C5.74987 8.24502 5.78875 8.17589 5.81213 8.10072C5.83551 8.02554 5.84285 7.94609 5.83364 7.86775L5.80097 7.58486C5.77626 7.38542 5.76342 7.18463 5.76252 6.98359C5.76252 4.03343 8.28444 1.62737 11.3926 1.62737C13.9895 1.62737 16.2336 3.30402 16.8535 5.70121L16.9314 6.00086C16.964 6.12249 17.035 6.22963 17.1332 6.30558C17.2314 6.38153 17.3514 6.42203 17.4744 6.42076C17.559 6.42076 17.6426 6.40105 17.7195 6.36359L17.9982 6.22855C18.3657 6.04945 18.7677 5.95716 19.1746 5.95848C19.8598 5.95848 20.5018 6.20884 20.9833 6.66226C21.4591 7.11074 22.7879 8.19629 22.7889 8.83206L3.94798 6.97571L3.94702 6.97669ZM23.2746 7.56613L22.7617 7.14623L23.2755 7.56613H23.2746ZM23.2746 7.56613C23.2938 7.65977 23.3649 7.73468 23.4543 7.75736C24.4376 8.02792 25.3094 8.61704 25.9397 9.43697C26.627 10.3334 27.0004 11.4409 26.9998 12.5813C26.9998 13.7641 26.7211 14.7656 26.154 15.5916C25.587 16.4176 24.7335 17.0662 23.5898 17.5492L23.5543 17.564L23.4899 17.5916L23.488 17.5196L23.4524 15.8883V15.8577L23.4793 15.8439L23.5773 15.7927C23.8214 15.6655 23.9493 15.5995 24.0684 15.5098C24.1886 15.4201 24.3001 15.3057 24.5106 15.082C25.0641 14.4886 25.3727 13.6025 25.3727 12.5813C25.3727 10.809 24.1002 9.34333 22.4798 9.23786L22.2875 9.22504M23.536 17.5186L23.5716 17.5038L23.5831 17.4989V17.5186H23.536ZM23.536 17.5186L23.535 17.4664L23.5177 17.4733L23.536 17.5186Z" fill="white"/>
+<path id="Vector_2" d="M17.2798 20.5732V20.524H16.2322V21.5412C15.1986 21.4191 14.2357 20.9421 13.5 20.1876C12.7644 19.4331 12.2992 18.4455 12.1802 17.3855H13.173V16.3121H12.1812C12.3004 15.2523 12.7656 14.2649 13.5013 13.5106C14.2369 12.7564 15.1997 12.2794 16.2332 12.1574V13.1747H17.2798V12.1574C18.3132 12.2794 19.276 12.7564 20.0117 13.5106C20.7473 14.2649 21.2126 15.2523 21.3317 16.3121H19.9968V17.3865H21.3317C21.2126 18.4464 20.7473 19.4337 20.0117 20.188C19.276 20.9423 18.3132 21.4192 17.2798 21.5412V20.5732ZM16.2802 13.5049H16.2322V16.1455C16.1255 16.2272 16.0391 16.3335 15.9798 16.4557C15.9206 16.578 15.8901 16.7128 15.891 16.8493C15.891 17.3323 16.2697 17.7276 16.7397 17.7364L18.4196 19.2337L18.4533 19.2633L18.485 19.2307L19.1481 18.5516L19.1808 18.5181L19.1491 18.4836L17.621 16.8C17.6134 16.6722 17.5789 16.5475 17.5201 16.4346C17.4612 16.3216 17.3792 16.223 17.2798 16.1455V13.5039H16.2802V13.5049ZM10.7578 16.8493C10.7578 20.2411 13.4489 23 16.756 23C20.0641 23 22.7542 20.2411 22.7542 16.8493C22.7542 13.4566 20.0631 10.6967 16.757 10.6967C15.1663 10.6982 13.6413 11.3469 12.5166 12.5005C11.3919 13.654 10.7593 15.218 10.7578 16.8493Z" fill="white"/>
+<path id="Vector 743" d="M3.88379 7.14621L4.34832 6.6698L7.13548 5.71697L12.2453 4.28772L18.7487 7.62263L21.0713 7.14621L22.4649 6.6698L22.7198 6.93123C23.1664 7.38922 23.5368 7.91566 23.8171 8.49062L24.323 9.52829L6.45339 8.63429C5.69745 8.59647 4.98374 8.27431 4.45534 7.73239L3.88379 7.14621Z" fill="white"/>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/Weather.svg b/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/Weather.svg
new file mode 100644
index 00000000..04c6ba52
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/Weather.svg
@@ -0,0 +1,3 @@
+<svg width="26" height="24" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.468 24C5.37001 24.0004 5.27358 23.9762 5.1882 23.9298C5.10281 23.8834 5.03139 23.8163 4.98096 23.7351C4.93053 23.654 4.90281 23.5616 4.90054 23.467C4.89827 23.3723 4.92152 23.2788 4.968 23.1955L11.937 10.6998C11.9854 10.613 12.0572 10.5405 12.1447 10.49C12.2323 10.4394 12.3325 10.4127 12.4345 10.4127C12.5365 10.4127 12.6367 10.4394 12.7243 10.49C12.8118 10.5405 12.8836 10.613 12.932 10.6998L19.899 23.1955C19.9455 23.2788 19.9687 23.3723 19.9665 23.467C19.9642 23.5616 19.9365 23.654 19.886 23.7351C19.8356 23.8163 19.7642 23.8834 19.6788 23.9298C19.5934 23.9762 19.497 24.0004 19.399 24H5.468ZM22.75 10.8649C23.7124 9.1938 24.2681 7.33295 24.375 5.42352C24.2412 3.76297 23.6829 2.16044 22.75 0.759605C22.7574 0.556248 22.8462 0.363601 22.9978 0.222263C23.1494 0.0809243 23.3518 0.00193198 23.5625 0.00193198C23.7732 0.00193198 23.9756 0.0809243 24.1272 0.222263C24.2788 0.363601 24.3676 0.556248 24.375 0.759605C25.2997 2.14044 25.8578 3.72008 26 5.35881C25.8957 7.28883 25.3402 9.17097 24.375 10.864C24.3676 11.0673 24.2788 11.26 24.1272 11.4013C23.9756 11.5426 23.7732 11.6216 23.5625 11.6216C23.3518 11.6216 23.1494 11.5426 22.9978 11.4013C22.8462 11.26 22.7574 11.0673 22.75 10.864V10.8649ZM1.626 10.8649C0.660358 9.17207 0.104439 7.2899 0 5.35978C0.141589 3.72002 0.699738 2.13931 1.625 0.757673C1.63239 0.554316 1.72123 0.36167 1.87279 0.220331C2.02436 0.0789924 2.22681 0 2.4375 0C2.64818 0 2.85064 0.0789924 3.00221 0.220331C3.15377 0.36167 3.24261 0.554316 3.25 0.757673C2.31711 2.1585 1.75876 3.76104 1.625 5.42159C1.73235 7.33095 2.28803 9.1917 3.25 10.863C3.25 11.0712 3.16434 11.271 3.01188 11.4182C2.85941 11.5655 2.65262 11.6482 2.437 11.6482C2.22138 11.6482 2.01459 11.5655 1.86212 11.4182C1.70965 11.271 1.624 11.0712 1.624 10.863L1.626 10.8649ZM19.095 9.69918C19.8111 8.462 20.2288 7.08464 20.317 5.6698C20.2349 4.34336 19.8163 3.05677 19.098 1.92341C19.098 1.71542 19.1835 1.51594 19.3358 1.36887C19.4881 1.22179 19.6946 1.13917 19.91 1.13917C20.1254 1.13917 20.3319 1.22179 20.4842 1.36887C20.6364 1.51594 20.722 1.71542 20.722 1.92341C21.4382 3.08207 21.855 4.39029 21.937 5.73741C21.8504 7.12999 21.4329 8.48461 20.717 9.69628C20.7096 9.89964 20.6208 10.0923 20.4692 10.2336C20.3176 10.375 20.1152 10.454 19.9045 10.454C19.6938 10.454 19.4914 10.375 19.3398 10.2336C19.1882 10.0923 19.0994 9.89964 19.092 9.69628L19.095 9.69918ZM5.689 9.69918C4.97322 8.48715 4.55611 7.13218 4.47 5.73934C4.55231 4.3914 4.96977 3.08247 5.687 1.92341C5.687 1.71542 5.77255 1.51594 5.92483 1.36887C6.07711 1.22179 6.28364 1.13917 6.499 1.13917C6.71436 1.13917 6.92089 1.22179 7.07317 1.36887C7.22545 1.51594 7.311 1.71542 7.311 1.92341C6.59299 3.05718 6.17471 4.34409 6.093 5.67077C6.18063 7.08396 6.59694 8.4599 7.311 9.69628C7.311 9.90428 7.22545 10.1038 7.07317 10.2508C6.92089 10.3979 6.71436 10.4805 6.499 10.4805C6.28364 10.4805 6.07711 10.3979 5.92483 10.2508C5.77255 10.1038 5.687 9.90428 5.687 9.69628L5.689 9.69918ZM15.437 7.75307C15.9358 7.08932 16.2188 6.29721 16.25 5.47761C16.1581 4.63433 15.881 3.81971 15.437 3.08818C15.437 2.87993 15.5227 2.68021 15.6751 2.53296C15.8276 2.3857 16.0344 2.30298 16.25 2.30298C16.4656 2.30298 16.6724 2.3857 16.8249 2.53296C16.9773 2.68021 17.063 2.87993 17.063 3.08818C17.5062 3.81296 17.7831 4.62122 17.875 5.45829C17.8429 6.28293 17.5605 7.08026 17.063 7.75113C17.063 7.95938 16.9773 8.1591 16.8249 8.30636C16.6724 8.45361 16.4656 8.53634 16.25 8.53634C16.0344 8.53634 15.8276 8.45361 15.6751 8.30636C15.5227 8.1591 15.437 7.95938 15.437 7.75113V7.75307ZM8.937 7.75307C8.43905 7.08232 8.15633 6.28497 8.124 5.46022C8.21582 4.6224 8.49309 3.81344 8.937 3.08818C8.937 2.88019 9.02255 2.68071 9.17483 2.53364C9.32711 2.38657 9.53364 2.30394 9.749 2.30394C9.96436 2.30394 10.1709 2.38657 10.3232 2.53364C10.4754 2.68071 10.561 2.88019 10.561 3.08818C10.1177 3.81924 9.84093 4.63316 9.749 5.47568C9.77999 6.29516 10.0626 7.08723 10.561 7.75113C10.561 7.95913 10.4754 8.1586 10.3232 8.30568C10.1709 8.45275 9.96436 8.53537 9.749 8.53537C9.53364 8.53537 9.32711 8.45275 9.17483 8.30568C9.02255 8.1586 8.937 7.95913 8.937 7.75113V7.75307ZM11.304 5.58578C11.27 5.18831 11.399 4.79385 11.6633 4.48743C11.9277 4.18102 12.3061 3.9872 12.717 3.94776C13.1287 3.98718 13.5077 4.18155 13.7721 4.48882C14.0366 4.79608 14.1651 5.19154 14.13 5.58964C14.1627 5.98631 14.033 6.37954 13.7688 6.68489C13.5046 6.99025 13.127 7.18338 12.717 7.22283C12.3053 7.18341 11.9263 6.98904 11.6618 6.68177C11.3974 6.37451 11.2689 5.97905 11.304 5.58095V5.58578Z" fill="white"/>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/layer.svg b/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/layer.svg
new file mode 100644
index 00000000..25d3cc6a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/layer.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719371328294" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5697" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256"><path d="M238.1312 388.4032c42.496-14.4896 78.8992-14.4896 154.8288-138.0864 75.9808-123.5968 143.872-173.2096 236.6464-133.9392 92.7744 39.2704 67.584 191.4368 95.744 272.0256 28.16 80.5888 88.1664 140.3904 128.256 179.1488 40.0384 38.7584 137.984 182.528-16.128 305.408-130.048 89.9584-260.2496-44.032-376.576-22.5792-116.2752 21.4528-332.1344-75.776-355.328-241.92-23.1936-166.144 90.112-205.6192 132.608-220.0576z m583.936 211.712c-71.9872-69.632-113.5104-122.368-139.52-196.7616-8.96-25.6-12.6976-48.9984-18.2784-100.7104-1.5872-15.104-1.8944-17.92-2.6624-24.3712-8.704-75.52-22.016-108.4416-49.664-120.1664-62.72-26.5728-110.4384 2.2016-180.3264 115.968-60.928 99.1744-100.6592 132.608-163.2256 152.2688l-3.584 1.1264c-6.4512 2.048-8.8576 2.7648-12.032 3.84-80.384 27.4432-116.9408 66.048-102.2976 170.9056 16.9984 121.7024 189.7984 224.256 302.2336 203.5712 50.176-9.216 85.6576-1.536 171.6736 27.4432 97.0752 32.768 138.1888 35.84 186.112 3.328 95.3856-77.0048 77.7728-172.3904 11.5712-236.4416zM315.1872 471.04c-68.4032 14.08-94.0032 68.7616-76.8 164.096 21.5552 84.6848 87.4496 107.008 152.576 107.008 65.024 0 91.7504-44.544 104.8064-74.8544 13.056-30.3616 23.6032-100.2496-48.3328-113.5104-71.9872-13.312-71.9872-46.6432-87.04-67.072-9.984-13.568-25.088-18.7904-45.2096-15.6672zM463.872 288.1024c-39.424 34.5088-79.616 122.9824-25.2416 176.3328 156.5696 112.7424 156.5696 214.4768 156.5696 252.5184-2.0992 58.7264 42.9568 96.5632 137.4208 96.5632 151.1424-20.5824 98.048-182.528 12.288-254.0032-85.76-71.4752-115.1488-21.9136-149.7088-232.448-24.576-76.3904-91.904-73.5232-131.328-38.9632z" fill="#ffffff" p-id="5698"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/traffic.png b/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/traffic.png
new file mode 100644
index 00000000..fcb9197e
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/images/home-Vector/traffic.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/icon/sound_off.png b/ruoyi-ui/src/views/JiHeExpressway/images/icon/sound_off.png
new file mode 100644
index 00000000..48a997d4
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/images/icon/sound_off.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/icon/sound_on.png b/ruoyi-ui/src/views/JiHeExpressway/images/icon/sound_on.png
new file mode 100644
index 00000000..3c4f6251
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/images/icon/sound_on.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调.svg
index 4ca82581..ab78d112 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调.svg
@@ -1,9 +1,11 @@
-<svg width="19" height="20" viewBox="0 0 19 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10067">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#228;&#186;&#164;&#232;&#176;&#131;">
-<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M17.3901 0H1.97581C1.27139 0 0.698915 0.641661 0.698915 1.43122V7.39223C0.677633 7.44709 0.666992 7.50911 0.666992 7.57351V15.8984C0.666992 16.0296 0.762759 16.137 0.879808 16.137H1.86089C1.92686 16.137 1.98858 16.1036 2.02902 16.0439L4.59345 12.349C4.68283 12.2202 4.85522 12.2273 4.93821 12.3609L6.24491 14.5125C6.31939 14.6366 6.47688 14.6533 6.57052 14.5459L9.25838 11.5332C9.34777 11.433 9.49461 11.4426 9.57335 11.5499L11.3227 13.9543C11.4014 14.0641 11.5483 14.0712 11.6377 13.971L14.4894 10.7508C14.5043 10.7341 14.5043 10.7055 14.4894 10.6888L13.8935 10.0161C13.7594 9.86584 13.8552 9.60823 14.0446 9.60823L16.4963 9.61061C16.5175 9.61061 16.5367 9.62969 16.5367 9.65593V12.4158C16.5367 12.6281 16.3069 12.7354 16.1728 12.5852L15.6258 11.9697C15.611 11.953 15.5854 11.953 15.5705 11.9697L11.6313 16.416C11.5462 16.5115 11.4057 16.5091 11.3227 16.4089L9.45418 14.1022C9.37331 14.0021 9.23285 13.9973 9.14559 14.0951L6.4407 17.1269C6.34919 17.2294 6.19809 17.2175 6.11934 17.1006L4.8765 15.2329C4.7935 15.1065 4.62537 15.1041 4.53812 15.2281L2.71641 17.852V17.8544C2.70364 17.8735 2.67811 17.8783 2.66108 17.864C2.6547 17.8568 2.64406 17.8544 2.63554 17.8544H0.709555C0.686146 17.8544 0.666992 17.8759 0.666992 17.9021C0.666992 18.6917 1.23947 19.3333 1.94389 19.3333H17.3901C18.0945 19.3333 18.667 18.6917 18.667 17.9021V1.43122C18.667 0.641661 18.0966 0 17.3901 0ZM16.5388 6.61937C16.5388 7.14654 16.1579 7.57351 15.6876 7.57351H3.67834C3.20802 7.57351 2.82708 7.14654 2.82708 6.61937V3.36336C2.82708 2.83619 3.20802 2.40921 3.67834 2.40921H15.6876C16.1579 2.40921 16.5388 2.83619 16.5388 3.36336V6.61937ZM13.2934 6.11129H14.1766C14.5213 6.11129 14.8001 5.79881 14.8001 5.41238V4.66099C14.8001 4.27456 14.5213 3.96208 14.1766 3.96208H13.2934C12.9486 3.96208 12.6698 4.27456 12.6698 4.66099V5.41238C12.6698 5.79881 12.9486 6.11129 13.2934 6.11129ZM9.86704 6.11129H10.7502C11.095 6.11129 11.3738 5.79881 11.3738 5.41238V4.66099C11.3738 4.27456 11.095 3.96208 10.7502 3.96208H9.86704C9.52228 3.96208 9.24349 4.27456 9.24349 4.66099V5.41238C9.24349 5.79881 9.52228 6.11129 9.86704 6.11129ZM6.41942 6.11129H7.3026C7.64737 6.11129 7.92615 5.79881 7.92615 5.41238V4.66099C7.92615 4.27456 7.64737 3.96208 7.3026 3.96208H6.41942C6.07465 3.96208 5.79586 4.27456 5.79586 4.66099V5.41238C5.79586 5.79881 6.07465 6.11129 6.41942 6.11129Z" fill="#0FD4FF"/>
+<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M23.3901 6H7.97581C7.27139 6 6.69891 6.64166 6.69891 7.43122V13.3922C6.67763 13.4471 6.66699 13.5091 6.66699 13.5735V21.8984C6.66699 22.0296 6.76276 22.137 6.87981 22.137H7.86089C7.92686 22.137 7.98858 22.1036 8.02902 22.0439L10.5935 18.349C10.6828 18.2202 10.8552 18.2273 10.9382 18.3609L12.2449 20.5125C12.3194 20.6366 12.4769 20.6533 12.5705 20.5459L15.2584 17.5332C15.3478 17.433 15.4946 17.4426 15.5734 17.5499L17.3227 19.9543C17.4014 20.0641 17.5483 20.0712 17.6377 19.971L20.4894 16.7508C20.5043 16.7341 20.5043 16.7055 20.4894 16.6888L19.8935 16.0161C19.7594 15.8658 19.8552 15.6082 20.0446 15.6082L22.4963 15.6106C22.5175 15.6106 22.5367 15.6297 22.5367 15.6559V18.4158C22.5367 18.6281 22.3069 18.7354 22.1728 18.5852L21.6258 17.9697C21.611 17.953 21.5854 17.953 21.5705 17.9697L17.6313 22.416C17.5462 22.5115 17.4057 22.5091 17.3227 22.4089L15.4542 20.1022C15.3733 20.0021 15.2328 19.9973 15.1456 20.0951L12.4407 23.1269C12.3492 23.2294 12.1981 23.2175 12.1193 23.1006L10.8765 21.2329C10.7935 21.1065 10.6254 21.1041 10.5381 21.2281L8.71641 23.852V23.8544C8.70364 23.8735 8.67811 23.8783 8.66108 23.864C8.6547 23.8568 8.64406 23.8544 8.63554 23.8544H6.70956C6.68615 23.8544 6.66699 23.8759 6.66699 23.9021C6.66699 24.6917 7.23947 25.3333 7.94389 25.3333H23.3901C24.0945 25.3333 24.667 24.6917 24.667 23.9021V7.43122C24.667 6.64166 24.0966 6 23.3901 6ZM22.5388 12.6194C22.5388 13.1465 22.1579 13.5735 21.6876 13.5735H9.67834C9.20802 13.5735 8.82708 13.1465 8.82708 12.6194V9.36336C8.82708 8.83619 9.20802 8.40921 9.67834 8.40921H21.6876C22.1579 8.40921 22.5388 8.83619 22.5388 9.36336V12.6194ZM19.2934 12.1113H20.1766C20.5213 12.1113 20.8001 11.7988 20.8001 11.4124V10.661C20.8001 10.2746 20.5213 9.96208 20.1766 9.96208H19.2934C18.9486 9.96208 18.6698 10.2746 18.6698 10.661V11.4124C18.6698 11.7988 18.9486 12.1113 19.2934 12.1113ZM15.867 12.1113H16.7502C17.095 12.1113 17.3738 11.7988 17.3738 11.4124V10.661C17.3738 10.2746 17.095 9.96208 16.7502 9.96208H15.867C15.5223 9.96208 15.2435 10.2746 15.2435 10.661V11.4124C15.2435 11.7988 15.5223 12.1113 15.867 12.1113ZM12.4194 12.1113H13.3026C13.6474 12.1113 13.9262 11.7988 13.9262 11.4124V10.661C13.9262 10.2746 13.6474 9.96208 13.3026 9.96208H12.4194C12.0747 9.96208 11.7959 10.2746 11.7959 10.661V11.4124C11.7959 11.7988 12.0747 12.1113 12.4194 12.1113Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_active.svg
index ae18901c..86c391a3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_active.svg
@@ -1,9 +1,11 @@
-<svg width="19" height="20" viewBox="0 0 19 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10145">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#228;&#186;&#164;&#232;&#176;&#131;">
-<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M17.3901 0H1.97581C1.27139 0 0.698915 0.641661 0.698915 1.43122V7.39223C0.677633 7.44709 0.666992 7.50911 0.666992 7.57351V15.8984C0.666992 16.0296 0.762759 16.137 0.879808 16.137H1.86089C1.92686 16.137 1.98858 16.1036 2.02902 16.0439L4.59345 12.349C4.68283 12.2202 4.85522 12.2273 4.93821 12.3609L6.24491 14.5125C6.31939 14.6366 6.47688 14.6533 6.57052 14.5459L9.25838 11.5332C9.34777 11.433 9.49461 11.4426 9.57335 11.5499L11.3227 13.9543C11.4014 14.0641 11.5483 14.0712 11.6377 13.971L14.4894 10.7508C14.5043 10.7341 14.5043 10.7055 14.4894 10.6888L13.8935 10.0161C13.7594 9.86584 13.8552 9.60823 14.0446 9.60823L16.4963 9.61061C16.5175 9.61061 16.5367 9.62969 16.5367 9.65593V12.4158C16.5367 12.6281 16.3069 12.7354 16.1728 12.5852L15.6258 11.9697C15.611 11.953 15.5854 11.953 15.5705 11.9697L11.6313 16.416C11.5462 16.5115 11.4057 16.5091 11.3227 16.4089L9.45418 14.1022C9.37331 14.0021 9.23285 13.9973 9.14559 14.0951L6.4407 17.1269C6.34919 17.2294 6.19809 17.2175 6.11934 17.1006L4.8765 15.2329C4.7935 15.1065 4.62537 15.1041 4.53812 15.2281L2.71641 17.852V17.8544C2.70364 17.8735 2.67811 17.8783 2.66108 17.864C2.6547 17.8568 2.64406 17.8544 2.63554 17.8544H0.709555C0.686146 17.8544 0.666992 17.8759 0.666992 17.9021C0.666992 18.6917 1.23947 19.3333 1.94389 19.3333H17.3901C18.0945 19.3333 18.667 18.6917 18.667 17.9021V1.43122C18.667 0.641661 18.0966 0 17.3901 0ZM16.5388 6.61937C16.5388 7.14654 16.1579 7.57351 15.6876 7.57351H3.67834C3.20802 7.57351 2.82708 7.14654 2.82708 6.61937V3.36336C2.82708 2.83619 3.20802 2.40921 3.67834 2.40921H15.6876C16.1579 2.40921 16.5388 2.83619 16.5388 3.36336V6.61937ZM13.2934 6.11129H14.1766C14.5213 6.11129 14.8001 5.79881 14.8001 5.41238V4.66099C14.8001 4.27456 14.5213 3.96208 14.1766 3.96208H13.2934C12.9486 3.96208 12.6698 4.27456 12.6698 4.66099V5.41238C12.6698 5.79881 12.9486 6.11129 13.2934 6.11129ZM9.86704 6.11129H10.7502C11.095 6.11129 11.3738 5.79881 11.3738 5.41238V4.66099C11.3738 4.27456 11.095 3.96208 10.7502 3.96208H9.86704C9.52228 3.96208 9.24349 4.27456 9.24349 4.66099V5.41238C9.24349 5.79881 9.52228 6.11129 9.86704 6.11129ZM6.41942 6.11129H7.3026C7.64737 6.11129 7.92615 5.79881 7.92615 5.41238V4.66099C7.92615 4.27456 7.64737 3.96208 7.3026 3.96208H6.41942C6.07465 3.96208 5.79586 4.27456 5.79586 4.66099V5.41238C5.79586 5.79881 6.07465 6.11129 6.41942 6.11129Z" fill="#FFDB82"/>
+<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M23.3901 6H7.97581C7.27139 6 6.69891 6.64166 6.69891 7.43122V13.3922C6.67763 13.4471 6.66699 13.5091 6.66699 13.5735V21.8984C6.66699 22.0296 6.76276 22.137 6.87981 22.137H7.86089C7.92686 22.137 7.98858 22.1036 8.02902 22.0439L10.5935 18.349C10.6828 18.2202 10.8552 18.2273 10.9382 18.3609L12.2449 20.5125C12.3194 20.6366 12.4769 20.6533 12.5705 20.5459L15.2584 17.5332C15.3478 17.433 15.4946 17.4426 15.5734 17.5499L17.3227 19.9543C17.4014 20.0641 17.5483 20.0712 17.6377 19.971L20.4894 16.7508C20.5043 16.7341 20.5043 16.7055 20.4894 16.6888L19.8935 16.0161C19.7594 15.8658 19.8552 15.6082 20.0446 15.6082L22.4963 15.6106C22.5175 15.6106 22.5367 15.6297 22.5367 15.6559V18.4158C22.5367 18.6281 22.3069 18.7354 22.1728 18.5852L21.6258 17.9697C21.611 17.953 21.5854 17.953 21.5705 17.9697L17.6313 22.416C17.5462 22.5115 17.4057 22.5091 17.3227 22.4089L15.4542 20.1022C15.3733 20.0021 15.2328 19.9973 15.1456 20.0951L12.4407 23.1269C12.3492 23.2294 12.1981 23.2175 12.1193 23.1006L10.8765 21.2329C10.7935 21.1065 10.6254 21.1041 10.5381 21.2281L8.71641 23.852V23.8544C8.70364 23.8735 8.67811 23.8783 8.66108 23.864C8.6547 23.8568 8.64406 23.8544 8.63554 23.8544H6.70956C6.68615 23.8544 6.66699 23.8759 6.66699 23.9021C6.66699 24.6917 7.23947 25.3333 7.94389 25.3333H23.3901C24.0945 25.3333 24.667 24.6917 24.667 23.9021V7.43122C24.667 6.64166 24.0966 6 23.3901 6ZM22.5388 12.6194C22.5388 13.1465 22.1579 13.5735 21.6876 13.5735H9.67834C9.20802 13.5735 8.82708 13.1465 8.82708 12.6194V9.36336C8.82708 8.83619 9.20802 8.40921 9.67834 8.40921H21.6876C22.1579 8.40921 22.5388 8.83619 22.5388 9.36336V12.6194ZM19.2934 12.1113H20.1766C20.5213 12.1113 20.8001 11.7988 20.8001 11.4124V10.661C20.8001 10.2746 20.5213 9.96208 20.1766 9.96208H19.2934C18.9486 9.96208 18.6698 10.2746 18.6698 10.661V11.4124C18.6698 11.7988 18.9486 12.1113 19.2934 12.1113ZM15.867 12.1113H16.7502C17.095 12.1113 17.3738 11.7988 17.3738 11.4124V10.661C17.3738 10.2746 17.095 9.96208 16.7502 9.96208H15.867C15.5223 9.96208 15.2435 10.2746 15.2435 10.661V11.4124C15.2435 11.7988 15.5223 12.1113 15.867 12.1113ZM12.4194 12.1113H13.3026C13.6474 12.1113 13.9262 11.7988 13.9262 11.4124V10.661C13.9262 10.2746 13.6474 9.96208 13.3026 9.96208H12.4194C12.0747 9.96208 11.7959 10.2746 11.7959 10.661V11.4124C11.7959 11.7988 12.0747 12.1113 12.4194 12.1113Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_fault.svg
index de49c85a..3398045f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/交调_fault.svg
@@ -1,9 +1,11 @@
-<svg width="19" height="20" viewBox="0 0 19 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10176">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#228;&#186;&#164;&#232;&#176;&#131;">
-<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M17.3901 0H1.97581C1.27139 0 0.698915 0.641661 0.698915 1.43122V7.39223C0.677633 7.44709 0.666992 7.50911 0.666992 7.57351V15.8984C0.666992 16.0296 0.762759 16.137 0.879808 16.137H1.86089C1.92686 16.137 1.98858 16.1036 2.02902 16.0439L4.59345 12.349C4.68283 12.2202 4.85522 12.2273 4.93821 12.3609L6.24491 14.5125C6.31939 14.6366 6.47688 14.6533 6.57052 14.5459L9.25838 11.5332C9.34777 11.433 9.49461 11.4426 9.57335 11.5499L11.3227 13.9543C11.4014 14.0641 11.5483 14.0712 11.6377 13.971L14.4894 10.7508C14.5043 10.7341 14.5043 10.7055 14.4894 10.6888L13.8935 10.0161C13.7594 9.86584 13.8552 9.60823 14.0446 9.60823L16.4963 9.61061C16.5175 9.61061 16.5367 9.62969 16.5367 9.65593V12.4158C16.5367 12.6281 16.3069 12.7354 16.1728 12.5852L15.6258 11.9697C15.611 11.953 15.5854 11.953 15.5705 11.9697L11.6313 16.416C11.5462 16.5115 11.4057 16.5091 11.3227 16.4089L9.45418 14.1022C9.37331 14.0021 9.23285 13.9973 9.14559 14.0951L6.4407 17.1269C6.34919 17.2294 6.19809 17.2175 6.11934 17.1006L4.8765 15.2329C4.7935 15.1065 4.62537 15.1041 4.53812 15.2281L2.71641 17.852V17.8544C2.70364 17.8735 2.67811 17.8783 2.66108 17.864C2.6547 17.8568 2.64406 17.8544 2.63554 17.8544H0.709555C0.686146 17.8544 0.666992 17.8759 0.666992 17.9021C0.666992 18.6917 1.23947 19.3333 1.94389 19.3333H17.3901C18.0945 19.3333 18.667 18.6917 18.667 17.9021V1.43122C18.667 0.641661 18.0966 0 17.3901 0ZM16.5388 6.61937C16.5388 7.14654 16.1579 7.57351 15.6876 7.57351H3.67834C3.20802 7.57351 2.82708 7.14654 2.82708 6.61937V3.36336C2.82708 2.83619 3.20802 2.40921 3.67834 2.40921H15.6876C16.1579 2.40921 16.5388 2.83619 16.5388 3.36336V6.61937ZM13.2934 6.11129H14.1766C14.5213 6.11129 14.8001 5.79881 14.8001 5.41238V4.66099C14.8001 4.27456 14.5213 3.96208 14.1766 3.96208H13.2934C12.9486 3.96208 12.6698 4.27456 12.6698 4.66099V5.41238C12.6698 5.79881 12.9486 6.11129 13.2934 6.11129ZM9.86704 6.11129H10.7502C11.095 6.11129 11.3738 5.79881 11.3738 5.41238V4.66099C11.3738 4.27456 11.095 3.96208 10.7502 3.96208H9.86704C9.52228 3.96208 9.24349 4.27456 9.24349 4.66099V5.41238C9.24349 5.79881 9.52228 6.11129 9.86704 6.11129ZM6.41942 6.11129H7.3026C7.64737 6.11129 7.92615 5.79881 7.92615 5.41238V4.66099C7.92615 4.27456 7.64737 3.96208 7.3026 3.96208H6.41942C6.07465 3.96208 5.79586 4.27456 5.79586 4.66099V5.41238C5.79586 5.79881 6.07465 6.11129 6.41942 6.11129Z" fill="#FF5F5F"/>
+<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M23.3901 6H7.97581C7.27139 6 6.69891 6.64166 6.69891 7.43122V13.3922C6.67763 13.4471 6.66699 13.5091 6.66699 13.5735V21.8984C6.66699 22.0296 6.76276 22.137 6.87981 22.137H7.86089C7.92686 22.137 7.98858 22.1036 8.02902 22.0439L10.5935 18.349C10.6828 18.2202 10.8552 18.2273 10.9382 18.3609L12.2449 20.5125C12.3194 20.6366 12.4769 20.6533 12.5705 20.5459L15.2584 17.5332C15.3478 17.433 15.4946 17.4426 15.5734 17.5499L17.3227 19.9543C17.4014 20.0641 17.5483 20.0712 17.6377 19.971L20.4894 16.7508C20.5043 16.7341 20.5043 16.7055 20.4894 16.6888L19.8935 16.0161C19.7594 15.8658 19.8552 15.6082 20.0446 15.6082L22.4963 15.6106C22.5175 15.6106 22.5367 15.6297 22.5367 15.6559V18.4158C22.5367 18.6281 22.3069 18.7354 22.1728 18.5852L21.6258 17.9697C21.611 17.953 21.5854 17.953 21.5705 17.9697L17.6313 22.416C17.5462 22.5115 17.4057 22.5091 17.3227 22.4089L15.4542 20.1022C15.3733 20.0021 15.2328 19.9973 15.1456 20.0951L12.4407 23.1269C12.3492 23.2294 12.1981 23.2175 12.1193 23.1006L10.8765 21.2329C10.7935 21.1065 10.6254 21.1041 10.5381 21.2281L8.71641 23.852V23.8544C8.70364 23.8735 8.67811 23.8783 8.66108 23.864C8.6547 23.8568 8.64406 23.8544 8.63554 23.8544H6.70956C6.68615 23.8544 6.66699 23.8759 6.66699 23.9021C6.66699 24.6917 7.23947 25.3333 7.94389 25.3333H23.3901C24.0945 25.3333 24.667 24.6917 24.667 23.9021V7.43122C24.667 6.64166 24.0966 6 23.3901 6ZM22.5388 12.6194C22.5388 13.1465 22.1579 13.5735 21.6876 13.5735H9.67834C9.20802 13.5735 8.82708 13.1465 8.82708 12.6194V9.36336C8.82708 8.83619 9.20802 8.40921 9.67834 8.40921H21.6876C22.1579 8.40921 22.5388 8.83619 22.5388 9.36336V12.6194ZM19.2934 12.1113H20.1766C20.5213 12.1113 20.8001 11.7988 20.8001 11.4124V10.661C20.8001 10.2746 20.5213 9.96208 20.1766 9.96208H19.2934C18.9486 9.96208 18.6698 10.2746 18.6698 10.661V11.4124C18.6698 11.7988 18.9486 12.1113 19.2934 12.1113ZM15.867 12.1113H16.7502C17.095 12.1113 17.3738 11.7988 17.3738 11.4124V10.661C17.3738 10.2746 17.095 9.96208 16.7502 9.96208H15.867C15.5223 9.96208 15.2435 10.2746 15.2435 10.661V11.4124C15.2435 11.7988 15.5223 12.1113 15.867 12.1113ZM12.4194 12.1113H13.3026C13.6474 12.1113 13.9262 11.7988 13.9262 11.4124V10.661C13.9262 10.2746 13.6474 9.96208 13.3026 9.96208H12.4194C12.0747 9.96208 11.7959 10.2746 11.7959 10.661V11.4124C11.7959 11.7988 12.0747 12.1113 12.4194 12.1113Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板.svg
index 03da1859..f9f43e07 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板.svg
@@ -1,12 +1,7 @@
-<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10216">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="Frame" clip-path="url(#clip0_136_174)">
-<path id="Vector" d="M20.9746 3.33325C21.1404 3.33325 21.2993 3.40214 21.4166 3.52476C21.5338 3.64738 21.5996 3.81369 21.5996 3.9871V11.1794H1.59961V3.9871C1.59961 3.81369 1.66546 3.64738 1.78267 3.52476C1.89988 3.40214 2.05885 3.33325 2.22461 3.33325H20.9746ZM7.22461 6.02187H4.72461V8.63725H7.22461V6.02187ZM10.9746 5.94864H8.47461V8.56402H10.9746V5.94864ZM14.7246 5.94864H12.2246V8.56402H14.7246V5.94864ZM18.4746 5.94864H15.9746V8.56402H18.4746V5.94864ZM21.5996 11.1794H19.0996V19.6794C19.0996 19.8528 19.1655 20.0191 19.2827 20.1417C19.3999 20.2644 19.5588 20.3333 19.7246 20.3333H20.9746C21.1404 20.3333 21.2993 20.2644 21.4166 20.1417C21.5338 20.0191 21.5996 19.8528 21.5996 19.6794V11.1794ZM4.09961 11.1794H1.59961V19.6794C1.59961 19.8528 1.66546 20.0191 1.78267 20.1417C1.89988 20.2644 2.05885 20.3333 2.22461 20.3333H3.47461C3.64037 20.3333 3.79934 20.2644 3.91655 20.1417C4.03376 20.0191 4.09961 19.8528 4.09961 19.6794V11.1794Z" fill="#0FD4FF"/>
+<path id="Vector" d="M24.9746 7.33301C25.1404 7.33301 25.2993 7.40189 25.4166 7.52451C25.5338 7.64713 25.5996 7.81344 25.5996 7.98685V15.1792H5.59961V7.98685C5.59961 7.81344 5.66546 7.64713 5.78267 7.52451C5.89988 7.40189 6.05885 7.33301 6.22461 7.33301H24.9746ZM11.2246 10.0216H8.72461V12.637H11.2246V10.0216ZM14.9746 9.94839H12.4746V12.5638H14.9746V9.94839ZM18.7246 9.94839H16.2246V12.5638H18.7246V9.94839ZM22.4746 9.94839H19.9746V12.5638H22.4746V9.94839ZM25.5996 15.1792H23.0996V23.6792C23.0996 23.8526 23.1655 24.0189 23.2827 24.1415C23.3999 24.2641 23.5588 24.333 23.7246 24.333H24.9746C25.1404 24.333 25.2993 24.2641 25.4166 24.1415C25.5338 24.0189 25.5996 23.8526 25.5996 23.6792V15.1792ZM8.09961 15.1792H5.59961V23.6792C5.59961 23.8526 5.66546 24.0189 5.78267 24.1415C5.89988 24.2641 6.05885 24.333 6.22461 24.333H7.47461C7.64037 24.333 7.79934 24.2641 7.91655 24.1415C8.03376 24.0189 8.09961 23.8526 8.09961 23.6792V15.1792Z" fill="#0FD4FF"/>
 </g>
 </g>
-<defs>
-<clipPath id="clip0_136_174">
-<rect width="20.6667" height="20.6667" fill="white"/>
-</clipPath>
-</defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_active.svg
index 6ca0ebf4..b2ce1f79 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_active.svg
@@ -1,12 +1,7 @@
-<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10230">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="Frame" clip-path="url(#clip0_409_3343)">
-<path id="Vector" d="M20.9746 3.33325C21.1404 3.33325 21.2993 3.40214 21.4166 3.52476C21.5338 3.64738 21.5996 3.81369 21.5996 3.9871V11.1794H1.59961V3.9871C1.59961 3.81369 1.66546 3.64738 1.78267 3.52476C1.89988 3.40214 2.05885 3.33325 2.22461 3.33325H20.9746ZM7.22461 6.02187H4.72461V8.63725H7.22461V6.02187ZM10.9746 5.94864H8.47461V8.56402H10.9746V5.94864ZM14.7246 5.94864H12.2246V8.56402H14.7246V5.94864ZM18.4746 5.94864H15.9746V8.56402H18.4746V5.94864ZM21.5996 11.1794H19.0996V19.6794C19.0996 19.8528 19.1655 20.0191 19.2827 20.1417C19.3999 20.2644 19.5588 20.3333 19.7246 20.3333H20.9746C21.1404 20.3333 21.2993 20.2644 21.4166 20.1417C21.5338 20.0191 21.5996 19.8528 21.5996 19.6794V11.1794ZM4.09961 11.1794H1.59961V19.6794C1.59961 19.8528 1.66546 20.0191 1.78267 20.1417C1.89988 20.2644 2.05885 20.3333 2.22461 20.3333H3.47461C3.64037 20.3333 3.79934 20.2644 3.91655 20.1417C4.03376 20.0191 4.09961 19.8528 4.09961 19.6794V11.1794Z" fill="#FFDB82"/>
+<path id="Vector" d="M24.9746 7.33301C25.1404 7.33301 25.2993 7.40189 25.4166 7.52451C25.5338 7.64713 25.5996 7.81344 25.5996 7.98685V15.1792H5.59961V7.98685C5.59961 7.81344 5.66546 7.64713 5.78267 7.52451C5.89988 7.40189 6.05885 7.33301 6.22461 7.33301H24.9746ZM11.2246 10.0216H8.72461V12.637H11.2246V10.0216ZM14.9746 9.94839H12.4746V12.5638H14.9746V9.94839ZM18.7246 9.94839H16.2246V12.5638H18.7246V9.94839ZM22.4746 9.94839H19.9746V12.5638H22.4746V9.94839ZM25.5996 15.1792H23.0996V23.6792C23.0996 23.8526 23.1655 24.0189 23.2827 24.1415C23.3999 24.2641 23.5588 24.333 23.7246 24.333H24.9746C25.1404 24.333 25.2993 24.2641 25.4166 24.1415C25.5338 24.0189 25.5996 23.8526 25.5996 23.6792V15.1792ZM8.09961 15.1792H5.59961V23.6792C5.59961 23.8526 5.66546 24.0189 5.78267 24.1415C5.89988 24.2641 6.05885 24.333 6.22461 24.333H7.47461C7.64037 24.333 7.79934 24.2641 7.91655 24.1415C8.03376 24.0189 8.09961 23.8526 8.09961 23.6792V15.1792Z" fill="#FFDB82"/>
 </g>
 </g>
-<defs>
-<clipPath id="clip0_409_3343">
-<rect width="20.6667" height="20.6667" fill="white"/>
-</clipPath>
-</defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_fault.svg
index ee6c6260..7d387119 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/情报板_fault.svg
@@ -1,12 +1,7 @@
-<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10223">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="Frame" clip-path="url(#clip0_409_3610)">
-<path id="Vector" d="M20.9746 3.33325C21.1404 3.33325 21.2993 3.40214 21.4166 3.52476C21.5338 3.64738 21.5996 3.81369 21.5996 3.9871V11.1794H1.59961V3.9871C1.59961 3.81369 1.66546 3.64738 1.78267 3.52476C1.89988 3.40214 2.05885 3.33325 2.22461 3.33325H20.9746ZM7.22461 6.02187H4.72461V8.63725H7.22461V6.02187ZM10.9746 5.94864H8.47461V8.56402H10.9746V5.94864ZM14.7246 5.94864H12.2246V8.56402H14.7246V5.94864ZM18.4746 5.94864H15.9746V8.56402H18.4746V5.94864ZM21.5996 11.1794H19.0996V19.6794C19.0996 19.8528 19.1655 20.0191 19.2827 20.1417C19.3999 20.2644 19.5588 20.3333 19.7246 20.3333H20.9746C21.1404 20.3333 21.2993 20.2644 21.4166 20.1417C21.5338 20.0191 21.5996 19.8528 21.5996 19.6794V11.1794ZM4.09961 11.1794H1.59961V19.6794C1.59961 19.8528 1.66546 20.0191 1.78267 20.1417C1.89988 20.2644 2.05885 20.3333 2.22461 20.3333H3.47461C3.64037 20.3333 3.79934 20.2644 3.91655 20.1417C4.03376 20.0191 4.09961 19.8528 4.09961 19.6794V11.1794Z" fill="#FF5F5F"/>
+<path id="Vector" d="M24.9746 7.33301C25.1404 7.33301 25.2993 7.40189 25.4166 7.52451C25.5338 7.64713 25.5996 7.81344 25.5996 7.98685V15.1792H5.59961V7.98685C5.59961 7.81344 5.66546 7.64713 5.78267 7.52451C5.89988 7.40189 6.05885 7.33301 6.22461 7.33301H24.9746ZM11.2246 10.0216H8.72461V12.637H11.2246V10.0216ZM14.9746 9.94839H12.4746V12.5638H14.9746V9.94839ZM18.7246 9.94839H16.2246V12.5638H18.7246V9.94839ZM22.4746 9.94839H19.9746V12.5638H22.4746V9.94839ZM25.5996 15.1792H23.0996V23.6792C23.0996 23.8526 23.1655 24.0189 23.2827 24.1415C23.3999 24.2641 23.5588 24.333 23.7246 24.333H24.9746C25.1404 24.333 25.2993 24.2641 25.4166 24.1415C25.5338 24.0189 25.5996 23.8526 25.5996 23.6792V15.1792ZM8.09961 15.1792H5.59961V23.6792C5.59961 23.8526 5.66546 24.0189 5.78267 24.1415C5.89988 24.2641 6.05885 24.333 6.22461 24.333H7.47461C7.64037 24.333 7.79934 24.2641 7.91655 24.1415C8.03376 24.0189 8.09961 23.8526 8.09961 23.6792V15.1792Z" fill="#FF5F5F"/>
 </g>
 </g>
-<defs>
-<clipPath id="clip0_409_3610">
-<rect width="20.6667" height="20.6667" fill="white"/>
-</clipPath>
-</defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机.svg
index e47bef3e..ab32f4e3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机.svg
@@ -1,5 +1,7 @@
-<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10141">
 <g id="Group 1142814037">
-<path id="Vector" d="M4.24 12.4248H2.08V9.71681L0 9.31858V18L2.08 17.2832V14.2566H5.44L7.28 11.7876L4.88 10.5133L4.24 12.4248ZM15.12 12.9823L20 9.87611L4.8 0H3.04L0.64 3.74336V5.0177L14 13.0619H15.12V12.9823ZM13.28 13.6195L1.76 6.21239L0.56 7.48672L13.92 15.531H15.12L15.76 14.8938L16.4 13.0619C16.4 13.0619 14.64 14.3363 14.56 14.3363C13.84 13.8584 13.28 13.6195 13.28 13.6195Z" fill="#0FD4FF"/>
+<path id="Vector" d="M11.24 19.4248H9.08V16.7168L7 16.3186V25L9.08 24.2832V21.2566H12.44L14.28 18.7876L11.88 17.5133L11.24 19.4248ZM22.12 19.9823L27 16.8761L11.8 7H10.04L7.64 10.7434V12.0177L21 20.0619H22.12V19.9823ZM20.28 20.6195L8.76 13.2124L7.56 14.4867L20.92 22.531H22.12L22.76 21.8938L23.4 20.0619C23.4 20.0619 21.64 21.3363 21.56 21.3363C20.84 20.8584 20.28 20.6195 20.28 20.6195Z" fill="#0FD4FF"/>
+</g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_active.svg
index c04a08ab..5ec0868f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_active.svg
@@ -1,5 +1,7 @@
-<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10172">
 <g id="Group 1142814037">
-<path id="Vector" d="M4.24 12.4248H2.08V9.71681L0 9.31858V18L2.08 17.2832V14.2566H5.44L7.28 11.7876L4.88 10.5133L4.24 12.4248ZM15.12 12.9823L20 9.87611L4.8 0H3.04L0.64 3.74336V5.0177L14 13.0619H15.12V12.9823ZM13.28 13.6195L1.76 6.21239L0.56 7.48672L13.92 15.531H15.12L15.76 14.8938L16.4 13.0619C16.4 13.0619 14.64 14.3363 14.56 14.3363C13.84 13.8584 13.28 13.6195 13.28 13.6195Z" fill="#FFDB82"/>
+<path id="Vector" d="M11.24 19.4248H9.08V16.7168L7 16.3186V25L9.08 24.2832V21.2566H12.44L14.28 18.7876L11.88 17.5133L11.24 19.4248ZM22.12 19.9823L27 16.8761L11.8 7H10.04L7.64 10.7434V12.0177L21 20.0619H22.12V19.9823ZM20.28 20.6195L8.76 13.2124L7.56 14.4867L20.92 22.531H22.12L22.76 21.8938L23.4 20.0619C23.4 20.0619 21.64 21.3363 21.56 21.3363C20.84 20.8584 20.28 20.6195 20.28 20.6195Z" fill="#FFDB82"/>
+</g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_fault.svg
index 23d5101c..65883c00 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/摄像机_fault.svg
@@ -1,5 +1,7 @@
-<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10203">
 <g id="Group 1142814037">
-<path id="Vector" d="M4.24 12.4248H2.08V9.71681L0 9.31858V18L2.08 17.2832V14.2566H5.44L7.28 11.7876L4.88 10.5133L4.24 12.4248ZM15.12 12.9823L20 9.87611L4.8 0H3.04L0.64 3.74336V5.0177L14 13.0619H15.12V12.9823ZM13.28 13.6195L1.76 6.21239L0.56 7.48672L13.92 15.531H15.12L15.76 14.8938L16.4 13.0619C16.4 13.0619 14.64 14.3363 14.56 14.3363C13.84 13.8584 13.28 13.6195 13.28 13.6195Z" fill="#FF5F5F"/>
+<path id="Vector" d="M11.24 19.4248H9.08V16.7168L7 16.3186V25L9.08 24.2832V21.2566H12.44L14.28 18.7876L11.88 17.5133L11.24 19.4248ZM22.12 19.9823L27 16.8761L11.8 7H10.04L7.64 10.7434V12.0177L21 20.0619H22.12V19.9823ZM20.28 20.6195L8.76 13.2124L7.56 14.4867L20.92 22.531H22.12L22.76 21.8938L23.4 20.0619C23.4 20.0619 21.64 21.3363 21.56 21.3363C20.84 20.8584 20.28 20.6195 20.28 20.6195Z" fill="#FF5F5F"/>
+</g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶.svg
index 34877b68..3af3cec4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶.svg
@@ -1,18 +1,20 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10069">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#233;&#155;&#183;&#232;&#190;&#190;">
-<g id="Frame" clip-path="url(#clip0_134_50)">
-<path id="Vector" d="M14.5398 7.78348L15.9296 13.3412C14.8155 13.6139 13.3294 13.7918 11.6669 13.7918C10.0044 13.7918 8.51983 13.6139 7.40427 13.3412L8.79407 7.78348C9.67631 7.89573 10.6461 7.95848 11.6669 7.95848C12.6878 7.95848 13.6576 7.89573 14.5398 7.78348ZM14.1825 6.35721L13.0815 1.95015C12.714 0.47723 10.6198 0.47723 10.2524 1.95015L9.15136 6.35436C9.91691 6.44915 10.7657 6.50015 11.6669 6.50015C12.5681 6.50015 13.4169 6.44762 14.1825 6.35721ZM20.5933 18.9179C20.9086 18.9959 21.1343 19.273 21.1468 19.5975C21.1593 19.9221 20.9556 20.2157 20.6474 20.3178L11.8974 23.2345C11.7478 23.2843 11.5861 23.2843 11.4365 23.2345L2.6865 20.3178C2.37824 20.2157 2.1746 19.9221 2.18707 19.5975C2.1996 19.273 2.42525 18.9959 2.74053 18.9179L6.22738 18.0457L7.05134 14.7542C8.30842 15.0635 9.9155 15.2487 11.6669 15.2487C13.4184 15.2487 15.0254 15.0635 16.2825 14.7542L17.1065 18.0457L20.5933 18.9179Z" fill="#0FD4FF"/>
+<g id="Frame" clip-path="url(#clip0_786_1105)">
+<path id="Vector" d="M19.5398 11.7837L20.9296 17.3414C19.8155 17.6141 18.3294 17.7921 16.6669 17.7921C15.0044 17.7921 13.5198 17.6141 12.4043 17.3414L13.7941 11.7837C14.6763 11.896 15.6461 11.9587 16.6669 11.9587C17.6878 11.9587 18.6576 11.896 19.5398 11.7837ZM19.1825 10.3575L18.0815 5.95039C17.714 4.47747 15.6198 4.47747 15.2524 5.95039L14.1514 10.3546C14.9169 10.4494 15.7657 10.5004 16.6669 10.5004C17.5681 10.5004 18.4169 10.4479 19.1825 10.3575ZM25.5933 22.9181C25.9086 22.9962 26.1343 23.2733 26.1468 23.5978C26.1593 23.9223 25.9556 24.2159 25.6474 24.3181L16.8974 27.2347C16.7478 27.2846 16.5861 27.2846 16.4365 27.2347L7.6865 24.3181C7.37824 24.2159 7.1746 23.9223 7.18707 23.5978C7.1996 23.2733 7.42525 22.9962 7.74053 22.9181L11.2274 22.046L12.0513 18.7545C13.3084 19.0637 14.9155 19.249 16.6669 19.249C18.4184 19.249 20.0254 19.0637 21.2825 18.7545L22.1065 22.046L25.5933 22.9181Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 </g>
 </g>
 </g>
 <defs>
-<clipPath id="clip0_134_50">
-<rect width="23.3333" height="23.3333" fill="white" transform="translate(0 0.666748)"/>
+<clipPath id="clip0_786_1105">
+<rect width="23.3333" height="23.3333" fill="white" transform="translate(5 4.66699)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_active.svg
index 1b7ce541..4057787a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_active.svg
@@ -1,18 +1,20 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10147">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#233;&#155;&#183;&#232;&#190;&#190;">
-<g id="Frame" clip-path="url(#clip0_409_3157)">
-<path id="Vector" d="M14.5398 7.78348L15.9296 13.3412C14.8155 13.6139 13.3294 13.7918 11.6669 13.7918C10.0044 13.7918 8.51983 13.6139 7.40428 13.3412L8.79407 7.78348C9.67631 7.89573 10.6461 7.95848 11.6669 7.95848C12.6878 7.95848 13.6576 7.89573 14.5398 7.78348ZM14.1825 6.35721L13.0815 1.95015C12.714 0.47723 10.6198 0.47723 10.2524 1.95015L9.15136 6.35436C9.91691 6.44915 10.7657 6.50015 11.6669 6.50015C12.5681 6.50015 13.4169 6.44762 14.1825 6.35721ZM20.5933 18.9179C20.9086 18.9959 21.1343 19.273 21.1468 19.5975C21.1593 19.9221 20.9556 20.2157 20.6474 20.3178L11.8974 23.2345C11.7478 23.2843 11.5861 23.2843 11.4365 23.2345L2.6865 20.3178C2.37824 20.2157 2.1746 19.9221 2.18707 19.5975C2.1996 19.273 2.42525 18.9959 2.74053 18.9179L6.22738 18.0457L7.05134 14.7542C8.30842 15.0635 9.9155 15.2487 11.6669 15.2487C13.4184 15.2487 15.0254 15.0635 16.2825 14.7542L17.1065 18.0458L20.5933 18.9179Z" fill="#FFDB82"/>
+<g id="Frame" clip-path="url(#clip0_786_1112)">
+<path id="Vector" d="M19.5398 11.7837L20.9296 17.3414C19.8155 17.6141 18.3294 17.7921 16.6669 17.7921C15.0044 17.7921 13.5198 17.6141 12.4043 17.3414L13.7941 11.7837C14.6763 11.896 15.6461 11.9587 16.6669 11.9587C17.6878 11.9587 18.6576 11.896 19.5398 11.7837ZM19.1825 10.3575L18.0815 5.95039C17.714 4.47747 15.6198 4.47747 15.2524 5.95039L14.1514 10.3546C14.9169 10.4494 15.7657 10.5004 16.6669 10.5004C17.5681 10.5004 18.4169 10.4479 19.1825 10.3575ZM25.5933 22.9181C25.9086 22.9962 26.1343 23.2733 26.1468 23.5978C26.1593 23.9223 25.9556 24.2159 25.6474 24.3181L16.8974 27.2347C16.7478 27.2846 16.5861 27.2846 16.4365 27.2347L7.6865 24.3181C7.37824 24.2159 7.1746 23.9223 7.18707 23.5978C7.1996 23.2733 7.42525 22.9962 7.74053 22.9181L11.2274 22.046L12.0513 18.7545C13.3084 19.0637 14.9155 19.249 16.6669 19.249C18.4184 19.249 20.0254 19.0637 21.2825 18.7545L22.1065 22.046L25.5933 22.9181Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 </g>
 </g>
 </g>
 <defs>
-<clipPath id="clip0_409_3157">
-<rect width="23.3333" height="23.3333" fill="white" transform="translate(0 0.666748)"/>
+<clipPath id="clip0_786_1112">
+<rect width="23.3333" height="23.3333" fill="white" transform="translate(5 4.66699)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_fault.svg
index 7f214302..0f6838e4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/智慧锥桶_fault.svg
@@ -1,18 +1,20 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10178">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#233;&#155;&#183;&#232;&#190;&#190;">
-<g id="Frame" clip-path="url(#clip0_409_3424)">
-<path id="Vector" d="M14.5398 7.78348L15.9296 13.3412C14.8155 13.6139 13.3294 13.7918 11.6669 13.7918C10.0044 13.7918 8.51983 13.6139 7.40428 13.3412L8.79407 7.78348C9.67631 7.89573 10.6461 7.95848 11.6669 7.95848C12.6878 7.95848 13.6576 7.89573 14.5398 7.78348ZM14.1825 6.35721L13.0815 1.95015C12.714 0.47723 10.6198 0.47723 10.2524 1.95015L9.15136 6.35436C9.91691 6.44915 10.7657 6.50015 11.6669 6.50015C12.5681 6.50015 13.4169 6.44762 14.1825 6.35721ZM20.5933 18.9179C20.9086 18.9959 21.1343 19.273 21.1468 19.5975C21.1593 19.9221 20.9556 20.2157 20.6474 20.3178L11.8974 23.2345C11.7478 23.2843 11.5861 23.2843 11.4365 23.2345L2.6865 20.3178C2.37824 20.2157 2.1746 19.9221 2.18707 19.5975C2.1996 19.273 2.42525 18.9959 2.74053 18.9179L6.22738 18.0457L7.05134 14.7542C8.30842 15.0635 9.9155 15.2487 11.6669 15.2487C13.4184 15.2487 15.0254 15.0635 16.2825 14.7542L17.1065 18.0458L20.5933 18.9179Z" fill="#FF5F5F"/>
+<g id="Frame" clip-path="url(#clip0_786_1119)">
+<path id="Vector" d="M19.5398 11.7837L20.9296 17.3414C19.8155 17.6141 18.3294 17.7921 16.6669 17.7921C15.0044 17.7921 13.5198 17.6141 12.4043 17.3414L13.7941 11.7837C14.6763 11.896 15.6461 11.9587 16.6669 11.9587C17.6878 11.9587 18.6576 11.896 19.5398 11.7837ZM19.1825 10.3575L18.0815 5.95039C17.714 4.47747 15.6198 4.47747 15.2524 5.95039L14.1514 10.3546C14.9169 10.4494 15.7657 10.5004 16.6669 10.5004C17.5681 10.5004 18.4169 10.4479 19.1825 10.3575ZM25.5933 22.9181C25.9086 22.9962 26.1343 23.2733 26.1468 23.5978C26.1593 23.9223 25.9556 24.2159 25.6474 24.3181L16.8974 27.2347C16.7478 27.2846 16.5861 27.2846 16.4365 27.2347L7.6865 24.3181C7.37824 24.2159 7.1746 23.9223 7.18707 23.5978C7.1996 23.2733 7.42525 22.9962 7.74053 22.9181L11.2274 22.046L12.0513 18.7545C13.3084 19.0637 14.9155 19.249 16.6669 19.249C18.4184 19.249 20.0254 19.0637 21.2825 18.7545L22.1065 22.046L25.5933 22.9181Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 </g>
 </g>
 </g>
 <defs>
-<clipPath id="clip0_409_3424">
-<rect width="23.3333" height="23.3333" fill="white" transform="translate(0 0.666748)"/>
+<clipPath id="clip0_786_1119">
+<rect width="23.3333" height="23.3333" fill="white" transform="translate(5 4.66699)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达.svg
index 7a166a6a..d51bee05 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达.svg
@@ -1,9 +1,11 @@
-<svg width="20" height="23" viewBox="0 0 20 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10066">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#233;&#155;&#183;&#232;&#190;&#190;">
-<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M10.945 10.7289C11.2618 10.8992 11.6217 10.9962 12.0053 10.9962C13.2467 10.9962 14.2553 9.98754 14.2553 8.74616C14.2553 7.50478 13.2467 6.49616 12.0053 6.49616C10.7639 6.49616 9.75531 7.50478 9.75531 8.74616C9.75531 9.12978 9.85014 9.4897 10.0226 9.80651L9.19066 10.6384L10.1131 11.5608L10.945 10.7289ZM2.84152 15.091C3.23161 15.6212 3.6648 16.1276 4.14324 16.6039C5.7704 18.2311 7.72299 19.3647 9.7079 19.8453L10.5851 21.9983C10.6691 22.1987 10.6454 22.4294 10.5247 22.6082C10.4019 22.7893 10.1993 22.897 9.98161 22.897H0.843674C0.630312 22.897 0.429881 22.7914 0.307036 22.6147C0.184192 22.438 0.158329 22.2138 0.23376 22.0134L2.84152 15.091ZM2.81135 6.10392L14.6432 17.938C13.598 18.6923 12.1863 18.9595 10.5915 18.6944C8.64971 18.369 6.68635 17.3 5.06781 15.6815C3.44928 14.063 2.37816 12.1018 2.05488 10.1556C1.7898 8.56297 2.05919 7.14918 2.81135 6.10392ZM12.0053 3.75694C14.7553 3.75694 16.9967 5.99401 16.9967 8.74832C16.9967 9.11039 16.7036 9.40133 16.3437 9.40133C15.9816 9.40133 15.6907 9.10823 15.6907 8.74832C15.6907 6.71599 14.0355 5.06297 12.0053 5.06297C11.6454 5.06297 11.3523 4.77202 11.3523 4.40995C11.3523 4.04789 11.6454 3.75694 12.0053 3.75694ZM12.0053 0.974609C16.2898 0.974609 19.7747 4.46168 19.7769 8.74401C19.7769 9.10607 19.4838 9.39702 19.1238 9.39702C18.7618 9.39702 18.4708 9.10392 18.4708 8.74401C18.4708 5.17935 15.57 2.28064 12.0053 2.28064C11.6454 2.28064 11.3523 1.98754 11.3523 1.62763C11.3523 1.26556 11.6454 0.974609 12.0053 0.974609Z" fill="#0FD4FF"/>
+<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M16.945 12.7289C17.2618 12.8992 17.6217 12.9962 18.0053 12.9962C19.2467 12.9962 20.2553 11.9875 20.2553 10.7462C20.2553 9.50478 19.2467 8.49616 18.0053 8.49616C16.7639 8.49616 15.7553 9.50478 15.7553 10.7462C15.7553 11.1298 15.8501 11.4897 16.0226 11.8065L15.1907 12.6384L16.1131 13.5608L16.945 12.7289ZM8.84152 17.091C9.23161 17.6212 9.6648 18.1276 10.1432 18.6039C11.7704 20.2311 13.723 21.3647 15.7079 21.8453L16.5851 23.9983C16.6691 24.1987 16.6454 24.4293 16.5247 24.6082C16.4019 24.7893 16.1993 24.897 15.9816 24.897H6.84367C6.63031 24.897 6.42988 24.7914 6.30704 24.6147C6.18419 24.438 6.15833 24.2138 6.23376 24.0134L8.84152 17.091ZM8.81135 8.10392L20.6432 19.938C19.598 20.6923 18.1863 20.9595 16.5915 20.6944C14.6497 20.369 12.6863 19.3 11.0678 17.6815C9.44928 16.063 8.37816 14.1018 8.05488 12.1556C7.7898 10.563 8.05919 9.14918 8.81135 8.10392ZM18.0053 5.75694C20.7553 5.75694 22.9967 7.99401 22.9967 10.7483C22.9967 11.1104 22.7036 11.4013 22.3437 11.4013C21.9816 11.4013 21.6907 11.1082 21.6907 10.7483C21.6907 8.71599 20.0355 7.06297 18.0053 7.06297C17.6454 7.06297 17.3523 6.77202 17.3523 6.40995C17.3523 6.04789 17.6454 5.75694 18.0053 5.75694ZM18.0053 2.97461C22.2898 2.97461 25.7747 6.46168 25.7769 10.744C25.7769 11.1061 25.4838 11.397 25.1238 11.397C24.7618 11.397 24.4708 11.1039 24.4708 10.744C24.4708 7.17935 21.57 4.28064 18.0053 4.28064C17.6454 4.28064 17.3523 3.98754 17.3523 3.62763C17.3523 3.26556 17.6454 2.97461 18.0053 2.97461Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_active.svg
index 09d0244f..8acf0b58 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_active.svg
@@ -1,9 +1,11 @@
-<svg width="20" height="23" viewBox="0 0 20 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10144">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#233;&#155;&#183;&#232;&#190;&#190;">
-<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M10.945 10.7289C11.2618 10.8992 11.6217 10.9962 12.0053 10.9962C13.2467 10.9962 14.2553 9.98754 14.2553 8.74616C14.2553 7.50478 13.2467 6.49616 12.0053 6.49616C10.7639 6.49616 9.75531 7.50478 9.75531 8.74616C9.75531 9.12978 9.85014 9.4897 10.0226 9.80651L9.19066 10.6384L10.1131 11.5608L10.945 10.7289ZM2.84152 15.091C3.23161 15.6212 3.6648 16.1276 4.14324 16.6039C5.7704 18.2311 7.72299 19.3647 9.7079 19.8453L10.5851 21.9983C10.6691 22.1987 10.6454 22.4294 10.5247 22.6082C10.4019 22.7893 10.1993 22.897 9.98161 22.897H0.843674C0.630312 22.897 0.429881 22.7914 0.307036 22.6147C0.184192 22.438 0.158329 22.2138 0.23376 22.0134L2.84152 15.091ZM2.81135 6.10392L14.6432 17.938C13.598 18.6923 12.1863 18.9595 10.5915 18.6944C8.64971 18.369 6.68635 17.3 5.06781 15.6815C3.44928 14.063 2.37816 12.1018 2.05488 10.1556C1.7898 8.56297 2.05919 7.14918 2.81135 6.10392ZM12.0053 3.75694C14.7553 3.75694 16.9967 5.99401 16.9967 8.74832C16.9967 9.11039 16.7036 9.40133 16.3437 9.40133C15.9816 9.40133 15.6907 9.10823 15.6907 8.74832C15.6907 6.71599 14.0355 5.06297 12.0053 5.06297C11.6454 5.06297 11.3523 4.77202 11.3523 4.40995C11.3523 4.04789 11.6454 3.75694 12.0053 3.75694ZM12.0053 0.974609C16.2898 0.974609 19.7747 4.46168 19.7769 8.74401C19.7769 9.10607 19.4838 9.39702 19.1238 9.39702C18.7618 9.39702 18.4708 9.10392 18.4708 8.74401C18.4708 5.17935 15.57 2.28064 12.0053 2.28064C11.6454 2.28064 11.3523 1.98754 11.3523 1.62763C11.3523 1.26556 11.6454 0.974609 12.0053 0.974609Z" fill="#FFDB82"/>
+<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M16.945 12.7289C17.2618 12.8992 17.6217 12.9962 18.0053 12.9962C19.2467 12.9962 20.2553 11.9875 20.2553 10.7462C20.2553 9.50478 19.2467 8.49616 18.0053 8.49616C16.7639 8.49616 15.7553 9.50478 15.7553 10.7462C15.7553 11.1298 15.8501 11.4897 16.0226 11.8065L15.1907 12.6384L16.1131 13.5608L16.945 12.7289ZM8.84152 17.091C9.23161 17.6212 9.6648 18.1276 10.1432 18.6039C11.7704 20.2311 13.723 21.3647 15.7079 21.8453L16.5851 23.9983C16.6691 24.1987 16.6454 24.4293 16.5247 24.6082C16.4019 24.7893 16.1993 24.897 15.9816 24.897H6.84367C6.63031 24.897 6.42988 24.7914 6.30704 24.6147C6.18419 24.438 6.15833 24.2138 6.23376 24.0134L8.84152 17.091ZM8.81135 8.10392L20.6432 19.938C19.598 20.6923 18.1863 20.9595 16.5915 20.6944C14.6497 20.369 12.6863 19.3 11.0678 17.6815C9.44928 16.063 8.37816 14.1018 8.05488 12.1556C7.7898 10.563 8.05919 9.14918 8.81135 8.10392ZM18.0053 5.75694C20.7553 5.75694 22.9967 7.99401 22.9967 10.7483C22.9967 11.1104 22.7036 11.4013 22.3437 11.4013C21.9816 11.4013 21.6907 11.1082 21.6907 10.7483C21.6907 8.71599 20.0355 7.06297 18.0053 7.06297C17.6454 7.06297 17.3523 6.77202 17.3523 6.40995C17.3523 6.04789 17.6454 5.75694 18.0053 5.75694ZM18.0053 2.97461C22.2898 2.97461 25.7747 6.46168 25.7769 10.744C25.7769 11.1061 25.4838 11.397 25.1238 11.397C24.7618 11.397 24.4708 11.1039 24.4708 10.744C24.4708 7.17935 21.57 4.28064 18.0053 4.28064C17.6454 4.28064 17.3523 3.98754 17.3523 3.62763C17.3523 3.26556 17.6454 2.97461 18.0053 2.97461Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_fault.svg
index 9170ef81..88956587 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/毫米波雷达_fault.svg
@@ -1,9 +1,11 @@
-<svg width="20" height="23" viewBox="0 0 20 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10175">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#233;&#155;&#183;&#232;&#190;&#190;">
-<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M10.945 10.7289C11.2618 10.8992 11.6217 10.9962 12.0053 10.9962C13.2467 10.9962 14.2553 9.98754 14.2553 8.74616C14.2553 7.50478 13.2467 6.49616 12.0053 6.49616C10.7639 6.49616 9.75531 7.50478 9.75531 8.74616C9.75531 9.12978 9.85014 9.4897 10.0226 9.80651L9.19066 10.6384L10.1131 11.5608L10.945 10.7289ZM2.84152 15.091C3.23161 15.6212 3.6648 16.1276 4.14324 16.6039C5.7704 18.2311 7.72299 19.3647 9.7079 19.8453L10.5851 21.9983C10.6691 22.1987 10.6454 22.4294 10.5247 22.6082C10.4019 22.7893 10.1993 22.897 9.98161 22.897H0.843674C0.630312 22.897 0.429881 22.7914 0.307036 22.6147C0.184192 22.438 0.158329 22.2138 0.23376 22.0134L2.84152 15.091ZM2.81135 6.10392L14.6432 17.938C13.598 18.6923 12.1863 18.9595 10.5915 18.6944C8.64971 18.369 6.68635 17.3 5.06781 15.6815C3.44928 14.063 2.37816 12.1018 2.05488 10.1556C1.7898 8.56297 2.05919 7.14918 2.81135 6.10392ZM12.0053 3.75694C14.7553 3.75694 16.9967 5.99401 16.9967 8.74832C16.9967 9.11039 16.7036 9.40133 16.3437 9.40133C15.9816 9.40133 15.6907 9.10823 15.6907 8.74832C15.6907 6.71599 14.0355 5.06297 12.0053 5.06297C11.6454 5.06297 11.3523 4.77202 11.3523 4.40995C11.3523 4.04789 11.6454 3.75694 12.0053 3.75694ZM12.0053 0.974609C16.2898 0.974609 19.7747 4.46168 19.7769 8.74401C19.7769 9.10607 19.4838 9.39702 19.1238 9.39702C18.7618 9.39702 18.4708 9.10392 18.4708 8.74401C18.4708 5.17935 15.57 2.28064 12.0053 2.28064C11.6454 2.28064 11.3523 1.98754 11.3523 1.62763C11.3523 1.26556 11.6454 0.974609 12.0053 0.974609Z" fill="#FF5F5F"/>
+<path id="&#229;&#189;&#162;&#231;&#138;&#182;" d="M16.945 12.7289C17.2618 12.8992 17.6217 12.9962 18.0053 12.9962C19.2467 12.9962 20.2553 11.9875 20.2553 10.7462C20.2553 9.50478 19.2467 8.49616 18.0053 8.49616C16.7639 8.49616 15.7553 9.50478 15.7553 10.7462C15.7553 11.1298 15.8501 11.4897 16.0226 11.8065L15.1907 12.6384L16.1131 13.5608L16.945 12.7289ZM8.84152 17.091C9.23161 17.6212 9.6648 18.1276 10.1432 18.6039C11.7704 20.2311 13.723 21.3647 15.7079 21.8453L16.5851 23.9983C16.6691 24.1987 16.6454 24.4293 16.5247 24.6082C16.4019 24.7893 16.1993 24.897 15.9816 24.897H6.84367C6.63031 24.897 6.42988 24.7914 6.30704 24.6147C6.18419 24.438 6.15833 24.2138 6.23376 24.0134L8.84152 17.091ZM8.81135 8.10392L20.6432 19.938C19.598 20.6923 18.1863 20.9595 16.5915 20.6944C14.6497 20.369 12.6863 19.3 11.0678 17.6815C9.44928 16.063 8.37816 14.1018 8.05488 12.1556C7.7898 10.563 8.05919 9.14918 8.81135 8.10392ZM18.0053 5.75694C20.7553 5.75694 22.9967 7.99401 22.9967 10.7483C22.9967 11.1104 22.7036 11.4013 22.3437 11.4013C21.9816 11.4013 21.6907 11.1082 21.6907 10.7483C21.6907 8.71599 20.0355 7.06297 18.0053 7.06297C17.6454 7.06297 17.3523 6.77202 17.3523 6.40995C17.3523 6.04789 17.6454 5.75694 18.0053 5.75694ZM18.0053 2.97461C22.2898 2.97461 25.7747 6.46168 25.7769 10.744C25.7769 11.1061 25.4838 11.397 25.1238 11.397C24.7618 11.397 24.4708 11.1039 24.4708 10.744C24.4708 7.17935 21.57 4.28064 18.0053 4.28064C17.6454 4.28064 17.3523 3.98754 17.3523 3.62763C17.3523 3.26556 17.6454 2.97461 18.0053 2.97461Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒.svg
index 29b6fadf..1bc151f2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒.svg
@@ -1,12 +1,14 @@
-<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10140">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="Frame" clip-path="url(#clip0_136_146)">
-<path id="Vector" d="M11.3949 2C11.0746 2 10.7084 2 10.3881 2.04493C6.49806 2.4942 3.29451 5.54927 2.74533 9.36812C2.33344 12.3783 3.5691 15.2536 5.90311 17.0957C6.13194 18.4435 7.32183 19.4768 8.74055 19.4768H13.912C15.3307 19.4768 16.5664 18.4435 16.7494 17.0957C18.8089 15.4783 19.9987 13.0971 19.9987 10.4913C20.0903 5.81884 16.2002 2 11.3949 2ZM15.0561 16.1971V16.6913C15.0561 17.2754 14.5985 17.7246 14.0035 17.7246H12.3102V12.513L12.8136 13.0971C12.9967 13.2768 13.2255 13.4116 13.5001 13.4116H13.5459C13.8205 13.4116 14.0951 13.2319 14.2323 13.0072L15.7884 10.5812C16.063 10.1768 15.9257 9.59275 15.5138 9.32319C15.1019 9.05362 14.5069 9.18841 14.2323 9.59275L13.317 10.9855L12.0356 9.5029C11.6695 9.09855 10.983 9.09855 10.6627 9.5029L9.38126 10.9855L8.46596 9.59275C8.19137 9.18841 7.64219 9.05362 7.18454 9.32319C6.77265 9.59275 6.63536 10.1319 6.90995 10.5812L8.46596 13.0072C8.60325 13.2319 8.87784 13.4116 9.15243 13.4116C9.42702 13.4116 9.74738 13.3217 9.93044 13.0971L10.4339 12.513V17.7246H8.74055C8.1456 17.7246 7.68795 17.2754 7.68795 16.6913V16.1971C5.53699 14.8493 4.16404 12.3783 4.53016 9.63768C4.98781 6.58261 7.50489 4.20145 10.6169 3.84203C10.8457 3.7971 11.1203 3.7971 11.3949 3.7971C15.1934 3.7971 18.2597 6.80725 18.2597 10.4913C18.2597 12.9174 16.9783 14.9841 15.0561 16.1971ZM13.6832 20.8696H9.10667C8.60325 20.8696 8.19137 21.2739 8.19137 21.7681C8.19137 22.2623 8.60325 22.6667 9.10667 22.6667H13.6832C14.1866 22.6667 14.5985 22.2623 14.5985 21.7681C14.5985 21.2739 14.1866 20.8696 13.6832 20.8696Z" fill="#0FD4FF"/>
+<g id="Frame" clip-path="url(#clip0_786_1705)">
+<path id="Vector" d="M15.3949 7C15.0746 7 14.7084 7 14.3881 7.04493C10.4981 7.4942 7.29451 10.5493 6.74533 14.3681C6.33344 17.3783 7.5691 20.2536 9.90311 22.0957C10.1319 23.4435 11.3218 24.4768 12.7405 24.4768H17.912C19.3307 24.4768 20.5664 23.4435 20.7494 22.0957C22.8089 20.4783 23.9987 18.0971 23.9987 15.4913C24.0903 10.8188 20.2002 7 15.3949 7ZM19.0561 21.1971V21.6913C19.0561 22.2754 18.5985 22.7246 18.0035 22.7246H16.3102V17.513L16.8136 18.0971C16.9967 18.2768 17.2255 18.4116 17.5001 18.4116H17.5459C17.8205 18.4116 18.0951 18.2319 18.2323 18.0072L19.7884 15.5812C20.063 15.1768 19.9257 14.5928 19.5138 14.3232C19.1019 14.0536 18.5069 14.1884 18.2323 14.5928L17.317 15.9855L16.0356 14.5029C15.6695 14.0986 14.983 14.0986 14.6627 14.5029L13.3813 15.9855L12.466 14.5928C12.1914 14.1884 11.6422 14.0536 11.1845 14.3232C10.7727 14.5928 10.6354 15.1319 10.9099 15.5812L12.466 18.0072C12.6033 18.2319 12.8778 18.4116 13.1524 18.4116C13.427 18.4116 13.7474 18.3217 13.9304 18.0971L14.4339 17.513V22.7246H12.7405C12.1456 22.7246 11.688 22.2754 11.688 21.6913V21.1971C9.53699 19.8493 8.16404 17.3783 8.53016 14.6377C8.98781 11.5826 11.5049 9.20145 14.6169 8.84203C14.8457 8.7971 15.1203 8.7971 15.3949 8.7971C19.1934 8.7971 22.2597 11.8072 22.2597 15.4913C22.2597 17.9174 20.9783 19.9841 19.0561 21.1971ZM17.6832 25.8696H13.1067C12.6033 25.8696 12.1914 26.2739 12.1914 26.7681C12.1914 27.2623 12.6033 27.6667 13.1067 27.6667H17.6832C18.1866 27.6667 18.5985 27.2623 18.5985 26.7681C18.5985 26.2739 18.1866 25.8696 17.6832 25.8696Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 <defs>
-<clipPath id="clip0_136_146">
-<rect width="22.6667" height="22.6667" fill="white"/>
+<clipPath id="clip0_786_1705">
+<rect width="22.6667" height="22.6667" fill="white" transform="translate(4 5)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_active.svg
index 0d1ca160..548bed47 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_active.svg
@@ -1,12 +1,14 @@
-<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10171">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="Frame" clip-path="url(#clip0_409_3350)">
-<path id="Vector" d="M11.3949 2C11.0746 2 10.7084 2 10.3881 2.04493C6.49806 2.4942 3.29451 5.54927 2.74533 9.36812C2.33344 12.3783 3.5691 15.2536 5.90311 17.0957C6.13194 18.4435 7.32183 19.4768 8.74055 19.4768H13.912C15.3307 19.4768 16.5664 18.4435 16.7494 17.0957C18.8089 15.4783 19.9987 13.0971 19.9987 10.4913C20.0903 5.81884 16.2002 2 11.3949 2ZM15.0561 16.1971V16.6913C15.0561 17.2754 14.5985 17.7246 14.0035 17.7246H12.3102V12.513L12.8136 13.0971C12.9967 13.2768 13.2255 13.4116 13.5001 13.4116H13.5459C13.8205 13.4116 14.0951 13.2319 14.2323 13.0072L15.7884 10.5812C16.0629 10.1768 15.9257 9.59275 15.5138 9.32319C15.1019 9.05362 14.5069 9.18841 14.2323 9.59275L13.317 10.9855L12.0356 9.5029C11.6695 9.09855 10.983 9.09855 10.6627 9.5029L9.38126 10.9855L8.46596 9.59275C8.19137 9.18841 7.64219 9.05362 7.18454 9.32319C6.77265 9.59275 6.63536 10.1319 6.90995 10.5812L8.46596 13.0072C8.60325 13.2319 8.87784 13.4116 9.15243 13.4116C9.42702 13.4116 9.74738 13.3217 9.93044 13.0971L10.4339 12.513V17.7246H8.74055C8.1456 17.7246 7.68795 17.2754 7.68795 16.6913V16.1971C5.53699 14.8493 4.16404 12.3783 4.53016 9.63768C4.98781 6.58261 7.50489 4.20145 10.6169 3.84203C10.8457 3.7971 11.1203 3.7971 11.3949 3.7971C15.1934 3.7971 18.2597 6.80725 18.2597 10.4913C18.2597 12.9174 16.9783 14.9841 15.0561 16.1971ZM13.6832 20.8696H9.10667C8.60325 20.8696 8.19137 21.2739 8.19137 21.7681C8.19137 22.2623 8.60325 22.6667 9.10667 22.6667H13.6832C14.1866 22.6667 14.5985 22.2623 14.5985 21.7681C14.5985 21.2739 14.1866 20.8696 13.6832 20.8696Z" fill="#FFDB82"/>
+<g id="Frame" clip-path="url(#clip0_786_1709)">
+<path id="Vector" d="M15.3949 7C15.0746 7 14.7084 7 14.3881 7.04493C10.4981 7.4942 7.29451 10.5493 6.74533 14.3681C6.33344 17.3783 7.5691 20.2536 9.90311 22.0957C10.1319 23.4435 11.3218 24.4768 12.7405 24.4768H17.912C19.3307 24.4768 20.5664 23.4435 20.7494 22.0957C22.8089 20.4783 23.9987 18.0971 23.9987 15.4913C24.0903 10.8188 20.2002 7 15.3949 7ZM19.0561 21.1971V21.6913C19.0561 22.2754 18.5985 22.7246 18.0035 22.7246H16.3102V17.513L16.8136 18.0971C16.9967 18.2768 17.2255 18.4116 17.5001 18.4116H17.5459C17.8205 18.4116 18.0951 18.2319 18.2323 18.0072L19.7884 15.5812C20.063 15.1768 19.9257 14.5928 19.5138 14.3232C19.1019 14.0536 18.5069 14.1884 18.2323 14.5928L17.317 15.9855L16.0356 14.5029C15.6695 14.0986 14.983 14.0986 14.6627 14.5029L13.3813 15.9855L12.466 14.5928C12.1914 14.1884 11.6422 14.0536 11.1845 14.3232C10.7727 14.5928 10.6354 15.1319 10.9099 15.5812L12.466 18.0072C12.6033 18.2319 12.8778 18.4116 13.1524 18.4116C13.427 18.4116 13.7474 18.3217 13.9304 18.0971L14.4339 17.513V22.7246H12.7405C12.1456 22.7246 11.688 22.2754 11.688 21.6913V21.1971C9.53699 19.8493 8.16404 17.3783 8.53016 14.6377C8.98781 11.5826 11.5049 9.20145 14.6169 8.84203C14.8457 8.7971 15.1203 8.7971 15.3949 8.7971C19.1934 8.7971 22.2597 11.8072 22.2597 15.4913C22.2597 17.9174 20.9783 19.9841 19.0561 21.1971ZM17.6832 25.8696H13.1067C12.6033 25.8696 12.1914 26.2739 12.1914 26.7681C12.1914 27.2623 12.6033 27.6667 13.1067 27.6667H17.6832C18.1866 27.6667 18.5985 27.2623 18.5985 26.7681C18.5985 26.2739 18.1866 25.8696 17.6832 25.8696Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 <defs>
-<clipPath id="clip0_409_3350">
-<rect width="22.6667" height="22.6667" fill="white"/>
+<clipPath id="clip0_786_1709">
+<rect width="22.6667" height="22.6667" fill="white" transform="translate(4 5)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_fault.svg
index 1a13a8e8..abce8993 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/疲劳唤醒_fault.svg
@@ -1,12 +1,14 @@
-<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10202">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="Frame" clip-path="url(#clip0_409_3617)">
-<path id="Vector" d="M11.3949 2C11.0746 2 10.7084 2 10.3881 2.04493C6.49806 2.4942 3.29451 5.54927 2.74533 9.36812C2.33344 12.3783 3.5691 15.2536 5.90311 17.0957C6.13194 18.4435 7.32183 19.4768 8.74055 19.4768H13.912C15.3307 19.4768 16.5664 18.4435 16.7494 17.0957C18.8089 15.4783 19.9987 13.0971 19.9987 10.4913C20.0903 5.81884 16.2002 2 11.3949 2ZM15.0561 16.1971V16.6913C15.0561 17.2754 14.5985 17.7246 14.0035 17.7246H12.3102V12.513L12.8136 13.0971C12.9967 13.2768 13.2255 13.4116 13.5001 13.4116H13.5459C13.8205 13.4116 14.0951 13.2319 14.2323 13.0072L15.7884 10.5812C16.0629 10.1768 15.9257 9.59275 15.5138 9.32319C15.1019 9.05362 14.5069 9.18841 14.2323 9.59275L13.317 10.9855L12.0356 9.5029C11.6695 9.09855 10.983 9.09855 10.6627 9.5029L9.38126 10.9855L8.46596 9.59275C8.19137 9.18841 7.64219 9.05362 7.18454 9.32319C6.77265 9.59275 6.63536 10.1319 6.90995 10.5812L8.46596 13.0072C8.60325 13.2319 8.87784 13.4116 9.15243 13.4116C9.42702 13.4116 9.74738 13.3217 9.93044 13.0971L10.4339 12.513V17.7246H8.74055C8.1456 17.7246 7.68795 17.2754 7.68795 16.6913V16.1971C5.53699 14.8493 4.16404 12.3783 4.53016 9.63768C4.98781 6.58261 7.50489 4.20145 10.6169 3.84203C10.8457 3.7971 11.1203 3.7971 11.3949 3.7971C15.1934 3.7971 18.2597 6.80725 18.2597 10.4913C18.2597 12.9174 16.9783 14.9841 15.0561 16.1971ZM13.6832 20.8696H9.10667C8.60325 20.8696 8.19137 21.2739 8.19137 21.7681C8.19137 22.2623 8.60325 22.6667 9.10667 22.6667H13.6832C14.1866 22.6667 14.5985 22.2623 14.5985 21.7681C14.5985 21.2739 14.1866 20.8696 13.6832 20.8696Z" fill="#FF5F5F"/>
+<g id="Frame" clip-path="url(#clip0_786_1713)">
+<path id="Vector" d="M15.3949 7C15.0746 7 14.7084 7 14.3881 7.04493C10.4981 7.4942 7.29451 10.5493 6.74533 14.3681C6.33344 17.3783 7.5691 20.2536 9.90311 22.0957C10.1319 23.4435 11.3218 24.4768 12.7405 24.4768H17.912C19.3307 24.4768 20.5664 23.4435 20.7494 22.0957C22.8089 20.4783 23.9987 18.0971 23.9987 15.4913C24.0903 10.8188 20.2002 7 15.3949 7ZM19.0561 21.1971V21.6913C19.0561 22.2754 18.5985 22.7246 18.0035 22.7246H16.3102V17.513L16.8136 18.0971C16.9967 18.2768 17.2255 18.4116 17.5001 18.4116H17.5459C17.8205 18.4116 18.0951 18.2319 18.2323 18.0072L19.7884 15.5812C20.063 15.1768 19.9257 14.5928 19.5138 14.3232C19.1019 14.0536 18.5069 14.1884 18.2323 14.5928L17.317 15.9855L16.0356 14.5029C15.6695 14.0986 14.983 14.0986 14.6627 14.5029L13.3813 15.9855L12.466 14.5928C12.1914 14.1884 11.6422 14.0536 11.1845 14.3232C10.7727 14.5928 10.6354 15.1319 10.9099 15.5812L12.466 18.0072C12.6033 18.2319 12.8778 18.4116 13.1524 18.4116C13.427 18.4116 13.7474 18.3217 13.9304 18.0971L14.4339 17.513V22.7246H12.7405C12.1456 22.7246 11.688 22.2754 11.688 21.6913V21.1971C9.53699 19.8493 8.16404 17.3783 8.53016 14.6377C8.98781 11.5826 11.5049 9.20145 14.6169 8.84203C14.8457 8.7971 15.1203 8.7971 15.3949 8.7971C19.1934 8.7971 22.2597 11.8072 22.2597 15.4913C22.2597 17.9174 20.9783 19.9841 19.0561 21.1971ZM17.6832 25.8696H13.1067C12.6033 25.8696 12.1914 26.2739 12.1914 26.7681C12.1914 27.2623 12.6033 27.6667 13.1067 27.6667H17.6832C18.1866 27.6667 18.5985 27.2623 18.5985 26.7681C18.5985 26.2739 18.1866 25.8696 17.6832 25.8696Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 <defs>
-<clipPath id="clip0_409_3617">
-<rect width="22.6667" height="22.6667" fill="white"/>
+<clipPath id="clip0_786_1713">
+<rect width="22.6667" height="22.6667" fill="white" transform="translate(4 5)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导.svg
index a0bdc397..5c675082 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导.svg
@@ -1,5 +1,7 @@
-<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10142">
 <g id="Group 1142814038">
-<path id="Vector" d="M9.43361 12.0085L9.64146 18H7.2486L7.45781 12.0102H9.43361V12.0085ZM6.62372 4.34709e-05L4.45513 17.9077H1.58504C0.0604699 17.9077 -0.340153 16.4166 0.279257 13.8144C0.533565 12.7413 0.910952 10.8919 1.30066 8.95388L1.53447 7.78666C2.00349 5.45231 2.45743 3.19032 2.71177 2.18962C3.22042 0.190058 3.51028 0.0941455 4.45513 4.34709e-05H6.62372ZM11.9659 4.34709e-05C13.1993 4.34709e-05 14.0717 0.665959 14.5064 2.47373C14.9413 4.28332 16.3934 12.6708 16.7571 14.0985C17.1194 15.5281 17.263 17.9077 15.8136 17.9077H12.4007L10.2089 0L11.9659 4.34709e-05ZM9.1738 4.52034L9.38164 10.5101H7.50838L7.71896 4.52039L9.1738 4.52034ZM9.01931 0.0271693L9.12322 3.02204H7.77364L7.87756 0.0271693H9.01931Z" fill="#0FD4FF"/>
+<path id="Vector" d="M17.4336 20.0085L17.6415 26H15.2486L15.4578 20.0102H17.4336V20.0085ZM14.6237 8.00004L12.4551 25.9077H9.58504C8.06047 25.9077 7.65985 24.4166 8.27926 21.8144C8.53356 20.7413 8.91095 18.8919 9.30066 16.9539L9.53447 15.7867C10.0035 13.4523 10.4574 11.1903 10.7118 10.1896C11.2204 8.19006 11.5103 8.09415 12.4551 8.00004H14.6237ZM19.9659 8.00004C21.1993 8.00004 22.0717 8.66596 22.5064 10.4737C22.9413 12.2833 24.3934 20.6708 24.7571 22.0985C25.1194 23.5281 25.263 25.9077 23.8136 25.9077H20.4007L18.2089 8L19.9659 8.00004ZM17.1738 12.5203L17.3816 18.5101H15.5084L15.719 12.5204L17.1738 12.5203ZM17.0193 8.02717L17.1232 11.022H15.7736L15.8776 8.02717H17.0193Z" fill="#0FD4FF"/>
+</g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_active.svg
index c8984a2b..04d47b68 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_active.svg
@@ -1,5 +1,7 @@
-<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10173">
 <g id="Group 1142814038">
-<path id="Vector" d="M9.43361 12.0085L9.64146 18H7.2486L7.45781 12.0102H9.43361V12.0085ZM6.62372 4.34709e-05L4.45513 17.9077H1.58504C0.0604699 17.9077 -0.340153 16.4166 0.279257 13.8144C0.533565 12.7413 0.910952 10.8919 1.30066 8.95388L1.53447 7.78666C2.00349 5.45231 2.45743 3.19032 2.71177 2.18962C3.22042 0.190058 3.51028 0.0941455 4.45513 4.34709e-05H6.62372ZM11.9659 4.34709e-05C13.1993 4.34709e-05 14.0717 0.665959 14.5064 2.47373C14.9413 4.28332 16.3934 12.6708 16.7571 14.0985C17.1194 15.5281 17.263 17.9077 15.8136 17.9077H12.4007L10.2089 0L11.9659 4.34709e-05ZM9.1738 4.52034L9.38164 10.5101H7.50838L7.71896 4.52039L9.1738 4.52034ZM9.01931 0.0271693L9.12322 3.02204H7.77364L7.87756 0.0271693H9.01931Z" fill="#FFDB82"/>
+<path id="Vector" d="M17.4336 20.0085L17.6415 26H15.2486L15.4578 20.0102H17.4336V20.0085ZM14.6237 8.00004L12.4551 25.9077H9.58504C8.06047 25.9077 7.65985 24.4166 8.27926 21.8144C8.53356 20.7413 8.91095 18.8919 9.30066 16.9539L9.53447 15.7867C10.0035 13.4523 10.4574 11.1903 10.7118 10.1896C11.2204 8.19006 11.5103 8.09415 12.4551 8.00004H14.6237ZM19.9659 8.00004C21.1993 8.00004 22.0717 8.66596 22.5064 10.4737C22.9413 12.2833 24.3934 20.6708 24.7571 22.0985C25.1194 23.5281 25.263 25.9077 23.8136 25.9077H20.4007L18.2089 8L19.9659 8.00004ZM17.1738 12.5203L17.3816 18.5101H15.5084L15.719 12.5204L17.1738 12.5203ZM17.0193 8.02717L17.1232 11.022H15.7736L15.8776 8.02717H17.0193Z" fill="#FFDB82"/>
+</g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_fault.svg
index 0fc87956..1c94fc5e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/行车诱导_fault.svg
@@ -1,5 +1,7 @@
-<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10204">
 <g id="Group 1142814038">
-<path id="Vector" d="M9.43361 12.0085L9.64146 18H7.2486L7.45781 12.0102H9.43361V12.0085ZM6.62372 4.34709e-05L4.45513 17.9077H1.58504C0.0604699 17.9077 -0.340153 16.4166 0.279257 13.8144C0.533565 12.7413 0.910952 10.8919 1.30066 8.95388L1.53447 7.78666C2.00349 5.45231 2.45743 3.19032 2.71177 2.18962C3.22042 0.190058 3.51028 0.0941455 4.45513 4.34709e-05H6.62372ZM11.9659 4.34709e-05C13.1993 4.34709e-05 14.0717 0.665959 14.5064 2.47373C14.9413 4.28332 16.3934 12.6708 16.7571 14.0985C17.1194 15.5281 17.263 17.9077 15.8136 17.9077H12.4007L10.2089 0L11.9659 4.34709e-05ZM9.1738 4.52034L9.38164 10.5101H7.50838L7.71896 4.52039L9.1738 4.52034ZM9.01931 0.0271693L9.12322 3.02204H7.77364L7.87756 0.0271693H9.01931Z" fill="#FF5F5F"/>
+<path id="Vector" d="M17.4336 20.0085L17.6415 26H15.2486L15.4578 20.0102H17.4336V20.0085ZM14.6237 8.00004L12.4551 25.9077H9.58504C8.06047 25.9077 7.65985 24.4166 8.27926 21.8144C8.53356 20.7413 8.91095 18.8919 9.30066 16.9539L9.53447 15.7867C10.0035 13.4523 10.4574 11.1903 10.7118 10.1896C11.2204 8.19006 11.5103 8.09415 12.4551 8.00004H14.6237ZM19.9659 8.00004C21.1993 8.00004 22.0717 8.66596 22.5064 10.4737C22.9413 12.2833 24.3934 20.6708 24.7571 22.0985C25.1194 23.5281 25.263 25.9077 23.8136 25.9077H20.4007L18.2089 8L19.9659 8.00004ZM17.1738 12.5203L17.3816 18.5101H15.5084L15.719 12.5204L17.1738 12.5203ZM17.0193 8.02717L17.1232 11.022H15.7736L15.8776 8.02717H17.0193Z" fill="#FF5F5F"/>
+</g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱.svg
index fb3f74ef..9153ba7d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱.svg
@@ -1,7 +1,9 @@
-<svg width="20" height="24" viewBox="0 0 20 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10137">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="Frame">
-<path id="Vector" d="M3.46202 6.5892H16.7064C17.0534 6.5892 17.3347 6.90485 17.3347 7.29421V20.9065C17.3347 21.1422 17.1644 21.3333 16.9543 21.3333H3.21405C3.00397 21.3333 2.83365 21.1422 2.83365 20.9065V7.29421C2.83365 6.90485 3.11498 6.58922 3.46202 6.58922V6.5892ZM14.7791 11.8202C14.6056 11.8202 14.4649 11.978 14.4649 12.1727V15.6977C14.4649 15.8924 14.6056 16.0502 14.7791 16.0502H14.7792C14.9528 16.0502 15.0934 15.8924 15.0934 15.6977V12.1727C15.0934 11.978 14.9528 11.8202 14.7792 11.8202H14.7791H14.7791ZM4.09485 7.67519C3.92133 7.67519 3.78067 7.83301 3.78067 8.02768V19.9277C3.78067 20.1223 3.92133 20.2802 4.09485 20.2802H16.0362C16.2097 20.2802 16.3504 20.1223 16.3504 19.9277V8.02765C16.3504 7.83299 16.2097 7.67517 16.0362 7.67517H4.09485V7.67519ZM4.40909 8.02768H15.722C15.8955 8.02768 16.0361 8.18552 16.0361 8.38018V19.5752C16.0361 19.7699 15.8955 19.9277 15.722 19.9277H4.40909C4.23557 19.9277 4.09491 19.7698 4.09491 19.5752V8.38018C4.09491 8.1855 4.23557 8.02768 4.40909 8.02768ZM16.7097 2.33325H3.42318C3.34419 2.33325 3.26715 2.36084 3.20277 2.4122C3.13838 2.46356 3.08985 2.53613 3.0639 2.61984L2.08762 5.76861C2.01861 5.99125 2.1235 6.2345 2.32192 6.31194C2.3621 6.32763 2.40435 6.33564 2.44689 6.33565H17.686C17.8961 6.33565 18.0664 6.14455 18.0664 5.90885C18.0664 5.86111 18.0593 5.81372 18.0453 5.76864L17.069 2.61982C17.043 2.53611 16.9945 2.46355 16.9301 2.4122C16.8658 2.36085 16.7887 2.33325 16.7097 2.33325Z" fill="#0FD4FF"/>
+<path id="Vector" d="M9.46202 10.589H22.7064C23.0534 10.589 23.3347 10.9046 23.3347 11.294V24.9062C23.3347 25.1419 23.1644 25.333 22.9543 25.333H9.21405C9.00397 25.333 8.83365 25.1419 8.83365 24.9062V11.294C8.83365 10.9046 9.11498 10.589 9.46202 10.589V10.589ZM20.7791 15.82C20.6056 15.82 20.4649 15.9778 20.4649 16.1725V19.6975C20.4649 19.8921 20.6056 20.0499 20.7791 20.0499H20.7792C20.9528 20.0499 21.0934 19.8921 21.0934 19.6975V16.1725C21.0934 15.9778 20.9528 15.82 20.7792 15.82H20.7791H20.7791ZM10.0949 11.6749C9.92133 11.6749 9.78067 11.8328 9.78067 12.0274V23.9274C9.78067 24.1221 9.92133 24.2799 10.0949 24.2799H22.0362C22.2097 24.2799 22.3504 24.1221 22.3504 23.9274V12.0274C22.3504 11.8327 22.2097 11.6749 22.0362 11.6749H10.0949V11.6749ZM10.4091 12.0274H21.722C21.8955 12.0274 22.0361 12.1853 22.0361 12.3799V23.5749C22.0361 23.7696 21.8955 23.9274 21.722 23.9274H10.4091C10.2356 23.9274 10.0949 23.7696 10.0949 23.5749V12.3799C10.0949 12.1853 10.2356 12.0274 10.4091 12.0274ZM22.7097 6.33301H9.42318C9.34419 6.33301 9.26715 6.3606 9.20277 6.41196C9.13838 6.46331 9.08985 6.53588 9.0639 6.61959L8.08762 9.76837C8.01861 9.99101 8.1235 10.2343 8.32192 10.3117C8.3621 10.3274 8.40435 10.3354 8.44689 10.3354H23.686C23.8961 10.3354 24.0664 10.1443 24.0664 9.9086C24.0664 9.86087 24.0593 9.81347 24.0453 9.76839L23.069 6.61957C23.043 6.53587 22.9945 6.4633 22.9301 6.41195C22.8658 6.3606 22.7887 6.33301 22.7097 6.33301Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_active.svg
index ecd06d3e..576d26c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_active.svg
@@ -1,7 +1,9 @@
-<svg width="20" height="24" viewBox="0 0 20 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10168">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="Frame">
-<path id="Vector" d="M3.46202 6.5892H16.7064C17.0534 6.5892 17.3347 6.90485 17.3347 7.29421V20.9065C17.3347 21.1422 17.1644 21.3333 16.9543 21.3333H3.21405C3.00397 21.3333 2.83365 21.1422 2.83365 20.9065V7.29421C2.83365 6.90485 3.11498 6.58922 3.46202 6.58922V6.5892ZM14.7791 11.8202C14.6056 11.8202 14.4649 11.978 14.4649 12.1727V15.6977C14.4649 15.8924 14.6056 16.0502 14.7791 16.0502H14.7792C14.9528 16.0502 15.0934 15.8924 15.0934 15.6977V12.1727C15.0934 11.978 14.9528 11.8202 14.7792 11.8202H14.7791H14.7791ZM4.09485 7.67519C3.92133 7.67519 3.78067 7.83301 3.78067 8.02768V19.9277C3.78067 20.1223 3.92133 20.2802 4.09485 20.2802H16.0362C16.2097 20.2802 16.3504 20.1223 16.3504 19.9277V8.02765C16.3504 7.83299 16.2097 7.67517 16.0362 7.67517H4.09485V7.67519ZM4.40909 8.02768H15.722C15.8955 8.02768 16.0361 8.18552 16.0361 8.38018V19.5752C16.0361 19.7699 15.8955 19.9277 15.722 19.9277H4.40909C4.23557 19.9277 4.09491 19.7698 4.09491 19.5752V8.38018C4.09491 8.1855 4.23557 8.02768 4.40909 8.02768ZM16.7097 2.33325H3.42318C3.34419 2.33325 3.26715 2.36084 3.20277 2.4122C3.13838 2.46356 3.08985 2.53613 3.0639 2.61984L2.08762 5.76861C2.01861 5.99125 2.1235 6.2345 2.32192 6.31194C2.3621 6.32763 2.40435 6.33564 2.44689 6.33565H17.686C17.8961 6.33565 18.0664 6.14455 18.0664 5.90885C18.0664 5.86111 18.0593 5.81372 18.0453 5.76864L17.069 2.61982C17.043 2.53611 16.9945 2.46355 16.9301 2.4122C16.8658 2.36085 16.7887 2.33325 16.7097 2.33325Z" fill="#FFDB82"/>
+<path id="Vector" d="M9.46202 10.589H22.7064C23.0534 10.589 23.3347 10.9046 23.3347 11.294V24.9062C23.3347 25.1419 23.1644 25.333 22.9543 25.333H9.21405C9.00397 25.333 8.83365 25.1419 8.83365 24.9062V11.294C8.83365 10.9046 9.11498 10.589 9.46202 10.589V10.589ZM20.7791 15.82C20.6056 15.82 20.4649 15.9778 20.4649 16.1725V19.6975C20.4649 19.8921 20.6056 20.0499 20.7791 20.0499H20.7792C20.9528 20.0499 21.0934 19.8921 21.0934 19.6975V16.1725C21.0934 15.9778 20.9528 15.82 20.7792 15.82H20.7791H20.7791ZM10.0949 11.6749C9.92133 11.6749 9.78067 11.8328 9.78067 12.0274V23.9274C9.78067 24.1221 9.92133 24.2799 10.0949 24.2799H22.0362C22.2097 24.2799 22.3504 24.1221 22.3504 23.9274V12.0274C22.3504 11.8327 22.2097 11.6749 22.0362 11.6749H10.0949V11.6749ZM10.4091 12.0274H21.722C21.8955 12.0274 22.0361 12.1853 22.0361 12.3799V23.5749C22.0361 23.7696 21.8955 23.9274 21.722 23.9274H10.4091C10.2356 23.9274 10.0949 23.7696 10.0949 23.5749V12.3799C10.0949 12.1853 10.2356 12.0274 10.4091 12.0274ZM22.7097 6.33301H9.42318C9.34419 6.33301 9.26715 6.3606 9.20277 6.41196C9.13838 6.46331 9.08985 6.53588 9.0639 6.61959L8.08762 9.76837C8.01861 9.99101 8.1235 10.2343 8.32192 10.3117C8.3621 10.3274 8.40435 10.3354 8.44689 10.3354H23.686C23.8961 10.3354 24.0664 10.1443 24.0664 9.9086C24.0664 9.86087 24.0593 9.81347 24.0453 9.76839L23.069 6.61957C23.043 6.53587 22.9945 6.4633 22.9301 6.41195C22.8658 6.3606 22.7887 6.33301 22.7097 6.33301Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_fault.svg
index aa14f248..ebbfa096 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/设备箱_fault.svg
@@ -1,7 +1,9 @@
-<svg width="20" height="24" viewBox="0 0 20 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10199">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="Frame">
-<path id="Vector" d="M3.46202 6.5892H16.7064C17.0534 6.5892 17.3347 6.90485 17.3347 7.29421V20.9065C17.3347 21.1422 17.1644 21.3333 16.9543 21.3333H3.21405C3.00397 21.3333 2.83365 21.1422 2.83365 20.9065V7.29421C2.83365 6.90485 3.11498 6.58922 3.46202 6.58922V6.5892ZM14.7791 11.8202C14.6056 11.8202 14.4649 11.978 14.4649 12.1727V15.6977C14.4649 15.8924 14.6056 16.0502 14.7791 16.0502H14.7792C14.9528 16.0502 15.0934 15.8924 15.0934 15.6977V12.1727C15.0934 11.978 14.9528 11.8202 14.7792 11.8202H14.7791H14.7791ZM4.09485 7.67519C3.92133 7.67519 3.78067 7.83301 3.78067 8.02768V19.9277C3.78067 20.1223 3.92133 20.2802 4.09485 20.2802H16.0362C16.2097 20.2802 16.3504 20.1223 16.3504 19.9277V8.02765C16.3504 7.83299 16.2097 7.67517 16.0362 7.67517H4.09485V7.67519ZM4.40909 8.02768H15.722C15.8955 8.02768 16.0361 8.18552 16.0361 8.38018V19.5752C16.0361 19.7699 15.8955 19.9277 15.722 19.9277H4.40909C4.23557 19.9277 4.09491 19.7698 4.09491 19.5752V8.38018C4.09491 8.1855 4.23557 8.02768 4.40909 8.02768ZM16.7097 2.33325H3.42318C3.34419 2.33325 3.26715 2.36084 3.20277 2.4122C3.13838 2.46356 3.08985 2.53613 3.0639 2.61984L2.08762 5.76861C2.01861 5.99125 2.1235 6.2345 2.32192 6.31194C2.3621 6.32763 2.40435 6.33564 2.44689 6.33565H17.686C17.8961 6.33565 18.0664 6.14455 18.0664 5.90885C18.0664 5.86111 18.0593 5.81372 18.0453 5.76864L17.069 2.61982C17.043 2.53611 16.9945 2.46355 16.9301 2.4122C16.8658 2.36085 16.7887 2.33325 16.7097 2.33325Z" fill="#FF5F5F"/>
+<path id="Vector" d="M9.46202 10.589H22.7064C23.0534 10.589 23.3347 10.9046 23.3347 11.294V24.9062C23.3347 25.1419 23.1644 25.333 22.9543 25.333H9.21405C9.00397 25.333 8.83365 25.1419 8.83365 24.9062V11.294C8.83365 10.9046 9.11498 10.589 9.46202 10.589V10.589ZM20.7791 15.82C20.6056 15.82 20.4649 15.9778 20.4649 16.1725V19.6975C20.4649 19.8921 20.6056 20.0499 20.7791 20.0499H20.7792C20.9528 20.0499 21.0934 19.8921 21.0934 19.6975V16.1725C21.0934 15.9778 20.9528 15.82 20.7792 15.82H20.7791H20.7791ZM10.0949 11.6749C9.92133 11.6749 9.78067 11.8328 9.78067 12.0274V23.9274C9.78067 24.1221 9.92133 24.2799 10.0949 24.2799H22.0362C22.2097 24.2799 22.3504 24.1221 22.3504 23.9274V12.0274C22.3504 11.8327 22.2097 11.6749 22.0362 11.6749H10.0949V11.6749ZM10.4091 12.0274H21.722C21.8955 12.0274 22.0361 12.1853 22.0361 12.3799V23.5749C22.0361 23.7696 21.8955 23.9274 21.722 23.9274H10.4091C10.2356 23.9274 10.0949 23.7696 10.0949 23.5749V12.3799C10.0949 12.1853 10.2356 12.0274 10.4091 12.0274ZM22.7097 6.33301H9.42318C9.34419 6.33301 9.26715 6.3606 9.20277 6.41196C9.13838 6.46331 9.08985 6.53588 9.0639 6.61959L8.08762 9.76837C8.01861 9.99101 8.1235 10.2343 8.32192 10.3117C8.3621 10.3274 8.40435 10.3354 8.44689 10.3354H23.686C23.8961 10.3354 24.0664 10.1443 24.0664 9.9086C24.0664 9.86087 24.0593 9.81347 24.0453 9.76839L23.069 6.61957C23.043 6.53587 22.9945 6.4633 22.9301 6.41195C22.8658 6.3606 22.7887 6.33301 22.7097 6.33301Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播.svg
index acae9388..d7257ba0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播.svg
@@ -1,7 +1,9 @@
-<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10068">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="Frame">
-<path id="Vector" d="M2 12.82C2 12.8988 2.01746 12.9768 2.05138 13.0496C2.0853 13.1224 2.13502 13.1885 2.1977 13.2443C2.26038 13.3 2.33479 13.3442 2.41669 13.3743C2.49858 13.4045 2.58636 13.42 2.675 13.42H3.29375C3.47277 13.42 3.64446 13.4832 3.77105 13.5957C3.89763 13.7083 3.96875 13.8609 3.96875 14.02V19.4C3.96875 19.5591 4.03987 19.7117 4.16645 19.8243C4.29304 19.9368 4.46473 20 4.64375 20H5.3075C5.39614 20 5.48392 19.9845 5.56581 19.9543C5.64771 19.9242 5.72212 19.88 5.7848 19.8243C5.84748 19.7685 5.8972 19.7024 5.93112 19.6296C5.96504 19.5568 5.9825 19.4788 5.9825 19.4V7.87C5.9825 7.79121 5.96504 7.71319 5.93112 7.64039C5.8972 7.56759 5.84748 7.50145 5.7848 7.44574C5.72212 7.39002 5.64771 7.34583 5.56581 7.31567C5.48392 7.28552 5.39614 7.27 5.3075 7.27H2.675C2.49598 7.27 2.32429 7.33321 2.1977 7.44574C2.07112 7.55826 2 7.71087 2 7.87V12.82ZM6.7925 7.23C6.77225 7.42959 6.77225 7.6304 6.7925 7.83V12.83C6.77225 13.0296 6.77225 13.2304 6.7925 13.43C12.6425 13.43 17.9525 18.23 17.9525 18.23C18.2113 18.47 18.425 18.39 18.425 18.06V2.6C18.425 2.27 18.2113 2.19 17.9525 2.43C17.9525 2.43 12.6538 7.23 6.7925 7.23ZM19.5838 2C19.3588 2 19.1675 2.27 19.1675 2.6V18.05C19.1675 18.38 19.3475 18.65 19.5838 18.65C19.82 18.65 20 18.38 20 18.05V2.6C20 2.27 19.8088 2 19.5838 2Z" fill="#0FD4FF"/>
+<path id="Vector" d="M7 18.82C7 18.8988 7.01746 18.9768 7.05138 19.0496C7.0853 19.1224 7.13502 19.1885 7.1977 19.2443C7.26038 19.3 7.33479 19.3442 7.41669 19.3743C7.49858 19.4045 7.58636 19.42 7.675 19.42H8.29375C8.47277 19.42 8.64446 19.4832 8.77105 19.5957C8.89763 19.7083 8.96875 19.8609 8.96875 20.02V25.4C8.96875 25.5591 9.03987 25.7117 9.16645 25.8243C9.29304 25.9368 9.46473 26 9.64375 26H10.3075C10.3961 26 10.4839 25.9845 10.5658 25.9543C10.6477 25.9242 10.7221 25.88 10.7848 25.8243C10.8475 25.7685 10.8972 25.7024 10.9311 25.6296C10.965 25.5568 10.9825 25.4788 10.9825 25.4V13.87C10.9825 13.7912 10.965 13.7132 10.9311 13.6404C10.8972 13.5676 10.8475 13.5015 10.7848 13.4457C10.7221 13.39 10.6477 13.3458 10.5658 13.3157C10.4839 13.2855 10.3961 13.27 10.3075 13.27H7.675C7.49598 13.27 7.32429 13.3332 7.1977 13.4457C7.07112 13.5583 7 13.7109 7 13.87V18.82ZM11.7925 13.23C11.7722 13.4296 11.7722 13.6304 11.7925 13.83V18.83C11.7722 19.0296 11.7722 19.2304 11.7925 19.43C17.6425 19.43 22.9525 24.23 22.9525 24.23C23.2113 24.47 23.425 24.39 23.425 24.06V8.6C23.425 8.27 23.2113 8.19 22.9525 8.43C22.9525 8.43 17.6538 13.23 11.7925 13.23ZM24.5838 8C24.3588 8 24.1675 8.27 24.1675 8.6V24.05C24.1675 24.38 24.3475 24.65 24.5838 24.65C24.82 24.65 25 24.38 25 24.05V8.6C25 8.27 24.8088 8 24.5838 8Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_active.svg
index dec7e395..c50cafdd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_active.svg
@@ -1,7 +1,9 @@
-<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10146">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="Frame">
-<path id="Vector" d="M2 12.82C2 12.8988 2.01746 12.9768 2.05138 13.0496C2.0853 13.1224 2.13502 13.1885 2.1977 13.2443C2.26038 13.3 2.33479 13.3442 2.41669 13.3743C2.49858 13.4045 2.58636 13.42 2.675 13.42H3.29375C3.47277 13.42 3.64446 13.4832 3.77105 13.5957C3.89763 13.7083 3.96875 13.8609 3.96875 14.02V19.4C3.96875 19.5591 4.03987 19.7117 4.16645 19.8243C4.29304 19.9368 4.46473 20 4.64375 20H5.3075C5.39614 20 5.48392 19.9845 5.56581 19.9543C5.64771 19.9242 5.72212 19.88 5.7848 19.8243C5.84748 19.7685 5.8972 19.7024 5.93112 19.6296C5.96504 19.5568 5.9825 19.4788 5.9825 19.4V7.87C5.9825 7.79121 5.96504 7.71319 5.93112 7.64039C5.8972 7.56759 5.84748 7.50145 5.7848 7.44574C5.72212 7.39002 5.64771 7.34582 5.56581 7.31567C5.48392 7.28552 5.39614 7.27 5.3075 7.27H2.675C2.49598 7.27 2.32429 7.33321 2.1977 7.44574C2.07112 7.55826 2 7.71087 2 7.87V12.82ZM6.7925 7.23C6.77225 7.4296 6.77225 7.63041 6.7925 7.83V12.83C6.77225 13.0296 6.77225 13.2304 6.7925 13.43C12.6425 13.43 17.9525 18.23 17.9525 18.23C18.2112 18.47 18.425 18.39 18.425 18.06V2.6C18.425 2.27 18.2112 2.19 17.9525 2.43C17.9525 2.43 12.6538 7.23 6.7925 7.23ZM19.5838 2C19.3588 2 19.1675 2.27 19.1675 2.6V18.05C19.1675 18.38 19.3475 18.65 19.5838 18.65C19.82 18.65 20 18.38 20 18.05V2.6C20 2.27 19.8088 2 19.5838 2Z" fill="#FFDB82"/>
+<path id="Vector" d="M7 18.82C7 18.8988 7.01746 18.9768 7.05138 19.0496C7.0853 19.1224 7.13502 19.1885 7.1977 19.2443C7.26038 19.3 7.33479 19.3442 7.41669 19.3743C7.49858 19.4045 7.58636 19.42 7.675 19.42H8.29375C8.47277 19.42 8.64446 19.4832 8.77105 19.5957C8.89763 19.7083 8.96875 19.8609 8.96875 20.02V25.4C8.96875 25.5591 9.03987 25.7117 9.16645 25.8243C9.29304 25.9368 9.46473 26 9.64375 26H10.3075C10.3961 26 10.4839 25.9845 10.5658 25.9543C10.6477 25.9242 10.7221 25.88 10.7848 25.8243C10.8475 25.7685 10.8972 25.7024 10.9311 25.6296C10.965 25.5568 10.9825 25.4788 10.9825 25.4V13.87C10.9825 13.7912 10.965 13.7132 10.9311 13.6404C10.8972 13.5676 10.8475 13.5015 10.7848 13.4457C10.7221 13.39 10.6477 13.3458 10.5658 13.3157C10.4839 13.2855 10.3961 13.27 10.3075 13.27H7.675C7.49598 13.27 7.32429 13.3332 7.1977 13.4457C7.07112 13.5583 7 13.7109 7 13.87V18.82ZM11.7925 13.23C11.7722 13.4296 11.7722 13.6304 11.7925 13.83V18.83C11.7722 19.0296 11.7722 19.2304 11.7925 19.43C17.6425 19.43 22.9525 24.23 22.9525 24.23C23.2113 24.47 23.425 24.39 23.425 24.06V8.6C23.425 8.27 23.2113 8.19 22.9525 8.43C22.9525 8.43 17.6538 13.23 11.7925 13.23ZM24.5838 8C24.3588 8 24.1675 8.27 24.1675 8.6V24.05C24.1675 24.38 24.3475 24.65 24.5838 24.65C24.82 24.65 25 24.38 25 24.05V8.6C25 8.27 24.8088 8 24.5838 8Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_fault.svg
index 9fddeaa3..37d7fafa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/语音广播_fault.svg
@@ -1,7 +1,9 @@
-<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10177">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="Frame">
-<path id="Vector" d="M2 12.82C2 12.8988 2.01746 12.9768 2.05138 13.0496C2.0853 13.1224 2.13502 13.1885 2.1977 13.2443C2.26038 13.3 2.33479 13.3442 2.41669 13.3743C2.49858 13.4045 2.58636 13.42 2.675 13.42H3.29375C3.47277 13.42 3.64446 13.4832 3.77105 13.5957C3.89763 13.7083 3.96875 13.8609 3.96875 14.02V19.4C3.96875 19.5591 4.03987 19.7117 4.16645 19.8243C4.29304 19.9368 4.46473 20 4.64375 20H5.3075C5.39614 20 5.48392 19.9845 5.56581 19.9543C5.64771 19.9242 5.72212 19.88 5.7848 19.8243C5.84748 19.7685 5.8972 19.7024 5.93112 19.6296C5.96504 19.5568 5.9825 19.4788 5.9825 19.4V7.87C5.9825 7.79121 5.96504 7.71319 5.93112 7.64039C5.8972 7.56759 5.84748 7.50145 5.7848 7.44574C5.72212 7.39002 5.64771 7.34582 5.56581 7.31567C5.48392 7.28552 5.39614 7.27 5.3075 7.27H2.675C2.49598 7.27 2.32429 7.33321 2.1977 7.44574C2.07112 7.55826 2 7.71087 2 7.87V12.82ZM6.7925 7.23C6.77225 7.4296 6.77225 7.63041 6.7925 7.83V12.83C6.77225 13.0296 6.77225 13.2304 6.7925 13.43C12.6425 13.43 17.9525 18.23 17.9525 18.23C18.2112 18.47 18.425 18.39 18.425 18.06V2.6C18.425 2.27 18.2112 2.19 17.9525 2.43C17.9525 2.43 12.6538 7.23 6.7925 7.23ZM19.5838 2C19.3588 2 19.1675 2.27 19.1675 2.6V18.05C19.1675 18.38 19.3475 18.65 19.5838 18.65C19.82 18.65 20 18.38 20 18.05V2.6C20 2.27 19.8088 2 19.5838 2Z" fill="#FF5F5F"/>
+<path id="Vector" d="M7 18.82C7 18.8988 7.01746 18.9768 7.05138 19.0496C7.0853 19.1224 7.13502 19.1885 7.1977 19.2443C7.26038 19.3 7.33479 19.3442 7.41669 19.3743C7.49858 19.4045 7.58636 19.42 7.675 19.42H8.29375C8.47277 19.42 8.64446 19.4832 8.77105 19.5957C8.89763 19.7083 8.96875 19.8609 8.96875 20.02V25.4C8.96875 25.5591 9.03987 25.7117 9.16645 25.8243C9.29304 25.9368 9.46473 26 9.64375 26H10.3075C10.3961 26 10.4839 25.9845 10.5658 25.9543C10.6477 25.9242 10.7221 25.88 10.7848 25.8243C10.8475 25.7685 10.8972 25.7024 10.9311 25.6296C10.965 25.5568 10.9825 25.4788 10.9825 25.4V13.87C10.9825 13.7912 10.965 13.7132 10.9311 13.6404C10.8972 13.5676 10.8475 13.5015 10.7848 13.4457C10.7221 13.39 10.6477 13.3458 10.5658 13.3157C10.4839 13.2855 10.3961 13.27 10.3075 13.27H7.675C7.49598 13.27 7.32429 13.3332 7.1977 13.4457C7.07112 13.5583 7 13.7109 7 13.87V18.82ZM11.7925 13.23C11.7722 13.4296 11.7722 13.6304 11.7925 13.83V18.83C11.7722 19.0296 11.7722 19.2304 11.7925 19.43C17.6425 19.43 22.9525 24.23 22.9525 24.23C23.2113 24.47 23.425 24.39 23.425 24.06V8.6C23.425 8.27 23.2113 8.19 22.9525 8.43C22.9525 8.43 17.6538 13.23 11.7925 13.23ZM24.5838 8C24.3588 8 24.1675 8.27 24.1675 8.6V24.05C24.1675 24.38 24.3475 24.65 24.5838 24.65C24.82 24.65 25 24.38 25 24.05V8.6C25 8.27 24.8088 8 24.5838 8Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区.svg
index a6705492..6201fa98 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区.svg
@@ -1,12 +1,14 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10078">
 <g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
-<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#0FD4FF"/>
-<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#0FD4FF"/>
-<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#0FD4FF"/>
+<path id="Vector" d="M19.5715 17.1523C19.4608 17.1523 19.3516 17.1523 19.2423 17.1441C19.4192 17.2741 19.5498 17.4556 19.6154 17.6627C19.6811 17.8699 19.6784 18.0921 19.6079 18.2978C19.5374 18.5034 19.4025 18.6819 19.2226 18.8077C19.0427 18.9336 18.827 19.0004 18.6061 18.9987C18.3971 19.0004 18.1923 18.9408 18.0179 18.8275C17.8435 18.7143 17.7074 18.5525 17.6271 18.3629C17.5468 18.1733 17.5258 17.9644 17.5669 17.7631C17.6081 17.5617 17.7094 17.3769 17.8579 17.2324C17.9591 17.1351 18.079 17.0584 18.2106 17.0069C17.0831 16.7714 16.0399 16.2447 15.1887 15.4811H9.40641C9.39844 15.4811 9.39058 15.4792 9.3835 15.4757C9.37641 15.4721 9.37031 15.4669 9.3657 15.4605C9.36109 15.4541 9.35811 15.4467 9.35702 15.4389C9.35592 15.4312 9.35673 15.4233 9.35939 15.4159L10.4202 12.4662C10.4312 12.435 10.4506 12.4132 10.4547 12.3915C10.4552 12.3882 10.4561 12.385 10.4575 12.382L10.4782 12.3412C10.8309 11.6768 11.1476 11.2067 11.9207 11.2067H13.0852C13.0736 11.0612 13.0676 10.9152 13.0672 10.7692C13.0679 10.5122 13.0841 10.2554 13.1156 10.0002H11.9415C11.6011 9.99586 11.2633 10.0573 10.9471 10.1809L10.9153 10.1904C10.5379 10.3374 10.2088 10.5832 9.96376 10.901C9.85194 11.0337 9.7498 11.174 9.65812 11.3208C9.51983 11.5369 9.41194 11.7284 9.33726 11.8643C9.11183 12.2597 8.32215 14.7175 8.32215 14.7175C7.50064 15.2827 7.0083 16.102 7 16.9335V20.6889C7.0014 21.2575 7.21622 21.8055 7.60333 22.2282C7.99043 22.6509 8.52262 22.9184 9.098 22.9796C9.58639 23.0428 10.0828 22.9583 10.5211 22.7374C10.9594 22.5166 11.3188 22.1698 11.5515 21.7432C11.5556 21.7353 11.562 21.7286 11.5698 21.724C11.5776 21.7195 11.5866 21.7172 11.5957 21.7174L14.5 21.7283L17.4043 21.7174C17.4134 21.7173 17.4223 21.7197 17.4301 21.7243C17.4379 21.7288 17.4443 21.7354 17.4485 21.7432C17.6812 22.1698 18.0406 22.5166 18.4789 22.7375C18.9172 22.9583 19.4136 23.0428 19.902 22.9796C20.4777 22.9169 21.0098 22.6481 21.3968 22.2246C21.7837 21.8011 21.9984 21.2525 22 20.6835V16.9335C21.9981 16.854 21.9921 16.7747 21.982 16.6958C21.2156 16.9978 20.3973 17.1527 19.5715 17.1523ZM11.3703 18.3601C11.2831 18.5653 11.131 18.7375 10.9364 18.8511C10.7419 18.9647 10.5153 19.0138 10.2902 18.9911C10.065 18.9684 9.8533 18.8751 9.68634 18.725C9.51937 18.5749 9.40603 18.376 9.3631 18.1577C9.32016 17.9394 9.3499 17.7133 9.44792 17.5129C9.54594 17.3125 9.70703 17.1484 9.90735 17.0449C10.1077 16.9414 10.3366 16.904 10.5602 16.9383C10.7838 16.9726 10.9903 17.0767 11.149 17.2352C11.2944 17.3805 11.3929 17.5648 11.4322 17.7649C11.4716 17.965 11.45 18.172 11.3703 18.3601Z" fill="#0FD4FF"/>
+<path id="Vector_2" d="M19.5 5C18.4122 5 17.3488 5.29324 16.4444 5.84265C15.5399 6.39206 14.8349 7.17295 14.4187 8.08658C14.0024 9.00021 13.8935 10.0055 14.1057 10.9755C14.3179 11.9454 14.8417 12.8363 15.6109 13.5355C16.3801 14.2348 17.3601 14.711 18.427 14.9039C19.4939 15.0969 20.5998 14.9978 21.6048 14.6194C22.6098 14.241 23.4687 13.6001 24.0731 12.7779C24.6774 11.9556 25 10.9889 25 10C25 8.67392 24.4205 7.40215 23.3891 6.46447C22.3576 5.52679 20.9587 5 19.5 5L19.5 5ZM21.7669 9.91486C21.5895 10.0955 21.3722 10.2401 21.1291 10.3391C20.886 10.438 20.6226 10.4892 20.3562 10.4892H18.5903V12.3513C18.5872 12.4973 18.5205 12.6363 18.4048 12.7376C18.2891 12.8389 18.134 12.8944 17.9734 12.8919H17.358V7.10675H20.2953C20.7585 7.09711 21.2098 7.24074 21.5653 7.51094C21.9207 7.78113 22.1561 8.1595 22.2277 8.57567C22.2606 8.81586 22.2364 9.05966 22.1569 9.29066C22.0775 9.52166 21.9445 9.7345 21.7669 9.91486Z" fill="#0FD4FF"/>
+<path id="Vector_3" d="M20.193 8.00005H18V8.9997H20.1598C20.3488 9.00375 20.5343 8.96644 20.6847 8.89411C20.8351 8.82178 20.9412 8.71888 20.9849 8.60287C20.9963 8.56883 21.0013 8.53406 20.9997 8.49929C20.9992 8.43303 20.9779 8.36748 20.937 8.30644C20.8961 8.2454 20.8365 8.19007 20.7615 8.14365C20.6865 8.09722 20.5976 8.06063 20.5 8.03599C20.4025 8.01134 20.2981 7.99913 20.193 8.00005Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_active.svg
index 716b7e01..1a863005 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_active.svg
@@ -1,12 +1,14 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10155">
 <g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
-<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#FFDB82"/>
-<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#FFDB82"/>
-<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#FFDB82"/>
+<path id="Vector" d="M19.5715 17.1523C19.4608 17.1523 19.3516 17.1523 19.2423 17.1441C19.4192 17.2741 19.5498 17.4556 19.6154 17.6627C19.6811 17.8699 19.6784 18.0921 19.6079 18.2978C19.5374 18.5034 19.4025 18.6819 19.2226 18.8077C19.0427 18.9336 18.827 19.0004 18.6061 18.9987C18.3971 19.0004 18.1923 18.9408 18.0179 18.8275C17.8435 18.7143 17.7074 18.5525 17.6271 18.3629C17.5468 18.1733 17.5258 17.9644 17.5669 17.7631C17.6081 17.5617 17.7094 17.3769 17.8579 17.2324C17.9591 17.1351 18.079 17.0584 18.2106 17.0069C17.0831 16.7714 16.0399 16.2447 15.1887 15.4811H9.40641C9.39844 15.4811 9.39058 15.4792 9.3835 15.4757C9.37641 15.4721 9.37031 15.4669 9.3657 15.4605C9.36109 15.4541 9.35811 15.4467 9.35702 15.4389C9.35592 15.4312 9.35673 15.4233 9.35939 15.4159L10.4202 12.4662C10.4312 12.435 10.4506 12.4132 10.4547 12.3915C10.4552 12.3882 10.4561 12.385 10.4575 12.382L10.4782 12.3412C10.8309 11.6768 11.1476 11.2067 11.9207 11.2067H13.0852C13.0736 11.0612 13.0676 10.9152 13.0672 10.7692C13.0679 10.5122 13.0841 10.2554 13.1156 10.0002H11.9415C11.6011 9.99586 11.2633 10.0573 10.9471 10.1809L10.9153 10.1904C10.5379 10.3374 10.2088 10.5832 9.96376 10.901C9.85194 11.0337 9.7498 11.174 9.65812 11.3208C9.51983 11.5369 9.41194 11.7284 9.33726 11.8643C9.11183 12.2597 8.32215 14.7175 8.32215 14.7175C7.50064 15.2827 7.0083 16.102 7 16.9335V20.6889C7.0014 21.2575 7.21622 21.8055 7.60333 22.2282C7.99043 22.6509 8.52262 22.9184 9.098 22.9796C9.58639 23.0428 10.0828 22.9583 10.5211 22.7374C10.9594 22.5166 11.3188 22.1698 11.5515 21.7432C11.5556 21.7353 11.562 21.7286 11.5698 21.724C11.5776 21.7195 11.5866 21.7172 11.5957 21.7174L14.5 21.7283L17.4043 21.7174C17.4134 21.7173 17.4223 21.7197 17.4301 21.7243C17.4379 21.7288 17.4443 21.7354 17.4485 21.7432C17.6812 22.1698 18.0406 22.5166 18.4789 22.7375C18.9172 22.9583 19.4136 23.0428 19.902 22.9796C20.4777 22.9169 21.0098 22.6481 21.3968 22.2246C21.7837 21.8011 21.9984 21.2525 22 20.6835V16.9335C21.9981 16.854 21.9921 16.7747 21.982 16.6958C21.2156 16.9978 20.3973 17.1527 19.5715 17.1523ZM11.3703 18.3601C11.2831 18.5653 11.131 18.7375 10.9364 18.8511C10.7419 18.9647 10.5153 19.0138 10.2902 18.9911C10.065 18.9684 9.8533 18.8751 9.68634 18.725C9.51937 18.5749 9.40603 18.376 9.3631 18.1577C9.32016 17.9394 9.3499 17.7133 9.44792 17.5129C9.54594 17.3125 9.70703 17.1484 9.90735 17.0449C10.1077 16.9414 10.3366 16.904 10.5602 16.9383C10.7838 16.9726 10.9903 17.0767 11.149 17.2352C11.2944 17.3805 11.3929 17.5648 11.4322 17.7649C11.4716 17.965 11.45 18.172 11.3703 18.3601Z" fill="#FFDB82"/>
+<path id="Vector_2" d="M19.5 5C18.4122 5 17.3488 5.29324 16.4444 5.84265C15.5399 6.39206 14.8349 7.17295 14.4187 8.08658C14.0024 9.00021 13.8935 10.0055 14.1057 10.9755C14.3179 11.9454 14.8417 12.8363 15.6109 13.5355C16.3801 14.2348 17.3601 14.711 18.427 14.9039C19.4939 15.0969 20.5998 14.9978 21.6048 14.6194C22.6098 14.241 23.4687 13.6001 24.0731 12.7779C24.6774 11.9556 25 10.9889 25 10C25 8.67392 24.4205 7.40215 23.3891 6.46447C22.3576 5.52679 20.9587 5 19.5 5L19.5 5ZM21.7669 9.91486C21.5895 10.0955 21.3722 10.2401 21.1291 10.3391C20.886 10.438 20.6226 10.4892 20.3562 10.4892H18.5903V12.3513C18.5872 12.4973 18.5205 12.6363 18.4048 12.7376C18.2891 12.8389 18.134 12.8944 17.9734 12.8919H17.358V7.10675H20.2953C20.7585 7.09711 21.2098 7.24074 21.5653 7.51094C21.9207 7.78113 22.1561 8.1595 22.2277 8.57567C22.2606 8.81586 22.2364 9.05966 22.1569 9.29066C22.0775 9.52166 21.9445 9.7345 21.7669 9.91486Z" fill="#FFDB82"/>
+<path id="Vector_3" d="M20.193 8.00005H18V8.9997H20.1598C20.3488 9.00375 20.5343 8.96644 20.6847 8.89411C20.8351 8.82178 20.9412 8.71888 20.9849 8.60287C20.9963 8.56883 21.0013 8.53406 20.9997 8.49929C20.9992 8.43303 20.9779 8.36748 20.937 8.30644C20.8961 8.2454 20.8365 8.19007 20.7615 8.14365C20.6865 8.09722 20.5976 8.06063 20.5 8.03599C20.4025 8.01134 20.2981 7.99913 20.193 8.00005Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_fault.svg
index 83bff754..55b0ca64 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/停车区_fault.svg
@@ -1,12 +1,14 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10186">
 <g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
 <g id="1">
 <g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
-<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#FF5F5F"/>
-<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#FF5F5F"/>
-<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#FF5F5F"/>
+<path id="Vector" d="M19.5715 17.1523C19.4608 17.1523 19.3516 17.1523 19.2423 17.1441C19.4192 17.2741 19.5498 17.4556 19.6154 17.6627C19.6811 17.8699 19.6784 18.0921 19.6079 18.2978C19.5374 18.5034 19.4025 18.6819 19.2226 18.8077C19.0427 18.9336 18.827 19.0004 18.6061 18.9987C18.3971 19.0004 18.1923 18.9408 18.0179 18.8275C17.8435 18.7143 17.7074 18.5525 17.6271 18.3629C17.5468 18.1733 17.5258 17.9644 17.5669 17.7631C17.6081 17.5617 17.7094 17.3769 17.8579 17.2324C17.9591 17.1351 18.079 17.0584 18.2106 17.0069C17.0831 16.7714 16.0399 16.2447 15.1887 15.4811H9.40641C9.39844 15.4811 9.39058 15.4792 9.3835 15.4757C9.37641 15.4721 9.37031 15.4669 9.3657 15.4605C9.36109 15.4541 9.35811 15.4467 9.35702 15.4389C9.35592 15.4312 9.35673 15.4233 9.35939 15.4159L10.4202 12.4662C10.4312 12.435 10.4506 12.4132 10.4547 12.3915C10.4552 12.3882 10.4561 12.385 10.4575 12.382L10.4782 12.3412C10.8309 11.6768 11.1476 11.2067 11.9207 11.2067H13.0852C13.0736 11.0612 13.0676 10.9152 13.0672 10.7692C13.0679 10.5122 13.0841 10.2554 13.1156 10.0002H11.9415C11.6011 9.99586 11.2633 10.0573 10.9471 10.1809L10.9153 10.1904C10.5379 10.3374 10.2088 10.5832 9.96376 10.901C9.85194 11.0337 9.7498 11.174 9.65812 11.3208C9.51983 11.5369 9.41194 11.7284 9.33726 11.8643C9.11183 12.2597 8.32215 14.7175 8.32215 14.7175C7.50064 15.2827 7.0083 16.102 7 16.9335V20.6889C7.0014 21.2575 7.21622 21.8055 7.60333 22.2282C7.99043 22.6509 8.52262 22.9184 9.098 22.9796C9.58639 23.0428 10.0828 22.9583 10.5211 22.7374C10.9594 22.5166 11.3188 22.1698 11.5515 21.7432C11.5556 21.7353 11.562 21.7286 11.5698 21.724C11.5776 21.7195 11.5866 21.7172 11.5957 21.7174L14.5 21.7283L17.4043 21.7174C17.4134 21.7173 17.4223 21.7197 17.4301 21.7243C17.4379 21.7288 17.4443 21.7354 17.4485 21.7432C17.6812 22.1698 18.0406 22.5166 18.4789 22.7375C18.9172 22.9583 19.4136 23.0428 19.902 22.9796C20.4777 22.9169 21.0098 22.6481 21.3968 22.2246C21.7837 21.8011 21.9984 21.2525 22 20.6835V16.9335C21.9981 16.854 21.9921 16.7747 21.982 16.6958C21.2156 16.9978 20.3973 17.1527 19.5715 17.1523ZM11.3703 18.3601C11.2831 18.5653 11.131 18.7375 10.9364 18.8511C10.7419 18.9647 10.5153 19.0138 10.2902 18.9911C10.065 18.9684 9.8533 18.8751 9.68634 18.725C9.51937 18.5749 9.40603 18.376 9.3631 18.1577C9.32016 17.9394 9.3499 17.7133 9.44792 17.5129C9.54594 17.3125 9.70703 17.1484 9.90735 17.0449C10.1077 16.9414 10.3366 16.904 10.5602 16.9383C10.7838 16.9726 10.9903 17.0767 11.149 17.2352C11.2944 17.3805 11.3929 17.5648 11.4322 17.7649C11.4716 17.965 11.45 18.172 11.3703 18.3601Z" fill="#FF5F5F"/>
+<path id="Vector_2" d="M19.5 5C18.4122 5 17.3488 5.29324 16.4444 5.84265C15.5399 6.39206 14.8349 7.17295 14.4187 8.08658C14.0024 9.00021 13.8935 10.0055 14.1057 10.9755C14.3179 11.9454 14.8417 12.8363 15.6109 13.5355C16.3801 14.2348 17.3601 14.711 18.427 14.9039C19.4939 15.0969 20.5998 14.9978 21.6048 14.6194C22.6098 14.241 23.4687 13.6001 24.0731 12.7779C24.6774 11.9556 25 10.9889 25 10C25 8.67392 24.4205 7.40215 23.3891 6.46447C22.3576 5.52679 20.9587 5 19.5 5L19.5 5ZM21.7669 9.91486C21.5895 10.0955 21.3722 10.2401 21.1291 10.3391C20.886 10.438 20.6226 10.4892 20.3562 10.4892H18.5903V12.3513C18.5872 12.4973 18.5205 12.6363 18.4048 12.7376C18.2891 12.8389 18.134 12.8944 17.9734 12.8919H17.358V7.10675H20.2953C20.7585 7.09711 21.2098 7.24074 21.5653 7.51094C21.9207 7.78113 22.1561 8.1595 22.2277 8.57567C22.2606 8.81586 22.2364 9.05966 22.1569 9.29066C22.0775 9.52166 21.9445 9.7345 21.7669 9.91486Z" fill="#FF5F5F"/>
+<path id="Vector_3" d="M20.193 8.00005H18V8.9997H20.1598C20.3488 9.00375 20.5343 8.96644 20.6847 8.89411C20.8351 8.82178 20.9412 8.71888 20.9849 8.60287C20.9963 8.56883 21.0013 8.53406 20.9997 8.49929C20.9992 8.43303 20.9779 8.36748 20.937 8.30644C20.8961 8.2454 20.8365 8.19007 20.7615 8.14365C20.6865 8.09722 20.5976 8.06063 20.5 8.03599C20.4025 8.01134 20.2981 7.99913 20.193 8.00005Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站.svg
index 237006ff..452a6042 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站.svg
@@ -1,4 +1,5 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10081">
 <g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
@@ -7,9 +8,10 @@
 <g id="Frame">
 <g id="Group 1142814065">
 <g id="Group 1142814139">
-<path id="Vector" d="M6 13.6346V20H13.9554V15.0769L15.0613 16.1731C15.1327 16.2308 15.204 16.2692 15.311 16.2692H18.7715C19.146 16.2692 19.485 15.9808 19.5028 15.5769C19.5385 15.1154 19.2174 14.7308 18.7893 14.7308H15.7213C15.7035 14.7308 13.6343 12.6346 13.4738 12.4808C13.2062 12.2308 12.8852 12.0962 12.5284 12.0962H7.42698C6.64214 12.0962 6 12.7885 6 13.6346ZM21.2865 12H18.7893C18.3969 12 18.0758 12.3462 18.0758 12.7692C18.0758 13.1923 18.3969 13.5385 18.7893 13.5385H21.2865C21.6789 13.5385 22 13.1923 22 12.7692C22 12.3462 21.6789 12 21.2865 12Z" fill="#0FD4FF"/>
-<path id="Vector_2" d="M8 7.5C8 8.16304 8.26339 8.79893 8.73223 9.26777C9.20107 9.73661 9.83696 10 10.5 10C11.163 10 11.7989 9.73661 12.2678 9.26777C12.7366 8.79893 13 8.16304 13 7.5C13 6.83696 12.7366 6.20107 12.2678 5.73223C11.7989 5.26339 11.163 5 10.5 5C9.83696 5 9.20107 5.26339 8.73223 5.73223C8.26339 6.20107 8 6.83696 8 7.5Z" fill="#0FD4FF"/>
-<path id="Vector_3" d="M19.3043 20.5385H6.78261C6.01739 20.5385 5.3913 19.8808 5.3913 19.0769V5.92308C5.3913 5.11923 6.01739 4.46154 6.78261 4.46154H14.087C14.8522 4.46154 15.4783 5.11923 15.4783 5.92308C15.4783 6.325 15.7913 6.65385 16.1739 6.65385C16.5565 6.65385 16.8696 6.325 16.8696 5.92308C16.8696 4.31538 15.6174 3 14.087 3H6.78261C5.25217 3 4 4.31538 4 5.92308V19.0769C4 20.6846 5.25217 22 6.78261 22H19.3043C19.687 22 20 21.6712 20 21.2692C20 20.8673 19.687 20.5385 19.3043 20.5385Z" fill="#0FD4FF"/>
+<path id="Vector" d="M10 16.6346V23H17.9554V18.0769L19.0613 19.1731C19.1327 19.2308 19.204 19.2692 19.311 19.2692H22.7715C23.146 19.2692 23.485 18.9808 23.5028 18.5769C23.5385 18.1154 23.2174 17.7308 22.7893 17.7308H19.7213C19.7035 17.7308 17.6343 15.6346 17.4738 15.4808C17.2062 15.2308 16.8852 15.0962 16.5284 15.0962H11.427C10.6421 15.0962 10 15.7885 10 16.6346ZM25.2865 15H22.7893C22.3969 15 22.0758 15.3462 22.0758 15.7692C22.0758 16.1923 22.3969 16.5385 22.7893 16.5385H25.2865C25.6789 16.5385 26 16.1923 26 15.7692C26 15.3462 25.6789 15 25.2865 15Z" fill="#0FD4FF"/>
+<path id="Vector_2" d="M12 10.5C12 11.163 12.2634 11.7989 12.7322 12.2678C13.2011 12.7366 13.837 13 14.5 13C15.163 13 15.7989 12.7366 16.2678 12.2678C16.7366 11.7989 17 11.163 17 10.5C17 9.83696 16.7366 9.20107 16.2678 8.73223C15.7989 8.26339 15.163 8 14.5 8C13.837 8 13.2011 8.26339 12.7322 8.73223C12.2634 9.20107 12 9.83696 12 10.5Z" fill="#0FD4FF"/>
+<path id="Vector_3" d="M23.3043 23.5385H10.7826C10.0174 23.5385 9.3913 22.8808 9.3913 22.0769V8.92308C9.3913 8.11923 10.0174 7.46154 10.7826 7.46154H18.087C18.8522 7.46154 19.4783 8.11923 19.4783 8.92308C19.4783 9.325 19.7913 9.65385 20.1739 9.65385C20.5565 9.65385 20.8696 9.325 20.8696 8.92308C20.8696 7.31538 19.6174 6 18.087 6H10.7826C9.25217 6 8 7.31538 8 8.92308V22.0769C8 23.6846 9.25217 25 10.7826 25H23.3043C23.687 25 24 24.6712 24 24.2692C24 23.8673 23.687 23.5385 23.3043 23.5385Z" fill="#0FD4FF"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_active.svg
index e4545b34..293a0e11 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_active.svg
@@ -1,4 +1,5 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10158">
 <g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
@@ -7,9 +8,10 @@
 <g id="Frame">
 <g id="Group 1142814065">
 <g id="Group 1142814139">
-<path id="Vector" d="M6 13.6346V20H13.9554V15.0769L15.0613 16.1731C15.1327 16.2308 15.204 16.2692 15.311 16.2692H18.7715C19.146 16.2692 19.4849 15.9808 19.5028 15.5769C19.5385 15.1154 19.2174 14.7308 18.7893 14.7308H15.7213C15.7035 14.7308 13.6343 12.6346 13.4738 12.4808C13.2062 12.2308 12.8852 12.0962 12.5284 12.0962H7.42698C6.64214 12.0962 6 12.7885 6 13.6346ZM21.2865 12H18.7893C18.3969 12 18.0758 12.3462 18.0758 12.7692C18.0758 13.1923 18.3969 13.5385 18.7893 13.5385H21.2865C21.6789 13.5385 22 13.1923 22 12.7692C22 12.3462 21.6789 12 21.2865 12Z" fill="#FFDB82"/>
-<path id="Vector_2" d="M8 7.5C8 8.16304 8.26339 8.79893 8.73223 9.26777C9.20107 9.73661 9.83696 10 10.5 10C11.163 10 11.7989 9.73661 12.2678 9.26777C12.7366 8.79893 13 8.16304 13 7.5C13 6.83696 12.7366 6.20107 12.2678 5.73223C11.7989 5.26339 11.163 5 10.5 5C9.83696 5 9.20107 5.26339 8.73223 5.73223C8.26339 6.20107 8 6.83696 8 7.5Z" fill="#FFDB82"/>
-<path id="Vector_3" d="M19.3043 20.5385H6.78261C6.01739 20.5385 5.3913 19.8808 5.3913 19.0769V5.92308C5.3913 5.11923 6.01739 4.46154 6.78261 4.46154H14.087C14.8522 4.46154 15.4783 5.11923 15.4783 5.92308C15.4783 6.325 15.7913 6.65385 16.1739 6.65385C16.5565 6.65385 16.8696 6.325 16.8696 5.92308C16.8696 4.31538 15.6174 3 14.087 3H6.78261C5.25217 3 4 4.31538 4 5.92308V19.0769C4 20.6846 5.25217 22 6.78261 22H19.3043C19.687 22 20 21.6712 20 21.2692C20 20.8673 19.687 20.5385 19.3043 20.5385Z" fill="#FFDB82"/>
+<path id="Vector" d="M10 16.6346V23H17.9554V18.0769L19.0613 19.1731C19.1327 19.2308 19.204 19.2692 19.311 19.2692H22.7715C23.146 19.2692 23.485 18.9808 23.5028 18.5769C23.5385 18.1154 23.2174 17.7308 22.7893 17.7308H19.7213C19.7035 17.7308 17.6343 15.6346 17.4738 15.4808C17.2062 15.2308 16.8852 15.0962 16.5284 15.0962H11.427C10.6421 15.0962 10 15.7885 10 16.6346ZM25.2865 15H22.7893C22.3969 15 22.0758 15.3462 22.0758 15.7692C22.0758 16.1923 22.3969 16.5385 22.7893 16.5385H25.2865C25.6789 16.5385 26 16.1923 26 15.7692C26 15.3462 25.6789 15 25.2865 15Z" fill="#FFDB82"/>
+<path id="Vector_2" d="M12 10.5C12 11.163 12.2634 11.7989 12.7322 12.2678C13.2011 12.7366 13.837 13 14.5 13C15.163 13 15.7989 12.7366 16.2678 12.2678C16.7366 11.7989 17 11.163 17 10.5C17 9.83696 16.7366 9.20107 16.2678 8.73223C15.7989 8.26339 15.163 8 14.5 8C13.837 8 13.2011 8.26339 12.7322 8.73223C12.2634 9.20107 12 9.83696 12 10.5Z" fill="#FFDB82"/>
+<path id="Vector_3" d="M23.3043 23.5385H10.7826C10.0174 23.5385 9.3913 22.8808 9.3913 22.0769V8.92308C9.3913 8.11923 10.0174 7.46154 10.7826 7.46154H18.087C18.8522 7.46154 19.4783 8.11923 19.4783 8.92308C19.4783 9.325 19.7913 9.65385 20.1739 9.65385C20.5565 9.65385 20.8696 9.325 20.8696 8.92308C20.8696 7.31538 19.6174 6 18.087 6H10.7826C9.25217 6 8 7.31538 8 8.92308V22.0769C8 23.6846 9.25217 25 10.7826 25H23.3043C23.687 25 24 24.6712 24 24.2692C24 23.8673 23.687 23.5385 23.3043 23.5385Z" fill="#FFDB82"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_fault.svg
index 95e9db5d..546883b9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_fault.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/收费站_fault.svg
@@ -1,4 +1,5 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10189">
 <g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
 <g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
 <g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
@@ -7,9 +8,10 @@
 <g id="Frame">
 <g id="Group 1142814065">
 <g id="Group 1142814139">
-<path id="Vector" d="M6 13.6346V20H13.9554V15.0769L15.0613 16.1731C15.1327 16.2308 15.204 16.2692 15.311 16.2692H18.7715C19.146 16.2692 19.4849 15.9808 19.5028 15.5769C19.5385 15.1154 19.2174 14.7308 18.7893 14.7308H15.7213C15.7035 14.7308 13.6343 12.6346 13.4738 12.4808C13.2062 12.2308 12.8852 12.0962 12.5284 12.0962H7.42698C6.64214 12.0962 6 12.7885 6 13.6346ZM21.2865 12H18.7893C18.3969 12 18.0758 12.3462 18.0758 12.7692C18.0758 13.1923 18.3969 13.5385 18.7893 13.5385H21.2865C21.6789 13.5385 22 13.1923 22 12.7692C22 12.3462 21.6789 12 21.2865 12Z" fill="#FF5F5F"/>
-<path id="Vector_2" d="M8 7.5C8 8.16304 8.26339 8.79893 8.73223 9.26777C9.20107 9.73661 9.83696 10 10.5 10C11.163 10 11.7989 9.73661 12.2678 9.26777C12.7366 8.79893 13 8.16304 13 7.5C13 6.83696 12.7366 6.20107 12.2678 5.73223C11.7989 5.26339 11.163 5 10.5 5C9.83696 5 9.20107 5.26339 8.73223 5.73223C8.26339 6.20107 8 6.83696 8 7.5Z" fill="#FF5F5F"/>
-<path id="Vector_3" d="M19.3043 20.5385H6.78261C6.01739 20.5385 5.3913 19.8808 5.3913 19.0769V5.92308C5.3913 5.11923 6.01739 4.46154 6.78261 4.46154H14.087C14.8522 4.46154 15.4783 5.11923 15.4783 5.92308C15.4783 6.325 15.7913 6.65385 16.1739 6.65385C16.5565 6.65385 16.8696 6.325 16.8696 5.92308C16.8696 4.31538 15.6174 3 14.087 3H6.78261C5.25217 3 4 4.31538 4 5.92308V19.0769C4 20.6846 5.25217 22 6.78261 22H19.3043C19.687 22 20 21.6712 20 21.2692C20 20.8673 19.687 20.5385 19.3043 20.5385Z" fill="#FF5F5F"/>
+<path id="Vector" d="M10 16.6346V23H17.9554V18.0769L19.0613 19.1731C19.1327 19.2308 19.204 19.2692 19.311 19.2692H22.7715C23.146 19.2692 23.485 18.9808 23.5028 18.5769C23.5385 18.1154 23.2174 17.7308 22.7893 17.7308H19.7213C19.7035 17.7308 17.6343 15.6346 17.4738 15.4808C17.2062 15.2308 16.8852 15.0962 16.5284 15.0962H11.427C10.6421 15.0962 10 15.7885 10 16.6346ZM25.2865 15H22.7893C22.3969 15 22.0758 15.3462 22.0758 15.7692C22.0758 16.1923 22.3969 16.5385 22.7893 16.5385H25.2865C25.6789 16.5385 26 16.1923 26 15.7692C26 15.3462 25.6789 15 25.2865 15Z" fill="#FF5F5F"/>
+<path id="Vector_2" d="M12 10.5C12 11.163 12.2634 11.7989 12.7322 12.2678C13.2011 12.7366 13.837 13 14.5 13C15.163 13 15.7989 12.7366 16.2678 12.2678C16.7366 11.7989 17 11.163 17 10.5C17 9.83696 16.7366 9.20107 16.2678 8.73223C15.7989 8.26339 15.163 8 14.5 8C13.837 8 13.2011 8.26339 12.7322 8.73223C12.2634 9.20107 12 9.83696 12 10.5Z" fill="#FF5F5F"/>
+<path id="Vector_3" d="M23.3043 23.5385H10.7826C10.0174 23.5385 9.3913 22.8808 9.3913 22.0769V8.92308C9.3913 8.11923 10.0174 7.46154 10.7826 7.46154H18.087C18.8522 7.46154 19.4783 8.11923 19.4783 8.92308C19.4783 9.325 19.7913 9.65385 20.1739 9.65385C20.5565 9.65385 20.8696 9.325 20.8696 8.92308C20.8696 7.31538 19.6174 6 18.087 6H10.7826C9.25217 6 8 7.31538 8 8.92308V22.0769C8 23.6846 9.25217 25 10.7826 25H23.3043C23.687 25 24 24.6712 24 24.2692C24 23.8673 23.687 23.5385 23.3043 23.5385Z" fill="#FF5F5F"/>
+</g>
 </g>
 </g>
 </g>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg
index d63f6d9e..ade3b10e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg
@@ -1,7 +1,11 @@
-<svg width="17" height="24" viewBox="0 0 17 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321314631">
+<g id="Frame 427319037">
 <g id="Group 1321314628">
-<path id="Vector" opacity="0.7" d="M2.125 21.25C2.125 21.8136 2.79665 22.3541 3.99219 22.7526C5.18774 23.1511 6.80924 23.375 8.5 23.375C10.1908 23.375 11.8123 23.1511 13.0078 22.7526C14.2033 22.3541 14.875 21.8136 14.875 21.25C14.875 20.6864 14.2033 20.1459 13.0078 19.7474C11.8123 19.3489 10.1908 19.125 8.5 19.125C6.80924 19.125 5.18774 19.3489 3.99219 19.7474C2.79665 20.1459 2.125 20.6864 2.125 21.25Z" fill="#0FD4FF"/>
-<path id="Vector_2" opacity="0.9" d="M4.25 20.7188C4.25 21.1414 4.69777 21.5468 5.4948 21.8457C6.29183 22.1446 7.37283 22.3125 8.5 22.3125C9.62717 22.3125 10.7082 22.1446 11.5052 21.8457C12.3022 21.5468 12.75 21.1414 12.75 20.7188C12.75 20.2961 12.3022 19.8907 11.5052 19.5918C10.7082 19.2929 9.62717 19.125 8.5 19.125C7.37283 19.125 6.29183 19.2929 5.4948 19.5918C4.69777 19.8907 4.25 20.2961 4.25 20.7188Z" fill="#0FD4FF"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M8.16004 0H8.84004C10.6319 0.000952005 12.3723 0.592908 13.7862 1.68228C14.4192 2.16048 14.9788 2.7273 15.4472 3.36471C15.8276 3.88644 16.1437 4.45104 16.389 5.04684C16.6134 5.58828 16.7775 6.15225 16.8779 6.72898C16.9567 7.17341 16.9973 7.62374 17 8.07494V8.41154V8.61005C16.998 9.10815 16.9485 9.60495 16.8521 10.0938C16.7423 10.6718 16.5684 11.2359 16.333 11.776C16.0698 12.374 15.7353 12.9389 15.3367 13.4584H15.3355C14.8515 14.1003 14.2734 14.6673 13.6204 15.1405L3.3806 15.1407C2.72719 14.6672 2.14918 14.1001 1.66425 13.4582C1.26527 12.9388 0.931729 12.3741 0.668391 11.776C0.432989 11.2358 0.258243 10.6718 0.1479 10.0938C0.051454 9.60523 0.00193337 9.10871 0 8.61089V8.41154V8.07494C0.00267935 7.62374 0.0439436 7.17341 0.122721 6.72898C0.22314 6.15225 0.386848 5.58828 0.611287 5.04684C0.856546 4.45104 1.17273 3.88644 1.55311 3.36471C2.02149 2.7273 2.58084 2.16048 3.21389 1.68228C4.62773 0.592908 6.36817 0.000952005 8.16004 0ZM3.3806 15.1407H13.6172C13.5898 15.1605 13.5637 15.1815 13.5375 15.2024L13.5375 15.2025C13.5027 15.2303 13.468 15.2582 13.4302 15.2837L11.884 16.8229H11.8764L10.1834 18.5051H6.80716L5.12416 16.8228H5.13061L3.64665 15.34C3.5931 15.3048 3.54345 15.2658 3.49371 15.2267C3.45661 15.1975 3.41946 15.1683 3.3806 15.1407ZM10.1883 18.5052L8.49515 20.1875L6.81215 18.5052H10.1883ZM4.40681 7.56789H7.65675C8.11865 7.56789 8.49354 7.95254 8.49354 8.42645V13.8692H4.40681V10.0845L3.08893 9.24561L4.40681 7.56789ZM7.64779 5.46221C7.64779 6.15798 7.0976 6.72247 6.41947 6.72247C5.74133 6.72247 5.19115 6.15798 5.19115 5.46221V4.26891C5.19115 3.76874 5.58651 3.36441 6.07272 3.36441H7.64779V5.46221ZM10.4704 8.25579H12.9385L14.2116 10.0845L12.9372 10.9286V13.8692H9.29707V9.45959C9.29707 8.79533 9.82294 8.25579 10.4704 8.25579ZM12.2386 6.37984C12.2386 6.99947 11.7486 7.50226 11.1447 7.50226C10.5407 7.50226 10.0507 6.99947 10.0507 6.37984V5.3165C10.0507 4.87147 10.4026 4.51046 10.8363 4.51046H12.2386V6.37984Z" fill="#0FD4FF"/>
+<path id="Vector" opacity="0.7" d="M9.125 26.25C9.125 26.8136 9.79665 27.3541 10.9922 27.7526C12.1877 28.1511 13.8092 28.375 15.5 28.375C17.1908 28.375 18.8123 28.1511 20.0078 27.7526C21.2033 27.3541 21.875 26.8136 21.875 26.25C21.875 25.6864 21.2033 25.1459 20.0078 24.7474C18.8123 24.3489 17.1908 24.125 15.5 24.125C13.8092 24.125 12.1877 24.3489 10.9922 24.7474C9.79665 25.1459 9.125 25.6864 9.125 26.25Z" fill="#0FD4FF"/>
+<path id="Vector_2" opacity="0.9" d="M11.25 25.7188C11.25 26.1414 11.6978 26.5468 12.4948 26.8457C13.2918 27.1446 14.3728 27.3125 15.5 27.3125C16.6272 27.3125 17.7082 27.1446 18.5052 26.8457C19.3022 26.5468 19.75 26.1414 19.75 25.7188C19.75 25.2961 19.3022 24.8907 18.5052 24.5918C17.7082 24.2929 16.6272 24.125 15.5 24.125C14.3728 24.125 13.2918 24.2929 12.4948 24.5918C11.6978 24.8907 11.25 25.2961 11.25 25.7188Z" fill="#0FD4FF"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M15.16 5H15.84C17.6319 5.00095 19.3723 5.59291 20.7862 6.68228C21.4192 7.16048 21.9788 7.7273 22.4472 8.36471C22.8276 8.88644 23.1437 9.45104 23.389 10.0468C23.6134 10.5883 23.7775 11.1523 23.8779 11.729C23.9567 12.1734 23.9973 12.6237 24 13.0749V13.4115V13.6101C23.998 14.1081 23.9485 14.6049 23.8521 15.0938C23.7423 15.6718 23.5684 16.2359 23.333 16.776C23.0698 17.374 22.7353 17.9389 22.3367 18.4584H22.3355C21.8515 19.1003 21.2734 19.6673 20.6204 20.1405L10.3806 20.1407C9.72719 19.6672 9.14918 19.1001 8.66425 18.4582C8.26527 17.9388 7.93173 17.3741 7.66839 16.776C7.43299 16.2358 7.25824 15.6718 7.1479 15.0938C7.05145 14.6052 7.00193 14.1087 7 13.6109V13.4115V13.0749C7.00268 12.6237 7.04394 12.1734 7.12272 11.729C7.22314 11.1523 7.38685 10.5883 7.61129 10.0468C7.85655 9.45104 8.17273 8.88644 8.55311 8.36471C9.02149 7.7273 9.58084 7.16048 10.2139 6.68228C11.6277 5.59291 13.3682 5.00095 15.16 5ZM10.3806 20.1407H20.6172C20.5898 20.1605 20.5637 20.1815 20.5375 20.2024L20.5375 20.2025C20.5027 20.2303 20.468 20.2582 20.4302 20.2837L18.884 21.8229H18.8764L17.1834 23.5051H13.8072L12.1242 21.8228H12.1306L10.6467 20.34C10.5931 20.3048 10.5434 20.2658 10.4937 20.2267C10.4566 20.1975 10.4195 20.1683 10.3806 20.1407ZM17.1883 23.5052L15.4951 25.1875L13.8121 23.5052H17.1883ZM11.4068 12.5679H14.6567C15.1186 12.5679 15.4935 12.9525 15.4935 13.4264V18.8692H11.4068V15.0845L10.0889 14.2456L11.4068 12.5679ZM14.6478 10.4622C14.6478 11.158 14.0976 11.7225 13.4195 11.7225C12.7413 11.7225 12.1911 11.158 12.1911 10.4622V9.26891C12.1911 8.76874 12.5865 8.36441 13.0727 8.36441H14.6478V10.4622ZM17.4704 13.2558H19.9385L21.2116 15.0845L19.9372 15.9286V18.8692H16.2971V14.4596C16.2971 13.7953 16.8229 13.2558 17.4704 13.2558ZM19.2386 11.3798C19.2386 11.9995 18.7486 12.5023 18.1447 12.5023C17.5407 12.5023 17.0507 11.9995 17.0507 11.3798V10.3165C17.0507 9.87147 17.4026 9.51046 17.8363 9.51046H19.2386V11.3798Z" fill="#0FD4FF"/>
+</g>
+</g>
 </g>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通事故_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通事故_active.svg
new file mode 100644
index 00000000..f6a16b7f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通事故_active.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2640)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2640)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2640)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2640)">
+<path d="M32.1163 24.4687C32.4813 24.2189 32.5383 23.742 32.2532 23.4014L31.9794 23.0835C31.6943 22.7542 31.2381 22.7542 30.9529 23.0835L27.1549 27.6364C26.8698 27.9771 26.9382 28.0452 27.3032 27.7954L32.1163 24.4687ZM31.7285 27.9203C31.7969 27.4888 31.5004 27.2391 31.0784 27.3526L28.0788 28.2155C27.6568 28.3404 27.6682 28.5107 28.0902 28.6015L30.7362 29.1579C31.1696 29.2487 31.5688 28.9649 31.6373 28.5334L31.7285 27.9203ZM28.1358 23.4127C27.9191 23.7988 27.4857 24.3551 27.1777 24.673L22.6384 29.2487C22.3304 29.5553 21.7602 29.9867 21.3724 30.1911L20.3801 30.3841C19.9467 30.3273 19.2624 30.1343 18.8632 29.964L16.8672 29.1011C16.468 28.9308 16.046 28.7605 15.9434 28.7378C15.8407 28.7151 15.2134 28.7718 14.78 28.8173L13.7421 28.6015C13.3544 28.3858 12.7955 27.9657 12.4761 27.6592L11.769 26.9552L10.6399 25.8312L10.5258 25.7176C10.2065 25.4111 9.94413 25.1499 9.93273 25.1386C9.92132 25.1272 9.8643 25.0023 9.81867 24.8547C9.76165 24.7071 10.1038 24.2189 10.3319 23.9805C10.56 23.742 10.503 23.2992 10.1951 22.9927L9.81867 22.618C9.51073 22.3114 9.19138 21.8913 9.11154 21.6983C9.0317 21.5053 9.40808 20.9035 9.60197 20.7105C9.79586 20.5175 10.1152 20.2904 10.3091 20.2109C10.503 20.1314 11.1987 20.6083 11.5067 20.9149L11.8831 21.2895C12.191 21.5961 12.6928 21.5961 13.0122 21.2895L19.3194 14.9654C19.6273 14.6588 19.6273 14.1479 19.3194 13.8413L18.943 13.4666C18.6351 13.1601 18.3157 12.74 18.2359 12.547C18.156 12.3539 18.521 11.7522 18.7035 11.5592C18.886 11.3661 19.1939 11.1391 19.3764 11.0596C19.5589 10.9801 20.266 11.457 20.574 11.7635L20.9504 12.1382C21.2583 12.4448 21.7031 12.5129 21.9312 12.2745C22.1594 12.036 22.4673 11.8089 22.6042 11.7522C22.741 11.6954 23.2999 12.1042 23.6078 12.4107L25.6152 14.4317C25.9231 14.7383 26.3451 15.3173 26.5504 15.692L26.7215 16.7025C26.6759 17.134 26.6303 17.5768 26.6189 17.679C26.6075 17.7812 26.8356 18.3829 27.0067 18.7803L27.8735 20.8013C28.0446 21.1987 28.2384 21.8913 28.2955 22.3228L28.1358 23.4127ZM21.9426 17.5087C22.0681 17.8947 22.5129 18.3375 22.9235 18.4965C22.9235 18.4965 23.5736 18.7349 24.0983 18.224C24.6115 17.7017 24.4062 17.0886 24.4062 17.0886C24.2694 16.6798 23.8474 16.2143 23.471 16.0553C23.0946 15.8964 21.8172 17.1226 21.9426 17.5087ZM16.2399 24.1621C15.7267 23.6398 15.0994 23.901 15.0994 23.901C14.6888 24.0713 14.244 24.5254 14.1071 24.9115C13.9703 25.2975 14.7458 26.2058 15.1678 26.3534C15.1678 26.3534 15.7723 26.5578 16.2856 26.0469C16.7988 25.5246 16.7532 24.673 16.2399 24.1621ZM26.9268 22.5044C26.9382 22.3455 26.8128 21.8913 26.6531 21.4826L25.8775 19.6432C25.695 19.2458 25.3072 19.1663 24.9879 19.4843L17.5516 26.9325C17.2436 27.2391 17.312 27.6478 17.7112 27.8181L19.5703 28.5561C19.9809 28.7264 20.4371 28.8627 20.5854 28.8627C20.7337 28.8627 21.3039 28.4199 21.6119 28.1133L26.1969 23.5376C26.5048 23.2311 26.9154 22.6634 26.9268 22.5044Z" fill="#FFDB82"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2640" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2640"/>
+</filter>
+<filter id="filter1_i_1302_2640" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2640"/>
+</filter>
+<filter id="filter2_i_1302_2640" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2640"/>
+</filter>
+<clipPath id="clip0_1302_2640">
+<rect width="24.5333" height="24.5333" fill="white" transform="translate(8.43359 10.6504)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通事故_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通事故_fault.svg
new file mode 100644
index 00000000..d8444e27
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通事故_fault.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2641)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2641)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2641)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2641)">
+<path d="M31.8165 24.4687C32.1815 24.2189 32.2385 23.742 31.9534 23.4014L31.6796 23.0835C31.3945 22.7542 30.9383 22.7542 30.6531 23.0835L26.8551 27.6364C26.57 27.9771 26.6384 28.0452 27.0034 27.7954L31.8165 24.4687ZM31.4287 27.9203C31.4971 27.4888 31.2006 27.2391 30.7786 27.3526L27.779 28.2155C27.357 28.3404 27.3684 28.5107 27.7904 28.6015L30.4364 29.1579C30.8698 29.2487 31.269 28.9649 31.3375 28.5334L31.4287 27.9203ZM27.836 23.4127C27.6193 23.7988 27.1859 24.3551 26.8779 24.673L22.3386 29.2487C22.0306 29.5553 21.4604 29.9867 21.0726 30.1911L20.0803 30.3841C19.6469 30.3273 18.9626 30.1343 18.5634 29.964L16.5674 29.1011C16.1682 28.9308 15.7462 28.7605 15.6436 28.7378C15.5409 28.7151 14.9136 28.7718 14.4802 28.8173L13.4423 28.6015C13.0546 28.3858 12.4957 27.9657 12.1763 27.6592L11.4692 26.9552L10.3401 25.8312L10.226 25.7176C9.90665 25.4111 9.64433 25.1499 9.63292 25.1386C9.62152 25.1272 9.56449 25.0023 9.51887 24.8547C9.46184 24.7071 9.80401 24.2189 10.0321 23.9805C10.2602 23.742 10.2032 23.2992 9.89525 22.9927L9.51887 22.618C9.21092 22.3114 8.89157 21.8913 8.81173 21.6983C8.73189 21.5053 9.10827 20.9035 9.30217 20.7105C9.49606 20.5175 9.81541 20.2904 10.0093 20.2109C10.2032 20.1314 10.8989 20.6083 11.2069 20.9149L11.5833 21.2895C11.8912 21.5961 12.393 21.5961 12.7124 21.2895L19.0196 14.9654C19.3275 14.6588 19.3275 14.1479 19.0196 13.8413L18.6432 13.4666C18.3353 13.1601 18.0159 12.74 17.9361 12.547C17.8562 12.3539 18.2212 11.7522 18.4037 11.5592C18.5862 11.3661 18.8941 11.1391 19.0766 11.0596C19.2591 10.9801 19.9662 11.457 20.2742 11.7635L20.6506 12.1382C20.9585 12.4448 21.4033 12.5129 21.6314 12.2745C21.8595 12.036 22.1675 11.8089 22.3044 11.7522C22.4412 11.6954 23.0001 12.1042 23.308 12.4107L25.3154 14.4317C25.6233 14.7383 26.0453 15.3173 26.2506 15.692L26.4217 16.7025C26.3761 17.134 26.3305 17.5768 26.3191 17.679C26.3077 17.7812 26.5358 18.3829 26.7069 18.7803L27.5737 20.8013C27.7447 21.1987 27.9386 21.8913 27.9957 22.3228L27.836 23.4127ZM21.6428 17.5087C21.7683 17.8947 22.2131 18.3375 22.6237 18.4965C22.6237 18.4965 23.2738 18.7349 23.7985 18.224C24.3117 17.7017 24.1064 17.0886 24.1064 17.0886C23.9696 16.6798 23.5476 16.2143 23.1712 16.0553C22.7948 15.8964 21.5174 17.1226 21.6428 17.5087ZM15.9401 24.1621C15.4269 23.6398 14.7996 23.901 14.7996 23.901C14.389 24.0713 13.9442 24.5254 13.8073 24.9115C13.6704 25.2975 14.446 26.2058 14.868 26.3534C14.868 26.3534 15.4725 26.5578 15.9857 26.0469C16.499 25.5246 16.4534 24.673 15.9401 24.1621ZM26.627 22.5044C26.6384 22.3455 26.513 21.8913 26.3533 21.4826L25.5777 19.6432C25.3952 19.2458 25.0074 19.1663 24.6881 19.4843L17.2518 26.9325C16.9438 27.2391 17.0122 27.6478 17.4114 27.8181L19.2705 28.5561C19.6811 28.7264 20.1373 28.8627 20.2856 28.8627C20.4339 28.8627 21.0041 28.4199 21.3121 28.1133L25.8971 23.5376C26.205 23.2311 26.6156 22.6634 26.627 22.5044Z" fill="#FF5F5F"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2641" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2641"/>
+</filter>
+<filter id="filter1_i_1302_2641" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2641"/>
+</filter>
+<filter id="filter2_i_1302_2641" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2641"/>
+</filter>
+<clipPath id="clip0_1302_2641">
+<rect width="24.5333" height="24.5333" fill="white" transform="translate(8.13379 10.6504)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通拥堵_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通拥堵_active.svg
new file mode 100644
index 00000000..57140769
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通拥堵_active.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2643)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2643)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2643)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2643)">
+<path d="M29.3186 24.3629L29.1593 23.9024C29.1129 23.7751 29.0307 23.664 28.9226 23.5823C28.8145 23.5006 28.6851 23.4518 28.5499 23.4419H28.0137C27.7709 22.7569 27.5097 22.0785 27.2302 21.4075C27.0824 21.2125 26.8949 21.0512 26.6799 20.9343C26.465 20.8174 26.2277 20.7475 25.9837 20.7294C25.1073 20.5628 24.2143 20.5008 23.3234 20.5449C22.4324 20.5017 21.5395 20.5636 20.6631 20.7294C20.1673 20.7928 19.715 21.0447 19.4 21.4328C19.3077 21.6173 18.9569 22.4774 18.6165 23.4498H18.0829C17.9473 23.458 17.8171 23.5062 17.7087 23.5881C17.6003 23.67 17.5185 23.7821 17.4735 23.9103L17.3307 24.3621C17.306 24.4171 17.2943 24.4772 17.2968 24.5375C17.2993 24.5978 17.3158 24.6567 17.3451 24.7095C17.3743 24.7624 17.4155 24.8076 17.4653 24.8418C17.5151 24.8759 17.5721 24.8979 17.6319 24.9061H18.1595C18.0176 25.3162 17.9253 25.5085 17.9253 25.5085C17.8814 25.6581 17.8588 25.8131 17.8583 25.969V29.3841C17.8573 29.505 17.9044 29.6213 17.9891 29.7076C18.0737 29.794 18.1892 29.8432 18.3101 29.8446H19.5819C19.6424 29.8448 19.7024 29.833 19.7584 29.81C19.8144 29.7869 19.8652 29.753 19.908 29.7102C19.9508 29.6674 19.9848 29.6165 20.0078 29.5606C20.0309 29.5046 20.0426 29.4446 20.0424 29.3841V28.7512H26.6348V29.3875C26.6347 29.4479 26.6465 29.5076 26.6695 29.5634C26.6925 29.6191 26.7263 29.6698 26.7689 29.7125C26.8115 29.7552 26.8621 29.7891 26.9178 29.8122C26.9735 29.8353 27.0332 29.8472 27.0936 29.8472H28.3645C28.4251 29.8474 28.485 29.8357 28.541 29.8126C28.597 29.7895 28.6478 29.7556 28.6907 29.7128C28.7335 29.67 28.7674 29.6192 28.7904 29.5632C28.8135 29.5072 28.8252 29.4472 28.825 29.3867V25.9717C28.8245 25.8158 28.8019 25.6607 28.758 25.5111C28.758 25.5111 28.6657 25.3205 28.5125 24.9088H29.0348C29.0944 24.9007 29.1513 24.8785 29.2005 24.844C29.2498 24.8095 29.29 24.7637 29.3179 24.7104C29.3458 24.6571 29.3605 24.5979 29.3608 24.5377C29.361 24.4776 29.3469 24.4182 29.3195 24.3647L29.3186 24.3629ZM20.6431 27.1103H20.0407C19.4966 27.1103 18.9612 27.0232 18.9612 26.6498V26.191C18.9468 26.1252 18.9496 26.0569 18.9694 25.9925C18.9892 25.9281 19.0252 25.87 19.0741 25.8236C19.123 25.7773 19.183 25.7444 19.2483 25.7281C19.3136 25.7118 19.3821 25.7126 19.447 25.7305C19.8173 25.7994 20.1735 25.9294 20.5012 26.1153C20.6657 26.1454 20.82 26.2164 20.9501 26.3216C21.0801 26.4269 21.1817 26.563 21.2454 26.7177C21.2289 26.9858 21.0948 27.1112 20.6431 27.1112V27.1103ZM19.3721 23.946C19.5334 23.2658 19.7837 22.6099 20.1164 21.9951C20.1747 21.8532 20.233 21.4006 23.3295 21.4006C26.4259 21.4006 26.492 21.9116 26.4999 21.9229C26.8256 22.5707 27.0863 23.2493 27.2781 23.9486C25.9888 24.2772 24.6592 24.4208 23.3295 24.3751C21.9971 24.4138 20.6656 24.2703 19.3721 23.9486V23.946ZM26.6339 27.1103H26.0307C25.5702 27.1103 25.437 26.9849 25.437 26.7255C25.5034 26.5726 25.6057 26.438 25.7353 26.3331C25.8649 26.2282 26.0179 26.1562 26.1813 26.1231C26.5089 25.9373 26.8651 25.8072 27.2355 25.7384C27.3003 25.7207 27.3687 25.7201 27.4339 25.7365C27.4991 25.7529 27.559 25.7858 27.6078 25.8321C27.6566 25.8783 27.6926 25.9364 27.7125 26.0006C27.7324 26.0649 27.7354 26.1331 27.7212 26.1989V26.6507C27.7125 27.0276 27.1693 27.1112 26.6331 27.1112L26.6339 27.1103ZM18.0002 22.682C18.2683 21.9368 18.5355 21.2761 18.6444 21.0663C18.806 20.8079 19.0197 20.5859 19.2718 20.4145C19.5238 20.243 19.8088 20.1259 20.1086 20.0704C20.1822 20.0519 20.2548 20.0295 20.3262 20.0034C21.2772 19.8035 22.2501 19.7274 23.2206 19.7771H23.2711C23.2624 19.7605 23.2624 19.7518 23.2546 19.7353H23.7769C23.8361 19.7263 23.8925 19.7038 23.9416 19.6694C23.9906 19.635 24.0311 19.5898 24.0597 19.5372C24.0884 19.4846 24.1045 19.426 24.1068 19.3662C24.1091 19.3063 24.0975 19.2467 24.0729 19.1921L23.9136 18.7403C23.8672 18.613 23.7849 18.5018 23.6768 18.4201C23.5687 18.3384 23.4393 18.2897 23.3042 18.2798H22.7671C22.5315 17.5921 22.2701 16.9135 21.9836 16.2454C21.8369 16.0514 21.6507 15.8907 21.4373 15.7738C21.224 15.6569 20.9883 15.5865 20.7458 15.5673C19.8694 15.4009 18.9764 15.3393 18.0855 15.3836C17.1946 15.3401 16.3017 15.4018 15.4252 15.5673C14.9294 15.6307 14.4771 15.8826 14.1621 16.2706C14.0698 16.4543 13.719 17.3153 13.3838 18.2876H12.8537C12.7181 18.296 12.588 18.3442 12.4796 18.4261C12.3712 18.508 12.2894 18.62 12.2443 18.7481L12.085 19.1999C12.0602 19.255 12.0486 19.315 12.0511 19.3754C12.0536 19.4357 12.0701 19.4946 12.0994 19.5474C12.1286 19.6002 12.1698 19.6455 12.2195 19.6796C12.2693 19.7137 12.3264 19.7358 12.3862 19.744H12.9129C12.771 20.154 12.6787 20.3464 12.6787 20.3464C12.6348 20.496 12.6122 20.651 12.6117 20.8069V24.2219C12.6108 24.3428 12.6578 24.4592 12.7425 24.5455C12.8271 24.6318 12.9426 24.681 13.0635 24.6824H14.3353C14.3958 24.6827 14.4558 24.6709 14.5118 24.6478C14.5678 24.6248 14.6186 24.5909 14.6614 24.5481C14.7043 24.5052 14.7382 24.4544 14.7612 24.3984C14.7843 24.3424 14.796 24.2825 14.7958 24.2219V23.5864H16.7283C16.8309 23.3308 17.0058 23.1106 17.2318 22.953C17.4577 22.7954 17.7248 22.7073 18.0002 22.6994V22.682ZM15.3886 21.929H14.7871C14.243 21.929 13.6998 21.8532 13.6998 21.4685V21.0167C13.6855 20.951 13.6883 20.8827 13.708 20.8185C13.7278 20.7542 13.7638 20.6961 13.8125 20.6498C13.8613 20.6035 13.9211 20.5706 13.9863 20.5542C14.0515 20.5378 14.1199 20.5385 14.1847 20.5562C14.555 20.6251 14.9113 20.7551 15.2389 20.9409C15.4034 20.9711 15.5578 21.0421 15.6878 21.1473C15.8178 21.2525 15.9194 21.3887 15.9832 21.5433C15.9832 21.8115 15.8491 21.9281 15.3895 21.9281L15.3886 21.929ZM14.1255 18.7647C14.287 18.0848 14.5372 17.4292 14.8698 16.8147C14.9281 16.6728 14.9873 16.2201 18.0829 16.2201C21.1784 16.2201 21.2454 16.7311 21.2533 16.7425C21.5773 17.391 21.838 18.0694 22.0315 18.7681C20.7422 19.0968 19.4127 19.2404 18.0829 19.1947C16.7502 19.2398 15.4179 19.0962 14.1255 18.7681V18.7647ZM20.233 13.8767C20.2914 13.7348 20.3506 13.2822 23.4461 13.2822C26.5417 13.2822 26.6087 13.7932 26.6165 13.8045C26.9407 14.453 27.2013 15.1314 27.3948 15.8302C26.1054 16.1588 24.7759 16.3024 23.4461 16.2567C23.2868 16.2567 23.1536 16.248 23.003 16.248C23.1771 16.6746 23.346 17.1098 23.5131 17.5451H23.5297C23.8189 17.5527 24.099 17.6485 24.3323 17.8196C24.5657 17.9907 24.7412 18.229 24.8354 18.5026L24.9948 18.9544C25.0929 19.2386 25.0811 19.5491 24.9617 19.8249C25.4209 19.8385 25.8778 19.8968 26.3258 19.9991L26.4598 20.0321C26.785 20.0743 27.0959 20.1916 27.3678 20.3747C27.6398 20.5578 27.8654 20.8018 28.0268 21.0872C28.0772 21.196 28.1686 21.4302 28.294 21.7314H28.4777C28.5382 21.7316 28.5982 21.7199 28.6542 21.6968C28.7102 21.6737 28.761 21.6398 28.8038 21.597C28.8466 21.5542 28.8805 21.5033 28.9036 21.4474C28.9267 21.3914 28.9384 21.3314 28.9382 21.2709V17.8524C28.9377 17.6965 28.9151 17.5414 28.8712 17.3919C28.8712 17.3919 28.7737 17.1995 28.6239 16.7895H29.1462C29.2061 16.7814 29.2633 16.7595 29.3132 16.7254C29.3631 16.6913 29.4043 16.646 29.4336 16.5932C29.4629 16.5403 29.4794 16.4813 29.4818 16.4209C29.4842 16.3605 29.4724 16.3004 29.4474 16.2454L29.2881 15.7936C29.2417 15.6663 29.1595 15.5551 29.0514 15.4734C28.9433 15.3917 28.8139 15.343 28.6788 15.3331H28.1391C27.8963 14.648 27.635 13.9696 27.3556 13.2987C27.2077 13.1038 27.0201 12.9425 26.8052 12.8256C26.5903 12.7087 26.353 12.6388 26.109 12.6206C25.2315 12.454 24.3373 12.3923 23.4452 12.4369C22.5543 12.3934 21.6614 12.4551 20.7849 12.6206C20.2892 12.6841 19.8369 12.936 19.5218 13.3239C19.4548 13.4658 19.2372 14.1779 18.9865 14.8386C19.3207 14.8473 19.5958 14.8639 19.8483 14.8726C20.032 14.4286 20.1826 14.0021 20.233 13.8767ZM27.83 18.0787V18.5392C27.83 18.9161 27.2859 18.9997 26.7419 18.9997H26.1395C25.679 18.9997 25.5458 18.8743 25.5458 18.6149C25.6122 18.462 25.7145 18.3274 25.8441 18.2225C25.9737 18.1176 26.1267 18.0456 26.2901 18.0125C26.6177 17.8267 26.974 17.6967 27.3443 17.6278C27.4084 17.6091 27.4763 17.6073 27.5413 17.6228C27.6064 17.6382 27.6662 17.6703 27.7151 17.7158C27.764 17.7614 27.8002 17.8189 27.8202 17.8826C27.8402 17.9464 27.8433 18.0143 27.8291 18.0796L27.83 18.0787Z" fill="#FFDB82"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2643" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2643"/>
+</filter>
+<filter id="filter1_i_1302_2643" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2643"/>
+</filter>
+<filter id="filter2_i_1302_2643" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2643"/>
+</filter>
+<clipPath id="clip0_1302_2643">
+<rect width="17.4316" height="17.4316" fill="white" transform="translate(12.0557 12.4224)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通拥堵_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通拥堵_fault.svg
new file mode 100644
index 00000000..e8e77ed0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通拥堵_fault.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2644)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2644)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2644)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2644)">
+<path d="M29.3196 24.3629L29.1603 23.9024C29.1138 23.7751 29.0316 23.664 28.9235 23.5823C28.8154 23.5006 28.686 23.4518 28.5509 23.4419H28.0147C27.7719 22.7569 27.5107 22.0785 27.2312 21.4075C27.0834 21.2125 26.8958 21.0512 26.6809 20.9343C26.466 20.8174 26.2286 20.7475 25.9846 20.7294C25.1083 20.5628 24.2153 20.5008 23.3243 20.5449C22.4334 20.5017 21.5405 20.5636 20.6641 20.7294C20.1683 20.7928 19.7159 21.0447 19.4009 21.4328C19.3087 21.6173 18.9578 22.4774 18.6175 23.4498H18.0838C17.9482 23.458 17.8181 23.5062 17.7097 23.5881C17.6013 23.67 17.5195 23.7821 17.4745 23.9103L17.3317 24.3621C17.3069 24.4171 17.2953 24.4772 17.2978 24.5375C17.3003 24.5978 17.3168 24.6567 17.3461 24.7095C17.3753 24.7624 17.4164 24.8076 17.4662 24.8418C17.516 24.8759 17.5731 24.8979 17.6329 24.9061H18.1605C18.0186 25.3162 17.9263 25.5085 17.9263 25.5085C17.8823 25.6581 17.8598 25.8131 17.8593 25.969V29.3841C17.8583 29.505 17.9053 29.6213 17.99 29.7076C18.0747 29.794 18.1901 29.8432 18.3111 29.8446H19.5829C19.6434 29.8448 19.7034 29.833 19.7594 29.81C19.8153 29.7869 19.8662 29.753 19.909 29.7102C19.9518 29.6674 19.9857 29.6165 20.0088 29.5606C20.0318 29.5046 20.0436 29.4446 20.0434 29.3841V28.7512H26.6358V29.3875C26.6357 29.4479 26.6474 29.5076 26.6704 29.5634C26.6935 29.6191 26.7272 29.6698 26.7698 29.7125C26.8124 29.7552 26.8631 29.7891 26.9188 29.8122C26.9745 29.8353 27.0342 29.8472 27.0945 29.8472H28.3655C28.426 29.8474 28.486 29.8357 28.542 29.8126C28.598 29.7895 28.6488 29.7556 28.6916 29.7128C28.7344 29.67 28.7683 29.6192 28.7914 29.5632C28.8145 29.5072 28.8262 29.4472 28.826 29.3867V25.9717C28.8255 25.8158 28.8029 25.6607 28.759 25.5111C28.759 25.5111 28.6667 25.3205 28.5135 24.9088H29.0358C29.0954 24.9007 29.1522 24.8785 29.2015 24.844C29.2508 24.8095 29.291 24.7637 29.3189 24.7104C29.3468 24.6571 29.3615 24.5979 29.3618 24.5377C29.362 24.4776 29.3479 24.4182 29.3204 24.3647L29.3196 24.3629ZM20.644 27.1103H20.0416C19.4976 27.1103 18.9622 27.0232 18.9622 26.6498V26.191C18.9478 26.1252 18.9506 26.0569 18.9704 25.9925C18.9901 25.9281 19.0262 25.87 19.0751 25.8236C19.1239 25.7773 19.1839 25.7444 19.2493 25.7281C19.3146 25.7118 19.383 25.7126 19.4479 25.7305C19.8183 25.7994 20.1745 25.9294 20.5021 26.1153C20.6667 26.1454 20.821 26.2164 20.951 26.3216C21.0811 26.4269 21.1826 26.563 21.2464 26.7177C21.2299 26.9858 21.0958 27.1112 20.644 27.1112V27.1103ZM19.3731 23.946C19.5344 23.2658 19.7847 22.6099 20.1174 21.9951C20.1757 21.8532 20.234 21.4006 23.3304 21.4006C26.4269 21.4006 26.493 21.9116 26.5008 21.9229C26.8265 22.5707 27.0872 23.2493 27.2791 23.9486C25.9897 24.2772 24.6602 24.4208 23.3304 24.3751C21.998 24.4138 20.6666 24.2703 19.3731 23.9486V23.946ZM26.6349 27.1103H26.0316C25.5711 27.1103 25.438 26.9849 25.438 26.7255C25.5043 26.5726 25.6067 26.438 25.7362 26.3331C25.8658 26.2282 26.0188 26.1562 26.1822 26.1231C26.5099 25.9373 26.8661 25.8072 27.2364 25.7384C27.3013 25.7207 27.3697 25.7201 27.4349 25.7365C27.5001 25.7529 27.5599 25.7858 27.6087 25.8321C27.6575 25.8783 27.6936 25.9364 27.7135 26.0006C27.7333 26.0649 27.7363 26.1331 27.7222 26.1989V26.6507C27.7135 27.0276 27.1703 27.1112 26.634 27.1112L26.6349 27.1103ZM18.0011 22.682C18.2693 21.9368 18.5365 21.2761 18.6453 21.0663C18.807 20.8079 19.0207 20.5859 19.2728 20.4145C19.5248 20.243 19.8098 20.1259 20.1095 20.0704C20.1832 20.0519 20.2558 20.0295 20.3272 20.0034C21.2782 19.8035 22.2511 19.7274 23.2216 19.7771H23.2721C23.2634 19.7605 23.2634 19.7518 23.2556 19.7353H23.7779C23.8371 19.7263 23.8935 19.7038 23.9425 19.6694C23.9916 19.635 24.0321 19.5898 24.0607 19.5372C24.0894 19.4846 24.1055 19.426 24.1078 19.3662C24.11 19.3063 24.0984 19.2467 24.0739 19.1921L23.9146 18.7403C23.8681 18.613 23.7859 18.5018 23.6778 18.4201C23.5697 18.3384 23.4403 18.2897 23.3052 18.2798H22.7681C22.5325 17.5921 22.2711 16.9135 21.9846 16.2454C21.8378 16.0514 21.6516 15.8907 21.4383 15.7738C21.2249 15.6569 20.9893 15.5865 20.7467 15.5673C19.8704 15.4009 18.9774 15.3393 18.0865 15.3836C17.1956 15.3401 16.3026 15.4018 15.4262 15.5673C14.9304 15.6307 14.4781 15.8826 14.163 16.2706C14.0708 16.4543 13.72 17.3153 13.3848 18.2876H12.8547C12.7191 18.296 12.589 18.3442 12.4806 18.4261C12.3722 18.508 12.2904 18.62 12.2453 18.7481L12.086 19.1999C12.0612 19.255 12.0496 19.315 12.0521 19.3754C12.0546 19.4357 12.0711 19.4946 12.1003 19.5474C12.1296 19.6002 12.1707 19.6455 12.2205 19.6796C12.2703 19.7137 12.3274 19.7358 12.3872 19.744H12.9139C12.772 20.154 12.6797 20.3464 12.6797 20.3464C12.6358 20.496 12.6132 20.651 12.6127 20.8069V24.2219C12.6117 24.3428 12.6588 24.4592 12.7434 24.5455C12.8281 24.6318 12.9436 24.681 13.0645 24.6824H14.3363C14.3968 24.6827 14.4568 24.6709 14.5128 24.6478C14.5688 24.6248 14.6196 24.5909 14.6624 24.5481C14.7052 24.5052 14.7391 24.4544 14.7622 24.3984C14.7853 24.3424 14.797 24.2825 14.7968 24.2219V23.5864H16.7293C16.8318 23.3308 17.0068 23.1106 17.2328 22.953C17.4587 22.7954 17.7258 22.7073 18.0011 22.6994V22.682ZM15.3896 21.929H14.7881C14.244 21.929 13.7008 21.8532 13.7008 21.4685V21.0167C13.6864 20.951 13.6893 20.8827 13.709 20.8185C13.7288 20.7542 13.7647 20.6961 13.8135 20.6498C13.8622 20.6035 13.9221 20.5706 13.9873 20.5542C14.0525 20.5378 14.1208 20.5385 14.1857 20.5562C14.556 20.6251 14.9123 20.7551 15.2399 20.9409C15.4044 20.9711 15.5588 21.0421 15.6888 21.1473C15.8188 21.2525 15.9204 21.3887 15.9842 21.5433C15.9842 21.8115 15.8501 21.9281 15.3905 21.9281L15.3896 21.929ZM14.1265 18.7647C14.288 18.0848 14.5382 17.4292 14.8708 16.8147C14.9291 16.6728 14.9883 16.2201 18.0838 16.2201C21.1794 16.2201 21.2464 16.7311 21.2543 16.7425C21.5783 17.391 21.8389 18.0694 22.0325 18.7681C20.7432 19.0968 19.4136 19.2404 18.0838 19.1947C16.7512 19.2398 15.4189 19.0962 14.1265 18.7681V18.7647ZM20.234 13.8767C20.2923 13.7348 20.3515 13.2822 23.4471 13.2822C26.5426 13.2822 26.6097 13.7932 26.6175 13.8045C26.9416 14.453 27.2023 15.1314 27.3957 15.8302C26.1064 16.1588 24.7769 16.3024 23.4471 16.2567C23.2878 16.2567 23.1546 16.248 23.004 16.248C23.1781 16.6746 23.347 17.1098 23.5141 17.5451H23.5307C23.8199 17.5527 24.1 17.6485 24.3333 17.8196C24.5667 17.9907 24.7422 18.229 24.8364 18.5026L24.9957 18.9544C25.0938 19.2386 25.082 19.5491 24.9627 19.8249C25.4219 19.8385 25.8788 19.8968 26.3267 19.9991L26.4608 20.0321C26.786 20.0743 27.0968 20.1916 27.3688 20.3747C27.6408 20.5578 27.8664 20.8018 28.0277 21.0872C28.0782 21.196 28.1696 21.4302 28.295 21.7314H28.4787C28.5392 21.7316 28.5992 21.7199 28.6552 21.6968C28.7111 21.6737 28.762 21.6398 28.8048 21.597C28.8476 21.5542 28.8815 21.5033 28.9046 21.4474C28.9276 21.3914 28.9394 21.3314 28.9392 21.2709V17.8524C28.9386 17.6965 28.9161 17.5414 28.8721 17.3919C28.8721 17.3919 28.7746 17.1995 28.6249 16.7895H29.1472C29.2071 16.7814 29.2643 16.7595 29.3142 16.7254C29.3641 16.6913 29.4053 16.646 29.4346 16.5932C29.4639 16.5403 29.4804 16.4813 29.4828 16.4209C29.4852 16.3605 29.4734 16.3004 29.4484 16.2454L29.2891 15.7936C29.2427 15.6663 29.1605 15.5551 29.0524 15.4734C28.9443 15.3917 28.8149 15.343 28.6797 15.3331H28.14C27.8973 14.648 27.636 13.9696 27.3566 13.2987C27.2087 13.1038 27.0211 12.9425 26.8062 12.8256C26.5913 12.7087 26.354 12.6388 26.11 12.6206C25.2325 12.454 24.3383 12.3923 23.4462 12.4369C22.5553 12.3934 21.6624 12.4551 20.7859 12.6206C20.2902 12.6841 19.8379 12.936 19.5228 13.3239C19.4558 13.4658 19.2381 14.1779 18.9874 14.8386C19.3217 14.8473 19.5968 14.8639 19.8492 14.8726C20.0329 14.4286 20.1835 14.0021 20.234 13.8767ZM27.831 18.0787V18.5392C27.831 18.9161 27.2869 18.9997 26.7429 18.9997H26.1405C25.68 18.9997 25.5468 18.8743 25.5468 18.6149C25.6131 18.462 25.7155 18.3274 25.8451 18.2225C25.9746 18.1176 26.1277 18.0456 26.2911 18.0125C26.6187 17.8267 26.9749 17.6967 27.3452 17.6278C27.4094 17.6091 27.4773 17.6073 27.5423 17.6228C27.6073 17.6382 27.6672 17.6703 27.7161 17.7158C27.765 17.7614 27.8012 17.8189 27.8212 17.8826C27.8412 17.9464 27.8443 18.0143 27.8301 18.0796L27.831 18.0787Z" fill="#FF5F5F"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2644" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2644"/>
+</filter>
+<filter id="filter1_i_1302_2644" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2644"/>
+</filter>
+<filter id="filter2_i_1302_2644" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2644"/>
+</filter>
+<clipPath id="clip0_1302_2644">
+<rect width="17.4316" height="17.4316" fill="white" transform="translate(12.0566 12.4224)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通管制_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通管制_active.svg
new file mode 100644
index 00000000..ef68bab5
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通管制_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2636)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2636)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2636)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M21.0198 8.86523C14.5776 8.86523 9.36523 14.1069 9.36523 20.5198C9.36523 26.9327 14.6069 32.2036 21.0198 32.2036C27.462 32.2036 32.7036 26.962 32.7036 20.5198C32.7036 14.0776 27.462 8.86523 21.0198 8.86523ZM21.0198 30.5345C15.5146 30.5345 11.0344 26.0542 11.0344 20.5491C11.0344 18.4114 11.7079 16.4495 12.8499 14.8389L15.5439 17.5329L14.9582 19.0264L14.1383 19.7877V22.7453L14.8997 23.5652H15.1339V24.8244C15.1339 24.8244 15.2511 25.0293 15.3682 25.0586C15.4561 25.0879 16.1588 25.1172 16.5688 25.0586C16.7152 25.0293 16.8323 24.8536 16.8616 24.8244V23.5652C18.4429 23.5652 20.0242 23.5652 21.5762 23.5652L26.7592 28.719C25.1487 29.861 23.1574 30.5345 21.0198 30.5345ZM24.4752 21.4568L24.7387 20.1977C24.768 20.0805 24.8265 19.9927 24.9437 19.9927H26.9642C27.0813 19.9927 27.1692 20.0805 27.1692 20.1977V21.4568C27.1692 21.574 27.0813 21.6618 26.9642 21.6618H24.6801C24.563 21.6618 24.4459 21.574 24.4752 21.4568ZM21.7519 18.9678L19.0286 16.2738C21.1662 16.1859 22.6011 16.2152 25.4708 16.4202L26.5542 19.0849C24.8265 18.9971 23.2746 18.9678 21.7519 18.9678ZM17.5644 21.4568C17.5937 21.574 17.4766 21.6618 17.3594 21.6618H15.0754C14.9582 21.6618 14.8704 21.574 14.8704 21.4568V20.1977C14.8704 20.0805 14.9582 19.9927 15.0754 19.9927H17.0959C17.213 19.9927 17.2716 20.0805 17.3009 20.1977L17.5644 21.4568ZM15.4853 19.0849L15.9539 17.9429L17.0373 19.0264C16.5395 19.0264 16.0417 19.0556 15.4853 19.0849ZM29.1897 26.2885L26.9056 24.0337V23.5652H27.1399L27.9012 22.7453V19.7877L27.0813 19.0264L25.8807 15.9224C25.8807 15.9224 24.6509 15.7467 23.3624 15.6588C21.8104 15.571 20.1413 15.571 18.5893 15.6588C18.5015 15.6588 18.4429 15.6588 18.355 15.6588L15.1047 12.4377C16.7445 11.2371 18.765 10.5344 20.9612 10.5344C26.4664 10.5344 30.9467 15.0146 30.9467 20.5198C31.0052 22.6867 30.3317 24.6487 29.1897 26.2885Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2636" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2636"/>
+</filter>
+<filter id="filter1_i_1302_2636" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2636"/>
+</filter>
+<filter id="filter2_i_1302_2636" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2636"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通管制_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通管制_fault.svg
new file mode 100644
index 00000000..9eb5e3a6
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/交通管制_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2637)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2637)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2637)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M21.0198 8.86523C14.5776 8.86523 9.36523 14.1069 9.36523 20.5198C9.36523 26.9327 14.6069 32.2036 21.0198 32.2036C27.462 32.2036 32.7036 26.962 32.7036 20.5198C32.7036 14.0776 27.462 8.86523 21.0198 8.86523ZM21.0198 30.5345C15.5146 30.5345 11.0344 26.0542 11.0344 20.5491C11.0344 18.4114 11.7079 16.4495 12.8499 14.8389L15.5439 17.5329L14.9582 19.0264L14.1383 19.7877V22.7453L14.8997 23.5652H15.1339V24.8244C15.1339 24.8244 15.2511 25.0293 15.3682 25.0586C15.4561 25.0879 16.1588 25.1172 16.5688 25.0586C16.7152 25.0293 16.8323 24.8536 16.8616 24.8244V23.5652C18.4429 23.5652 20.0242 23.5652 21.5762 23.5652L26.7592 28.719C25.1487 29.861 23.1574 30.5345 21.0198 30.5345ZM24.4752 21.4568L24.7387 20.1977C24.768 20.0805 24.8265 19.9927 24.9437 19.9927H26.9642C27.0813 19.9927 27.1692 20.0805 27.1692 20.1977V21.4568C27.1692 21.574 27.0813 21.6618 26.9642 21.6618H24.6801C24.563 21.6618 24.4459 21.574 24.4752 21.4568ZM21.7519 18.9678L19.0286 16.2738C21.1662 16.1859 22.6011 16.2152 25.4708 16.4202L26.5542 19.0849C24.8265 18.9971 23.2746 18.9678 21.7519 18.9678ZM17.5644 21.4568C17.5937 21.574 17.4766 21.6618 17.3594 21.6618H15.0754C14.9582 21.6618 14.8704 21.574 14.8704 21.4568V20.1977C14.8704 20.0805 14.9582 19.9927 15.0754 19.9927H17.0959C17.213 19.9927 17.2716 20.0805 17.3009 20.1977L17.5644 21.4568ZM15.4853 19.0849L15.9539 17.9429L17.0373 19.0264C16.5395 19.0264 16.0417 19.0556 15.4853 19.0849ZM29.1897 26.2885L26.9056 24.0337V23.5652H27.1399L27.9012 22.7453V19.7877L27.0813 19.0264L25.8807 15.9224C25.8807 15.9224 24.6509 15.7467 23.3624 15.6588C21.8104 15.571 20.1413 15.571 18.5893 15.6588C18.5015 15.6588 18.4429 15.6588 18.355 15.6588L15.1047 12.4377C16.7445 11.2371 18.765 10.5344 20.9612 10.5344C26.4664 10.5344 30.9467 15.0146 30.9467 20.5198C31.0052 22.6867 30.3317 24.6487 29.1897 26.2885Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2637" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2637"/>
+</filter>
+<filter id="filter1_i_1302_2637" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2637"/>
+</filter>
+<filter id="filter2_i_1302_2637" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2637"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/其他事件_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/其他事件_active.svg
new file mode 100644
index 00000000..941594a9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/其他事件_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2610)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2610)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2610)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M24.2824 21.1562L28.9251 30.0437C29.025 30.2687 29.025 30.3812 28.9251 30.6625C28.6755 30.8875 28.5757 31 28.3261 31H19.0406C18.791 31 18.6911 30.8875 18.5913 30.6625C18.4914 30.4375 18.4914 30.325 18.5913 30.0437L23.234 21.1562C23.4337 20.7625 24.0328 20.7625 24.2824 21.1562ZM28.0265 13C28.4259 13 28.8253 13.2812 28.8253 13.7312V22.1687C28.8253 22.7875 28.4259 23.0687 27.8768 23.0687C27.4774 23.0687 27.078 22.6187 27.078 22.1687V14.9688H14.5975V29.2H16.1451C16.6942 29.2 17.0936 29.65 17.0936 30.1C17.0936 30.55 16.6942 31 16.1451 31H13.7988C13.3994 31 13 30.7188 13 30.2688V14.1812C13 13.7312 13.1498 13.1688 13.649 13H28.0265ZM23.6833 28.1312C23.3339 28.1312 22.9844 28.4688 22.9844 28.8625C22.9844 29.2 23.3339 29.5938 23.6833 29.5938C24.0328 29.5938 24.3822 29.2563 24.3822 28.8625C24.2824 28.525 24.0328 28.1312 23.6833 28.1312ZM23.6833 24.475C23.3339 24.475 23.1342 24.7 23.0842 24.9812V27.175C23.0842 27.5125 23.3339 27.7937 23.6833 27.7937C24.0328 27.7937 24.2324 27.5687 24.2824 27.2875V25.0938C24.2824 24.7 24.0328 24.475 23.6833 24.475ZM19.39 21.2687C19.9392 21.2687 20.3385 21.7188 20.3385 22.3375C20.3385 22.9563 19.9392 23.4062 19.39 23.4062H17.1435C16.5944 23.4062 16.195 22.9563 16.195 22.3375C16.195 21.7188 16.5944 21.2687 17.1435 21.2687H19.39ZM23.1342 16.9375C23.6833 16.9375 24.0827 17.3875 24.0827 18.0062C24.0827 18.625 23.6833 18.9062 23.1342 18.9062H17.1435C16.7441 18.9062 16.3448 18.4562 16.3448 18.0062C16.3448 17.5562 16.7441 16.9375 17.1435 16.9375H23.1342Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2610" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2610"/>
+</filter>
+<filter id="filter1_i_1302_2610" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2610"/>
+</filter>
+<filter id="filter2_i_1302_2610" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2610"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/其他事件_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/其他事件_fault.svg
new file mode 100644
index 00000000..e10e1252
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/其他事件_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2611)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2611)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2611)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M24.2824 21.1562L28.9251 30.0437C29.025 30.2687 29.025 30.3812 28.9251 30.6625C28.6755 30.8875 28.5757 31 28.3261 31H19.0406C18.791 31 18.6911 30.8875 18.5913 30.6625C18.4914 30.4375 18.4914 30.325 18.5913 30.0437L23.234 21.1562C23.4337 20.7625 24.0328 20.7625 24.2824 21.1562ZM28.0265 13C28.4259 13 28.8253 13.2812 28.8253 13.7312V22.1687C28.8253 22.7875 28.4259 23.0687 27.8768 23.0687C27.4774 23.0687 27.078 22.6187 27.078 22.1687V14.9688H14.5975V29.2H16.1451C16.6942 29.2 17.0936 29.65 17.0936 30.1C17.0936 30.55 16.6942 31 16.1451 31H13.7988C13.3994 31 13 30.7188 13 30.2688V14.1812C13 13.7312 13.1498 13.1688 13.649 13H28.0265ZM23.6833 28.1312C23.3339 28.1312 22.9844 28.4688 22.9844 28.8625C22.9844 29.2 23.3339 29.5938 23.6833 29.5938C24.0328 29.5938 24.3822 29.2563 24.3822 28.8625C24.2824 28.525 24.0328 28.1312 23.6833 28.1312ZM23.6833 24.475C23.3339 24.475 23.1342 24.7 23.0842 24.9812V27.175C23.0842 27.5125 23.3339 27.7937 23.6833 27.7937C24.0328 27.7937 24.2324 27.5687 24.2824 27.2875V25.0938C24.2824 24.7 24.0328 24.475 23.6833 24.475ZM19.39 21.2687C19.9392 21.2687 20.3385 21.7188 20.3385 22.3375C20.3385 22.9563 19.9392 23.4062 19.39 23.4062H17.1435C16.5944 23.4062 16.195 22.9563 16.195 22.3375C16.195 21.7188 16.5944 21.2687 17.1435 21.2687H19.39ZM23.1342 16.9375C23.6833 16.9375 24.0827 17.3875 24.0827 18.0062C24.0827 18.625 23.6833 18.9062 23.1342 18.9062H17.1435C16.7441 18.9062 16.3448 18.4562 16.3448 18.0062C16.3448 17.5562 16.7441 16.9375 17.1435 16.9375H23.1342Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2611" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2611"/>
+</filter>
+<filter id="filter1_i_1302_2611" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2611"/>
+</filter>
+<filter id="filter2_i_1302_2611" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2611"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/异常天气_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/异常天气_active.svg
new file mode 100644
index 00000000..1feaeb29
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/异常天气_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2645)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2645)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2645)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M13.5254 22.6308L14.6504 24.4026L13.5254 27.3558L12.4004 24.4026L13.5254 22.6308ZM30.4004 24.4026L29.2754 22.6308L28.1504 24.4026L29.2754 27.3558L30.4004 24.4026ZM17.4629 24.9933L18.5879 26.7651L17.4629 29.7183L16.3379 26.7651L17.4629 24.9933ZM26.4629 26.7651L25.3379 24.9933L24.2129 26.7651L25.3379 29.7183L26.4629 26.7651ZM22.5254 27.9464L21.4004 26.1745L20.2754 27.9464L21.4004 30.8995L22.5254 27.9464ZM21.2879 23.812C22.1085 23.8127 22.9193 23.6245 23.6632 23.2606C24.407 22.8967 25.0659 22.366 25.5933 21.7058C26.0823 21.9461 26.6191 22.0596 27.1585 22.037C27.698 22.0143 28.2244 21.8561 28.6936 21.5756C29.1628 21.295 29.561 20.9004 29.8548 20.4249C30.1487 19.9493 30.3296 19.4067 30.3824 18.8425C30.4352 18.2783 30.3583 17.709 30.1582 17.1825C29.958 16.656 29.6405 16.1876 29.2323 15.8166C28.8241 15.4456 28.3371 15.1828 27.8121 15.0504C27.2871 14.9179 26.7396 14.9197 26.2154 15.0554C25.7297 14.1296 25.0162 13.3577 24.1495 12.8201C23.2828 12.2826 22.2945 11.9992 21.2879 11.9995C20.2895 11.9991 19.309 12.2778 18.4472 12.8069C17.5853 13.3361 16.8732 14.0967 16.384 15.0105C15.8689 14.9117 15.339 14.94 14.8361 15.0933C14.3332 15.2466 13.8712 15.5207 13.4867 15.8938C13.1021 16.2669 12.8055 16.7289 12.6203 17.2432C12.4351 17.7575 12.3664 18.31 12.4196 18.8569C12.4729 19.4039 12.6466 19.9303 12.9271 20.3946C13.2076 20.8589 13.5871 21.2483 14.0356 21.532C14.4842 21.8157 14.9894 21.986 15.5114 22.0293C16.0334 22.0725 16.5579 21.9877 17.0433 21.7814C17.5707 22.4197 18.2227 22.9314 18.9551 23.2817C19.6875 23.6321 20.4831 23.8129 21.2879 23.812ZM20.398 16.2544C20.3339 15.8268 20.5893 15.3094 20.956 15.0767C21.244 14.8959 21.5759 14.9196 21.8628 15.1038L21.9415 15.1534C22.2756 15.359 22.459 15.7582 22.4016 16.1611L21.9989 18.8508H20.7861L20.3991 16.2544H20.398ZM22.0743 20.1501C22.0743 20.3381 22.0031 20.5184 21.8766 20.6513C21.75 20.7842 21.5783 20.8589 21.3993 20.8589C21.2202 20.8589 21.0486 20.7842 20.922 20.6513C20.7954 20.5184 20.7243 20.3381 20.7243 20.1501C20.7243 19.9622 20.7954 19.7819 20.922 19.649C21.0486 19.5161 21.2202 19.4414 21.3993 19.4414C21.5783 19.4414 21.75 19.5161 21.8766 19.649C22.0031 19.7819 22.0743 19.9622 22.0743 20.1501Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2645" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2645"/>
+</filter>
+<filter id="filter1_i_1302_2645" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2645"/>
+</filter>
+<filter id="filter2_i_1302_2645" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2645"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/异常天气_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/异常天气_fault.svg
new file mode 100644
index 00000000..8148ad86
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/异常天气_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2646)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2646)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2646)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M13.5254 22.6308L14.6504 24.4026L13.5254 27.3558L12.4004 24.4026L13.5254 22.6308ZM30.4004 24.4026L29.2754 22.6308L28.1504 24.4026L29.2754 27.3558L30.4004 24.4026ZM17.4629 24.9933L18.5879 26.7651L17.4629 29.7183L16.3379 26.7651L17.4629 24.9933ZM26.4629 26.7651L25.3379 24.9933L24.2129 26.7651L25.3379 29.7183L26.4629 26.7651ZM22.5254 27.9464L21.4004 26.1745L20.2754 27.9464L21.4004 30.8995L22.5254 27.9464ZM21.2879 23.812C22.1085 23.8127 22.9193 23.6245 23.6632 23.2606C24.407 22.8967 25.0659 22.366 25.5933 21.7058C26.0823 21.9461 26.6191 22.0596 27.1585 22.037C27.698 22.0143 28.2244 21.8561 28.6936 21.5756C29.1628 21.295 29.561 20.9004 29.8548 20.4249C30.1487 19.9493 30.3296 19.4067 30.3824 18.8425C30.4352 18.2783 30.3583 17.709 30.1582 17.1825C29.958 16.656 29.6405 16.1876 29.2323 15.8166C28.8241 15.4456 28.3371 15.1828 27.8121 15.0504C27.2871 14.9179 26.7396 14.9197 26.2154 15.0554C25.7297 14.1296 25.0162 13.3577 24.1495 12.8201C23.2828 12.2826 22.2945 11.9992 21.2879 11.9995C20.2895 11.9991 19.309 12.2778 18.4472 12.8069C17.5853 13.3361 16.8732 14.0967 16.384 15.0105C15.8689 14.9117 15.339 14.94 14.8361 15.0933C14.3332 15.2466 13.8712 15.5207 13.4867 15.8938C13.1021 16.2669 12.8055 16.7289 12.6203 17.2432C12.4351 17.7575 12.3664 18.31 12.4196 18.8569C12.4729 19.4039 12.6466 19.9303 12.9271 20.3946C13.2076 20.8589 13.5871 21.2483 14.0356 21.532C14.4842 21.8157 14.9894 21.986 15.5114 22.0293C16.0334 22.0725 16.5579 21.9877 17.0433 21.7814C17.5707 22.4197 18.2227 22.9314 18.9551 23.2817C19.6875 23.6321 20.4831 23.8129 21.2879 23.812ZM20.398 16.2544C20.3339 15.8268 20.5893 15.3094 20.956 15.0767C21.244 14.8959 21.5759 14.9196 21.8628 15.1038L21.9415 15.1534C22.2756 15.359 22.459 15.7582 22.4016 16.1611L21.9989 18.8508H20.7861L20.3991 16.2544H20.398ZM22.0743 20.1501C22.0743 20.3381 22.0031 20.5184 21.8766 20.6513C21.75 20.7842 21.5783 20.8589 21.3993 20.8589C21.2202 20.8589 21.0486 20.7842 20.922 20.6513C20.7954 20.5184 20.7243 20.3381 20.7243 20.1501C20.7243 19.9622 20.7954 19.7819 20.922 19.649C21.0486 19.5161 21.2202 19.4414 21.3993 19.4414C21.5783 19.4414 21.75 19.5161 21.8766 19.649C22.0031 19.7819 22.0743 19.9622 22.0743 20.1501Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2646" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2646"/>
+</filter>
+<filter id="filter1_i_1302_2646" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2646"/>
+</filter>
+<filter id="filter2_i_1302_2646" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2646"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/感知事件_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/感知事件_active.svg
new file mode 100644
index 00000000..9f03ac09
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/感知事件_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2613)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2613)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2613)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M20.8568 18.2606C18.9313 18.2606 17.3697 19.8426 17.3697 21.794C17.3697 23.7462 18.9321 25.3283 20.8568 25.3283C22.7815 25.3283 24.3438 23.7462 24.3438 21.794C24.3438 19.8426 22.7815 18.2606 20.8568 18.2606ZM15.548 16.2377C12.8397 19.386 12.8445 24.1125 15.548 27.2867L16.6247 26.1959C14.5161 23.6339 14.5161 19.8804 16.6333 17.3403L15.5488 16.2377H15.548ZM14.1451 14.8144L13.0936 13.7495C9.0509 17.9698 9.04382 25.5656 13.0677 29.7977L14.1444 28.7069C10.6699 24.7459 10.6659 18.751 14.1444 14.8144H14.1451ZM26.1774 16.2369L25.0928 17.3356C27.21 19.8804 27.214 23.6291 25.1038 26.1928L26.1805 27.2836C28.8809 24.1125 28.8809 19.3852 26.1774 16.2377V16.2369ZM28.6357 13.7503L27.5834 14.8152C31.0594 18.7487 31.0555 24.7467 27.5834 28.71L28.6577 29.8024C32.6847 25.5664 32.6737 17.9706 28.6357 13.7503Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2613" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2613"/>
+</filter>
+<filter id="filter1_i_1302_2613" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2613"/>
+</filter>
+<filter id="filter2_i_1302_2613" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2613"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/感知事件_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/感知事件_fault.svg
new file mode 100644
index 00000000..d7f329ae
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/感知事件_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2612)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2612)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2612)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M20.8568 18.2606C18.9313 18.2606 17.3697 19.8426 17.3697 21.794C17.3697 23.7462 18.9321 25.3283 20.8568 25.3283C22.7815 25.3283 24.3438 23.7462 24.3438 21.794C24.3438 19.8426 22.7815 18.2606 20.8568 18.2606ZM15.548 16.2377C12.8397 19.386 12.8445 24.1125 15.548 27.2867L16.6247 26.1959C14.5161 23.6339 14.5161 19.8804 16.6333 17.3403L15.5488 16.2377H15.548ZM14.1451 14.8144L13.0936 13.7495C9.0509 17.9698 9.04382 25.5656 13.0677 29.7977L14.1444 28.7069C10.6699 24.7459 10.6659 18.751 14.1444 14.8144H14.1451ZM26.1774 16.2369L25.0928 17.3356C27.21 19.8804 27.214 23.6291 25.1038 26.1928L26.1805 27.2836C28.8809 24.1125 28.8809 19.3852 26.1774 16.2377V16.2369ZM28.6357 13.7503L27.5834 14.8152C31.0594 18.7487 31.0555 24.7467 27.5834 28.71L28.6577 29.8024C32.6847 25.5664 32.6737 17.9706 28.6357 13.7503Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2612" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2612"/>
+</filter>
+<filter id="filter1_i_1302_2612" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2612"/>
+</filter>
+<filter id="filter2_i_1302_2612" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2612"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/施工建设_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/施工建设_active.svg
new file mode 100644
index 00000000..859a9776
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/施工建设_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2599)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2599)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2599)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M19.7544 27.4893C19.4248 27.4913 19.1076 27.3678 18.8723 27.1457C18.637 26.9236 18.5027 26.6209 18.4987 26.3038V24.8491C18.5027 24.532 18.637 24.2293 18.8723 24.0071C19.1076 23.785 19.4248 23.6615 19.7544 23.6636H22.7323C23.4237 23.6636 23.9892 24.1975 23.9892 24.8491V26.3038C23.9852 26.6211 23.8507 26.9239 23.6152 27.1461C23.3796 27.3683 23.0622 27.4916 22.7323 27.4893H19.7544ZM10.667 29V27.9065H13.7206V18.1533H12.4322V16.5125H15.2865C16.3125 16.0493 22.4012 13.0222 26.4424 11L27.2574 12.4502L25.6623 13.2476V18.4248H26.4878C27.1104 18.4248 27.62 18.9059 27.62 19.4936V20.8036C27.6163 21.0895 27.4951 21.3623 27.283 21.5626C27.0709 21.7629 26.785 21.8743 26.4878 21.8725H23.6779C23.3805 21.8746 23.0943 21.7633 22.8819 21.563C22.6695 21.3627 22.5483 21.0897 22.5446 20.8036V19.4936C22.5446 18.9059 23.0541 18.4248 23.6779 18.4248H24.5034V13.8275C15.8648 18.1388 15.7249 18.1533 15.4649 18.1533H15.4602V27.9065H31.667V29H10.667ZM29.2616 27.4893H26.2849C25.9551 27.4916 25.6376 27.3683 25.4021 27.1461C25.1665 26.9239 25.032 26.6211 25.028 26.3038V24.8491C25.028 24.1975 25.5935 23.6636 26.2849 23.6636H29.2616C29.953 23.6636 30.5185 24.1975 30.5185 24.8491V26.3038C30.5145 26.6211 30.38 26.9239 30.1445 27.1461C29.9089 27.3683 29.5915 27.4916 29.2616 27.4893Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2599" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2599"/>
+</filter>
+<filter id="filter1_i_1302_2599" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2599"/>
+</filter>
+<filter id="filter2_i_1302_2599" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2599"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/施工建设_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/施工建设_fault.svg
new file mode 100644
index 00000000..7ed43797
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/施工建设_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2598)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2598)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2598)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M19.7544 27.4893C19.4248 27.4913 19.1076 27.3678 18.8723 27.1457C18.637 26.9236 18.5027 26.6209 18.4987 26.3038V24.8491C18.5027 24.532 18.637 24.2293 18.8723 24.0071C19.1076 23.785 19.4248 23.6615 19.7544 23.6636H22.7323C23.4237 23.6636 23.9892 24.1975 23.9892 24.8491V26.3038C23.9852 26.6211 23.8507 26.9239 23.6152 27.1461C23.3796 27.3683 23.0622 27.4916 22.7323 27.4893H19.7544ZM10.667 29V27.9065H13.7206V18.1533H12.4322V16.5125H15.2865C16.3125 16.0493 22.4012 13.0222 26.4424 11L27.2574 12.4502L25.6623 13.2476V18.4248H26.4878C27.1104 18.4248 27.62 18.9059 27.62 19.4936V20.8036C27.6163 21.0895 27.4951 21.3623 27.283 21.5626C27.0709 21.7629 26.785 21.8743 26.4878 21.8725H23.6779C23.3805 21.8746 23.0943 21.7633 22.8819 21.563C22.6695 21.3627 22.5483 21.0897 22.5446 20.8036V19.4936C22.5446 18.9059 23.0541 18.4248 23.6779 18.4248H24.5034V13.8275C15.8648 18.1388 15.7249 18.1533 15.4649 18.1533H15.4602V27.9065H31.667V29H10.667ZM29.2616 27.4893H26.2849C25.9551 27.4916 25.6376 27.3683 25.4021 27.1461C25.1665 26.9239 25.032 26.6211 25.028 26.3038V24.8491C25.028 24.1975 25.5935 23.6636 26.2849 23.6636H29.2616C29.953 23.6636 30.5185 24.1975 30.5185 24.8491V26.3038C30.5145 26.6211 30.38 26.9239 30.1445 27.1461C29.9089 27.3683 29.5915 27.4916 29.2616 27.4893Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2598" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2598"/>
+</filter>
+<filter id="filter1_i_1302_2598" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2598"/>
+</filter>
+<filter id="filter2_i_1302_2598" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2598"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/服务区异常_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/服务区异常_active.svg
new file mode 100644
index 00000000..f2889fa2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/服务区异常_active.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2649)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2649)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2649)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M26.7878 20.3262C27.0055 19.9876 27.1687 19.7166 27.3863 19.378C27.6584 18.9039 28.0392 18.633 28.4745 18.5652C28.6922 18.4975 28.9642 18.4298 29.1274 18.2266C29.2362 18.1589 29.2907 18.0234 29.3451 17.888C29.3995 17.7525 29.4539 17.5493 29.5627 17.4139C29.8347 16.8043 30.1068 16.1947 30.3788 15.6529C30.4332 15.5852 30.3788 15.4497 30.3244 15.382C30.27 15.3142 30.2156 15.382 30.1612 15.4497L30.1068 15.5174C29.7803 15.9915 29.3995 16.5334 29.073 17.0075C29.0186 17.0752 28.9642 17.1429 28.8554 17.0752C28.7466 17.0752 28.7466 17.0075 28.801 16.872C28.8554 16.8043 28.8554 16.7366 28.9098 16.6688C29.2362 16.1947 29.5627 15.7206 29.8892 15.3142C29.9436 15.2465 29.9436 15.1788 29.8892 15.0433C29.8347 14.9756 29.7803 14.9756 29.7259 15.0433C29.6171 15.1788 29.5627 15.3142 29.4539 15.4497C29.1818 15.8561 28.9098 16.1947 28.6922 16.6011C28.6377 16.6688 28.4745 16.7366 28.4201 16.6688C28.3657 16.5334 28.4201 16.5334 28.4745 16.3979C28.4745 16.3979 28.4745 16.3302 28.5289 16.3302C28.801 15.9238 29.1274 15.5174 29.3995 15.0433C29.4539 14.9756 29.5083 14.9079 29.5627 14.7724C29.5627 14.7047 29.5083 14.7047 29.5083 14.637C29.4539 14.5692 29.3995 14.5692 29.3451 14.637C29.0186 15.1111 28.6922 15.5852 28.4201 16.127C28.2025 16.4656 28.0937 16.5334 27.9848 16.4656C27.876 16.4656 27.876 16.3979 27.9304 16.2625C27.9848 16.1947 28.0393 16.127 28.0393 16.0593L29.0186 14.8401C29.1274 14.7047 29.1274 14.7047 29.0186 14.5692C29.0186 14.5692 29.0186 14.5015 28.9642 14.5015C28.9098 14.366 28.8554 14.366 28.7466 14.5015C28.7466 14.5692 28.7466 14.637 28.6922 14.637C28.0937 15.2465 27.4952 15.7884 26.8967 16.3979C26.8423 16.3979 26.8423 16.4656 26.8423 16.5334C26.8423 16.9397 26.7878 17.2784 26.7878 17.6848C26.7878 17.9557 26.7334 18.1589 26.6246 18.2943C26.407 18.5652 26.2438 18.9039 26.0261 19.2425C26.2438 19.6489 26.5158 19.9876 26.7878 20.3262C26.7878 20.3939 26.7878 20.3939 26.7878 20.3262ZM27.8745 23.0999C25.3173 19.2393 24.5556 18.4975 21.9984 14.5692C21.944 14.5692 21.944 14.5015 21.8895 14.5015H21.6734C21.5102 14.5015 21.4014 14.637 21.4014 14.8401V16.3979C21.4014 16.4656 21.4014 16.5334 21.4558 16.6011C22.1631 17.617 22.8704 18.7007 23.5777 19.7166C23.7409 19.9876 23.9586 20.2585 24.1218 20.5294C24.2306 20.4617 24.285 20.3939 24.3939 20.3939C24.5027 20.3262 24.6115 20.3262 24.7203 20.3262C24.8835 20.3262 24.9379 20.3939 24.9924 20.5294C24.9924 20.5971 25.0468 20.5971 25.0468 20.6648C26.3526 22.8322 25.8085 21.813 27.1143 23.9804C27.2231 24.1836 27.3863 24.319 27.5496 24.3868C27.8216 24.5222 27.7293 24.2031 28.0014 23.9999C28.1646 23.6613 28.0922 23.3708 27.8745 23.0999Z" fill="#FFDB82"/>
+<path d="M25.1836 21.5499C25.0598 21.3437 24.9361 21.2062 24.7505 20.9999L24.6886 21.0687C23.3894 22.8562 22.0901 24.7124 20.7909 26.4999C20.729 26.5687 20.729 26.6374 20.6671 26.7062V26.9124C20.7909 27.3937 21.1002 27.5312 21.4714 27.5999H21.7189C21.9045 27.5999 22.0282 27.4624 22.0901 27.2562C22.5851 26.4999 23.1419 25.7437 23.6368 24.9874C24.2555 24.0937 24.8742 23.1312 25.5548 22.2374C25.6166 22.1687 25.6166 22.0999 25.5548 22.0312C25.4929 21.8937 25.3692 21.7562 25.1836 21.5499ZM18.6873 15.2937C18.0068 14.6749 17.0787 14.3999 15.2845 14.3999H11.2012V14.9499C12.3767 14.9499 12.5004 15.0874 12.5004 16.3249V25.6749C12.5004 26.9812 12.3767 27.0499 11.2012 27.0499V27.5999H15.3464V27.0499C13.9234 27.0499 13.8615 26.9124 13.8615 25.6749V21.6874H15.1608C16.8312 21.6874 19.801 21.4812 19.801 17.9749C19.7391 16.8062 19.3679 15.9124 18.6873 15.2937ZM15.1608 20.9999H13.8615V16.1874C13.8615 15.2937 13.9234 15.0874 14.2328 15.0874H15.0989C16.2744 15.0874 17.0787 15.2937 17.5737 15.7749C18.0686 16.2562 18.3161 17.0124 18.3161 17.9062C18.378 20.5187 16.7694 20.9999 15.1608 20.9999Z" fill="#FFDB82"/>
+<path d="M28.5829 22.5817C28.6797 22.4089 28.9618 22.4089 29.0586 22.5817L31.7863 27.4451C31.8097 27.4868 31.8217 27.5337 31.8213 27.5812C31.8208 27.6288 31.8079 27.6754 31.7837 27.7167C31.7605 27.7575 31.7265 27.7915 31.6852 27.8153C31.6439 27.839 31.5969 27.8518 31.5488 27.8521H26.0935C26.0455 27.8518 25.9984 27.839 25.9571 27.8153C25.9159 27.7915 25.8819 27.7575 25.8586 27.7167C25.8346 27.6753 25.8218 27.6287 25.8213 27.5812C25.8209 27.5337 25.8328 27.4869 25.856 27.4451L28.5829 22.5817ZM28.8212 26.1906C28.7075 26.1906 28.5985 26.2344 28.5181 26.3123C28.4377 26.3902 28.3926 26.4958 28.3926 26.606C28.3926 26.7162 28.4377 26.8218 28.5181 26.8997C28.5985 26.9776 28.7075 27.0214 28.8212 27.0214C28.9348 27.0214 29.0439 26.9776 29.1242 26.8997C29.2046 26.8218 29.2498 26.7162 29.2498 26.606C29.2498 26.4958 29.2046 26.3902 29.1242 26.3123C29.0439 26.2344 28.9348 26.1906 28.8212 26.1906ZM28.8212 24.1137C28.7649 24.1137 28.7091 24.1244 28.6571 24.1453C28.6051 24.1662 28.5579 24.1968 28.5181 24.2354C28.4783 24.2739 28.4467 24.3197 28.4252 24.3701C28.4036 24.4205 28.3926 24.4745 28.3926 24.5291V25.3598C28.3926 25.47 28.4377 25.5757 28.5181 25.6536C28.5985 25.7315 28.7075 25.7752 28.8212 25.7752C28.9348 25.7752 29.0439 25.7315 29.1242 25.6536C29.2046 25.5757 29.2498 25.47 29.2498 25.3598V24.5291C29.2498 24.4745 29.2387 24.4205 29.2172 24.3701C29.1956 24.3197 29.164 24.2739 29.1242 24.2354C29.0844 24.1968 29.0372 24.1662 28.9852 24.1453C28.9332 24.1244 28.8775 24.1137 28.8212 24.1137Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2649" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2649"/>
+</filter>
+<filter id="filter1_i_1302_2649" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2649"/>
+</filter>
+<filter id="filter2_i_1302_2649" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2649"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/服务区异常_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/服务区异常_fault.svg
new file mode 100644
index 00000000..b4c8f858
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/服务区异常_fault.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2650)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2650)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2650)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M26.7888 20.3262C27.0065 19.9876 27.1697 19.7166 27.3873 19.378C27.6594 18.9039 28.0402 18.633 28.4755 18.5652C28.6931 18.4975 28.9652 18.4298 29.1284 18.2266C29.2372 18.1589 29.2916 18.0234 29.346 17.888C29.4004 17.7525 29.4549 17.5493 29.5637 17.4139C29.8357 16.8043 30.1078 16.1947 30.3798 15.6529C30.4342 15.5852 30.3798 15.4497 30.3254 15.382C30.271 15.3142 30.2166 15.382 30.1622 15.4497L30.1078 15.5174C29.7813 15.9915 29.4004 16.5334 29.074 17.0075C29.0196 17.0752 28.9652 17.1429 28.8564 17.0752C28.7475 17.0752 28.7475 17.0075 28.802 16.872C28.8564 16.8043 28.8564 16.7366 28.9108 16.6688C29.2372 16.1947 29.5637 15.7206 29.8901 15.3142C29.9445 15.2465 29.9445 15.1788 29.8901 15.0433C29.8357 14.9756 29.7813 14.9756 29.7269 15.0433C29.6181 15.1788 29.5637 15.3142 29.4549 15.4497C29.1828 15.8561 28.9108 16.1947 28.6931 16.6011C28.6387 16.6688 28.4755 16.7366 28.4211 16.6688C28.3667 16.5334 28.4211 16.5334 28.4755 16.3979C28.4755 16.3979 28.4755 16.3302 28.5299 16.3302C28.802 15.9238 29.1284 15.5174 29.4004 15.0433C29.4549 14.9756 29.5093 14.9079 29.5637 14.7724C29.5637 14.7047 29.5093 14.7047 29.5093 14.637C29.4549 14.5692 29.4004 14.5692 29.346 14.637C29.0196 15.1111 28.6931 15.5852 28.4211 16.127C28.2035 16.4656 28.0946 16.5334 27.9858 16.4656C27.877 16.4656 27.877 16.3979 27.9314 16.2625C27.9858 16.1947 28.0402 16.127 28.0402 16.0593L29.0196 14.8401C29.1284 14.7047 29.1284 14.7047 29.0196 14.5692C29.0196 14.5692 29.0196 14.5015 28.9652 14.5015C28.9108 14.366 28.8564 14.366 28.7475 14.5015C28.7475 14.5692 28.7475 14.637 28.6931 14.637C28.0946 15.2465 27.4961 15.7884 26.8976 16.3979C26.8432 16.3979 26.8432 16.4656 26.8432 16.5334C26.8432 16.9397 26.7888 17.2784 26.7888 17.6848C26.7888 17.9557 26.7344 18.1589 26.6256 18.2943C26.408 18.5652 26.2447 18.9039 26.0271 19.2425C26.2447 19.6489 26.5168 19.9876 26.7888 20.3262C26.7888 20.3939 26.7888 20.3939 26.7888 20.3262ZM27.8755 23.0999C25.3183 19.2393 24.5566 18.4975 21.9993 14.5692C21.9449 14.5692 21.9449 14.5015 21.8905 14.5015H21.6744C21.5112 14.5015 21.4023 14.637 21.4023 14.8401V16.3979C21.4023 16.4656 21.4023 16.5334 21.4568 16.6011C22.1641 17.617 22.8714 18.7007 23.5787 19.7166C23.7419 19.9876 23.9596 20.2585 24.1228 20.5294C24.2316 20.4617 24.286 20.3939 24.3948 20.3939C24.5036 20.3262 24.6125 20.3262 24.7213 20.3262C24.8845 20.3262 24.9389 20.3939 24.9933 20.5294C24.9933 20.5971 25.0477 20.5971 25.0477 20.6648C26.3536 22.8322 25.8095 21.813 27.1153 23.9804C27.2241 24.1836 27.3873 24.319 27.5505 24.3868C27.8226 24.5222 27.7303 24.2031 28.0023 23.9999C28.1656 23.6613 28.0931 23.3708 27.8755 23.0999Z" fill="#FF5F5F"/>
+<path d="M25.1845 21.5499C25.0608 21.3437 24.9371 21.2062 24.7515 20.9999L24.6896 21.0687C23.3903 22.8562 22.0911 24.7124 20.7918 26.4999C20.73 26.5687 20.73 26.6374 20.6681 26.7062V26.9124C20.7918 27.3937 21.1012 27.5312 21.4724 27.5999H21.7199C21.9055 27.5999 22.0292 27.4624 22.0911 27.2562C22.586 26.4999 23.1429 25.7437 23.6378 24.9874C24.2565 24.0937 24.8752 23.1312 25.5557 22.2374C25.6176 22.1687 25.6176 22.0999 25.5557 22.0312C25.4939 21.8937 25.3701 21.7562 25.1845 21.5499ZM18.6883 15.2937C18.0077 14.6749 17.0797 14.3999 15.2855 14.3999H11.2021V14.9499C12.3777 14.9499 12.5014 15.0874 12.5014 16.3249V25.6749C12.5014 26.9812 12.3777 27.0499 11.2021 27.0499V27.5999H15.3474V27.0499C13.9244 27.0499 13.8625 26.9124 13.8625 25.6749V21.6874H15.1618C16.8322 21.6874 19.8019 21.4812 19.8019 17.9749C19.7401 16.8062 19.3689 15.9124 18.6883 15.2937ZM15.1618 20.9999H13.8625V16.1874C13.8625 15.2937 13.9244 15.0874 14.2337 15.0874H15.0999C16.2754 15.0874 17.0797 15.2937 17.5747 15.7749C18.0696 16.2562 18.3171 17.0124 18.3171 17.9062C18.3789 20.5187 16.7704 20.9999 15.1618 20.9999Z" fill="#FF5F5F"/>
+<path d="M28.5838 22.5817C28.6807 22.4089 28.9627 22.4089 29.0596 22.5817L31.7873 27.4451C31.8107 27.4868 31.8227 27.5337 31.8223 27.5812C31.8218 27.6288 31.8089 27.6754 31.7847 27.7167C31.7614 27.7575 31.7274 27.7915 31.6862 27.8153C31.6449 27.839 31.5978 27.8518 31.5498 27.8521H26.0945C26.0465 27.8518 25.9994 27.839 25.9581 27.8153C25.9169 27.7915 25.8828 27.7575 25.8596 27.7167C25.8356 27.6753 25.8227 27.6287 25.8223 27.5812C25.8218 27.5337 25.8338 27.4869 25.857 27.4451L28.5838 22.5817ZM28.8221 26.1906C28.7085 26.1906 28.5995 26.2344 28.5191 26.3123C28.4387 26.3902 28.3935 26.4958 28.3935 26.606C28.3935 26.7162 28.4387 26.8218 28.5191 26.8997C28.5995 26.9776 28.7085 27.0214 28.8221 27.0214C28.9358 27.0214 29.0448 26.9776 29.1252 26.8997C29.2056 26.8218 29.2508 26.7162 29.2508 26.606C29.2508 26.4958 29.2056 26.3902 29.1252 26.3123C29.0448 26.2344 28.9358 26.1906 28.8221 26.1906ZM28.8221 24.1137C28.7659 24.1137 28.7101 24.1244 28.6581 24.1453C28.6061 24.1662 28.5589 24.1968 28.5191 24.2354C28.4793 24.2739 28.4477 24.3197 28.4262 24.3701C28.4046 24.4205 28.3935 24.4745 28.3935 24.5291V25.3598C28.3935 25.47 28.4387 25.5757 28.5191 25.6536C28.5995 25.7315 28.7085 25.7752 28.8221 25.7752C28.9358 25.7752 29.0448 25.7315 29.1252 25.6536C29.2056 25.5757 29.2508 25.47 29.2508 25.3598V24.5291C29.2508 24.4745 29.2397 24.4205 29.2181 24.3701C29.1966 24.3197 29.165 24.2739 29.1252 24.2354C29.0854 24.1968 29.0382 24.1662 28.9862 24.1453C28.9342 24.1244 28.8784 24.1137 28.8221 24.1137Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2650" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2650"/>
+</filter>
+<filter id="filter1_i_1302_2650" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2650"/>
+</filter>
+<filter id="filter2_i_1302_2650" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2650"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/设施设备隐患_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/设施设备隐患_active.svg
new file mode 100644
index 00000000..1a06e433
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/设施设备隐患_active.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2600)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2600)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2600)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2600)">
+<path d="M26.1736 22.4252C26.3458 22.4232 26.5097 22.4932 26.6259 22.6167L26.6612 22.6538L26.7068 22.697L26.7628 22.7464L26.8251 22.7979C27.0118 22.9482 27.2816 23.1191 27.5057 23.1191C27.7298 23.1191 27.9974 22.9503 28.1842 22.802L28.2464 22.7506L28.3253 22.6826L28.3668 22.6414L28.3813 22.627C28.4652 22.5425 28.5713 22.483 28.6876 22.4553C28.8039 22.4277 28.9256 22.4329 29.0391 22.4705L29.0785 22.4849L29.0951 22.4932L30.2155 23.115L30.228 23.1232C30.3316 23.1969 30.4082 23.3021 30.446 23.4229C30.4838 23.5437 30.4809 23.6735 30.4376 23.7924L30.4251 23.8274C30.3664 23.9617 30.3326 24.1054 30.3255 24.2516C30.3255 24.8508 30.7986 25.3388 31.3879 25.3635H31.4792C31.6929 25.3635 31.8631 25.5488 31.9149 25.8268C31.9689 26.1191 31.9979 26.4156 32 26.7121C31.9917 27.0128 31.9585 27.3093 31.9066 27.6016C31.8527 27.8714 31.695 28.0484 31.4999 28.0649H31.4232C31.128 28.0671 30.8458 28.1854 30.6384 28.3939C30.4311 28.6023 30.3156 28.8839 30.3172 29.1768C30.3255 29.3003 30.3504 29.4239 30.3919 29.5433L30.4147 29.601C30.4639 29.717 30.4742 29.8455 30.4444 29.9678C30.4145 30.0901 30.3459 30.1996 30.2487 30.2804L30.2176 30.3051L30.2052 30.3134L29.064 30.9496L29.0515 30.9537C28.9343 31.0014 28.8052 31.0126 28.6814 30.9857C28.5576 30.9589 28.445 30.8953 28.3585 30.8034L28.3439 30.787L28.2817 30.7252L28.2298 30.6758C28.041 30.5049 27.7235 30.2722 27.4621 30.2722C27.2048 30.2722 26.8666 30.5172 26.6695 30.6964L26.6155 30.7499C26.5332 30.8517 26.4215 30.9259 26.2954 30.9628C26.1692 30.9996 26.0347 30.9971 25.91 30.9558L25.8748 30.9414L25.8623 30.9373L24.7626 30.3196L24.7501 30.3113C24.6469 30.2374 24.5708 30.132 24.5333 30.0113C24.4959 29.8905 24.4992 29.7609 24.5426 29.6421L24.5551 29.6071C24.6134 29.4721 24.6464 29.3277 24.6526 29.1809C24.654 28.8957 24.5442 28.6209 24.3463 28.4141C24.1483 28.2073 23.8774 28.0844 23.5902 28.0711H23.499C23.2852 28.0711 23.1151 27.8858 23.0632 27.6078C23.009 27.3142 22.9778 27.0168 22.9698 26.7183C22.9781 26.4218 23.0093 26.1253 23.0632 25.8329C23.1172 25.5611 23.2749 25.3861 23.4699 25.3696H23.5467C23.8418 25.3675 24.1241 25.2492 24.3314 25.0407C24.5388 24.8322 24.6543 24.5507 24.6526 24.2578C24.646 24.1319 24.6209 24.0078 24.5779 23.8892L24.5551 23.8315C24.505 23.7157 24.4941 23.5869 24.524 23.4644C24.5539 23.3418 24.6231 23.2323 24.7211 23.1521L24.7522 23.1274L24.7647 23.1191L25.9266 22.4767L25.9391 22.4726C26.0134 22.4419 26.093 22.4258 26.1736 22.4252ZM21.4178 10.2152C21.673 10.3634 21.8846 10.5734 22.0299 10.8288L28.0286 21.3957C27.8358 21.4876 27.6604 21.6116 27.5098 21.7622L27.5306 21.7849C27.3635 21.6063 27.1621 21.4626 26.9384 21.3622C26.7147 21.2618 26.473 21.2067 26.2275 21.2001H26.0864L26.0325 21.2042L20.5961 11.6338L11.6489 27.1219H21.7601C21.7809 27.3587 21.812 27.5955 21.8556 27.8302L21.866 27.8817C21.9311 28.2045 22.0791 28.5052 22.2955 28.7547H11.651C11.3617 28.756 11.0771 28.6816 10.8261 28.5388C10.5751 28.396 10.3665 28.19 10.2215 27.9416C10.0764 27.6932 10 27.4112 10 27.1241C9.99998 26.837 10.0763 26.5549 10.2214 26.3065L19.1768 10.8185C19.284 10.6327 19.427 10.4698 19.5977 10.3391C19.7684 10.2083 19.9634 10.1122 20.1716 10.0564C20.3798 10.0005 20.597 9.98599 20.8108 10.0136C21.0247 10.0412 21.2309 10.1104 21.4178 10.2172V10.2152ZM26.3354 25.5735C26.1112 25.8003 25.9591 26.0875 25.8978 26.3993C25.8366 26.7112 25.869 27.034 25.991 27.3278C26.24 27.929 26.823 28.3202 27.4704 28.3202C28.3543 28.3202 29.0723 27.5996 29.0723 26.7101C29.073 26.3931 28.9795 26.083 28.8035 25.8185C28.6274 25.5541 28.3766 25.3471 28.0825 25.2235C27.7897 25.102 27.4669 25.0705 27.1559 25.1329C26.8448 25.1952 26.5598 25.3487 26.3375 25.5735H26.3354ZM20.7123 23.0368C20.8743 23.0369 21.0347 23.0687 21.1843 23.1303C21.3339 23.192 21.4698 23.2823 21.5843 23.396C21.6987 23.5098 21.7894 23.6448 21.8513 23.7934C21.9132 23.9419 21.945 24.1011 21.9448 24.2619C21.9447 24.4226 21.9126 24.5818 21.8505 24.7302C21.7884 24.8787 21.6974 25.0136 21.5828 25.1272C21.4681 25.2407 21.3321 25.3308 21.1824 25.3922C21.0327 25.4536 20.8722 25.4851 20.7102 25.485C20.3831 25.4847 20.0694 25.3555 19.8383 25.1257C19.6071 24.8959 19.4774 24.5845 19.4777 24.2598C19.478 23.9352 19.6082 23.6239 19.8397 23.3946C20.0713 23.1652 20.3851 23.0365 20.7123 23.0368ZM20.6086 15.4801C20.825 15.4803 21.0389 15.5269 21.2355 15.6167C21.4322 15.7066 21.6069 15.8375 21.7478 16.0006C21.8887 16.1637 21.9924 16.355 22.0519 16.5616C22.1113 16.7682 22.125 16.985 22.0921 17.1973L21.3804 21.8713C21.3665 21.9681 21.318 22.0568 21.2437 22.121C21.1694 22.1853 21.0744 22.2209 20.9758 22.2214H20.2454C20.1465 22.2214 20.051 22.186 19.9763 22.1217C19.9016 22.0574 19.8527 21.9685 19.8387 21.8713L19.127 17.1973C19.0948 16.9852 19.1091 16.7687 19.1688 16.5626C19.2285 16.3564 19.3323 16.1654 19.4731 16.0027C19.6139 15.8399 19.7884 15.7092 19.9847 15.6193C20.181 15.5295 20.3945 15.4827 20.6106 15.4822L20.6086 15.4801Z" fill="#FFDB82"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2600" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2600"/>
+</filter>
+<filter id="filter1_i_1302_2600" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2600"/>
+</filter>
+<filter id="filter2_i_1302_2600" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2600"/>
+</filter>
+<clipPath id="clip0_1302_2600">
+<rect width="25.8246" height="25.8246" fill="white" transform="translate(8.08789 9.05273)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/设施设备隐患_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/设施设备隐患_fault.svg
new file mode 100644
index 00000000..a3c4a334
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/设施设备隐患_fault.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2601)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2601)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2601)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2601)">
+<path d="M26.1736 22.4252C26.3458 22.4232 26.5097 22.4932 26.6259 22.6167L26.6612 22.6538L26.7068 22.697L26.7628 22.7464L26.8251 22.7979C27.0118 22.9482 27.2816 23.1191 27.5057 23.1191C27.7298 23.1191 27.9974 22.9503 28.1842 22.802L28.2464 22.7506L28.3253 22.6826L28.3668 22.6414L28.3813 22.627C28.4652 22.5425 28.5713 22.483 28.6876 22.4553C28.8039 22.4277 28.9256 22.4329 29.0391 22.4705L29.0785 22.4849L29.0951 22.4932L30.2155 23.115L30.228 23.1232C30.3316 23.1969 30.4082 23.3021 30.446 23.4229C30.4838 23.5437 30.4809 23.6735 30.4376 23.7924L30.4251 23.8274C30.3664 23.9617 30.3326 24.1054 30.3255 24.2516C30.3255 24.8508 30.7986 25.3388 31.3879 25.3635H31.4792C31.6929 25.3635 31.8631 25.5488 31.9149 25.8268C31.9689 26.1191 31.9979 26.4156 32 26.7121C31.9917 27.0128 31.9585 27.3093 31.9066 27.6016C31.8527 27.8714 31.695 28.0484 31.4999 28.0649H31.4232C31.128 28.0671 30.8458 28.1854 30.6384 28.3939C30.4311 28.6023 30.3156 28.8839 30.3172 29.1768C30.3255 29.3003 30.3504 29.4239 30.3919 29.5433L30.4147 29.601C30.4639 29.717 30.4742 29.8455 30.4444 29.9678C30.4145 30.0901 30.3459 30.1996 30.2487 30.2804L30.2176 30.3051L30.2052 30.3134L29.064 30.9496L29.0515 30.9537C28.9343 31.0014 28.8052 31.0126 28.6814 30.9857C28.5576 30.9589 28.445 30.8953 28.3585 30.8034L28.3439 30.787L28.2817 30.7252L28.2298 30.6758C28.041 30.5049 27.7235 30.2722 27.4621 30.2722C27.2048 30.2722 26.8666 30.5172 26.6695 30.6964L26.6155 30.7499C26.5332 30.8517 26.4215 30.9259 26.2954 30.9628C26.1692 30.9996 26.0347 30.9971 25.91 30.9558L25.8748 30.9414L25.8623 30.9373L24.7626 30.3196L24.7501 30.3113C24.6469 30.2374 24.5708 30.132 24.5333 30.0113C24.4959 29.8905 24.4992 29.7609 24.5426 29.6421L24.5551 29.6071C24.6134 29.4721 24.6464 29.3277 24.6526 29.1809C24.654 28.8957 24.5442 28.6209 24.3463 28.4141C24.1483 28.2073 23.8774 28.0844 23.5902 28.0711H23.499C23.2852 28.0711 23.1151 27.8858 23.0632 27.6078C23.009 27.3142 22.9778 27.0168 22.9698 26.7183C22.9781 26.4218 23.0093 26.1253 23.0632 25.8329C23.1172 25.5611 23.2749 25.3861 23.4699 25.3696H23.5467C23.8418 25.3675 24.1241 25.2492 24.3314 25.0407C24.5388 24.8322 24.6543 24.5507 24.6526 24.2578C24.646 24.1319 24.6209 24.0078 24.5779 23.8892L24.5551 23.8315C24.505 23.7157 24.4941 23.5869 24.524 23.4644C24.5539 23.3418 24.6231 23.2323 24.7211 23.1521L24.7522 23.1274L24.7647 23.1191L25.9266 22.4767L25.9391 22.4726C26.0134 22.4419 26.093 22.4258 26.1736 22.4252ZM21.4178 10.2152C21.673 10.3634 21.8846 10.5734 22.0299 10.8288L28.0286 21.3957C27.8358 21.4876 27.6604 21.6116 27.5098 21.7622L27.5306 21.7849C27.3635 21.6063 27.1621 21.4626 26.9384 21.3622C26.7147 21.2618 26.473 21.2067 26.2275 21.2001H26.0864L26.0325 21.2042L20.5961 11.6338L11.6489 27.1219H21.7601C21.7809 27.3587 21.812 27.5955 21.8556 27.8302L21.866 27.8817C21.9311 28.2045 22.0791 28.5052 22.2955 28.7547H11.651C11.3617 28.756 11.0771 28.6816 10.8261 28.5388C10.5751 28.396 10.3665 28.19 10.2215 27.9416C10.0764 27.6932 10 27.4112 10 27.1241C9.99998 26.837 10.0763 26.5549 10.2214 26.3065L19.1768 10.8185C19.284 10.6327 19.427 10.4698 19.5977 10.3391C19.7684 10.2083 19.9634 10.1122 20.1716 10.0564C20.3798 10.0005 20.597 9.98599 20.8108 10.0136C21.0247 10.0412 21.2309 10.1104 21.4178 10.2172V10.2152ZM26.3354 25.5735C26.1112 25.8003 25.9591 26.0875 25.8978 26.3993C25.8366 26.7112 25.869 27.034 25.991 27.3278C26.24 27.929 26.823 28.3202 27.4704 28.3202C28.3543 28.3202 29.0723 27.5996 29.0723 26.7101C29.073 26.3931 28.9795 26.083 28.8035 25.8185C28.6274 25.5541 28.3766 25.3471 28.0825 25.2235C27.7897 25.102 27.4669 25.0705 27.1559 25.1329C26.8448 25.1952 26.5598 25.3487 26.3375 25.5735H26.3354ZM20.7123 23.0368C20.8743 23.0369 21.0347 23.0687 21.1843 23.1303C21.3339 23.192 21.4698 23.2823 21.5843 23.396C21.6987 23.5098 21.7894 23.6448 21.8513 23.7934C21.9132 23.9419 21.945 24.1011 21.9448 24.2619C21.9447 24.4226 21.9126 24.5818 21.8505 24.7302C21.7884 24.8787 21.6974 25.0136 21.5828 25.1272C21.4681 25.2407 21.3321 25.3308 21.1824 25.3922C21.0327 25.4536 20.8722 25.4851 20.7102 25.485C20.3831 25.4847 20.0694 25.3555 19.8383 25.1257C19.6071 24.8959 19.4774 24.5845 19.4777 24.2598C19.478 23.9352 19.6082 23.6239 19.8397 23.3946C20.0713 23.1652 20.3851 23.0365 20.7123 23.0368ZM20.6086 15.4801C20.825 15.4803 21.0389 15.5269 21.2355 15.6167C21.4322 15.7066 21.6069 15.8375 21.7478 16.0006C21.8887 16.1637 21.9924 16.355 22.0519 16.5616C22.1113 16.7682 22.125 16.985 22.0921 17.1973L21.3804 21.8713C21.3665 21.9681 21.318 22.0568 21.2437 22.121C21.1694 22.1853 21.0744 22.2209 20.9758 22.2214H20.2454C20.1465 22.2214 20.051 22.186 19.9763 22.1217C19.9016 22.0574 19.8527 21.9685 19.8387 21.8713L19.127 17.1973C19.0948 16.9852 19.1091 16.7687 19.1688 16.5626C19.2285 16.3564 19.3323 16.1654 19.4731 16.0027C19.6139 15.8399 19.7884 15.7092 19.9847 15.6193C20.181 15.5295 20.3945 15.4827 20.6106 15.4822L20.6086 15.4801Z" fill="#FF5F5F"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2601" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2601"/>
+</filter>
+<filter id="filter1_i_1302_2601" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2601"/>
+</filter>
+<filter id="filter2_i_1302_2601" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2601"/>
+</filter>
+<clipPath id="clip0_1302_2601">
+<rect width="25.8246" height="25.8246" fill="white" transform="translate(8.08789 9.05273)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/路障清除_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/路障清除_active.svg
new file mode 100644
index 00000000..fa72b653
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/路障清除_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2596)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2596)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2596)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M20.82 13.957C20.82 12.877 21.636 12 22.639 12C23.641 12 24.456 12.877 24.456 13.957C24.456 15.0371 23.641 15.9141 22.639 15.9141C22.4004 15.9152 22.164 15.8654 21.9433 15.7676C21.7226 15.6697 21.5219 15.5257 21.3529 15.3439C21.1839 15.162 21.0498 14.9459 20.9583 14.7079C20.8669 14.4699 20.8199 14.2147 20.82 13.957ZM16.634 16.3169L18.262 16.1744L18.296 16.6733L18.323 16.993C18.384 17.8312 19.053 18.4565 19.817 18.3895C20.1861 18.3539 20.527 18.1616 20.7651 17.8549C21.0032 17.5482 21.1189 17.152 21.087 16.7533L21.082 16.6993C21.0581 16.374 20.9743 16.0571 20.8353 15.7673C20.6964 15.4775 20.5052 15.2206 20.273 15.0118C20.0409 14.803 19.7723 14.6465 19.4833 14.5514C19.1943 14.4563 18.8905 14.4246 18.59 14.4582H18.502L16.369 14.6472C15.307 14.7401 15.429 16.4217 16.492 16.3299L16.632 16.3169H16.634ZM21.094 17.5341L21.274 21.1328C21.331 22.2993 22.867 22.2075 22.806 21.041L22.63 17.4413C22.573 16.2748 21.036 16.3677 21.094 17.5341ZM18.373 22.4797L21.132 19.1909L22.294 16.7662L20.299 15.0252L19.599 14.6353L17.708 16.7111L15.935 19.6391L18.373 22.4797ZM11 27.9879L12.395 29.649L16.445 25.5167C17.493 24.4551 16.064 22.8242 15.047 23.8556L11 27.9879ZM21.567 28.718L21.227 24.9756C21.093 23.4204 19.044 23.6796 19.178 25.1895L19.514 28.9318L21.567 28.718ZM27.183 23.0694C26.977 23.2162 26.195 24.0738 26.057 24.1116C25.923 24.1494 25.071 23.9604 24.796 24.4853C24.788 24.4972 24.784 24.5145 24.773 24.535L23.938 24.0565L23.611 23.1007L22.755 20.811C22.305 19.7525 20.909 20.4654 21.365 21.5271L21.735 22.5175L19.545 21.0616L19.14 20.1684C18.834 19.4966 18.253 19.3875 17.802 19.61C17.711 18.9134 17.057 18.5731 16.507 18.7297L17.122 15.6959C17.352 14.5554 15.853 14.186 15.62 15.3265L15.062 18.0828L14.99 18.0374L14.68 17.8322L14.374 18.5407L14.902 18.8928C14.872 19.07 14.822 19.327 14.75 19.6618L15.745 19.839L14.81 24.2995C14.508 25.7814 16.507 26.3225 16.82 24.7964L17.481 21.5778L19.258 25.4919C19.878 26.8506 21.738 25.8818 21.1 24.481L20.176 22.4408L22.232 23.8254L22.972 24.3244L24.513 25.3645C24.073 26.9586 23.323 30 23.323 30H31L27.183 23.0683V23.0694Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2596" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2596"/>
+</filter>
+<filter id="filter1_i_1302_2596" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2596"/>
+</filter>
+<filter id="filter2_i_1302_2596" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2596"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/路障清除_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/路障清除_fault.svg
new file mode 100644
index 00000000..949aa36e
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/路障清除_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2597)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2597)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2597)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M20.82 13.957C20.82 12.877 21.636 12 22.639 12C23.641 12 24.456 12.877 24.456 13.957C24.456 15.0371 23.641 15.9141 22.639 15.9141C22.4004 15.9152 22.164 15.8654 21.9433 15.7676C21.7226 15.6697 21.5219 15.5257 21.3529 15.3439C21.1839 15.162 21.0498 14.9459 20.9583 14.7079C20.8669 14.4699 20.8199 14.2147 20.82 13.957ZM16.634 16.3169L18.262 16.1744L18.296 16.6733L18.323 16.993C18.384 17.8312 19.053 18.4565 19.817 18.3895C20.1861 18.3539 20.527 18.1616 20.7651 17.8549C21.0032 17.5482 21.1189 17.152 21.087 16.7533L21.082 16.6993C21.0581 16.374 20.9743 16.0571 20.8353 15.7673C20.6964 15.4775 20.5052 15.2206 20.273 15.0118C20.0409 14.803 19.7723 14.6465 19.4833 14.5514C19.1943 14.4563 18.8905 14.4246 18.59 14.4582H18.502L16.369 14.6472C15.307 14.7401 15.429 16.4217 16.492 16.3299L16.632 16.3169H16.634ZM21.094 17.5341L21.274 21.1328C21.331 22.2993 22.867 22.2075 22.806 21.041L22.63 17.4413C22.573 16.2748 21.036 16.3677 21.094 17.5341ZM18.373 22.4797L21.132 19.1909L22.294 16.7662L20.299 15.0252L19.599 14.6353L17.708 16.7111L15.935 19.6391L18.373 22.4797ZM11 27.9879L12.395 29.649L16.445 25.5167C17.493 24.4551 16.064 22.8242 15.047 23.8556L11 27.9879ZM21.567 28.718L21.227 24.9756C21.093 23.4204 19.044 23.6796 19.178 25.1895L19.514 28.9318L21.567 28.718ZM27.183 23.0694C26.977 23.2162 26.195 24.0738 26.057 24.1116C25.923 24.1494 25.071 23.9604 24.796 24.4853C24.788 24.4972 24.784 24.5145 24.773 24.535L23.938 24.0565L23.611 23.1007L22.755 20.811C22.305 19.7525 20.909 20.4654 21.365 21.5271L21.735 22.5175L19.545 21.0616L19.14 20.1684C18.834 19.4966 18.253 19.3875 17.802 19.61C17.711 18.9134 17.057 18.5731 16.507 18.7297L17.122 15.6959C17.352 14.5554 15.853 14.186 15.62 15.3265L15.062 18.0828L14.99 18.0374L14.68 17.8322L14.374 18.5407L14.902 18.8928C14.872 19.07 14.822 19.327 14.75 19.6618L15.745 19.839L14.81 24.2995C14.508 25.7814 16.507 26.3225 16.82 24.7964L17.481 21.5778L19.258 25.4919C19.878 26.8506 21.738 25.8818 21.1 24.481L20.176 22.4408L22.232 23.8254L22.972 24.3244L24.513 25.3645C24.073 26.9586 23.323 30 23.323 30H31L27.183 23.0683V23.0694Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2597" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2597"/>
+</filter>
+<filter id="filter1_i_1302_2597" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2597"/>
+</filter>
+<filter id="filter2_i_1302_2597" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2597"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/车辆故障_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/车辆故障_active.svg
new file mode 100644
index 00000000..db5afece
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/车辆故障_active.svg
@@ -0,0 +1,51 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2639)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2639)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2639)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M10.9268 29.312H31.5789V30.9642H10.9268L10.9268 29.312Z" fill="#FFDB82"/>
+<path d="M27.7901 17.6796C27.7435 17.437 27.6031 17.2227 27.3994 17.0835C27.1958 16.9443 26.9454 16.8915 26.7031 16.9366L25.9393 17.0811C25.8047 16.9737 25.6614 16.8776 25.511 16.7939L23.1262 12.8728C22.6448 12.1351 21.5956 11.8988 21.1709 11.9793L13.3756 13.4553C12.9526 13.5353 12.06 14.1415 11.8804 15.0024L11.0871 19.5251C11.0871 19.5251 10.9193 19.724 10.7929 19.949L10.0291 20.0934C9.52755 20.1882 9.19616 20.6754 9.29185 21.1822C9.31408 21.3024 9.35974 21.417 9.42621 21.5195C9.49268 21.622 9.57867 21.7103 9.67924 21.7794C9.77982 21.8485 9.89301 21.8971 10.0123 21.9223C10.1317 21.9476 10.2548 21.949 10.3746 21.9264L10.6907 21.8666C10.7256 22.0958 10.7711 22.361 10.8295 22.6712C11.1733 24.4954 11.6654 25.075 12.1498 25.217L12.5356 25.3473L12.8551 27.0412C12.9591 27.5912 13.1216 27.7297 13.6479 27.6303L14.8282 27.4065C15.3545 27.307 15.4556 27.1182 15.3522 26.5681L15.0326 24.8742L23.7896 23.2159L23.7902 23.2183L26.5985 22.48C26.9979 22.1709 27.2448 21.4534 26.901 19.6269C26.8425 19.3167 26.7888 19.0526 26.7374 18.8264L27.0534 18.7667C27.173 18.7439 27.287 18.6976 27.3888 18.6306C27.4906 18.5636 27.5782 18.4772 27.6466 18.3762C27.715 18.2753 27.7629 18.1618 27.7875 18.0423C27.8121 17.9227 27.813 17.7995 27.79 17.6796H27.7901ZM13.2781 20.0573C12.8014 20.1473 12.5166 19.2823 12.545 18.9472C12.5686 18.6642 12.7429 17.1509 12.8244 16.3813C12.8658 16.1142 13.2651 15.4429 13.9586 15.3564L21.3221 13.9621C21.9991 13.7893 22.6134 14.2682 22.7511 14.5015C23.1091 15.1877 23.8203 16.5334 23.9473 16.788C24.0938 17.09 24.1416 17.9999 23.3637 18.1474L13.2781 20.0573ZM14.837 23.9288C14.5136 23.9886 14.1798 23.9176 13.9086 23.7311C13.6374 23.5447 13.451 23.2581 13.3903 22.9341C13.2633 22.2598 13.7046 21.6061 14.3751 21.4794C15.0455 21.3527 15.6942 21.7997 15.8218 22.4741C15.9494 23.1484 15.5057 23.802 14.837 23.9288ZM23.6248 22.2645C23.3015 22.3242 22.9677 22.2532 22.6966 22.0669C22.4255 21.8806 22.239 21.5942 22.1781 21.2704C22.1168 20.9467 22.186 20.6118 22.3706 20.3392C22.5551 20.0665 22.84 19.8783 23.1628 19.8158C23.8333 19.6885 24.4819 20.1361 24.6095 20.8104C24.7371 21.4847 24.2958 22.1378 23.6248 22.2645ZM25.8536 24.9856C25.8536 25.4172 26.0247 25.8312 26.3293 26.1364C26.6338 26.4416 27.0469 26.6131 27.4776 26.6131C27.9082 26.6131 28.3213 26.4416 28.6258 26.1364C28.9304 25.8312 29.1015 25.4172 29.1015 24.9856C29.1015 24.5539 28.9304 24.1399 28.6258 23.8347C28.3213 23.5295 27.9082 23.358 27.4776 23.358C27.0469 23.358 26.6338 23.5295 26.3293 23.8347C26.0247 24.1399 25.8536 24.5539 25.8536 24.9856Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2639" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2639"/>
+</filter>
+<filter id="filter1_i_1302_2639" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2639"/>
+</filter>
+<filter id="filter2_i_1302_2639" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2639"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/车辆故障_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/车辆故障_fault.svg
new file mode 100644
index 00000000..acc04f90
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/车辆故障_fault.svg
@@ -0,0 +1,51 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2638)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2638)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2638)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M10.5781 29.3115H31.2303V30.9637H10.5781L10.5781 29.3115Z" fill="#FF5F5F"/>
+<path d="M27.4414 17.6792C27.3949 17.4365 27.2544 17.2222 27.0508 17.083C26.8471 16.9438 26.5968 16.891 26.3545 16.9361L25.5906 17.0806C25.456 16.9732 25.3128 16.8771 25.1624 16.7934L22.7776 12.8723C22.2961 12.1346 21.247 11.8983 20.8223 11.9789L13.027 13.4549C12.604 13.5348 11.7114 14.141 11.5318 15.0019L10.7384 19.5246C10.7384 19.5246 10.5707 19.7235 10.4443 19.9485L9.68046 20.093C9.17891 20.1877 8.84752 20.6749 8.94322 21.1817C8.96545 21.3019 9.0111 21.4165 9.07758 21.519C9.14405 21.6215 9.23003 21.7098 9.33061 21.7789C9.43119 21.848 9.54438 21.8966 9.6637 21.9218C9.78303 21.9471 9.90615 21.9485 10.026 21.9259L10.3421 21.8662C10.3769 22.0953 10.4224 22.3605 10.4809 22.6707C10.8247 24.4949 11.3168 25.0745 11.8012 25.2166L12.1869 25.3468L12.5065 27.0407C12.6105 27.5907 12.7729 27.7292 13.2993 27.6298L14.4796 27.406C15.0059 27.3065 15.1069 27.1177 15.0035 26.5676L14.684 24.8738L23.441 23.2154L23.4416 23.2178L26.2499 22.4795C26.6492 22.1704 26.8962 21.4529 26.5524 19.6264C26.4939 19.3162 26.4401 19.0521 26.3887 18.826L26.7048 18.7662C26.8244 18.7434 26.9384 18.6971 27.0402 18.6302C27.142 18.5632 27.2296 18.4767 27.298 18.3757C27.3664 18.2748 27.4143 18.1613 27.4389 18.0418C27.4635 17.9222 27.4644 17.799 27.4414 17.6792H27.4414ZM12.9295 20.0568C12.4527 20.1468 12.168 19.2818 12.1964 18.9467C12.22 18.6637 12.3942 17.1504 12.4758 16.3808C12.5171 16.1138 12.9164 15.4424 13.61 15.3559L20.9735 13.9616C21.6504 13.7888 22.2648 14.2677 22.4024 14.501C22.7604 15.1872 23.4717 16.5329 23.5987 16.7875C23.7452 17.0895 23.793 17.9995 23.015 18.1469L12.9295 20.0568ZM14.4884 23.9283C14.165 23.9881 13.8311 23.9171 13.5599 23.7306C13.2887 23.5442 13.1024 23.2576 13.0417 22.9336C12.9147 22.2593 13.356 21.6056 14.0264 21.4789C14.6969 21.3522 15.3456 21.7992 15.4732 22.4736C15.6008 23.1479 15.1571 23.8016 14.4884 23.9283ZM23.2761 22.264C22.9528 22.3237 22.6191 22.2527 22.348 22.0664C22.0768 21.8801 21.8904 21.5937 21.8294 21.2699C21.7681 20.9462 21.8373 20.6114 22.0219 20.3387C22.2065 20.066 22.4914 19.8778 22.8142 19.8153C23.4847 19.688 24.1333 20.1356 24.2609 20.8099C24.3885 21.4843 23.9472 22.1373 23.2761 22.264ZM25.505 24.9851C25.505 25.4167 25.6761 25.8307 25.9806 26.1359C26.2852 26.4412 26.6982 26.6126 27.1289 26.6126C27.5596 26.6126 27.9727 26.4412 28.2772 26.1359C28.5818 25.8307 28.7528 25.4167 28.7528 24.9851C28.7528 24.5534 28.5818 24.1394 28.2772 23.8342C27.9727 23.529 27.5596 23.3575 27.1289 23.3575C26.6982 23.3575 26.2852 23.529 25.9806 23.8342C25.6761 24.1394 25.505 24.5534 25.505 24.9851Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2638" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2638"/>
+</filter>
+<filter id="filter1_i_1302_2638" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2638"/>
+</filter>
+<filter id="filter2_i_1302_2638" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2638"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/非法上路_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/非法上路_active.svg
new file mode 100644
index 00000000..57dabe2c
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/非法上路_active.svg
@@ -0,0 +1,54 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2614)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2614)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2614)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M30.0651 26.0309C28.8384 26.0229 27.8752 25.0428 27.8964 23.7915C27.9156 22.5755 28.9544 21.6561 30.1032 21.6661C31.1916 21.6753 32.2627 22.559 32.2693 23.856C32.2746 25.0574 31.2711 26.0386 30.0651 26.0309ZM30.0813 24.7873C30.2037 24.7889 30.3252 24.7664 30.4389 24.7211C30.5526 24.6757 30.6563 24.6084 30.744 24.523C30.8317 24.4376 30.9017 24.3358 30.95 24.2233C30.9983 24.1108 31.024 23.9899 31.0256 23.8675V23.8406C31.023 23.5924 30.9229 23.3552 30.7468 23.1801C30.5708 23.0051 30.333 22.9063 30.0847 22.9051C29.5657 22.9051 29.1327 23.2832 29.1331 23.8452C29.1331 24.4769 29.6506 24.8134 30.0813 24.7873ZM12.8429 24.3247C12.7175 24.3212 12.5983 24.2693 12.5103 24.1799C12.4223 24.0904 12.3724 23.9703 12.3711 23.8449C12.3742 23.5832 12.6081 23.3573 12.8663 23.3669C12.9876 23.3761 13.1013 23.4292 13.1862 23.5163C13.271 23.6034 13.3212 23.7184 13.3274 23.8399C13.3263 23.968 13.2749 24.0907 13.1843 24.1814C13.0937 24.272 12.9711 24.3235 12.8429 24.3247Z" fill="#FFDB82"/>
+<path d="M30.5457 23.8622C30.5432 23.9874 30.4912 24.1065 30.401 24.1933C30.3108 24.2801 30.1898 24.3275 30.0646 24.3252C29.9408 24.3223 29.8231 24.2704 29.7376 24.1809C29.652 24.0913 29.6054 23.9715 29.6082 23.8476V23.8372C29.6136 23.5787 29.8387 23.3585 30.09 23.3685C30.2154 23.3751 30.3332 23.4304 30.4183 23.5226C30.5034 23.6149 30.5491 23.7367 30.5457 23.8622ZM17.6425 16.1691C17.9755 16.1507 18.3084 16.134 18.6414 16.1192C18.9188 16.1076 19.0314 16.2141 19.0341 16.4918C19.0376 16.8504 19.0394 17.209 19.0394 17.5676L19.57 18.0985L20.1282 17.5403V16.4622C20.1282 16.2525 20.2139 16.1403 20.3972 16.1403C20.7656 16.1426 21.1348 16.1464 21.5021 16.1656L22.2901 15.3777C21.5866 15.2916 20.8774 15.2686 20.1686 15.2686C19.0878 15.2686 18.0071 15.307 16.9264 15.3412L16.8161 15.3454L17.6425 16.1691ZM22.355 23.8518L19.5704 21.0676L16.7861 23.8518H22.355Z" fill="#FFDB82"/>
+<path d="M34.7077 22.4623C34.6624 22.0758 34.4223 21.8372 34.058 21.7108C33.999 21.684 33.9515 21.637 33.924 21.5783C33.4373 20.5878 32.6735 19.9169 31.6326 19.5655C30.7075 19.2539 29.777 18.9565 28.8549 18.6392C28.5625 18.5389 28.2529 18.4386 28.007 18.2608C27.0465 17.5669 26.0783 16.8846 25.0391 16.3121C24.8854 16.2276 24.7317 16.1442 24.575 16.0643L23.9268 16.7125C24.311 16.8988 24.6806 17.1216 25.0506 17.3395C25.5443 17.6291 26.0234 17.9457 26.5017 18.2615C26.5955 18.3234 26.6554 18.4344 26.7322 18.5228C26.6189 18.5612 26.5071 18.6342 26.3918 18.6342C25.4125 18.6434 24.4324 18.6396 23.4531 18.6396H21.9974L21.0558 19.582L25.3249 23.8515H27.3907C27.4722 22.2256 28.6459 21.2909 29.8638 21.1818C30.4472 21.126 31.0319 21.2737 31.5189 21.5998C32.3257 22.1315 32.728 22.9007 32.7606 23.8635C33.1448 23.8635 33.5048 23.8869 33.8602 23.8538C34.0554 23.833 34.2413 23.7596 34.3981 23.6414C34.7884 23.3375 34.7584 22.8918 34.7077 22.4623ZM15.1634 22.5042L18.0852 19.582L17.1427 18.6396H16.1358C15.3017 18.6396 14.4691 18.6438 13.6385 18.635C13.5444 18.635 13.4506 18.5646 13.3569 18.5262C13.3953 18.434 13.4111 18.3191 13.4764 18.2527C14.0246 17.698 14.632 17.2052 15.2879 16.7831L14.5433 16.0386C13.6539 16.6406 12.7695 17.2484 11.8774 17.8462C11.5151 18.0875 11.1697 18.3653 10.7248 18.4609C10.1796 18.5781 9.63713 18.7072 9.0935 18.832C8.77539 18.9047 8.5491 19.2466 8.56946 19.5643C8.60557 20.0926 8.6463 20.6232 8.63285 21.1514C8.62401 21.4838 8.62132 21.843 8.34932 22.1146C8.29877 22.1728 8.2682 22.2456 8.2621 22.3225C8.23982 22.5372 8.22599 22.7535 8.22368 22.969C8.21946 23.3828 8.47687 23.7632 8.87989 23.8143C9.29943 23.8677 9.73049 23.8262 10.1715 23.8262C10.21 22.3467 11.3191 21.2947 12.6515 21.1806C13.255 21.1275 13.8576 21.291 14.3516 21.6417C14.6828 21.8654 14.9601 22.16 15.1634 22.5042Z" fill="#FFDB82"/>
+<path d="M14.4092 24.3453L19.1724 19.5821L14.4092 14.8188L14.8076 14.4204L19.5708 19.1836L24.3341 14.4204L24.7329 14.8188L19.9696 19.5821L24.7329 24.3453L24.3341 24.7437L19.5708 19.9805L14.8076 24.7437L14.4092 24.3453Z" fill="#FFDB82"/>
+<path d="M13.6676 24.3221C13.5851 24.4653 13.4659 24.5838 13.3223 24.6655C13.1788 24.7472 13.016 24.7892 12.8508 24.787C12.3252 24.787 11.9088 24.3805 11.9076 23.8649C11.9076 23.3217 12.3206 22.9021 12.8558 22.9044C13.1032 22.9072 13.3397 23.0069 13.5146 23.182C13.6895 23.357 13.7888 23.5937 13.7913 23.8411V23.8722C13.7897 24.0115 13.7566 24.1486 13.6945 24.2733L14.8878 23.0796C14.5858 22.2917 13.8432 21.7273 13.0087 21.6731C12.7126 21.6518 12.4153 21.691 12.1348 21.7884C11.8543 21.8857 11.5966 22.0391 11.3774 22.2393C11.1581 22.4394 10.9819 22.6821 10.8594 22.9525C10.737 23.223 10.6709 23.5155 10.6651 23.8123C10.6551 25.036 11.5987 26.0137 12.8308 26.0306C13.1619 26.0359 13.4897 25.9644 13.7885 25.8218C14.0874 25.6791 14.3491 25.4692 14.5532 25.2085L13.6676 24.3221Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2614" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2614"/>
+</filter>
+<filter id="filter1_i_1302_2614" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2614"/>
+</filter>
+<filter id="filter2_i_1302_2614" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2614"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/非法上路_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/非法上路_fault.svg
new file mode 100644
index 00000000..2fafc08f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/事件专题/非法上路_fault.svg
@@ -0,0 +1,54 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2615)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2615)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2615)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M30.0192 26.0309C28.7925 26.0229 27.8293 25.0428 27.8505 23.7915C27.8697 22.5755 28.9085 21.6561 30.0573 21.6661C31.1457 21.6753 32.2168 22.559 32.2234 23.856C32.2287 25.0574 31.2252 26.0386 30.0192 26.0309ZM30.0354 24.7873C30.1578 24.7889 30.2793 24.7664 30.393 24.7211C30.5067 24.6757 30.6104 24.6084 30.6981 24.523C30.7858 24.4376 30.8558 24.3358 30.9041 24.2233C30.9524 24.1108 30.9781 23.9899 30.9797 23.8675V23.8406C30.9771 23.5924 30.877 23.3552 30.7009 23.1801C30.5249 23.0051 30.2871 22.9063 30.0388 22.9051C29.5198 22.9051 29.0868 23.2832 29.0872 23.8452C29.0872 24.4769 29.6047 24.8134 30.0354 24.7873ZM12.797 24.3247C12.6716 24.3212 12.5524 24.2693 12.4644 24.1799C12.3764 24.0904 12.3265 23.9703 12.3252 23.8449C12.3283 23.5832 12.5622 23.3573 12.8204 23.3669C12.9417 23.3761 13.0554 23.4292 13.1403 23.5163C13.2251 23.6034 13.2753 23.7184 13.2815 23.8399C13.2804 23.968 13.229 24.0907 13.1384 24.1814C13.0478 24.272 12.9252 24.3235 12.797 24.3247Z" fill="#FF5F5F"/>
+<path d="M30.4998 23.8622C30.4973 23.9874 30.4453 24.1065 30.3551 24.1933C30.2649 24.2801 30.1439 24.3275 30.0187 24.3252C29.8949 24.3223 29.7772 24.2704 29.6917 24.1809C29.6061 24.0913 29.5595 23.9715 29.5623 23.8476V23.8372C29.5677 23.5787 29.7928 23.3585 30.0441 23.3685C30.1695 23.3751 30.2873 23.4304 30.3724 23.5226C30.4575 23.6149 30.5032 23.7367 30.4998 23.8622ZM17.5966 16.1691C17.9296 16.1507 18.2625 16.134 18.5955 16.1192C18.8729 16.1076 18.9855 16.2141 18.9882 16.4918C18.9917 16.8504 18.9935 17.209 18.9935 17.5676L19.5241 18.0985L20.0823 17.5403V16.4622C20.0823 16.2525 20.168 16.1403 20.3513 16.1403C20.7197 16.1426 21.0889 16.1464 21.4562 16.1656L22.2442 15.3777C21.5407 15.2916 20.8315 15.2686 20.1227 15.2686C19.0419 15.2686 17.9612 15.307 16.8805 15.3412L16.7702 15.3454L17.5966 16.1691ZM22.3091 23.8518L19.5245 21.0676L16.7402 23.8518H22.3091Z" fill="#FF5F5F"/>
+<path d="M34.6618 22.4623C34.6165 22.0758 34.3764 21.8372 34.0121 21.7108C33.9531 21.684 33.9056 21.637 33.8781 21.5783C33.3914 20.5878 32.6276 19.9169 31.5867 19.5655C30.6616 19.2539 29.7311 18.9565 28.809 18.6392C28.5166 18.5389 28.207 18.4386 27.9611 18.2608C27.0006 17.5669 26.0324 16.8846 24.9932 16.3121C24.8395 16.2276 24.6858 16.1442 24.5291 16.0643L23.8809 16.7125C24.2651 16.8988 24.6347 17.1216 25.0047 17.3395C25.4984 17.6291 25.9775 17.9457 26.4558 18.2615C26.5496 18.3234 26.6095 18.4344 26.6863 18.5228C26.573 18.5612 26.4612 18.6342 26.3459 18.6342C25.3666 18.6434 24.3865 18.6396 23.4072 18.6396H21.9515L21.0099 19.582L25.279 23.8515H27.3448C27.4263 22.2256 28.6 21.2909 29.8179 21.1818C30.4013 21.126 30.9861 21.2737 31.473 21.5998C32.2798 22.1315 32.6821 22.9007 32.7147 23.8635C33.0989 23.8635 33.4589 23.8869 33.8143 23.8538C34.0095 23.833 34.1954 23.7596 34.3522 23.6414C34.7425 23.3375 34.7125 22.8918 34.6618 22.4623ZM15.1175 22.5042L18.0393 19.582L17.0968 18.6396H16.0899C15.2558 18.6396 14.4232 18.6438 13.5926 18.635C13.4985 18.635 13.4047 18.5646 13.311 18.5262C13.3494 18.434 13.3652 18.3191 13.4305 18.2527C13.9787 17.698 14.5861 17.2052 15.242 16.7831L14.4974 16.0386C13.608 16.6406 12.7236 17.2484 11.8315 17.8462C11.4692 18.0875 11.1238 18.3653 10.6789 18.4609C10.1337 18.5781 9.59124 18.7072 9.0476 18.832C8.72949 18.9047 8.5032 19.2466 8.52356 19.5643C8.55967 20.0926 8.6004 20.6232 8.58695 21.1514C8.57812 21.4838 8.57543 21.843 8.30342 22.1146C8.25287 22.1728 8.2223 22.2456 8.21621 22.3225C8.19392 22.5372 8.18009 22.7535 8.17779 22.969C8.17356 23.3828 8.43097 23.7632 8.83399 23.8143C9.25353 23.8677 9.68459 23.8262 10.1256 23.8262C10.1641 22.3467 11.2732 21.2947 12.6056 21.1806C13.2091 21.1275 13.8117 21.291 14.3057 21.6417C14.6369 21.8654 14.9142 22.16 15.1175 22.5042Z" fill="#FF5F5F"/>
+<path d="M14.3633 24.3453L19.1265 19.5821L14.3633 14.8188L14.7617 14.4204L19.5249 19.1836L24.2882 14.4204L24.687 14.8188L19.9237 19.5821L24.687 24.3453L24.2882 24.7437L19.5249 19.9805L14.7617 24.7437L14.3633 24.3453Z" fill="#FF5F5F"/>
+<path d="M13.6217 24.3221C13.5392 24.4653 13.42 24.5838 13.2765 24.6655C13.1329 24.7472 12.9701 24.7892 12.8049 24.787C12.2793 24.787 11.8629 24.3805 11.8617 23.8649C11.8617 23.3217 12.2747 22.9021 12.8099 22.9044C13.0573 22.9072 13.2938 23.0069 13.4687 23.182C13.6436 23.357 13.7429 23.5937 13.7454 23.8411V23.8722C13.7438 24.0115 13.7107 24.1486 13.6486 24.2733L14.8419 23.0796C14.5399 22.2917 13.7973 21.7273 12.9628 21.6731C12.6667 21.6518 12.3694 21.691 12.0889 21.7884C11.8084 21.8857 11.5507 22.0391 11.3315 22.2393C11.1122 22.4394 10.936 22.6821 10.8135 22.9525C10.6911 23.223 10.625 23.5155 10.6192 23.8123C10.6092 25.036 11.5528 26.0137 12.7849 26.0306C13.116 26.0359 13.4438 25.9644 13.7426 25.8218C14.0415 25.6791 14.3032 25.4692 14.5073 25.2085L13.6217 24.3221Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2615" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2615"/>
+</filter>
+<filter id="filter1_i_1302_2615" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2615"/>
+</filter>
+<filter id="filter2_i_1302_2615" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2615"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/交调_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/交调_active.svg
new file mode 100644
index 00000000..f1119377
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/交调_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2592)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2592)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2592)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M28.1987 12.8003H14.0176C13.3695 12.8003 12.8428 13.3906 12.8428 14.117V19.6011C12.8233 19.6516 12.8135 19.7087 12.8135 19.7679V27.4268C12.8135 27.5475 12.9016 27.6463 13.0093 27.6463H13.9119C13.9726 27.6463 14.0293 27.6156 14.0665 27.5607L16.4258 24.1614C16.5081 24.0429 16.6666 24.0495 16.743 24.1723L17.9452 26.1518C18.0137 26.2659 18.1586 26.2813 18.2447 26.1825L20.7176 23.4108C20.7998 23.3187 20.9349 23.3275 21.0073 23.4262L22.6167 25.6383C22.6892 25.7392 22.8243 25.7458 22.9065 25.6537L25.5301 22.691C25.5438 22.6757 25.5438 22.6493 25.5301 22.634L24.9819 22.0151C24.8585 21.8769 24.9466 21.6399 25.1209 21.6399L27.3764 21.6421C27.396 21.6421 27.4136 21.6596 27.4136 21.6838V24.2228C27.4136 24.4181 27.2022 24.5169 27.0788 24.3786L26.5756 23.8124C26.5619 23.7971 26.5384 23.7971 26.5247 23.8124L22.9006 27.903C22.8223 27.9908 22.6931 27.9886 22.6167 27.8965L20.8977 25.7744C20.8233 25.6822 20.6941 25.6778 20.6138 25.7678L18.1253 28.557C18.0411 28.6514 17.9021 28.6404 17.8296 28.5329L16.6862 26.8146C16.6099 26.6983 16.4552 26.6961 16.3749 26.8102L14.6989 29.2242V29.2263C14.6872 29.2439 14.6637 29.2483 14.648 29.2351C14.6422 29.2285 14.6324 29.2263 14.6245 29.2263H12.8526C12.8311 29.2263 12.8135 29.2461 12.8135 29.2702C12.8135 29.9966 13.3402 30.587 13.9882 30.587H28.1987C28.8468 30.587 29.3735 29.9966 29.3735 29.2702V14.117C29.3735 13.3906 28.8488 12.8003 28.1987 12.8003ZM27.4156 18.8901C27.4156 19.3751 27.0651 19.7679 26.6324 19.7679H15.5839C15.1512 19.7679 14.8008 19.3751 14.8008 18.8901V15.8946C14.8008 15.4096 15.1512 15.0168 15.5839 15.0168H26.6324C27.0651 15.0168 27.4156 15.4096 27.4156 15.8946V18.8901ZM24.4298 18.4227H25.2423C25.5595 18.4227 25.816 18.1352 25.816 17.7797V17.0884C25.816 16.7329 25.5595 16.4454 25.2423 16.4454H24.4298C24.1126 16.4454 23.8561 16.7329 23.8561 17.0884V17.7797C23.8561 18.1352 24.1126 18.4227 24.4298 18.4227ZM21.2775 18.4227H22.0901C22.4072 18.4227 22.6637 18.1352 22.6637 17.7797V17.0884C22.6637 16.7329 22.4072 16.4454 22.0901 16.4454H21.2775C20.9603 16.4454 20.7039 16.7329 20.7039 17.0884V17.7797C20.7039 18.1352 20.9603 18.4227 21.2775 18.4227ZM18.1057 18.4227H18.9182C19.2354 18.4227 19.4919 18.1352 19.4919 17.7797V17.0884C19.4919 16.7329 19.2354 16.4454 18.9182 16.4454H18.1057C17.7885 16.4454 17.532 16.7329 17.532 17.0884V17.7797C17.532 18.1352 17.7885 18.4227 18.1057 18.4227Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2592" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2592"/>
+</filter>
+<filter id="filter1_i_1302_2592" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2592"/>
+</filter>
+<filter id="filter2_i_1302_2592" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2592"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/交调_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/交调_fault.svg
new file mode 100644
index 00000000..68b70013
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/交调_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2593)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2593)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2593)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M28.397 12.7998H14.2158C13.5678 12.7998 13.0411 13.3901 13.0411 14.1165V19.6007C13.0215 19.6511 13.0117 19.7082 13.0117 19.7674V27.4263C13.0117 27.547 13.0998 27.6458 13.2075 27.6458H14.1101C14.1708 27.6458 14.2276 27.6151 14.2648 27.5602L16.6241 24.1609C16.7063 24.0424 16.8649 24.049 16.9412 24.1719L18.1434 26.1513C18.2119 26.2654 18.3568 26.2808 18.443 26.182L20.9158 23.4104C20.998 23.3182 21.1331 23.327 21.2056 23.4257L22.815 25.6378C22.8874 25.7388 23.0225 25.7453 23.1047 25.6532L25.7283 22.6906C25.742 22.6752 25.742 22.6489 25.7283 22.6335L25.1801 22.0146C25.0568 21.8764 25.1449 21.6394 25.3191 21.6394L27.5747 21.6416C27.5942 21.6416 27.6118 21.6591 27.6118 21.6833V24.2223C27.6118 24.4176 27.4004 24.5164 27.277 24.3781L26.7739 23.812C26.7602 23.7966 26.7367 23.7966 26.723 23.812L23.0989 27.9026C23.0206 27.9903 22.8913 27.9881 22.815 27.896L21.0959 25.7739C21.0215 25.6817 20.8923 25.6773 20.812 25.7673L18.3235 28.5565C18.2393 28.6509 18.1003 28.6399 18.0279 28.5324L16.8845 26.8141C16.8081 26.6978 16.6534 26.6956 16.5732 26.8097L14.8972 29.2237V29.2259C14.8854 29.2434 14.8619 29.2478 14.8463 29.2346C14.8404 29.2281 14.8306 29.2259 14.8228 29.2259H13.0509C13.0293 29.2259 13.0117 29.2456 13.0117 29.2698C13.0117 29.9961 13.5384 30.5865 14.1865 30.5865H28.397C29.045 30.5865 29.5717 29.9961 29.5717 29.2698V14.1165C29.5717 13.3901 29.047 12.7998 28.397 12.7998ZM27.6138 18.8896C27.6138 19.3746 27.2633 19.7674 26.8306 19.7674H15.7822C15.3495 19.7674 14.999 19.3746 14.999 18.8896V15.8941C14.999 15.4091 15.3495 15.0163 15.7822 15.0163H26.8306C27.2633 15.0163 27.6138 15.4091 27.6138 15.8941V18.8896ZM24.628 18.4222H25.4405C25.7577 18.4222 26.0142 18.1347 26.0142 17.7792V17.0879C26.0142 16.7324 25.7577 16.4449 25.4405 16.4449H24.628C24.3108 16.4449 24.0543 16.7324 24.0543 17.0879V17.7792C24.0543 18.1347 24.3108 18.4222 24.628 18.4222ZM21.4758 18.4222H22.2883C22.6055 18.4222 22.862 18.1347 22.862 17.7792V17.0879C22.862 16.7324 22.6055 16.4449 22.2883 16.4449H21.4758C21.1586 16.4449 20.9021 16.7324 20.9021 17.0879V17.7792C20.9021 18.1347 21.1586 18.4222 21.4758 18.4222ZM18.3039 18.4222H19.1165C19.4337 18.4222 19.6901 18.1347 19.6901 17.7792V17.0879C19.6901 16.7324 19.4337 16.4449 19.1165 16.4449H18.3039C17.9868 16.4449 17.7303 16.7324 17.7303 17.0879V17.7792C17.7303 18.1347 17.9868 18.4222 18.3039 18.4222Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2593" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2593"/>
+</filter>
+<filter id="filter1_i_1302_2593" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2593"/>
+</filter>
+<filter id="filter2_i_1302_2593" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2593"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/合流区_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/合流区_active.svg
new file mode 100644
index 00000000..cf3d665a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/合流区_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2587)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2587)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2587)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M28.7369 20.2108C29.0136 20.2108 29.3644 20.3829 29.5097 20.595L30.3776 22.5161H32.0492C32.1403 22.5161 32.2145 22.5899 32.2145 22.6806V23.3507C32.2146 23.3869 32.2027 23.4221 32.1806 23.4508C32.1585 23.4796 32.1275 23.5003 32.0924 23.5098L30.9641 23.8156L31.2478 24.4434C31.376 24.7262 31.4417 25.0329 31.4417 25.3426V30.2008H30.4757L30.0066 29.5783C29.9723 29.5329 29.9279 29.4961 29.8768 29.4708C29.8256 29.4454 29.7693 29.4323 29.7122 29.4323H19.2609C19.1449 29.4323 19.0367 29.4861 18.9672 29.5783L18.4973 30.2008H17.5313L17.5568 25.2788C17.5584 24.9606 17.6295 24.6471 17.7655 24.3589L18.0089 23.8394L16.8845 23.5651C16.8485 23.5563 16.8166 23.5358 16.7937 23.5068C16.7709 23.4778 16.7585 23.4421 16.7585 23.4053V22.6806C16.7585 22.5899 16.8327 22.5161 16.9239 22.5161H18.6318L19.5568 20.5519C19.6339 20.4447 19.7359 20.3576 19.8542 20.2981C19.9725 20.2387 20.1036 20.2087 20.2361 20.2108H28.7369ZM18.9803 11.8345C19.0077 11.8127 19.0418 11.8008 19.0769 11.8008C19.112 11.8008 19.1461 11.8127 19.1735 11.8345L22.6511 14.601C22.7415 14.6729 22.8145 14.7641 22.8646 14.8679C22.9148 14.9716 22.9409 15.0853 22.9409 15.2004V16.6374C22.9409 16.6659 22.9329 16.6939 22.9178 16.7182C22.9028 16.7425 22.8812 16.7621 22.8555 16.7749C22.8298 16.7876 22.8011 16.793 22.7725 16.7905C22.7439 16.7879 22.7166 16.7775 22.6936 16.7604L20.6225 15.2157V19.8265H19.9409C19.7974 19.8266 19.6568 19.8664 19.5348 19.9414C19.4128 20.0165 19.3142 20.1239 19.25 20.2515L18.3041 22.1319H17.5313V19.4423L14.7493 21.5171C14.6655 21.5796 14.5954 21.6583 14.5432 21.7486C14.491 21.8388 14.4578 21.9386 14.4455 22.042L14.4401 22.1319V29.4323L12.8945 28.6639V21.7477C12.8945 21.5312 12.9405 21.3171 13.0295 21.1196C13.1184 20.922 13.2484 20.7453 13.4108 20.6011L13.5128 20.5181L17.5313 17.5211V15.2157L15.4602 16.7604C15.4425 16.7734 15.4223 16.7826 15.4007 16.7872L15.3675 16.7911C15.3265 16.7911 15.2872 16.7749 15.2582 16.7461C15.2292 16.7173 15.2129 16.6782 15.2129 16.6374V15.2004C15.213 15.0853 15.2391 14.9716 15.2892 14.8679C15.3394 14.7641 15.4124 14.6729 15.5027 14.601L18.9803 11.8345ZM19.4633 25.7391C19.3729 25.7391 19.2853 25.7706 19.2158 25.8281C19.1464 25.8857 19.0994 25.9657 19.0831 26.0542L19.0769 26.1233V26.3154C19.0769 26.4707 19.0908 26.5275 19.1179 26.5859C19.1445 26.6434 19.1865 26.6926 19.2392 26.7281C19.2825 26.7573 19.325 26.778 19.4193 26.7973L19.5012 26.8126L21.0143 27.0639C21.0991 27.0778 21.1859 27.058 21.2562 27.0089C21.3264 26.9597 21.3745 26.8851 21.3899 26.8011L21.3953 26.7427V26.7004C21.3994 26.6273 21.3883 26.554 21.3629 26.4853C21.3418 26.4322 21.3078 26.3852 21.264 26.3485C21.2254 26.3166 21.1818 26.2914 21.1349 26.2739L21.0692 26.2509L19.5854 25.7591C19.5461 25.7459 19.5048 25.7392 19.4633 25.7391ZM29.4556 25.7429L29.3876 25.7583L27.9039 26.2501C27.8329 26.2694 27.7666 26.3029 27.7091 26.3485C27.6652 26.3852 27.6313 26.4322 27.6102 26.4853C27.5917 26.5318 27.5812 26.5812 27.5793 26.6313L27.5777 26.7004V26.7427C27.5777 26.8282 27.6115 26.9103 27.6718 26.9712C27.7321 27.0322 27.814 27.0671 27.9 27.0685L27.9587 27.0639L29.4719 26.8126C29.6264 26.7873 29.6805 26.7642 29.7338 26.7281C29.7866 26.6926 29.8285 26.6434 29.8552 26.5859C29.8816 26.5267 29.8948 26.4625 29.8938 26.3977L29.8961 26.3154V26.1233C29.8961 26.0683 29.8842 26.014 29.8613 25.9639C29.8383 25.9139 29.8048 25.8693 29.7631 25.8333C29.7213 25.7972 29.6723 25.7705 29.6192 25.7549C29.5662 25.7393 29.5104 25.7352 29.4556 25.7429ZM28.2856 21.3634H20.6874C20.5329 21.3634 20.3938 21.4595 20.3412 21.604L19.6797 23.4129C19.6714 23.4357 19.6677 23.4598 19.6689 23.484C19.6701 23.5081 19.6761 23.5318 19.6867 23.5536C19.9749 24.143 21.5754 24.4373 24.4865 24.4373C27.3977 24.4373 28.9981 24.143 29.2864 23.5536C29.2969 23.5318 29.303 23.5081 29.3042 23.484C29.3053 23.4598 29.3017 23.4357 29.2933 23.4129L28.6318 21.604C28.606 21.5334 28.5588 21.4724 28.4969 21.4294C28.435 21.3863 28.3612 21.3633 28.2856 21.3634Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2587" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2587"/>
+</filter>
+<filter id="filter1_i_1302_2587" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2587"/>
+</filter>
+<filter id="filter2_i_1302_2587" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2587"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/合流区_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/合流区_fault.svg
new file mode 100644
index 00000000..fcdc39b6
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/合流区_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2586)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2586)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2586)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M27.9352 20.2098C28.2118 20.2098 28.5627 20.3819 28.708 20.594L29.5758 22.5152H31.2474C31.3386 22.5152 31.4128 22.5889 31.4128 22.6796V23.3497C31.4129 23.3859 31.4009 23.4211 31.3789 23.4498C31.3568 23.4786 31.3258 23.4993 31.2907 23.5088L30.1624 23.8146L30.446 24.4425C30.5743 24.7253 30.64 25.0319 30.64 25.3416V30.1998H29.674L29.2049 29.5773C29.1706 29.532 29.1261 29.4951 29.075 29.4698C29.0239 29.4444 28.9676 29.4313 28.9104 29.4313H18.4591C18.3432 29.4313 18.235 29.4851 18.1654 29.5773L17.6956 30.1998H16.7296L16.7551 25.2778C16.7566 24.9596 16.8277 24.6461 16.9637 24.3579L17.2072 23.8385L16.0827 23.5641C16.0468 23.5553 16.0148 23.5348 15.992 23.5058C15.9691 23.4769 15.9567 23.4411 15.9568 23.4043V22.6796C15.9568 22.5889 16.031 22.5152 16.1222 22.5152H17.83L18.7551 20.551C18.8321 20.4437 18.9341 20.3566 19.0525 20.2972C19.1708 20.2377 19.3018 20.2078 19.4344 20.2098H27.9352ZM18.1786 11.8335C18.206 11.8117 18.2401 11.7998 18.2752 11.7998C18.3103 11.7998 18.3444 11.8117 18.3718 11.8335L21.8494 14.6C21.9397 14.6719 22.0127 14.7632 22.0629 14.8669C22.113 14.9706 22.1391 15.0843 22.1392 15.1994V16.6364C22.1392 16.665 22.1312 16.6929 22.1161 16.7172C22.101 16.7415 22.0794 16.7611 22.0537 16.7739C22.0281 16.7867 21.9993 16.7921 21.9707 16.7895C21.9421 16.7869 21.9148 16.7765 21.8919 16.7594L19.8208 15.2148V19.8255H19.1392C18.9957 19.8256 18.8551 19.8654 18.733 19.9405C18.611 20.0155 18.5124 20.1229 18.4483 20.2505L17.5024 22.1309H16.7296V19.4413L13.9475 21.5162C13.8638 21.5786 13.7937 21.6574 13.7415 21.7476C13.6892 21.8378 13.656 21.9376 13.6438 22.041L13.6384 22.1309V29.4313L12.0928 28.6629V21.7467C12.0928 21.5302 12.1387 21.3162 12.2277 21.1186C12.3167 20.921 12.4466 20.7443 12.609 20.6002L12.711 20.5172L16.7296 17.5202V15.2148L14.6585 16.7594C14.6408 16.7725 14.6205 16.7816 14.599 16.7863L14.5657 16.7901C14.5247 16.7901 14.4854 16.7739 14.4564 16.7451C14.4275 16.7163 14.4112 16.6772 14.4112 16.6364V15.1994C14.4112 15.0843 14.4373 14.9706 14.4875 14.8669C14.5376 14.7632 14.6106 14.6719 14.701 14.6L18.1786 11.8335ZM18.6616 25.7381C18.5711 25.7381 18.4836 25.7696 18.4141 25.8272C18.3446 25.8847 18.2976 25.9647 18.2814 26.0532L18.2752 26.1223V26.3145C18.2752 26.4697 18.2891 26.5265 18.3161 26.5849C18.3428 26.6425 18.3847 26.6916 18.4375 26.7271C18.4807 26.7563 18.5232 26.7771 18.6175 26.7963L18.6994 26.8116L20.2126 27.0629C20.2973 27.0768 20.3842 27.0571 20.4544 27.0079C20.5247 26.9588 20.5727 26.8841 20.5882 26.8001L20.5936 26.7417V26.6995C20.5976 26.6263 20.5866 26.5531 20.5611 26.4843C20.54 26.4312 20.5061 26.3842 20.4622 26.3475C20.4237 26.3156 20.3801 26.2904 20.3331 26.273L20.2675 26.2499L18.7837 25.7581C18.7443 25.7449 18.7031 25.7382 18.6616 25.7381ZM28.6539 25.7419L28.5859 25.7573L27.1021 26.2491C27.0311 26.2684 26.9649 26.3019 26.9073 26.3475C26.8635 26.3842 26.8295 26.4312 26.8084 26.4843C26.7899 26.5309 26.7795 26.5802 26.7775 26.6303L26.776 26.6995V26.7417C26.776 26.8272 26.8097 26.9093 26.87 26.9702C26.9303 27.0312 27.0123 27.0661 27.0982 27.0675L27.157 27.0629L28.6701 26.8116C28.8247 26.7863 28.8788 26.7632 28.9321 26.7271C28.9848 26.6916 29.0268 26.6425 29.0534 26.5849C29.0798 26.5257 29.093 26.4615 29.0921 26.3967L29.0944 26.3145V26.1223C29.0944 26.0673 29.0825 26.013 29.0595 25.9629C29.0366 25.9129 29.0031 25.8683 28.9613 25.8323C28.9196 25.7962 28.8705 25.7695 28.8175 25.7539C28.7644 25.7383 28.7086 25.7342 28.6539 25.7419ZM27.4839 21.3625H19.8857C19.7311 21.3625 19.592 21.4585 19.5395 21.603L18.878 23.412C18.8696 23.4347 18.866 23.4588 18.8672 23.483C18.8683 23.5071 18.8744 23.5308 18.8849 23.5526C19.1732 24.142 20.7736 24.4363 23.6848 24.4363C26.5959 24.4363 28.1964 24.142 28.4846 23.5526C28.4952 23.5308 28.5012 23.5071 28.5024 23.483C28.5036 23.4588 28.4999 23.4347 28.4916 23.412L27.8301 21.603C27.8042 21.5324 27.7571 21.4714 27.6951 21.4284C27.6332 21.3854 27.5594 21.3623 27.4839 21.3625Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2586" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2586"/>
+</filter>
+<filter id="filter1_i_1302_2586" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2586"/>
+</filter>
+<filter id="filter2_i_1302_2586" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2586"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/太阳能板_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/太阳能板_active.svg
new file mode 100644
index 00000000..5c8b11e7
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/太阳能板_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2582)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2582)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2582)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M21.4354 25.3751V27.4934H25.0642V29.3888H15.9922V27.4934H19.621V25.3751H21.4354ZM14.356 22.2944L13.7296 25.0592H11.9233C11.6344 25.0592 11.3617 24.9242 11.1862 24.692C11.0107 24.4598 10.9567 24.1601 11.035 23.882L11.4913 22.2944H14.356ZM20.0746 22.2944V25.0592H14.6611L15.2875 22.2944H20.0746ZM26.3575 22.2944L26.9839 25.0592H20.9818V22.2944H26.3575ZM29.8648 22.2944L30.3211 23.8847C30.3994 24.1628 30.3454 24.4625 30.1699 24.692C29.9971 24.9242 29.7244 25.0592 29.4328 25.0592H27.9127L27.2863 22.2944H29.8648ZM14.9824 19.5296L14.5639 21.3737H11.7586L12.2878 19.5296H14.9824ZM20.0746 19.5296V21.3737H15.4954L15.9139 19.5296H20.0746ZM25.7311 19.5296L26.1496 21.3737H20.9818V19.5296H25.7311ZM29.071 19.5296L29.6002 21.3737H27.0784L26.6626 19.5296H29.071ZM15.6088 16.7648L15.1903 18.6089H12.5524L13.0816 16.7648H15.6088ZM20.0746 16.7648V18.6089H16.1218L16.5403 16.7648H20.0746ZM25.1047 16.7648L25.5232 18.6089H20.9818V16.7648H25.1047ZM28.2772 16.7648L28.8064 18.6089H26.452L26.0335 16.7648H28.2772ZM16.2352 14L15.8167 15.8441H13.3462L13.6837 14.6696C13.7971 14.2754 14.1589 14.0027 14.5693 14.0027H16.2352V14ZM20.0746 14V15.8441H16.7482L17.1667 14H20.0746ZM24.4783 14L24.8968 15.8441H20.9818V14H24.4783ZM26.7895 14C27.1999 14 27.5617 14.2727 27.6751 14.6669L28.0126 15.8441H25.8256L25.4071 14H26.7895Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2582" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2582"/>
+</filter>
+<filter id="filter1_i_1302_2582" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2582"/>
+</filter>
+<filter id="filter2_i_1302_2582" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2582"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/太阳能板_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/太阳能板_fault.svg
new file mode 100644
index 00000000..da80f4a2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/太阳能板_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2583)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2583)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2583)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M21.4354 25.3751V27.4934H25.0642V29.3888H15.9922V27.4934H19.621V25.3751H21.4354ZM14.356 22.2944L13.7296 25.0592H11.9233C11.6344 25.0592 11.3617 24.9242 11.1862 24.692C11.0107 24.4598 10.9567 24.1601 11.035 23.882L11.4913 22.2944H14.356ZM20.0746 22.2944V25.0592H14.6611L15.2875 22.2944H20.0746ZM26.3575 22.2944L26.9839 25.0592H20.9818V22.2944H26.3575ZM29.8648 22.2944L30.3211 23.8847C30.3994 24.1628 30.3454 24.4625 30.1699 24.692C29.9971 24.9242 29.7244 25.0592 29.4328 25.0592H27.9127L27.2863 22.2944H29.8648ZM14.9824 19.5296L14.5639 21.3737H11.7586L12.2878 19.5296H14.9824ZM20.0746 19.5296V21.3737H15.4954L15.9139 19.5296H20.0746ZM25.7311 19.5296L26.1496 21.3737H20.9818V19.5296H25.7311ZM29.071 19.5296L29.6002 21.3737H27.0784L26.6626 19.5296H29.071ZM15.6088 16.7648L15.1903 18.6089H12.5524L13.0816 16.7648H15.6088ZM20.0746 16.7648V18.6089H16.1218L16.5403 16.7648H20.0746ZM25.1047 16.7648L25.5232 18.6089H20.9818V16.7648H25.1047ZM28.2772 16.7648L28.8064 18.6089H26.452L26.0335 16.7648H28.2772ZM16.2352 14L15.8167 15.8441H13.3462L13.6837 14.6696C13.7971 14.2754 14.1589 14.0027 14.5693 14.0027H16.2352V14ZM20.0746 14V15.8441H16.7482L17.1667 14H20.0746ZM24.4783 14L24.8968 15.8441H20.9818V14H24.4783ZM26.7895 14C27.1999 14 27.5617 14.2727 27.6751 14.6669L28.0126 15.8441H25.8256L25.4071 14H26.7895Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2583" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2583"/>
+</filter>
+<filter id="filter1_i_1302_2583" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2583"/>
+</filter>
+<filter id="filter2_i_1302_2583" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2583"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/情报板_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/情报板_active.svg
new file mode 100644
index 00000000..1aaf0f54
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/情报板_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2578)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2578)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2578)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M29.3271 14.1997C29.4763 14.1997 29.6194 14.2617 29.7249 14.3721C29.8304 14.4824 29.8896 14.6321 29.8896 14.7882V21.2612H11.8896V14.7882C11.8896 14.6321 11.9489 14.4824 12.0544 14.3721C12.1599 14.2617 12.303 14.1997 12.4521 14.1997H29.3271ZM16.9521 16.6195H14.7021V18.9733H16.9521V16.6195ZM20.3271 16.5536H18.0771V18.9074H20.3271V16.5536ZM23.7021 16.5536H21.4521V18.9074H23.7021V16.5536ZM27.0771 16.5536H24.8271V18.9074H27.0771V16.5536ZM29.8896 21.2612H27.6396V28.9112C27.6396 29.0673 27.6989 29.217 27.8044 29.3274C27.9099 29.4377 28.053 29.4997 28.2021 29.4997H29.3271C29.4763 29.4997 29.6194 29.4377 29.7249 29.3274C29.8304 29.217 29.8896 29.0673 29.8896 28.9112V21.2612ZM14.1396 21.2612H11.8896V28.9112C11.8896 29.0673 11.9489 29.217 12.0544 29.3274C12.1599 29.4377 12.303 29.4997 12.4521 29.4997H13.5771C13.7263 29.4997 13.8694 29.4377 13.9749 29.3274C14.0804 29.217 14.1396 29.0673 14.1396 28.9112V21.2612Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2578" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2578"/>
+</filter>
+<filter id="filter1_i_1302_2578" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2578"/>
+</filter>
+<filter id="filter2_i_1302_2578" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2578"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/情报板_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/情报板_fault.svg
new file mode 100644
index 00000000..219c1a7a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/情报板_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2579)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2579)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2579)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M29.3789 14.2002C29.5281 14.2002 29.6712 14.2622 29.7767 14.3726C29.8821 14.4829 29.9414 14.6326 29.9414 14.7887V21.2617H11.9414V14.7887C11.9414 14.6326 12.0007 14.4829 12.1062 14.3726C12.2116 14.2622 12.3547 14.2002 12.5039 14.2002H29.3789ZM17.0039 16.6199H14.7539V18.9738H17.0039V16.6199ZM20.3789 16.554H18.1289V18.9079H20.3789V16.554ZM23.7539 16.554H21.5039V18.9079H23.7539V16.554ZM27.1289 16.554H24.8789V18.9079H27.1289V16.554ZM29.9414 21.2617H27.6914V28.9117C27.6914 29.0678 27.7507 29.2175 27.8562 29.3278C27.9616 29.4382 28.1047 29.5002 28.2539 29.5002H29.3789C29.5281 29.5002 29.6712 29.4382 29.7767 29.3278C29.8821 29.2175 29.9414 29.0678 29.9414 28.9117V21.2617ZM14.1914 21.2617H11.9414V28.9117C11.9414 29.0678 12.0007 29.2175 12.1062 29.3278C12.2116 29.4382 12.3547 29.5002 12.5039 29.5002H13.6289C13.7781 29.5002 13.9212 29.4382 14.0267 29.3278C14.1321 29.2175 14.1914 29.0678 14.1914 28.9117V21.2617Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2579" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2579"/>
+</filter>
+<filter id="filter1_i_1302_2579" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2579"/>
+</filter>
+<filter id="filter2_i_1302_2579" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2579"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/护栏碰撞_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/护栏碰撞_active.svg
new file mode 100644
index 00000000..bc0a9d75
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/护栏碰撞_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2575)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2575)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2575)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M33.3498 19.079V18.0537H31.5V16.0255L30.653 14.7998L29.806 16.0255V18.0537H28.0677V16.0255L27.2207 14.7998L26.3738 16.0255V18.0537H24.6132V16.0255L23.7662 14.7998L22.9193 16.0255V18.0537H21.1587V16.0255L20.3117 14.7998L19.4647 16.0255V18.0537H17.7262V16.0255L16.8795 14.8221L16.0325 16.0255V18.0537H14.2717V16.0255L13.425 14.8221L12.578 16.0255V18.0537H10.5498V19.079H12.578V23.8038H10.5498V24.8291H12.578V26.9018H14.2717V24.8291H16.0325V26.9018H17.7262V24.8291H19.4647V26.9018H21.1587V24.8291H22.9193V26.9018H24.6132V24.8291H26.3738V26.9018H28.0677V24.8291H29.806V26.9018H31.5V24.8291H33.3498V23.8038H31.5V19.079H33.3498ZM13.425 24.6953C13.3209 24.6953 13.2281 24.6582 13.1464 24.584C13.0646 24.5098 13.0237 24.4132 13.0237 24.2943C13.0237 24.1756 13.0646 24.079 13.1464 24.0046C13.2281 23.9304 13.3246 23.8933 13.4361 23.8933C13.5474 23.8933 13.6403 23.9304 13.7146 24.0046C13.7889 24.079 13.826 24.1756 13.826 24.2943C13.826 24.4131 13.7889 24.5096 13.7146 24.584C13.6404 24.6582 13.5439 24.6953 13.4252 24.6953H13.425ZM13.425 18.9452C13.3209 18.9452 13.2281 18.9081 13.1464 18.8339C13.0646 18.7595 13.0237 18.663 13.0237 18.5442C13.0237 18.4255 13.0646 18.3289 13.1464 18.2545C13.2281 18.1803 13.3246 18.1432 13.4361 18.1432C13.5474 18.1432 13.6403 18.1803 13.7146 18.2545C13.7889 18.3288 13.826 18.4253 13.826 18.5442C13.826 18.663 13.7889 18.7595 13.7146 18.8339C13.6404 18.9081 13.5439 18.9452 13.4252 18.9452H13.425ZM16.0325 23.8038H14.2717V19.079H16.0325V23.8038ZM16.8795 24.6953C16.7606 24.6953 16.664 24.6582 16.5898 24.584C16.5156 24.5098 16.4785 24.4132 16.4785 24.2943C16.4785 24.1756 16.5156 24.079 16.5898 24.0046C16.664 23.9304 16.7606 23.8933 16.8795 23.8933C16.9984 23.8933 17.095 23.9304 17.1694 24.0046C17.2436 24.079 17.2807 24.1756 17.2807 24.2943C17.2807 24.4131 17.2436 24.5096 17.1694 24.584C17.0952 24.6582 16.9985 24.6953 16.8795 24.6953ZM16.8795 18.9452C16.7606 18.9452 16.664 18.9081 16.5898 18.8339C16.5156 18.7595 16.4785 18.663 16.4785 18.5442C16.4785 18.4255 16.5156 18.3289 16.5898 18.2545C16.664 18.1803 16.7606 18.1432 16.8795 18.1432C16.9984 18.1432 17.095 18.1803 17.1694 18.2545C17.2436 18.3288 17.2807 18.4253 17.2807 18.5442C17.2807 18.663 17.2436 18.7595 17.1694 18.8339C17.0952 18.9081 16.9985 18.9452 16.8795 18.9452ZM19.4647 23.8038H17.7262V19.079H19.4647V23.8038ZM20.3117 24.6953C20.2077 24.6953 20.1185 24.6582 20.0443 24.584C19.9701 24.5098 19.933 24.4132 19.933 24.2943C19.933 24.1756 19.9701 24.079 20.0443 24.0046C20.1185 23.9304 20.2114 23.8933 20.3229 23.8933C20.4343 23.8933 20.5272 23.9304 20.6014 24.0046C20.6756 24.079 20.7127 24.1756 20.7127 24.2943C20.7127 24.4131 20.6756 24.5096 20.6014 24.584C20.5272 24.6582 20.4306 24.6953 20.3117 24.6953ZM20.3117 18.9452C20.2077 18.9452 20.1185 18.9081 20.0443 18.8339C19.9701 18.7595 19.933 18.663 19.933 18.5442C19.933 18.4255 19.9701 18.3289 20.0443 18.2545C20.1185 18.1803 20.2114 18.1432 20.3229 18.1432C20.4343 18.1432 20.5272 18.1803 20.6014 18.2545C20.6756 18.3288 20.7127 18.4253 20.7127 18.5442C20.7127 18.663 20.6756 18.7595 20.6014 18.8339C20.5272 18.9081 20.4306 18.9452 20.3117 18.9452ZM22.9193 23.8038H21.181V19.079H22.9193V23.8038ZM23.7662 24.6953C23.6473 24.6953 23.5508 24.6582 23.4766 24.584C23.4022 24.5098 23.365 24.4132 23.365 24.2943C23.365 24.1756 23.4022 24.079 23.4766 24.0046C23.5508 23.9304 23.6473 23.8933 23.7662 23.8933C23.8851 23.8933 23.9817 23.9304 24.0559 24.0046C24.1301 24.079 24.1672 24.1756 24.1672 24.2943C24.1672 24.4131 24.1301 24.5096 24.0559 24.584C23.9817 24.6582 23.8851 24.6953 23.7662 24.6953ZM23.7662 18.9452C23.6473 18.9452 23.5508 18.9081 23.4766 18.8339C23.4022 18.7595 23.365 18.663 23.365 18.5442C23.365 18.4255 23.4022 18.3289 23.4766 18.2545C23.5508 18.1803 23.6473 18.1432 23.7662 18.1432C23.8851 18.1432 23.9817 18.1803 24.0559 18.2545C24.1301 18.3288 24.1672 18.4253 24.1672 18.5442C24.1672 18.663 24.1301 18.7595 24.0559 18.8339C23.9817 18.9081 23.8851 18.9452 23.7662 18.9452ZM26.3738 23.8038H24.6132V19.079H26.3738V23.8038ZM27.2207 24.6953C27.1018 24.6953 27.0053 24.6582 26.9311 24.584C26.8569 24.5098 26.8197 24.4132 26.8197 24.2943C26.8197 24.1756 26.8569 24.079 26.9311 24.0046C27.0053 23.9304 27.0981 23.8933 27.2096 23.8933C27.3211 23.8933 27.4177 23.9304 27.4993 24.0046C27.5809 24.079 27.6218 24.1756 27.6218 24.2943C27.6218 24.4131 27.5809 24.5096 27.4993 24.584C27.4177 24.6582 27.3248 24.6953 27.2207 24.6953ZM27.2207 18.9452C27.1018 18.9452 27.0053 18.9081 26.9311 18.8339C26.8569 18.7595 26.8197 18.663 26.8197 18.5442C26.8197 18.4255 26.8569 18.3289 26.9311 18.2545C27.0053 18.1803 27.0981 18.1432 27.2096 18.1432C27.3211 18.1432 27.4177 18.1803 27.4993 18.2545C27.5809 18.3288 27.6218 18.4253 27.6218 18.5442C27.6218 18.663 27.5809 18.7595 27.4993 18.8339C27.4177 18.9081 27.3248 18.9452 27.2207 18.9452ZM29.806 23.8038H28.0677V19.079H29.806V23.8038ZM30.653 24.6953C30.5489 24.6953 30.4561 24.6582 30.3745 24.584C30.2928 24.5098 30.252 24.4132 30.252 24.2943C30.252 24.1756 30.2928 24.079 30.3745 24.0046C30.4561 23.9304 30.5527 23.8933 30.6641 23.8933C30.7756 23.8933 30.8685 23.9304 30.9427 24.0046C31.0169 24.079 31.054 24.1756 31.054 24.2943C31.054 24.4131 31.0169 24.5096 30.9427 24.584C30.8685 24.6582 30.7719 24.6953 30.653 24.6953ZM30.653 18.9452C30.5489 18.9452 30.4561 18.9081 30.3745 18.8339C30.2928 18.7595 30.252 18.663 30.252 18.5442C30.252 18.4255 30.2928 18.3289 30.3745 18.2545C30.4561 18.1803 30.5527 18.1432 30.6641 18.1432C30.7756 18.1432 30.8685 18.1803 30.9427 18.2545C31.0169 18.3288 31.054 18.4253 31.054 18.5442C31.054 18.663 31.0169 18.7595 30.9427 18.8339C30.8685 18.9081 30.7719 18.9452 30.653 18.9452Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2575" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2575"/>
+</filter>
+<filter id="filter1_i_1302_2575" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2575"/>
+</filter>
+<filter id="filter2_i_1302_2575" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2575"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/护栏碰撞_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/护栏碰撞_fault.svg
new file mode 100644
index 00000000..f061bc25
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/护栏碰撞_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2574)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2574)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2574)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M32.6506 19.079V18.0537H30.8008V16.0255L29.9538 14.7998L29.1068 16.0255V18.0537H27.3685V16.0255L26.5215 14.7998L25.6745 16.0255V18.0537H23.914V16.0255L23.067 14.7998L22.22 16.0255V18.0537H20.4595V16.0255L19.6125 14.7998L18.7655 16.0255V18.0537H17.027V16.0255L16.1803 14.8221L15.3333 16.0255V18.0537H13.5725V16.0255L12.7257 14.8221L11.8788 16.0255V18.0537H9.85059V19.079H11.8788V23.8038H9.85059V24.8291H11.8788V26.9018H13.5725V24.8291H15.3333V26.9018H17.027V24.8291H18.7655V26.9018H20.4595V24.8291H22.22V26.9018H23.914V24.8291H25.6745V26.9018H27.3685V24.8291H29.1068V26.9018H30.8008V24.8291H32.6506V23.8038H30.8008V19.079H32.6506ZM12.7257 24.6953C12.6217 24.6953 12.5288 24.6582 12.4472 24.584C12.3654 24.5098 12.3245 24.4132 12.3245 24.2943C12.3245 24.1756 12.3654 24.079 12.4472 24.0046C12.5288 23.9304 12.6254 23.8933 12.7369 23.8933C12.8482 23.8933 12.9411 23.9304 13.0154 24.0046C13.0896 24.079 13.1268 24.1756 13.1268 24.2943C13.1268 24.4131 13.0896 24.5096 13.0154 24.584C12.9412 24.6582 12.8447 24.6953 12.726 24.6953H12.7257ZM12.7257 18.9452C12.6217 18.9452 12.5288 18.9081 12.4472 18.8339C12.3654 18.7595 12.3245 18.663 12.3245 18.5442C12.3245 18.4255 12.3654 18.3289 12.4472 18.2545C12.5288 18.1803 12.6254 18.1432 12.7369 18.1432C12.8482 18.1432 12.9411 18.1803 13.0154 18.2545C13.0896 18.3288 13.1268 18.4253 13.1268 18.5442C13.1268 18.663 13.0896 18.7595 13.0154 18.8339C12.9412 18.9081 12.8447 18.9452 12.726 18.9452H12.7257ZM15.3333 23.8038H13.5725V19.079H15.3333V23.8038ZM16.1803 24.6953C16.0614 24.6953 15.9648 24.6582 15.8906 24.584C15.8164 24.5098 15.7793 24.4132 15.7793 24.2943C15.7793 24.1756 15.8164 24.079 15.8906 24.0046C15.9648 23.9304 16.0614 23.8933 16.1803 23.8933C16.2992 23.8933 16.3958 23.9304 16.4702 24.0046C16.5444 24.079 16.5815 24.1756 16.5815 24.2943C16.5815 24.4131 16.5444 24.5096 16.4702 24.584C16.3959 24.6582 16.2993 24.6953 16.1803 24.6953ZM16.1803 18.9452C16.0614 18.9452 15.9648 18.9081 15.8906 18.8339C15.8164 18.7595 15.7793 18.663 15.7793 18.5442C15.7793 18.4255 15.8164 18.3289 15.8906 18.2545C15.9648 18.1803 16.0614 18.1432 16.1803 18.1432C16.2992 18.1432 16.3958 18.1803 16.4702 18.2545C16.5444 18.3288 16.5815 18.4253 16.5815 18.5442C16.5815 18.663 16.5444 18.7595 16.4702 18.8339C16.3959 18.9081 16.2993 18.9452 16.1803 18.9452ZM18.7655 23.8038H17.027V19.079H18.7655V23.8038ZM19.6125 24.6953C19.5085 24.6953 19.4193 24.6582 19.3451 24.584C19.2709 24.5098 19.2338 24.4132 19.2338 24.2943C19.2338 24.1756 19.2709 24.079 19.3451 24.0046C19.4193 23.9304 19.5122 23.8933 19.6236 23.8933C19.7351 23.8933 19.828 23.9304 19.9022 24.0046C19.9764 24.079 20.0135 24.1756 20.0135 24.2943C20.0135 24.4131 19.9764 24.5096 19.9022 24.584C19.828 24.6582 19.7314 24.6953 19.6125 24.6953ZM19.6125 18.9452C19.5085 18.9452 19.4193 18.9081 19.3451 18.8339C19.2709 18.7595 19.2338 18.663 19.2338 18.5442C19.2338 18.4255 19.2709 18.3289 19.3451 18.2545C19.4193 18.1803 19.5122 18.1432 19.6236 18.1432C19.7351 18.1432 19.828 18.1803 19.9022 18.2545C19.9764 18.3288 20.0135 18.4253 20.0135 18.5442C20.0135 18.663 19.9764 18.7595 19.9022 18.8339C19.828 18.9081 19.7314 18.9452 19.6125 18.9452ZM22.22 23.8038H20.4818V19.079H22.22V23.8038ZM23.067 24.6953C22.9481 24.6953 22.8516 24.6582 22.7773 24.584C22.703 24.5098 22.6658 24.4132 22.6658 24.2943C22.6658 24.1756 22.703 24.079 22.7773 24.0046C22.8516 23.9304 22.9481 23.8933 23.067 23.8933C23.1859 23.8933 23.2825 23.9304 23.3567 24.0046C23.4309 24.079 23.468 24.1756 23.468 24.2943C23.468 24.4131 23.4309 24.5096 23.3567 24.584C23.2825 24.6582 23.1859 24.6953 23.067 24.6953ZM23.067 18.9452C22.9481 18.9452 22.8516 18.9081 22.7773 18.8339C22.703 18.7595 22.6658 18.663 22.6658 18.5442C22.6658 18.4255 22.703 18.3289 22.7773 18.2545C22.8516 18.1803 22.9481 18.1432 23.067 18.1432C23.1859 18.1432 23.2825 18.1803 23.3567 18.2545C23.4309 18.3288 23.468 18.4253 23.468 18.5442C23.468 18.663 23.4309 18.7595 23.3567 18.8339C23.2825 18.9081 23.1859 18.9452 23.067 18.9452ZM25.6745 23.8038H23.914V19.079H25.6745V23.8038ZM26.5215 24.6953C26.4026 24.6953 26.3061 24.6582 26.2319 24.584C26.1576 24.5098 26.1205 24.4132 26.1205 24.2943C26.1205 24.1756 26.1576 24.079 26.2319 24.0046C26.3061 23.9304 26.3989 23.8933 26.5104 23.8933C26.6219 23.8933 26.7184 23.9304 26.8001 24.0046C26.8817 24.079 26.9225 24.1756 26.9225 24.2943C26.9225 24.4131 26.8817 24.5096 26.8001 24.584C26.7184 24.6582 26.6256 24.6953 26.5215 24.6953ZM26.5215 18.9452C26.4026 18.9452 26.3061 18.9081 26.2319 18.8339C26.1576 18.7595 26.1205 18.663 26.1205 18.5442C26.1205 18.4255 26.1576 18.3289 26.2319 18.2545C26.3061 18.1803 26.3989 18.1432 26.5104 18.1432C26.6219 18.1432 26.7184 18.1803 26.8001 18.2545C26.8817 18.3288 26.9225 18.4253 26.9225 18.5442C26.9225 18.663 26.8817 18.7595 26.8001 18.8339C26.7184 18.9081 26.6256 18.9452 26.5215 18.9452ZM29.1068 23.8038H27.3685V19.079H29.1068V23.8038ZM29.9538 24.6953C29.8497 24.6953 29.7569 24.6582 29.6752 24.584C29.5936 24.5098 29.5528 24.4132 29.5528 24.2943C29.5528 24.1756 29.5936 24.079 29.6752 24.0046C29.7569 23.9304 29.8534 23.8933 29.9649 23.8933C30.0764 23.8933 30.1692 23.9304 30.2435 24.0046C30.3177 24.079 30.3548 24.1756 30.3548 24.2943C30.3548 24.4131 30.3177 24.5096 30.2435 24.584C30.1692 24.6582 30.0727 24.6953 29.9538 24.6953ZM29.9538 18.9452C29.8497 18.9452 29.7569 18.9081 29.6752 18.8339C29.5936 18.7595 29.5528 18.663 29.5528 18.5442C29.5528 18.4255 29.5936 18.3289 29.6752 18.2545C29.7569 18.1803 29.8534 18.1432 29.9649 18.1432C30.0764 18.1432 30.1692 18.1803 30.2435 18.2545C30.3177 18.3288 30.3548 18.4253 30.3548 18.5442C30.3548 18.663 30.3177 18.7595 30.2435 18.8339C30.1692 18.9081 30.0727 18.9452 29.9538 18.9452Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2574" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2574"/>
+</filter>
+<filter id="filter1_i_1302_2574" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2574"/>
+</filter>
+<filter id="filter2_i_1302_2574" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2574"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/摄像机_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/摄像机_active.svg
new file mode 100644
index 00000000..b1573ef6
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/摄像机_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2634)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2634)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2634)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M17.24 23.4248H15.08V20.7168L13 20.3186V29L15.08 28.2832V25.2566H18.44L20.28 22.7876L17.88 21.5133L17.24 23.4248ZM28.12 23.9823L33 20.8761L17.8 11H16.04L13.64 14.7434V16.0177L27 24.0619H28.12V23.9823ZM26.28 24.6195L14.76 17.2124L13.56 18.4867L26.92 26.531H28.12L28.76 25.8938L29.4 24.0619C29.4 24.0619 27.64 25.3363 27.56 25.3363C26.84 24.8584 26.28 24.6195 26.28 24.6195Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2634" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2634"/>
+</filter>
+<filter id="filter1_i_1302_2634" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2634"/>
+</filter>
+<filter id="filter2_i_1302_2634" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2634"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/摄像机_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/摄像机_fault.svg
new file mode 100644
index 00000000..415d2e92
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/摄像机_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2635)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2635)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2635)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M17.24 23.4248H15.08V20.7168L13 20.3186V29L15.08 28.2832V25.2566H18.44L20.28 22.7876L17.88 21.5133L17.24 23.4248ZM28.12 23.9823L33 20.8761L17.8 11H16.04L13.64 14.7434V16.0177L27 24.0619H28.12V23.9823ZM26.28 24.6195L14.76 17.2124L13.56 18.4867L26.92 26.531H28.12L28.76 25.8938L29.4 24.0619C29.4 24.0619 27.64 25.3363 27.56 25.3363C26.84 24.8584 26.28 24.6195 26.28 24.6195Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2635" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2635"/>
+</filter>
+<filter id="filter1_i_1302_2635" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2635"/>
+</filter>
+<filter id="filter2_i_1302_2635" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2635"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/智慧锥桶_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/智慧锥桶_active.svg
new file mode 100644
index 00000000..422c5ddd
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/智慧锥桶_active.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2588)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2588)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2588)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2588)">
+<path d="M23.5398 16.7837L24.9296 22.3414C23.8155 22.6141 22.3294 22.7921 20.6669 22.7921C19.0044 22.7921 17.5198 22.6141 16.4043 22.3414L17.7941 16.7837C18.6763 16.896 19.6461 16.9587 20.6669 16.9587C21.6878 16.9587 22.6576 16.896 23.5398 16.7837ZM23.1825 15.3575L22.0815 10.9504C21.714 9.47747 19.6198 9.47747 19.2524 10.9504L18.1514 15.3546C18.9169 15.4494 19.7657 15.5004 20.6669 15.5004C21.5681 15.5004 22.4169 15.4479 23.1825 15.3575ZM29.5933 27.9181C29.9086 27.9962 30.1343 28.2733 30.1468 28.5978C30.1593 28.9223 29.9556 29.2159 29.6474 29.3181L20.8974 32.2347C20.7478 32.2846 20.5861 32.2846 20.4365 32.2347L11.6865 29.3181C11.3782 29.2159 11.1746 28.9223 11.1871 28.5978C11.1996 28.2733 11.4253 27.9962 11.7405 27.9181L15.2274 27.046L16.0513 23.7545C17.3084 24.0637 18.9155 24.249 20.6669 24.249C22.4184 24.249 24.0254 24.0637 25.2825 23.7545L26.1065 27.046L29.5933 27.9181Z" fill="#FFDB82"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2588" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2588"/>
+</filter>
+<filter id="filter1_i_1302_2588" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2588"/>
+</filter>
+<filter id="filter2_i_1302_2588" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2588"/>
+</filter>
+<clipPath id="clip0_1302_2588">
+<rect width="23.3333" height="23.3333" fill="white" transform="translate(9 9.66699)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/智慧锥桶_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/智慧锥桶_fault.svg
new file mode 100644
index 00000000..ae68b46b
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/智慧锥桶_fault.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2589)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2589)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2589)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2589)">
+<path d="M24.5398 16.7837L25.9296 22.3414C24.8155 22.6141 23.3294 22.7921 21.6669 22.7921C20.0044 22.7921 18.5198 22.6141 17.4043 22.3414L18.7941 16.7837C19.6763 16.896 20.6461 16.9587 21.6669 16.9587C22.6878 16.9587 23.6576 16.896 24.5398 16.7837ZM24.1825 15.3575L23.0815 10.9504C22.714 9.47747 20.6198 9.47747 20.2524 10.9504L19.1514 15.3546C19.9169 15.4494 20.7657 15.5004 21.6669 15.5004C22.5681 15.5004 23.4169 15.4479 24.1825 15.3575ZM30.5933 27.9181C30.9086 27.9962 31.1343 28.2733 31.1468 28.5978C31.1593 28.9223 30.9556 29.2159 30.6474 29.3181L21.8974 32.2347C21.7478 32.2846 21.5861 32.2846 21.4365 32.2347L12.6865 29.3181C12.3782 29.2159 12.1746 28.9223 12.1871 28.5978C12.1996 28.2733 12.4253 27.9962 12.7405 27.9181L16.2274 27.046L17.0513 23.7545C18.3084 24.0637 19.9155 24.249 21.6669 24.249C23.4184 24.249 25.0254 24.0637 26.2825 23.7545L27.1065 27.046L30.5933 27.9181Z" fill="#FF5F5F"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2589" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2589"/>
+</filter>
+<filter id="filter1_i_1302_2589" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2589"/>
+</filter>
+<filter id="filter2_i_1302_2589" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2589"/>
+</filter>
+<clipPath id="clip0_1302_2589">
+<rect width="23.3333" height="23.3333" fill="white" transform="translate(10 9.66699)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/毫米波雷达_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/毫米波雷达_active.svg
new file mode 100644
index 00000000..fbd04db0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/毫米波雷达_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2572)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2572)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2572)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M22.2007 20.0557C22.4858 20.209 22.8097 20.2963 23.155 20.2963C24.2722 20.2963 25.18 19.3885 25.18 18.2713C25.18 17.154 24.2722 16.2463 23.155 16.2463C22.0377 16.2463 21.13 17.154 21.13 18.2713C21.13 18.6165 21.2153 18.9404 21.3705 19.2256L20.6218 19.9743L21.452 20.8044L22.2007 20.0557ZM14.9076 23.9816C15.2586 24.4588 15.6485 24.9146 16.0791 25.3432C17.5436 26.8077 19.3009 27.8279 21.0873 28.2605L21.8767 30.1982C21.9524 30.3786 21.9311 30.5861 21.8224 30.7471C21.7119 30.91 21.5295 31.007 21.3336 31.007H13.1095C12.9175 31.007 12.7371 30.912 12.6265 30.7529C12.516 30.5939 12.4927 30.3922 12.5606 30.2118L14.9076 23.9816ZM14.8804 15.8932L25.5291 26.5439C24.5884 27.2228 23.3179 27.4633 21.8826 27.2247C20.1349 26.9318 18.3679 25.9697 16.9112 24.5131C15.4545 23.0564 14.4905 21.2913 14.1996 19.5398C13.961 18.1064 14.2035 16.834 14.8804 15.8932ZM23.155 13.781C25.63 13.781 27.6472 15.7943 27.6472 18.2732C27.6472 18.5991 27.3834 18.8609 27.0595 18.8609C26.7336 18.8609 26.4718 18.5971 26.4718 18.2732C26.4718 16.4441 24.9821 14.9564 23.155 14.9564C22.8311 14.9564 22.5673 14.6945 22.5673 14.3687C22.5673 14.0428 22.8311 13.781 23.155 13.781ZM23.155 11.2769C27.011 11.2769 30.1474 14.4152 30.1494 18.2693C30.1494 18.5952 29.8856 18.857 29.5617 18.857C29.2358 18.857 28.9739 18.5932 28.9739 18.2693C28.9739 15.0611 26.3632 12.4523 23.155 12.4523C22.8311 12.4523 22.5673 12.1885 22.5673 11.8646C22.5673 11.5387 22.8311 11.2769 23.155 11.2769Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2572" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2572"/>
+</filter>
+<filter id="filter1_i_1302_2572" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2572"/>
+</filter>
+<filter id="filter2_i_1302_2572" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2572"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/毫米波雷达_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/毫米波雷达_fault.svg
new file mode 100644
index 00000000..b62582a0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/毫米波雷达_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2573)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2573)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2573)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M21.5024 20.0567C21.7876 20.2099 22.1115 20.2972 22.4567 20.2972C23.574 20.2972 24.4817 19.3895 24.4817 18.2722C24.4817 17.155 23.574 16.2472 22.4567 16.2472C21.3395 16.2472 20.4317 17.155 20.4317 18.2722C20.4317 18.6175 20.5171 18.9414 20.6723 19.2265L19.9235 19.9752L20.7537 20.8054L21.5024 20.0567ZM14.2093 23.9826C14.5604 24.4597 14.9503 24.9155 15.3809 25.3442C16.8453 26.8087 18.6026 27.8289 20.3891 28.2615L21.1785 30.1992C21.2541 30.3796 21.2328 30.5871 21.1242 30.7481C21.0136 30.911 20.8313 31.008 20.6354 31.008H12.4113C12.2192 31.008 12.0388 30.913 11.9283 30.7539C11.8177 30.5949 11.7944 30.3931 11.8623 30.2127L14.2093 23.9826ZM14.1822 15.8942L24.8309 26.5449C23.8901 27.2237 22.6197 27.4643 21.1843 27.2257C19.4367 26.9328 17.6697 25.9707 16.213 24.514C14.7563 23.0574 13.7923 21.2923 13.5013 19.5408C13.2628 18.1074 13.5052 16.8349 14.1822 15.8942ZM22.4567 13.7819C24.9317 13.7819 26.949 15.7953 26.949 18.2742C26.949 18.6 26.6852 18.8619 26.3613 18.8619C26.0354 18.8619 25.7735 18.5981 25.7735 18.2742C25.7735 16.4451 24.2839 14.9574 22.4567 14.9574C22.1328 14.9574 21.869 14.6955 21.869 14.3696C21.869 14.0438 22.1328 13.7819 22.4567 13.7819ZM22.4567 11.2778C26.3128 11.2778 29.4492 14.4162 29.4511 18.2703C29.4511 18.5962 29.1873 18.858 28.8634 18.858C28.5376 18.858 28.2757 18.5942 28.2757 18.2703C28.2757 15.0621 25.6649 12.4533 22.4567 12.4533C22.1328 12.4533 21.869 12.1895 21.869 11.8655C21.869 11.5397 22.1328 11.2778 22.4567 11.2778Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2573" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2573"/>
+</filter>
+<filter id="filter1_i_1302_2573" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2573"/>
+</filter>
+<filter id="filter2_i_1302_2573" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2573"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/气象检测器_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/气象检测器_active.svg
new file mode 100644
index 00000000..3460bda0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/气象检测器_active.svg
@@ -0,0 +1,53 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2618)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2618)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2618)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M23.7726 20.1072L23.5926 20.4372C25.0726 22.5972 25.5926 24.6272 24.7526 25.4372C23.6526 26.4372 20.6526 25.0372 18.0526 22.2572C15.4526 19.4772 14.2426 16.3772 15.3426 15.3472C16.2426 14.5072 18.4226 15.3472 20.6026 17.1572C20.6627 17.1944 20.732 17.2141 20.8026 17.2141C20.8733 17.2141 20.9426 17.1944 21.0026 17.1572L21.1926 17.0772L21.4326 15.5272C21.4404 15.4594 21.4307 15.3907 21.4045 15.3277C21.3782 15.2647 21.3363 15.2095 21.2826 15.1672C18.5526 13.1672 15.5826 12.2872 13.9426 13.9172C11.8726 15.9872 10.6226 22.4172 14.6126 26.4072C15.3578 27.1616 16.2358 27.7718 17.2026 28.2072V30.7372H15.1226C14.876 30.7372 14.6394 30.8352 14.465 31.0096C14.2906 31.184 14.1926 31.4206 14.1926 31.6672C14.1926 31.9139 14.2906 32.1504 14.465 32.3248C14.6394 32.4993 14.876 32.5972 15.1226 32.5972H22.5326C22.7793 32.5972 23.0158 32.4993 23.1903 32.3248C23.3647 32.1504 23.4626 31.9139 23.4626 31.6672C23.4626 31.4206 23.3647 31.184 23.1903 31.0096C23.0158 30.8352 22.7793 30.7372 22.5326 30.7372H19.0526V28.7372C20.3199 28.9813 21.6259 28.9354 22.8728 28.6029C24.1197 28.2704 25.2752 27.6599 26.2526 26.8172C27.8126 25.2572 27.1926 22.2572 25.4426 19.5272L23.7726 20.0672V20.1072Z" fill="#FFDB82"/>
+<path d="M19.7532 20.8967L19.9632 21.1067C20.0652 21.2044 20.1867 21.2793 20.3198 21.3266C20.4528 21.374 20.5944 21.3926 20.7352 21.3812C20.8759 21.3699 21.0127 21.3289 21.1365 21.2609C21.2602 21.1929 21.3682 21.0994 21.4532 20.9867L23.2532 18.7967C23.3844 18.6254 23.4697 18.4235 23.5012 18.21C23.5327 17.9965 23.5093 17.7786 23.4332 17.5767C23.6118 17.72 23.8342 17.7976 24.0632 17.7967C24.2795 17.8127 24.4956 17.7633 24.6834 17.6548C24.8712 17.5463 25.022 17.3838 25.1162 17.1884C25.2103 16.993 25.2434 16.7738 25.2112 16.5593C25.1791 16.3449 25.083 16.145 24.9357 15.9859C24.7883 15.8267 24.5965 15.7157 24.3851 15.6671C24.1737 15.6185 23.9526 15.6347 23.7506 15.7136C23.5485 15.7924 23.3749 15.9303 23.2523 16.1092C23.1297 16.2881 23.0638 16.4998 23.0632 16.7167C23.061 16.9581 23.1383 17.1935 23.2832 17.3867C23.0808 17.31 22.862 17.2872 22.6481 17.3205C22.4343 17.3538 22.2327 17.4421 22.0632 17.5767L19.8632 19.3667C19.7446 19.4523 19.6462 19.5628 19.5749 19.6905C19.5037 19.8183 19.4613 19.9601 19.4508 20.106C19.4403 20.2519 19.462 20.3983 19.5142 20.5349C19.5665 20.6715 19.6481 20.795 19.7532 20.8967Z" fill="#FFDB82"/>
+<path d="M23.0225 12.4473V13.9873C23.507 13.9884 23.9862 14.0894 24.43 14.2838C24.8739 14.4782 25.273 14.7619 25.6025 15.1173C26.2917 15.8471 26.6746 16.8135 26.6725 17.8173H28.1725C28.1966 16.4237 27.6688 15.077 26.704 14.071C25.7393 13.0651 24.4159 12.4814 23.0225 12.4473Z" fill="#FFDB82"/>
+<path d="M23.0225 9.66699V11.237C24.7306 11.2815 26.3516 12.0011 27.5304 13.238C28.7093 14.475 29.3501 16.1287 29.3125 17.837H30.8125C30.8581 15.7219 30.0641 13.6748 28.6042 12.1437C27.1443 10.6125 25.1373 9.72203 23.0225 9.66699Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2618" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2618"/>
+</filter>
+<filter id="filter1_i_1302_2618" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2618"/>
+</filter>
+<filter id="filter2_i_1302_2618" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2618"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/气象检测器_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/气象检测器_fault.svg
new file mode 100644
index 00000000..d2e7a6fc
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/气象检测器_fault.svg
@@ -0,0 +1,53 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2619)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2619)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2619)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M23.7726 20.1072L23.5926 20.4372C25.0726 22.5972 25.5926 24.6272 24.7526 25.4372C23.6526 26.4372 20.6526 25.0372 18.0526 22.2572C15.4526 19.4772 14.2426 16.3772 15.3426 15.3472C16.2426 14.5072 18.4226 15.3472 20.6026 17.1572C20.6627 17.1944 20.732 17.2141 20.8026 17.2141C20.8733 17.2141 20.9426 17.1944 21.0026 17.1572L21.1926 17.0772L21.4326 15.5272C21.4404 15.4594 21.4307 15.3907 21.4045 15.3277C21.3782 15.2647 21.3363 15.2095 21.2826 15.1672C18.5526 13.1672 15.5826 12.2872 13.9426 13.9172C11.8726 15.9872 10.6226 22.4172 14.6126 26.4072C15.3578 27.1616 16.2358 27.7718 17.2026 28.2072V30.7372H15.1226C14.876 30.7372 14.6394 30.8352 14.465 31.0096C14.2906 31.184 14.1926 31.4206 14.1926 31.6672C14.1926 31.9139 14.2906 32.1504 14.465 32.3248C14.6394 32.4993 14.876 32.5972 15.1226 32.5972H22.5326C22.7793 32.5972 23.0158 32.4993 23.1903 32.3248C23.3647 32.1504 23.4626 31.9139 23.4626 31.6672C23.4626 31.4206 23.3647 31.184 23.1903 31.0096C23.0158 30.8352 22.7793 30.7372 22.5326 30.7372H19.0526V28.7372C20.3199 28.9813 21.6259 28.9354 22.8728 28.6029C24.1197 28.2704 25.2752 27.6599 26.2526 26.8172C27.8126 25.2572 27.1926 22.2572 25.4426 19.5272L23.7726 20.0672V20.1072Z" fill="#FF5F5F"/>
+<path d="M19.7532 20.8967L19.9632 21.1067C20.0652 21.2044 20.1867 21.2793 20.3198 21.3266C20.4528 21.374 20.5944 21.3926 20.7352 21.3812C20.8759 21.3699 21.0127 21.3289 21.1365 21.2609C21.2602 21.1929 21.3682 21.0994 21.4532 20.9867L23.2532 18.7967C23.3844 18.6254 23.4697 18.4235 23.5012 18.21C23.5327 17.9965 23.5093 17.7786 23.4332 17.5767C23.6118 17.72 23.8342 17.7976 24.0632 17.7967C24.2795 17.8127 24.4956 17.7633 24.6834 17.6548C24.8712 17.5463 25.022 17.3838 25.1162 17.1884C25.2103 16.993 25.2434 16.7738 25.2112 16.5593C25.1791 16.3449 25.083 16.145 24.9357 15.9859C24.7883 15.8267 24.5965 15.7157 24.3851 15.6671C24.1737 15.6185 23.9526 15.6347 23.7506 15.7136C23.5485 15.7924 23.3749 15.9303 23.2523 16.1092C23.1297 16.2881 23.0638 16.4998 23.0632 16.7167C23.061 16.9581 23.1383 17.1935 23.2832 17.3867C23.0808 17.31 22.862 17.2872 22.6481 17.3205C22.4343 17.3538 22.2327 17.4421 22.0632 17.5767L19.8632 19.3667C19.7446 19.4523 19.6462 19.5628 19.5749 19.6905C19.5037 19.8183 19.4613 19.9601 19.4508 20.106C19.4403 20.2519 19.462 20.3983 19.5142 20.5349C19.5665 20.6715 19.6481 20.795 19.7532 20.8967Z" fill="#FF5F5F"/>
+<path d="M23.0225 12.4473V13.9873C23.507 13.9884 23.9862 14.0894 24.43 14.2838C24.8739 14.4782 25.273 14.7619 25.6025 15.1173C26.2917 15.8471 26.6746 16.8135 26.6725 17.8173H28.1725C28.1966 16.4237 27.6688 15.077 26.704 14.071C25.7393 13.0651 24.4159 12.4814 23.0225 12.4473Z" fill="#FF5F5F"/>
+<path d="M23.0225 9.66699V11.237C24.7306 11.2815 26.3516 12.0011 27.5304 13.238C28.7093 14.475 29.3501 16.1287 29.3125 17.837H30.8125C30.8581 15.7219 30.0641 13.6748 28.6042 12.1437C27.1443 10.6125 25.1373 9.72203 23.0225 9.66699Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2619" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2619"/>
+</filter>
+<filter id="filter1_i_1302_2619" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2619"/>
+</filter>
+<filter id="filter2_i_1302_2619" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2619"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/疲劳唤醒_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/疲劳唤醒_active.svg
new file mode 100644
index 00000000..67c35d94
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/疲劳唤醒_active.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2584)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2584)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2584)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2584)">
+<path d="M20.3949 11C20.0746 11 19.7084 11 19.3881 11.0449C15.4981 11.4942 12.2945 14.5493 11.7453 18.3681C11.3334 21.3783 12.5691 24.2536 14.9031 26.0957C15.1319 27.4435 16.3218 28.4768 17.7405 28.4768H22.912C24.3307 28.4768 25.5664 27.4435 25.7494 26.0957C27.8089 24.4783 28.9987 22.0971 28.9987 19.4913C29.0903 14.8188 25.2002 11 20.3949 11ZM24.0561 25.1971V25.6913C24.0561 26.2754 23.5985 26.7246 23.0035 26.7246H21.3102V21.513L21.8136 22.0971C21.9967 22.2768 22.2255 22.4116 22.5001 22.4116H22.5459C22.8205 22.4116 23.0951 22.2319 23.2323 22.0072L24.7884 19.5812C25.0629 19.1768 24.9257 18.5928 24.5138 18.3232C24.1019 18.0536 23.5069 18.1884 23.2323 18.5928L22.317 19.9855L21.0356 18.5029C20.6695 18.0986 19.983 18.0986 19.6627 18.5029L18.3813 19.9855L17.466 18.5928C17.1914 18.1884 16.6422 18.0536 16.1845 18.3232C15.7727 18.5928 15.6354 19.1319 15.9099 19.5812L17.466 22.0072C17.6033 22.2319 17.8778 22.4116 18.1524 22.4116C18.427 22.4116 18.7474 22.3217 18.9304 22.0971L19.4339 21.513V26.7246H17.7405C17.1456 26.7246 16.688 26.2754 16.688 25.6913V25.1971C14.537 23.8493 13.164 21.3783 13.5302 18.6377C13.9878 15.5826 16.5049 13.2014 19.6169 12.842C19.8457 12.7971 20.1203 12.7971 20.3949 12.7971C24.1934 12.7971 27.2597 15.8072 27.2597 19.4913C27.2597 21.9174 25.9783 23.9841 24.0561 25.1971ZM22.6832 29.8696H18.1067C17.6033 29.8696 17.1914 30.2739 17.1914 30.7681C17.1914 31.2623 17.6033 31.6667 18.1067 31.6667H22.6832C23.1866 31.6667 23.5985 31.2623 23.5985 30.7681C23.5985 30.2739 23.1866 29.8696 22.6832 29.8696Z" fill="#FFDB82"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2584" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2584"/>
+</filter>
+<filter id="filter1_i_1302_2584" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2584"/>
+</filter>
+<filter id="filter2_i_1302_2584" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2584"/>
+</filter>
+<clipPath id="clip0_1302_2584">
+<rect width="22.6667" height="22.6667" fill="white" transform="translate(9 9)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/疲劳唤醒_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/疲劳唤醒_fault.svg
new file mode 100644
index 00000000..b72a52aa
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/疲劳唤醒_fault.svg
@@ -0,0 +1,55 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2585)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2585)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2585)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<g clip-path="url(#clip0_1302_2585)">
+<path d="M20.3949 11C20.0746 11 19.7084 11 19.3881 11.0449C15.4981 11.4942 12.2945 14.5493 11.7453 18.3681C11.3334 21.3783 12.5691 24.2536 14.9031 26.0957C15.1319 27.4435 16.3218 28.4768 17.7405 28.4768H22.912C24.3307 28.4768 25.5664 27.4435 25.7494 26.0957C27.8089 24.4783 28.9987 22.0971 28.9987 19.4913C29.0903 14.8188 25.2002 11 20.3949 11ZM24.0561 25.1971V25.6913C24.0561 26.2754 23.5985 26.7246 23.0035 26.7246H21.3102V21.513L21.8136 22.0971C21.9967 22.2768 22.2255 22.4116 22.5001 22.4116H22.5459C22.8205 22.4116 23.0951 22.2319 23.2323 22.0072L24.7884 19.5812C25.0629 19.1768 24.9257 18.5928 24.5138 18.3232C24.1019 18.0536 23.5069 18.1884 23.2323 18.5928L22.317 19.9855L21.0356 18.5029C20.6695 18.0986 19.983 18.0986 19.6627 18.5029L18.3813 19.9855L17.466 18.5928C17.1914 18.1884 16.6422 18.0536 16.1845 18.3232C15.7727 18.5928 15.6354 19.1319 15.9099 19.5812L17.466 22.0072C17.6033 22.2319 17.8778 22.4116 18.1524 22.4116C18.427 22.4116 18.7474 22.3217 18.9304 22.0971L19.4339 21.513V26.7246H17.7405C17.1456 26.7246 16.688 26.2754 16.688 25.6913V25.1971C14.537 23.8493 13.164 21.3783 13.5302 18.6377C13.9878 15.5826 16.5049 13.2014 19.6169 12.842C19.8457 12.7971 20.1203 12.7971 20.3949 12.7971C24.1934 12.7971 27.2597 15.8072 27.2597 19.4913C27.2597 21.9174 25.9783 23.9841 24.0561 25.1971ZM22.6832 29.8696H18.1067C17.6033 29.8696 17.1914 30.2739 17.1914 30.7681C17.1914 31.2623 17.6033 31.6667 18.1067 31.6667H22.6832C23.1866 31.6667 23.5985 31.2623 23.5985 30.7681C23.5985 30.2739 23.1866 29.8696 22.6832 29.8696Z" fill="#FF5F5F"/>
+</g>
+<defs>
+<filter id="filter0_i_1302_2585" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2585"/>
+</filter>
+<filter id="filter1_i_1302_2585" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2585"/>
+</filter>
+<filter id="filter2_i_1302_2585" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2585"/>
+</filter>
+<clipPath id="clip0_1302_2585">
+<rect width="22.6667" height="22.6667" fill="white" transform="translate(9 9)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/行车诱导_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/行车诱导_active.svg
new file mode 100644
index 00000000..fe5082ca
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/行车诱导_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2616)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2616)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2616)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M22.4336 24.0085L22.6415 30H20.2486L20.4578 24.0102H22.4336V24.0085ZM19.6237 12L17.4551 29.9077H14.585C13.0605 29.9077 12.6598 28.4166 13.2793 25.8144C13.5336 24.7413 13.911 22.8919 14.3007 20.9539L14.5345 19.7867C15.0035 17.4523 15.4574 15.1903 15.7118 14.1896C16.2204 12.1901 16.5103 12.0941 17.4551 12H19.6237ZM24.9659 12C26.1993 12 27.0717 12.666 27.5064 14.4737C27.9413 16.2833 29.3934 24.6708 29.7571 26.0985C30.1194 27.5281 30.263 29.9077 28.8136 29.9077H25.4007L23.2089 12L24.9659 12ZM22.1738 16.5203L22.3816 22.5101H20.5084L20.719 16.5204L22.1738 16.5203ZM22.0193 12.0272L22.1232 15.022H20.7736L20.8776 12.0272H22.0193Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2616" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2616"/>
+</filter>
+<filter id="filter1_i_1302_2616" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2616"/>
+</filter>
+<filter id="filter2_i_1302_2616" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2616"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/行车诱导_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/行车诱导_fault.svg
new file mode 100644
index 00000000..63c8c1e2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/行车诱导_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2617)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2617)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2617)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M22.4336 24.0085L22.6415 30H20.2486L20.4578 24.0102H22.4336V24.0085ZM19.6237 12L17.4551 29.9077H14.585C13.0605 29.9077 12.6598 28.4166 13.2793 25.8144C13.5336 24.7413 13.911 22.8919 14.3007 20.9539L14.5345 19.7867C15.0035 17.4523 15.4574 15.1903 15.7118 14.1896C16.2204 12.1901 16.5103 12.0941 17.4551 12H19.6237ZM24.9659 12C26.1993 12 27.0717 12.666 27.5064 14.4737C27.9413 16.2833 29.3934 24.6708 29.7571 26.0985C30.1194 27.5281 30.263 29.9077 28.8136 29.9077H25.4007L23.2089 12L24.9659 12ZM22.1738 16.5203L22.3816 22.5101H20.5084L20.719 16.5204L22.1738 16.5203ZM22.0193 12.0272L22.1232 15.022H20.7736L20.8776 12.0272H22.0193Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2617" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2617"/>
+</filter>
+<filter id="filter1_i_1302_2617" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2617"/>
+</filter>
+<filter id="filter2_i_1302_2617" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2617"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/设备箱_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/设备箱_active.svg
new file mode 100644
index 00000000..94fff315
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/设备箱_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2580)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2580)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2580)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M14.9909 16.8596H27.573C27.9027 16.8596 28.1699 17.1594 28.1699 17.5293V30.4609C28.1699 30.6849 28.0081 30.8664 27.8086 30.8664H14.7553C14.5557 30.8664 14.3939 30.6849 14.3939 30.4609V17.5293C14.3939 17.1594 14.6612 16.8596 14.9909 16.8596V16.8596ZM25.7421 21.829C25.5773 21.829 25.4436 21.9789 25.4436 22.1639V25.5126C25.4436 25.6976 25.5773 25.8475 25.7421 25.8475H25.7422C25.9071 25.8475 26.0407 25.6976 26.0407 25.5126V22.1639C26.0407 21.9789 25.9071 21.829 25.7422 21.829H25.7421H25.7421ZM15.5921 17.8912C15.4272 17.8912 15.2936 18.0412 15.2936 18.2261V29.5311C15.2936 29.716 15.4272 29.866 15.5921 29.866H26.9363C27.1012 29.866 27.2348 29.716 27.2348 29.5311V18.2261C27.2348 18.0412 27.1012 17.8912 26.9363 17.8912H15.5921V17.8912ZM15.8906 18.2261H26.6378C26.8026 18.2261 26.9363 18.3761 26.9363 18.561V29.1962C26.9363 29.3812 26.8026 29.5311 26.6378 29.5311H15.8906C15.7257 29.5311 15.5921 29.3812 15.5921 29.1962V18.561C15.5921 18.376 15.7257 18.2261 15.8906 18.2261ZM27.5762 12.8164H14.954C14.8789 12.8164 14.8057 12.8426 14.7446 12.8914C14.6834 12.9402 14.6373 13.0091 14.6127 13.0887L13.6852 16.08C13.6196 16.2915 13.7193 16.5226 13.9078 16.5962C13.946 16.6111 13.9861 16.6187 14.0265 16.6187H28.5037C28.7032 16.6187 28.865 16.4371 28.865 16.2132C28.865 16.1679 28.8582 16.1228 28.845 16.08L27.9175 13.0886C27.8928 13.0091 27.8467 12.9402 27.7856 12.8914C27.7244 12.8426 27.6512 12.8164 27.5762 12.8164Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2580" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2580"/>
+</filter>
+<filter id="filter1_i_1302_2580" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2580"/>
+</filter>
+<filter id="filter2_i_1302_2580" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2580"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/设备箱_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/设备箱_fault.svg
new file mode 100644
index 00000000..e7ddfd19
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/设备箱_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2581)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2581)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2581)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M14.9889 16.8596H27.571C27.9007 16.8596 28.168 17.1594 28.168 17.5293V30.4609C28.168 30.6849 28.0062 30.8664 27.8066 30.8664H14.7533C14.5538 30.8664 14.392 30.6849 14.392 30.4609V17.5293C14.392 17.1594 14.6592 16.8596 14.9889 16.8596V16.8596ZM25.7401 21.829C25.5753 21.829 25.4417 21.9789 25.4417 22.1639V25.5126C25.4417 25.6976 25.5753 25.8475 25.7401 25.8475H25.7403C25.9051 25.8475 26.0387 25.6976 26.0387 25.5126V22.1639C26.0387 21.9789 25.9051 21.829 25.7403 21.829H25.7401H25.7401ZM15.5901 17.8912C15.4253 17.8912 15.2916 18.0412 15.2916 18.2261V29.5311C15.2916 29.716 15.4253 29.866 15.5901 29.866H26.9344C27.0992 29.866 27.2329 29.716 27.2329 29.5311V18.2261C27.2329 18.0412 27.0992 17.8912 26.9344 17.8912H15.5901V17.8912ZM15.8886 18.2261H26.6359C26.8007 18.2261 26.9343 18.3761 26.9343 18.561V29.1962C26.9343 29.3812 26.8007 29.5311 26.6359 29.5311H15.8886C15.7238 29.5311 15.5902 29.3812 15.5902 29.1962V18.561C15.5902 18.376 15.7238 18.2261 15.8886 18.2261ZM27.5742 12.8164H14.952C14.877 12.8164 14.8038 12.8426 14.7426 12.8914C14.6815 12.9402 14.6354 13.0091 14.6107 13.0887L13.6832 16.08C13.6177 16.2915 13.7173 16.5226 13.9058 16.5962C13.944 16.6111 13.9841 16.6187 14.0245 16.6187H28.5017C28.7013 16.6187 28.8631 16.4371 28.8631 16.2132C28.8631 16.1679 28.8563 16.1228 28.843 16.08L27.9156 13.0886C27.8909 13.0091 27.8448 12.9402 27.7836 12.8914C27.7225 12.8426 27.6493 12.8164 27.5742 12.8164Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2581" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2581"/>
+</filter>
+<filter id="filter1_i_1302_2581" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2581"/>
+</filter>
+<filter id="filter2_i_1302_2581" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2581"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/语音广播_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/语音广播_active.svg
new file mode 100644
index 00000000..c9c955dd
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/语音广播_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2576)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2576)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2576)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M12.2998 22.5373C12.2998 22.6082 12.3155 22.6785 12.346 22.744C12.3766 22.8095 12.4213 22.869 12.4777 22.9192C12.5341 22.9693 12.6011 23.0091 12.6748 23.0362C12.7485 23.0633 12.8275 23.0773 12.9073 23.0773H13.4642C13.6253 23.0773 13.7798 23.1342 13.8937 23.2355C14.0077 23.3367 14.0717 23.4741 14.0717 23.6173V28.4593C14.0717 28.6025 14.1357 28.7399 14.2496 28.8412C14.3635 28.9424 14.5181 28.9993 14.6792 28.9993H15.2766C15.3563 28.9993 15.4353 28.9854 15.509 28.9582C15.5827 28.9311 15.6497 28.8913 15.7061 28.8412C15.7625 28.791 15.8073 28.7315 15.8378 28.666C15.8683 28.6005 15.8841 28.5302 15.8841 28.4593V18.0823C15.8841 18.0114 15.8683 17.9412 15.8378 17.8757C15.8073 17.8102 15.7625 17.7506 15.7061 17.7005C15.6497 17.6503 15.5827 17.6106 15.509 17.5834C15.4353 17.5563 15.3563 17.5423 15.2766 17.5423H12.9073C12.7462 17.5423 12.5917 17.5992 12.4777 17.7005C12.3638 17.8017 12.2998 17.9391 12.2998 18.0823V22.5373ZM16.6131 17.5063C16.5948 17.686 16.5948 17.8667 16.6131 18.0463V22.5463C16.5948 22.726 16.5948 22.9067 16.6131 23.0863C21.8781 23.0863 26.6571 27.4063 26.6571 27.4063C26.8899 27.6223 27.0823 27.5503 27.0823 27.2533V13.3393C27.0823 13.0423 26.8899 12.9703 26.6571 13.1863C26.6571 13.1863 21.8882 17.5063 16.6131 17.5063ZM28.1252 12.7993C27.9227 12.7993 27.7506 13.0423 27.7506 13.3393V27.2443C27.7506 27.5413 27.9126 27.7843 28.1252 27.7843C28.3378 27.7843 28.4998 27.5413 28.4998 27.2443V13.3393C28.4998 13.0423 28.3277 12.7993 28.1252 12.7993Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2576" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2576"/>
+</filter>
+<filter id="filter1_i_1302_2576" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2576"/>
+</filter>
+<filter id="filter2_i_1302_2576" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2576"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/语音广播_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/语音广播_fault.svg
new file mode 100644
index 00000000..1172be6e
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/语音广播_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2577)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2577)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2577)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M12.3008 22.5383C12.3008 22.6092 12.3165 22.6794 12.347 22.7449C12.3776 22.8105 12.4223 22.87 12.4787 22.9201C12.5351 22.9703 12.6021 23.0101 12.6758 23.0372C12.7495 23.0643 12.8285 23.0783 12.9083 23.0783H13.4652C13.6263 23.0783 13.7808 23.1352 13.8947 23.2365C14.0087 23.3377 14.0727 23.4751 14.0727 23.6183V28.4603C14.0727 28.6035 14.1367 28.7409 14.2506 28.8421C14.3645 28.9434 14.519 29.0003 14.6802 29.0003H15.2775C15.3573 29.0003 15.4363 28.9863 15.51 28.9592C15.5837 28.9321 15.6507 28.8923 15.7071 28.8421C15.7635 28.792 15.8083 28.7325 15.8388 28.6669C15.8693 28.6014 15.885 28.5312 15.885 28.4603V18.0833C15.885 18.0124 15.8693 17.9422 15.8388 17.8766C15.8083 17.8111 15.7635 17.7516 15.7071 17.7015C15.6507 17.6513 15.5837 17.6115 15.51 17.5844C15.4363 17.5573 15.3573 17.5433 15.2775 17.5433H12.9083C12.7472 17.5433 12.5926 17.6002 12.4787 17.7015C12.3648 17.8027 12.3008 17.9401 12.3008 18.0833V22.5383ZM16.614 17.5073C16.5958 17.6869 16.5958 17.8677 16.614 18.0473V22.5473C16.5958 22.7269 16.5958 22.9077 16.614 23.0873C21.879 23.0873 26.658 27.4073 26.658 27.4073C26.8909 27.6233 27.0833 27.5513 27.0833 27.2543V13.3403C27.0833 13.0433 26.8909 12.9713 26.658 13.1873C26.658 13.1873 21.8892 17.5073 16.614 17.5073ZM28.1262 12.8003C27.9237 12.8003 27.7515 13.0433 27.7515 13.3403V27.2453C27.7515 27.5423 27.9135 27.7853 28.1262 27.7853C28.3388 27.7853 28.5008 27.5423 28.5008 27.2453V13.3403C28.5008 13.0433 28.3287 12.8003 28.1262 12.8003Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2577" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2577"/>
+</filter>
+<filter id="filter1_i_1302_2577" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2577"/>
+</filter>
+<filter id="filter2_i_1302_2577" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2577"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/远端机_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/远端机_active.svg
new file mode 100644
index 00000000..f41a2059
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/远端机_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2595)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2595)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2595)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M30.5059 22.9547C30.5059 22.9211 30.5059 22.8875 30.4933 22.8538L28.8558 13.8966C28.7928 13.5603 28.6165 13.224 28.3645 12.9998C28.0874 12.7532 27.7221 12.6074 27.2939 12.6074H14.6474C14.2191 12.6074 13.816 12.7644 13.5263 13.011C13.2492 13.2576 13.0854 13.5939 13.0728 13.9527L11.4353 22.7866C11.4228 22.8426 11.4102 22.8987 11.4102 22.9435M14.534 14.1096C14.5466 14.076 14.5466 14.0424 14.5466 13.9975C14.5466 13.9751 14.5592 13.9527 14.5718 13.9415C14.597 13.9191 14.6222 13.9078 14.6474 13.9078H27.2813C27.2939 13.9078 27.3065 13.9078 27.3065 13.9303C27.3568 13.9751 27.382 14.0424 27.3946 14.1208L28.4527 19.8494C28.4023 19.8382 28.3645 19.8382 28.3142 19.8382H13.6145C13.5767 19.8382 13.5263 19.8382 13.4759 19.8494L14.534 14.1096ZM13.3248 20.679C13.4003 20.6341 13.5137 20.6005 13.6145 20.6005H28.3267C28.4275 20.6005 28.5283 20.6229 28.6165 20.679L28.8432 21.9009H13.1106L13.3248 20.679ZM30.0524 28.986H11.8762C11.6243 28.986 11.4102 28.8066 11.4102 28.5712V26.7551C11.4102 26.5309 11.6117 26.3403 11.8762 26.3403H30.0524C30.3043 26.3403 30.5185 26.5197 30.5185 26.7551V28.5824C30.5185 28.8066 30.3169 28.986 30.0524 28.986ZM30.0398 23.3135H11.9014C11.6369 23.3135 11.4228 23.504 11.4228 23.7395V25.5219C11.4228 25.7574 11.6369 25.9479 11.9014 25.9479H30.0272C30.2917 25.9479 30.5059 25.7574 30.5059 25.5219V23.7395C30.5185 23.5153 30.3043 23.3135 30.0398 23.3135ZM15.5291 25.421C15.5291 25.5556 15.4157 25.6565 15.2646 25.6565C15.1134 25.6565 15.0001 25.5556 15.0001 25.421V23.9413C15.0001 23.8067 15.1134 23.7058 15.2646 23.7058C15.4157 23.7058 15.5291 23.8067 15.5291 23.9413V25.421ZM16.6375 25.421C16.6375 25.5556 16.5242 25.6565 16.373 25.6565C16.2219 25.6565 16.1085 25.5556 16.1085 25.421V23.9413C16.1085 23.8067 16.2219 23.7058 16.373 23.7058C16.5242 23.7058 16.6375 23.8067 16.6375 23.9413V25.421ZM17.746 25.421C17.746 25.5556 17.6326 25.6565 17.4815 25.6565C17.3303 25.6565 17.217 25.5556 17.217 25.421V23.9413C17.217 23.8067 17.3303 23.7058 17.4815 23.7058C17.6326 23.7058 17.746 23.8067 17.746 23.9413V25.421ZM27.0042 25.5331C26.4499 25.5331 25.9965 25.1296 25.9965 24.6363C25.9965 24.143 26.4499 23.7395 27.0042 23.7395C27.5584 23.7395 28.0118 24.143 28.0118 24.6363C28.0118 25.1296 27.571 25.5331 27.0042 25.5331Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2595" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2595"/>
+</filter>
+<filter id="filter1_i_1302_2595" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2595"/>
+</filter>
+<filter id="filter2_i_1302_2595" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2595"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/远端机_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/远端机_fault.svg
new file mode 100644
index 00000000..780a6d51
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路测设备/远端机_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2594)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2594)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2594)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M30.9063 22.9547C30.9063 22.9211 30.9063 22.8875 30.8937 22.8538L29.2562 13.8966C29.1932 13.5603 29.0168 13.224 28.7649 12.9998C28.4878 12.7532 28.1225 12.6074 27.6943 12.6074H15.0478C14.6195 12.6074 14.2164 12.7644 13.9267 13.011C13.6496 13.2576 13.4858 13.5939 13.4732 13.9527L11.8357 22.7866C11.8231 22.8426 11.8105 22.8987 11.8105 22.9435M14.9344 14.1096C14.947 14.076 14.947 14.0424 14.947 13.9975C14.947 13.9751 14.9596 13.9527 14.9722 13.9415C14.9974 13.9191 15.0226 13.9078 15.0478 13.9078H27.6817C27.6943 13.9078 27.7069 13.9078 27.7069 13.9303C27.7572 13.9751 27.7824 14.0424 27.795 14.1208L28.8531 19.8494C28.8027 19.8382 28.7649 19.8382 28.7145 19.8382H14.0149C13.9771 19.8382 13.9267 19.8382 13.8763 19.8494L14.9344 14.1096ZM13.7252 20.679C13.8007 20.6341 13.9141 20.6005 14.0149 20.6005H28.7271C28.8279 20.6005 28.9287 20.6229 29.0168 20.679L29.2436 21.9009H13.511L13.7252 20.679ZM30.4528 28.986H12.2766C12.0247 28.986 11.8105 28.8066 11.8105 28.5712V26.7551C11.8105 26.5309 12.0121 26.3403 12.2766 26.3403H30.4528C30.7047 26.3403 30.9189 26.5197 30.9189 26.7551V28.5824C30.9189 28.8066 30.7173 28.986 30.4528 28.986ZM30.4402 23.3135H12.3018C12.0373 23.3135 11.8231 23.504 11.8231 23.7395V25.5219C11.8231 25.7574 12.0373 25.9479 12.3018 25.9479H30.4276C30.6921 25.9479 30.9063 25.7574 30.9063 25.5219V23.7395C30.9189 23.5153 30.7047 23.3135 30.4402 23.3135ZM15.9295 25.421C15.9295 25.5556 15.8161 25.6565 15.665 25.6565C15.5138 25.6565 15.4004 25.5556 15.4004 25.421V23.9413C15.4004 23.8067 15.5138 23.7058 15.665 23.7058C15.8161 23.7058 15.9295 23.8067 15.9295 23.9413V25.421ZM17.0379 25.421C17.0379 25.5556 16.9246 25.6565 16.7734 25.6565C16.6223 25.6565 16.5089 25.5556 16.5089 25.421V23.9413C16.5089 23.8067 16.6223 23.7058 16.7734 23.7058C16.9246 23.7058 17.0379 23.8067 17.0379 23.9413V25.421ZM18.1464 25.421C18.1464 25.5556 18.033 25.6565 17.8819 25.6565C17.7307 25.6565 17.6174 25.5556 17.6174 25.421V23.9413C17.6174 23.8067 17.7307 23.7058 17.8819 23.7058C18.033 23.7058 18.1464 23.8067 18.1464 23.9413V25.421ZM27.4045 25.5331C26.8503 25.5331 26.3969 25.1296 26.3969 24.6363C26.3969 24.143 26.8503 23.7395 27.4045 23.7395C27.9588 23.7395 28.4122 24.143 28.4122 24.6363C28.4122 25.1296 27.9714 25.5331 27.4045 25.5331Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2594" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2594"/>
+</filter>
+<filter id="filter1_i_1302_2594" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2594"/>
+</filter>
+<filter id="filter2_i_1302_2594" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2594"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/停车区_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/停车区_active.svg
new file mode 100644
index 00000000..ff67f4e9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/停车区_active.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2654)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2654)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2654)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M24.5715 23.1523C24.4608 23.1523 24.3516 23.1523 24.2423 23.1441C24.4192 23.2741 24.5498 23.4556 24.6154 23.6627C24.6811 23.8699 24.6784 24.0922 24.6079 24.2978C24.5374 24.5034 24.4025 24.6819 24.2226 24.8077C24.0427 24.9336 23.827 25.0004 23.6061 24.9987C23.3971 25.0004 23.1923 24.9408 23.0179 24.8275C22.8435 24.7143 22.7074 24.5525 22.6271 24.3629C22.5468 24.1733 22.5258 23.9644 22.5669 23.7631C22.6081 23.5617 22.7094 23.3769 22.8579 23.2324C22.9591 23.1351 23.079 23.0584 23.2106 23.0069C22.0831 22.7714 21.0399 22.2447 20.1887 21.4811H14.4064C14.3984 21.4811 14.3906 21.4792 14.3835 21.4757C14.3764 21.4721 14.3703 21.4669 14.3657 21.4605C14.3611 21.4541 14.3581 21.4467 14.357 21.4389C14.3559 21.4312 14.3567 21.4233 14.3594 21.4159L15.4202 18.4662C15.4312 18.435 15.4506 18.4132 15.4547 18.3915C15.4552 18.3882 15.4561 18.385 15.4575 18.382L15.4782 18.3412C15.8309 17.6768 16.1476 17.2067 16.9207 17.2067H18.0852C18.0736 17.0612 18.0676 16.9152 18.0672 16.7692C18.0679 16.5122 18.0841 16.2554 18.1156 16.0002H16.9415C16.6011 15.9959 16.2633 16.0573 15.9471 16.1809L15.9153 16.1904C15.5379 16.3374 15.2088 16.5832 14.9638 16.901C14.8519 17.0337 14.7498 17.174 14.6581 17.3208C14.5198 17.5369 14.4119 17.7284 14.3373 17.8643C14.1118 18.2597 13.3221 20.7175 13.3221 20.7175C12.5006 21.2827 12.0083 22.102 12 22.9335V26.6889C12.0014 27.2575 12.2162 27.8055 12.6033 28.2282C12.9904 28.6509 13.5226 28.9184 14.098 28.9796C14.5864 29.0428 15.0828 28.9583 15.5211 28.7374C15.9594 28.5166 16.3188 28.1698 16.5515 27.7432C16.5556 27.7353 16.562 27.7286 16.5698 27.724C16.5776 27.7195 16.5866 27.7172 16.5957 27.7174L19.5 27.7283L22.4043 27.7174C22.4134 27.7173 22.4223 27.7197 22.4301 27.7243C22.4379 27.7288 22.4443 27.7354 22.4485 27.7432C22.6812 28.1698 23.0406 28.5166 23.4789 28.7375C23.9172 28.9583 24.4136 29.0428 24.902 28.9796C25.4777 28.9169 26.0098 28.6481 26.3968 28.2246C26.7837 27.8011 26.9984 27.2525 27 26.6835V22.9335C26.9981 22.854 26.9921 22.7747 26.982 22.6958C26.2156 22.9978 25.3973 23.1527 24.5715 23.1523ZM16.3703 24.3601C16.2831 24.5653 16.131 24.7375 15.9364 24.8511C15.7419 24.9647 15.5153 25.0138 15.2902 24.9911C15.065 24.9684 14.8533 24.8751 14.6863 24.725C14.5194 24.5749 14.406 24.376 14.3631 24.1577C14.3202 23.9394 14.3499 23.7133 14.4479 23.5129C14.5459 23.3125 14.707 23.1484 14.9074 23.0449C15.1077 22.9414 15.3366 22.904 15.5602 22.9383C15.7838 22.9726 15.9903 23.0767 16.149 23.2352C16.2944 23.3805 16.3929 23.5648 16.4322 23.7649C16.4716 23.965 16.45 24.172 16.3703 24.3601Z" fill="#FFDB82"/>
+<path d="M24.5 11C23.4122 11 22.3488 11.2932 21.4444 11.8427C20.5399 12.3921 19.8349 13.173 19.4187 14.0866C19.0024 15.0002 18.8935 16.0055 19.1057 16.9755C19.3179 17.9454 19.8417 18.8363 20.6109 19.5355C21.3801 20.2348 22.3601 20.711 23.427 20.9039C24.4939 21.0969 25.5998 20.9978 26.6048 20.6194C27.6098 20.241 28.4687 19.6001 29.0731 18.7779C29.6774 17.9556 30 16.9889 30 16C30 14.6739 29.4205 13.4022 28.3891 12.4645C27.3576 11.5268 25.9587 11 24.5 11H24.5ZM26.7669 15.9149C26.5895 16.0955 26.3722 16.2401 26.1291 16.3391C25.886 16.438 25.6226 16.4892 25.3562 16.4892H23.5903V18.3513C23.5872 18.4973 23.5205 18.6363 23.4048 18.7376C23.2891 18.8389 23.134 18.8944 22.9734 18.8919H22.358V13.1067H25.2953C25.7585 13.0971 26.2098 13.2407 26.5653 13.5109C26.9207 13.7811 27.1561 14.1595 27.2277 14.5757C27.2606 14.8159 27.2364 15.0597 27.1569 15.2907C27.0775 15.5217 26.9445 15.7345 26.7669 15.9149Z" fill="#FFDB82"/>
+<path d="M25.193 14H23V14.9997H25.1598C25.3488 15.0037 25.5343 14.9664 25.6847 14.8941C25.8351 14.8218 25.9412 14.7189 25.9849 14.6029C25.9963 14.5688 26.0013 14.5341 25.9997 14.4993C25.9992 14.433 25.9779 14.3675 25.937 14.3064C25.8961 14.2454 25.8365 14.1901 25.7615 14.1436C25.6865 14.0972 25.5976 14.0606 25.5 14.036C25.4025 14.0113 25.2981 13.9991 25.193 14Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2654" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2654"/>
+</filter>
+<filter id="filter1_i_1302_2654" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2654"/>
+</filter>
+<filter id="filter2_i_1302_2654" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2654"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/停车区_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/停车区_fault.svg
new file mode 100644
index 00000000..40be555a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/停车区_fault.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2653)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2653)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2653)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M24.5715 23.1523C24.4608 23.1523 24.3516 23.1523 24.2423 23.1441C24.4192 23.2741 24.5498 23.4556 24.6154 23.6627C24.6811 23.8699 24.6784 24.0922 24.6079 24.2978C24.5374 24.5034 24.4025 24.6819 24.2226 24.8077C24.0427 24.9336 23.827 25.0004 23.6061 24.9987C23.3971 25.0004 23.1923 24.9408 23.0179 24.8275C22.8435 24.7143 22.7074 24.5525 22.6271 24.3629C22.5468 24.1733 22.5258 23.9644 22.5669 23.7631C22.6081 23.5617 22.7094 23.3769 22.8579 23.2324C22.9591 23.1351 23.079 23.0584 23.2106 23.0069C22.0831 22.7714 21.0399 22.2447 20.1887 21.4811H14.4064C14.3984 21.4811 14.3906 21.4792 14.3835 21.4757C14.3764 21.4721 14.3703 21.4669 14.3657 21.4605C14.3611 21.4541 14.3581 21.4467 14.357 21.4389C14.3559 21.4312 14.3567 21.4233 14.3594 21.4159L15.4202 18.4662C15.4312 18.435 15.4506 18.4132 15.4547 18.3915C15.4552 18.3882 15.4561 18.385 15.4575 18.382L15.4782 18.3412C15.8309 17.6768 16.1476 17.2067 16.9207 17.2067H18.0852C18.0736 17.0612 18.0676 16.9152 18.0672 16.7692C18.0679 16.5122 18.0841 16.2554 18.1156 16.0002H16.9415C16.6011 15.9959 16.2633 16.0573 15.9471 16.1809L15.9153 16.1904C15.5379 16.3374 15.2088 16.5832 14.9638 16.901C14.8519 17.0337 14.7498 17.174 14.6581 17.3208C14.5198 17.5369 14.4119 17.7284 14.3373 17.8643C14.1118 18.2597 13.3221 20.7175 13.3221 20.7175C12.5006 21.2827 12.0083 22.102 12 22.9335V26.6889C12.0014 27.2575 12.2162 27.8055 12.6033 28.2282C12.9904 28.6509 13.5226 28.9184 14.098 28.9796C14.5864 29.0428 15.0828 28.9583 15.5211 28.7374C15.9594 28.5166 16.3188 28.1698 16.5515 27.7432C16.5556 27.7353 16.562 27.7286 16.5698 27.724C16.5776 27.7195 16.5866 27.7172 16.5957 27.7174L19.5 27.7283L22.4043 27.7174C22.4134 27.7173 22.4223 27.7197 22.4301 27.7243C22.4379 27.7288 22.4443 27.7354 22.4485 27.7432C22.6812 28.1698 23.0406 28.5166 23.4789 28.7375C23.9172 28.9583 24.4136 29.0428 24.902 28.9796C25.4777 28.9169 26.0098 28.6481 26.3968 28.2246C26.7837 27.8011 26.9984 27.2525 27 26.6835V22.9335C26.9981 22.854 26.9921 22.7747 26.982 22.6958C26.2156 22.9978 25.3973 23.1527 24.5715 23.1523ZM16.3703 24.3601C16.2831 24.5653 16.131 24.7375 15.9364 24.8511C15.7419 24.9647 15.5153 25.0138 15.2902 24.9911C15.065 24.9684 14.8533 24.8751 14.6863 24.725C14.5194 24.5749 14.406 24.376 14.3631 24.1577C14.3202 23.9394 14.3499 23.7133 14.4479 23.5129C14.5459 23.3125 14.707 23.1484 14.9074 23.0449C15.1077 22.9414 15.3366 22.904 15.5602 22.9383C15.7838 22.9726 15.9903 23.0767 16.149 23.2352C16.2944 23.3805 16.3929 23.5648 16.4322 23.7649C16.4716 23.965 16.45 24.172 16.3703 24.3601Z" fill="#FF5F5F"/>
+<path d="M24.5 11C23.4122 11 22.3488 11.2932 21.4444 11.8427C20.5399 12.3921 19.8349 13.173 19.4187 14.0866C19.0024 15.0002 18.8935 16.0055 19.1057 16.9755C19.3179 17.9454 19.8417 18.8363 20.6109 19.5355C21.3801 20.2348 22.3601 20.711 23.427 20.9039C24.4939 21.0969 25.5998 20.9978 26.6048 20.6194C27.6098 20.241 28.4687 19.6001 29.0731 18.7779C29.6774 17.9556 30 16.9889 30 16C30 14.6739 29.4205 13.4022 28.3891 12.4645C27.3576 11.5268 25.9587 11 24.5 11H24.5ZM26.7669 15.9149C26.5895 16.0955 26.3722 16.2401 26.1291 16.3391C25.886 16.438 25.6226 16.4892 25.3562 16.4892H23.5903V18.3513C23.5872 18.4973 23.5205 18.6363 23.4048 18.7376C23.2891 18.8389 23.134 18.8944 22.9734 18.8919H22.358V13.1067H25.2953C25.7585 13.0971 26.2098 13.2407 26.5653 13.5109C26.9207 13.7811 27.1561 14.1595 27.2277 14.5757C27.2606 14.8159 27.2364 15.0597 27.1569 15.2907C27.0775 15.5217 26.9445 15.7345 26.7669 15.9149Z" fill="#FF5F5F"/>
+<path d="M25.193 14H23V14.9997H25.1598C25.3488 15.0037 25.5343 14.9664 25.6847 14.8941C25.8351 14.8218 25.9412 14.7189 25.9849 14.6029C25.9963 14.5688 26.0013 14.5341 25.9997 14.4993C25.9992 14.433 25.9779 14.3675 25.937 14.3064C25.8961 14.2454 25.8365 14.1901 25.7615 14.1436C25.6865 14.0972 25.5976 14.0606 25.5 14.036C25.4025 14.0113 25.2981 13.9991 25.193 14Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2653" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2653"/>
+</filter>
+<filter id="filter1_i_1302_2653" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2653"/>
+</filter>
+<filter id="filter2_i_1302_2653" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2653"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/收费站_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/收费站_active.svg
new file mode 100644
index 00000000..40297868
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/收费站_active.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2609)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2609)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2609)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M15 21.6346V28H22.9554V23.0769L24.0613 24.1731C24.1327 24.2308 24.204 24.2692 24.311 24.2692H27.7715C28.146 24.2692 28.4849 23.9808 28.5028 23.5769C28.5385 23.1154 28.2174 22.7308 27.7893 22.7308H24.7213C24.7035 22.7308 22.6343 20.6346 22.4738 20.4808C22.2062 20.2308 21.8852 20.0962 21.5284 20.0962H16.427C15.6421 20.0962 15 20.7885 15 21.6346ZM30.2865 20H27.7893C27.3969 20 27.0758 20.3462 27.0758 20.7692C27.0758 21.1923 27.3969 21.5385 27.7893 21.5385H30.2865C30.6789 21.5385 31 21.1923 31 20.7692C31 20.3462 30.6789 20 30.2865 20Z" fill="#FFDB82"/>
+<path d="M17 15.5C17 16.163 17.2634 16.7989 17.7322 17.2678C18.2011 17.7366 18.837 18 19.5 18C20.163 18 20.7989 17.7366 21.2678 17.2678C21.7366 16.7989 22 16.163 22 15.5C22 14.837 21.7366 14.2011 21.2678 13.7322C20.7989 13.2634 20.163 13 19.5 13C18.837 13 18.2011 13.2634 17.7322 13.7322C17.2634 14.2011 17 14.837 17 15.5Z" fill="#FFDB82"/>
+<path d="M28.3043 28.5385H15.7826C15.0174 28.5385 14.3913 27.8808 14.3913 27.0769V13.9231C14.3913 13.1192 15.0174 12.4615 15.7826 12.4615H23.087C23.8522 12.4615 24.4783 13.1192 24.4783 13.9231C24.4783 14.325 24.7913 14.6538 25.1739 14.6538C25.5565 14.6538 25.8696 14.325 25.8696 13.9231C25.8696 12.3154 24.6174 11 23.087 11H15.7826C14.2522 11 13 12.3154 13 13.9231V27.0769C13 28.6846 14.2522 30 15.7826 30H28.3043C28.687 30 29 29.6712 29 29.2692C29 28.8673 28.687 28.5385 28.3043 28.5385Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2609" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2609"/>
+</filter>
+<filter id="filter1_i_1302_2609" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2609"/>
+</filter>
+<filter id="filter2_i_1302_2609" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2609"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/收费站_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/收费站_fault.svg
new file mode 100644
index 00000000..84181901
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/收费站_fault.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2608)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2608)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2608)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M15 21.6346V28H22.9554V23.0769L24.0613 24.1731C24.1327 24.2308 24.204 24.2692 24.311 24.2692H27.7715C28.146 24.2692 28.4849 23.9808 28.5028 23.5769C28.5385 23.1154 28.2174 22.7308 27.7893 22.7308H24.7213C24.7035 22.7308 22.6343 20.6346 22.4738 20.4808C22.2062 20.2308 21.8852 20.0962 21.5284 20.0962H16.427C15.6421 20.0962 15 20.7885 15 21.6346ZM30.2865 20H27.7893C27.3969 20 27.0758 20.3462 27.0758 20.7692C27.0758 21.1923 27.3969 21.5385 27.7893 21.5385H30.2865C30.6789 21.5385 31 21.1923 31 20.7692C31 20.3462 30.6789 20 30.2865 20Z" fill="#FF5F5F"/>
+<path d="M17 15.5C17 16.163 17.2634 16.7989 17.7322 17.2678C18.2011 17.7366 18.837 18 19.5 18C20.163 18 20.7989 17.7366 21.2678 17.2678C21.7366 16.7989 22 16.163 22 15.5C22 14.837 21.7366 14.2011 21.2678 13.7322C20.7989 13.2634 20.163 13 19.5 13C18.837 13 18.2011 13.2634 17.7322 13.7322C17.2634 14.2011 17 14.837 17 15.5Z" fill="#FF5F5F"/>
+<path d="M28.3043 28.5385H15.7826C15.0174 28.5385 14.3913 27.8808 14.3913 27.0769V13.9231C14.3913 13.1192 15.0174 12.4615 15.7826 12.4615H23.087C23.8522 12.4615 24.4783 13.1192 24.4783 13.9231C24.4783 14.325 24.7913 14.6538 25.1739 14.6538C25.5565 14.6538 25.8696 14.325 25.8696 13.9231C25.8696 12.3154 24.6174 11 23.087 11H15.7826C14.2522 11 13 12.3154 13 13.9231V27.0769C13 28.6846 14.2522 30 15.7826 30H28.3043C28.687 30 29 29.6712 29 29.2692C29 28.8673 28.687 28.5385 28.3043 28.5385Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2608" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2608"/>
+</filter>
+<filter id="filter1_i_1302_2608" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2608"/>
+</filter>
+<filter id="filter2_i_1302_2608" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2608"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/服务区_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/服务区_active.svg
new file mode 100644
index 00000000..e09c85c9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/服务区_active.svg
@@ -0,0 +1,51 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2651)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2651)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2651)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M27.8658 21.5509C28.1183 21.2374 28.3608 20.9557 28.6133 20.6343C28.9204 20.2194 29.3702 19.9301 29.8778 19.8209C30.1731 19.7829 30.4548 19.6754 30.6994 19.5074C30.8169 19.4341 30.9059 19.3236 30.9519 19.1939C31.0735 19.0486 31.1599 18.8775 31.2044 18.694L32.1543 17.0037C32.2164 16.9422 32.1543 16.8172 32.0902 16.7537C32.026 16.6902 31.9639 16.7537 31.9018 16.8172L31.8377 16.8787C31.4589 17.3806 31.016 17.8171 30.6353 18.319C30.5712 18.3805 30.509 18.444 30.3808 18.3805C30.2545 18.3805 30.2545 18.319 30.3187 18.194C30.3808 18.1305 30.3808 18.0671 30.4449 17.9956C30.8237 17.5572 31.2024 17.1187 31.6473 16.6803C31.7114 16.6188 31.7114 16.5553 31.6473 16.4303C31.636 16.4162 31.6217 16.4049 31.6054 16.3971C31.5891 16.3893 31.5712 16.3853 31.5531 16.3853C31.535 16.3853 31.5171 16.3893 31.5008 16.3971C31.4845 16.4049 31.4702 16.4162 31.4589 16.4303C31.3348 16.5395 31.2281 16.6666 31.1423 16.8072L30.1944 17.9321C30.1303 17.9956 29.9419 18.0571 29.8778 17.9956C29.8539 17.9538 29.8472 17.9045 29.8592 17.8579C29.8711 17.8113 29.9008 17.7711 29.9419 17.7457C29.9412 17.7372 29.9425 17.7287 29.9456 17.7208C29.9487 17.7129 29.9536 17.7058 29.96 17.7C29.9658 17.6943 29.9726 17.6898 29.9802 17.6867C29.9878 17.6837 29.9959 17.6821 30.0041 17.6822C30.3828 17.3072 30.6994 16.8687 31.0782 16.4918C31.1596 16.4211 31.2275 16.3364 31.2786 16.2418C31.2786 16.1783 31.2144 16.1783 31.2144 16.1168C31.2037 16.1021 31.1895 16.0901 31.1731 16.0818C31.1568 16.0735 31.1386 16.0692 31.1203 16.0692C31.1019 16.0694 31.0838 16.0738 31.0675 16.082C31.0511 16.0903 31.037 16.1022 31.0261 16.1168C30.6473 16.5533 30.2666 17.0552 29.8878 17.4937C29.8381 17.5412 29.7783 17.5771 29.7128 17.5987C29.6472 17.6203 29.5776 17.6271 29.5091 17.6187C29.3828 17.6187 29.3828 17.4937 29.445 17.4302L29.6453 17.2318L30.7816 16.1069C30.9098 15.9819 30.9098 15.9819 30.7816 15.8569C30.7823 15.8485 30.781 15.84 30.7779 15.832C30.7748 15.8241 30.7699 15.817 30.7635 15.8113C30.7577 15.8056 30.7509 15.8011 30.7433 15.798C30.7357 15.795 30.7276 15.7934 30.7195 15.7934C30.6553 15.6685 30.5932 15.6685 30.467 15.7934L30.3407 15.9184C29.6453 16.4819 28.95 17.0453 28.1905 17.6088C28.1284 17.6088 28.1284 17.6703 28.1284 17.7338C28.1284 18.1087 28.0642 18.4837 28.0642 18.8606C28.0702 18.9767 28.0507 19.0926 28.0071 19.2005C27.9635 19.3083 27.8969 19.4056 27.8117 19.4856C27.5108 19.7881 27.2422 20.1205 27.0102 20.4776C27.0102 20.4776 27.7857 21.4715 27.8658 21.5509ZM32.0902 27.0762C29.0562 23.384 25.9581 19.6919 22.9241 15.9958C22.86 15.9323 22.86 15.9323 22.7237 15.9323C22.3886 15.9402 22.0534 15.9196 21.7217 15.8708C21.4692 15.8748 21.4031 15.9958 21.4031 16.1942V17.6961C21.3989 17.7301 21.4023 17.7646 21.413 17.7971C21.4238 17.8297 21.4416 17.8595 21.4652 17.8845C22.2929 18.8785 23.1145 19.8784 24.0082 20.8803C24.2086 21.1303 24.4511 21.3802 24.6415 21.6322C24.7677 21.5687 24.8299 21.5052 24.9561 21.5052C25.0824 21.4437 25.2106 21.4437 25.3369 21.3802C25.4045 21.3715 25.4731 21.3866 25.5306 21.4229C25.5881 21.4591 25.6309 21.5143 25.6515 21.5786C25.6515 21.6421 25.7156 21.6421 25.7156 21.7036C27.2326 23.7689 28.8137 25.7707 30.3247 27.836C30.4461 28.0137 30.6237 28.1463 30.8297 28.213C30.9903 28.2795 31.1644 28.3084 31.3382 28.2974C31.512 28.2864 31.6809 28.2358 31.8317 28.1495C32.1483 27.8995 32.3366 27.3361 32.0841 27.0861L32.0902 27.0762Z" fill="#FFDB82"/>
+<path d="M25.016 21.9368L24.9531 21.9987C23.5435 23.7003 22.1989 25.3939 20.7894 27.1034C20.7244 27.1653 20.7244 27.2292 20.6594 27.2911V27.4909C20.7894 27.9322 21.1083 28.0581 21.4942 28.12H21.813C22.0161 28.12 22.1339 27.9941 22.2619 27.8064C22.8387 27.1114 23.3505 26.3565 23.9274 25.6635C24.6321 24.7707 25.1887 23.9939 25.9016 23.175C25.9016 23.175 25.0424 21.9608 25.016 21.9368ZM18.5451 16.5824C17.8403 16.0153 16.8796 15.6997 14.9582 15.6997H10.6016V16.2669C11.8832 16.2669 11.9461 16.3927 11.9461 17.589V26.4104C11.9461 27.6087 11.8182 27.7325 10.6016 27.7325V28.2997H15.0333V27.7325C13.4938 27.7325 13.4308 27.6067 13.4308 26.4104V22.6298H14.8302C16.6237 22.6298 19.7637 22.4301 19.7637 19.1008C19.6987 17.9685 19.2498 17.1496 18.5451 16.5824ZM14.7652 21.9368H13.3557V17.4013C13.3557 16.5824 13.4207 16.3927 13.7416 16.3927H14.7023C15.9209 16.3927 16.8166 16.5924 17.3284 17.0857C17.9053 17.5271 18.2262 18.2201 18.2262 19.1008C18.2262 21.4974 16.4957 21.9368 14.7734 21.9368H14.7652Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2651" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2651"/>
+</filter>
+<filter id="filter1_i_1302_2651" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2651"/>
+</filter>
+<filter id="filter2_i_1302_2651" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2651"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/服务区_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/服务区_fault.svg
new file mode 100644
index 00000000..5c56865d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/服务区_fault.svg
@@ -0,0 +1,51 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2652)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2652)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2652)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M27.8678 21.5504C28.1203 21.2369 28.3628 20.9552 28.6153 20.6338C28.9224 20.2189 29.3721 19.9296 29.8798 19.8204C30.175 19.7824 30.4568 19.6749 30.7014 19.5069C30.8189 19.4336 30.9079 19.3232 30.9539 19.1934C31.0755 19.0481 31.1619 18.877 31.2064 18.6935L32.1562 17.0032C32.2184 16.9417 32.1562 16.8167 32.0921 16.7532C32.028 16.6897 31.9659 16.7532 31.9037 16.8167L31.8396 16.8782C31.4609 17.3801 31.018 17.8166 30.6372 18.3185C30.5731 18.38 30.511 18.4435 30.3827 18.38C30.2565 18.38 30.2565 18.3185 30.3206 18.1935C30.3827 18.1301 30.3827 18.0666 30.4469 17.9951C30.8256 17.5567 31.2044 17.1182 31.6492 16.6798C31.7134 16.6183 31.7134 16.5548 31.6492 16.4298C31.638 16.4158 31.6237 16.4044 31.6074 16.3966C31.591 16.3888 31.5732 16.3848 31.5551 16.3848C31.5369 16.3848 31.5191 16.3888 31.5028 16.3966C31.4864 16.4044 31.4721 16.4158 31.4609 16.4298C31.3368 16.539 31.23 16.6661 31.1442 16.8068L30.1964 17.9317C30.1323 17.9951 29.9439 18.0566 29.8798 17.9951C29.8559 17.9533 29.8492 17.904 29.8611 17.8574C29.8731 17.8108 29.9027 17.7706 29.9439 17.7452C29.9432 17.7367 29.9444 17.7282 29.9475 17.7203C29.9507 17.7124 29.9556 17.7053 29.9619 17.6995C29.9677 17.6938 29.9746 17.6893 29.9822 17.6863C29.9897 17.6832 29.9978 17.6816 30.006 17.6817C30.3848 17.3067 30.7014 16.8683 31.0801 16.4913C31.1615 16.4206 31.2294 16.3359 31.2805 16.2413C31.2805 16.1778 31.2164 16.1778 31.2164 16.1163C31.2056 16.1016 31.1915 16.0896 31.1751 16.0813C31.1587 16.073 31.1406 16.0687 31.1222 16.0687C31.1038 16.0689 31.0858 16.0733 31.0694 16.0815C31.0531 16.0898 31.0389 16.1017 31.028 16.1163C30.6493 16.5528 30.2685 17.0548 29.8898 17.4932C29.8401 17.5407 29.7803 17.5766 29.7147 17.5982C29.6492 17.6198 29.5796 17.6267 29.511 17.6182C29.3848 17.6182 29.3848 17.4932 29.4469 17.4297L29.6473 17.2313L30.7835 16.1064C30.9118 15.9814 30.9118 15.9814 30.7835 15.8564C30.7843 15.848 30.783 15.8395 30.7799 15.8316C30.7767 15.8236 30.7718 15.8166 30.7655 15.8108C30.7597 15.8051 30.7528 15.8006 30.7453 15.7975C30.7377 15.7945 30.7296 15.7929 30.7214 15.793C30.6573 15.668 30.5952 15.668 30.4689 15.793L30.3427 15.9179C29.6473 16.4814 28.9519 17.0448 28.1924 17.6083C28.1303 17.6083 28.1303 17.6698 28.1303 17.7333C28.1303 18.1082 28.0662 18.4832 28.0662 18.8601C28.0721 18.9762 28.0526 19.0921 28.009 19.2C27.9654 19.3079 27.8988 19.4051 27.8137 19.4851C27.5127 19.7876 27.2441 20.12 27.0121 20.4771C27.0121 20.4771 27.7876 21.471 27.8678 21.5504ZM32.0921 27.0757C29.0581 23.3835 25.96 19.6914 22.9261 15.9953C22.8619 15.9318 22.8619 15.9318 22.7257 15.9318C22.3905 15.9397 22.0553 15.9191 21.7237 15.8703C21.4712 15.8743 21.4051 15.9953 21.4051 16.1937V17.6956C21.4009 17.7296 21.4043 17.7641 21.415 17.7966C21.4257 17.8292 21.4435 17.859 21.4672 17.884C22.2948 18.878 23.1164 19.8779 24.0102 20.8798C24.2106 21.1298 24.4531 21.3798 24.6434 21.6317C24.7697 21.5682 24.8318 21.5047 24.9581 21.5047C25.0843 21.4432 25.2126 21.4432 25.3388 21.3798C25.4064 21.371 25.475 21.3861 25.5325 21.4224C25.59 21.4586 25.6328 21.5138 25.6534 21.5782C25.6534 21.6416 25.7176 21.6416 25.7176 21.7031C27.2345 23.7684 28.8157 25.7702 30.3266 27.8355C30.448 28.0132 30.6257 28.1458 30.8316 28.2125C30.9923 28.279 31.1663 28.3079 31.3401 28.2969C31.5139 28.2859 31.6828 28.2353 31.8336 28.149C32.1502 27.899 32.3386 27.3356 32.0861 27.0856L32.0921 27.0757Z" fill="#FF5F5F"/>
+<path d="M25.018 21.9363L24.955 21.9982C23.5455 23.6998 22.2009 25.3934 20.7913 27.1029C20.7263 27.1648 20.7263 27.2287 20.6613 27.2907V27.4904C20.7913 27.9317 21.1102 28.0576 21.4961 28.1195H21.815C22.0181 28.1195 22.1359 27.9937 22.2638 27.8059C22.8407 27.1109 23.3525 26.356 23.9293 25.663C24.6341 24.7703 25.1906 23.9934 25.9035 23.1745C25.9035 23.1745 25.0444 21.9603 25.018 21.9363ZM18.547 16.582C17.8422 16.0148 16.8815 15.6992 14.9601 15.6992H10.6035V16.2664C11.8851 16.2664 11.9481 16.3922 11.9481 17.5885V26.4099C11.9481 27.6082 11.8201 27.732 10.6035 27.732V28.2992H15.0353V27.732C13.4957 27.732 13.4328 27.6062 13.4328 26.4099V22.6293H14.8322C16.6256 22.6293 19.7656 22.4296 19.7656 19.1004C19.7006 17.968 19.2518 17.1491 18.547 16.582ZM14.7672 21.9363H13.3576V17.4008C13.3576 16.582 13.4226 16.3922 13.7435 16.3922H14.7042C15.9229 16.3922 16.8186 16.5919 17.3304 17.0852C17.9072 17.5266 18.2281 18.2196 18.2281 19.1004C18.2281 21.4969 16.4977 21.9363 14.7753 21.9363H14.7672Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2652" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2652"/>
+</filter>
+<filter id="filter1_i_1302_2652" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2652"/>
+</filter>
+<filter id="filter2_i_1302_2652" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2652"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/枢纽立交_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/枢纽立交_active.svg
new file mode 100644
index 00000000..e97af496
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/枢纽立交_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2602)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2602)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2602)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M19.3814 11.063C19.5019 10.979 19.6591 10.979 19.7802 11.063L20.8401 11.8022V16.1982C21.4292 15.9064 22.0728 15.755 22.7246 15.7549C23.3764 15.7547 24.0201 15.9059 24.6094 16.1974C25.1986 16.4889 25.7187 16.9135 26.1322 17.4407C26.5456 17.9678 26.8422 18.5843 27.0004 19.2458C27.1586 19.9074 27.1746 20.5973 27.0473 21.2661C26.9199 21.9348 26.6523 22.5657 26.2637 23.1132C25.8752 23.6607 25.3754 24.1112 24.8004 24.4323C24.2253 24.7534 23.5894 24.937 22.9384 24.9699V24.9748H20.8401V27.3478C22.5918 26.1522 25.323 25.4137 29.2339 25.4137L29.9398 26.5225C30.0201 26.6485 30.0201 26.813 29.9398 26.9397L29.2339 28.0485C23.6938 28.0485 20.8394 30.4068 20.8394 32H18.3216V24.9748H10.7675L10.0603 23.866C10.021 23.8042 10 23.7316 10 23.6574C10 23.5832 10.021 23.5106 10.0603 23.4488L10.7668 22.34H18.3216V11.8022L19.3814 11.063ZM20.8401 20.1448V22.34H22.9384C23.3534 22.34 23.759 22.2113 24.1041 21.97C24.4492 21.7288 24.7181 21.386 24.8769 20.9849C25.0357 20.5837 25.0773 20.1424 24.9963 19.7165C24.9154 19.2907 24.7155 18.8996 24.4221 18.5926C24.1286 18.2856 23.7547 18.0765 23.3477 17.9918C22.9407 17.9071 22.5188 17.9505 22.1354 18.1167C21.752 18.2828 21.4243 18.5642 21.1937 18.9252C20.9631 19.2862 20.8401 19.7106 20.8401 20.1448Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2602" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2602"/>
+</filter>
+<filter id="filter1_i_1302_2602" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2602"/>
+</filter>
+<filter id="filter2_i_1302_2602" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2602"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/枢纽立交_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/枢纽立交_fault.svg
new file mode 100644
index 00000000..75bd328d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/枢纽立交_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2603)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2603)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2603)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M19.3814 11.063C19.5019 10.979 19.6591 10.979 19.7802 11.063L20.8401 11.8022V16.1982C21.4292 15.9064 22.0728 15.755 22.7246 15.7549C23.3764 15.7547 24.0201 15.9059 24.6094 16.1974C25.1986 16.4889 25.7187 16.9135 26.1322 17.4407C26.5456 17.9678 26.8422 18.5843 27.0004 19.2458C27.1586 19.9074 27.1746 20.5973 27.0473 21.2661C26.9199 21.9348 26.6523 22.5657 26.2637 23.1132C25.8752 23.6607 25.3754 24.1112 24.8004 24.4323C24.2253 24.7534 23.5894 24.937 22.9384 24.9699V24.9748H20.8401V27.3478C22.5918 26.1522 25.323 25.4137 29.2339 25.4137L29.9398 26.5225C30.0201 26.6485 30.0201 26.813 29.9398 26.9397L29.2339 28.0485C23.6938 28.0485 20.8394 30.4068 20.8394 32H18.3216V24.9748H10.7675L10.0603 23.866C10.021 23.8042 10 23.7316 10 23.6574C10 23.5832 10.021 23.5106 10.0603 23.4488L10.7668 22.34H18.3216V11.8022L19.3814 11.063ZM20.8401 20.1448V22.34H22.9384C23.3534 22.34 23.759 22.2113 24.1041 21.97C24.4492 21.7288 24.7181 21.386 24.8769 20.9849C25.0357 20.5837 25.0773 20.1424 24.9963 19.7165C24.9154 19.2907 24.7155 18.8996 24.4221 18.5926C24.1286 18.2856 23.7547 18.0765 23.3477 17.9918C22.9407 17.9071 22.5188 17.9505 22.1354 18.1167C21.752 18.2828 21.4243 18.5642 21.1937 18.9252C20.9631 19.2862 20.8401 19.7106 20.8401 20.1448Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2603" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2603"/>
+</filter>
+<filter id="filter1_i_1302_2603" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2603"/>
+</filter>
+<filter id="filter2_i_1302_2603" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2603"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/桥梁_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/桥梁_active.svg
new file mode 100644
index 00000000..860e04bb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/桥梁_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2605)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2605)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2605)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M30.375 28H28.0625C27.0625 24.71 24.25 22.4 21 22.4C17.75 22.4 14.9375 24.71 13.9375 28H11.625C11.25 28 11 27.72 11 27.3V19.6C11 18.83 11.5625 18.2 12.25 18.2H12.875V15.4H11.625C11.25 15.4 11 15.12 11 14.7C11 14.28 11.25 14 11.625 14H30.375C30.75 14 31 14.28 31 14.7C31 15.12 30.75 15.4 30.375 15.4H29.125V18.2H29.75C30.4375 18.2 31 18.83 31 19.6V27.3C31 27.72 30.75 28 30.375 28ZM16.625 15.4H14.125V18.2H16.625V15.4ZM20.375 15.4H17.875V18.2H20.375V15.4ZM24.125 15.4H21.625V18.2H24.125V15.4ZM27.875 15.4H25.375V18.2H27.875V15.4Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2605" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2605"/>
+</filter>
+<filter id="filter1_i_1302_2605" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2605"/>
+</filter>
+<filter id="filter2_i_1302_2605" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2605"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/桥梁_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/桥梁_fault.svg
new file mode 100644
index 00000000..7019a199
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/桥梁_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2604)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2604)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2604)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M30.375 28H28.0625C27.0625 24.71 24.25 22.4 21 22.4C17.75 22.4 14.9375 24.71 13.9375 28H11.625C11.25 28 11 27.72 11 27.3V19.6C11 18.83 11.5625 18.2 12.25 18.2H12.875V15.4H11.625C11.25 15.4 11 15.12 11 14.7C11 14.28 11.25 14 11.625 14H30.375C30.75 14 31 14.28 31 14.7C31 15.12 30.75 15.4 30.375 15.4H29.125V18.2H29.75C30.4375 18.2 31 18.83 31 19.6V27.3C31 27.72 30.75 28 30.375 28ZM16.625 15.4H14.125V18.2H16.625V15.4ZM20.375 15.4H17.875V18.2H20.375V15.4ZM24.125 15.4H21.625V18.2H24.125V15.4ZM27.875 15.4H25.375V18.2H27.875V15.4Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2604" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2604"/>
+</filter>
+<filter id="filter1_i_1302_2604" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2604"/>
+</filter>
+<filter id="filter2_i_1302_2604" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2604"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/清障驻点_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/清障驻点_active.svg
new file mode 100644
index 00000000..32fee76d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/清障驻点_active.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2606)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2606)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2606)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path opacity="0.7" d="M14.9932 30.7375C14.9932 31.2729 15.6312 31.7864 16.767 32.165C17.9028 32.5436 19.4432 32.7562 21.0494 32.7562C22.6556 32.7562 24.1961 32.5436 25.3318 32.165C26.4676 31.7864 27.1057 31.2729 27.1057 30.7375C27.1057 30.2021 26.4676 29.6886 25.3318 29.31C24.1961 28.9314 22.6556 28.7188 21.0494 28.7188C19.4432 28.7188 17.9028 28.9314 16.767 29.31C15.6312 29.6886 14.9932 30.2021 14.9932 30.7375Z" fill="#FFDB82"/>
+<path opacity="0.9" d="M17.0117 30.2328C17.0117 30.6344 17.4371 31.0195 18.1943 31.3034C18.9515 31.5874 19.9784 31.7469 21.0492 31.7469C22.12 31.7469 23.147 31.5874 23.9042 31.3034C24.6613 31.0195 25.0867 30.6344 25.0867 30.2328C25.0867 29.8313 24.6613 29.4462 23.9042 29.1622C23.147 28.8783 22.12 28.7188 21.0492 28.7188C19.9784 28.7188 18.9515 28.8783 18.1943 29.1622C17.4371 29.4462 17.0117 29.8313 17.0117 30.2328Z" fill="#FFDB82"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.7266 10.5498H21.3726C23.0749 10.5507 24.7283 11.1131 26.0715 12.148C26.6729 12.6023 27.2045 13.1407 27.6495 13.7463C28.0108 14.2419 28.3111 14.7783 28.5441 15.3443C28.7574 15.8587 28.9132 16.3944 29.0086 16.9423C29.0835 17.3645 29.1221 17.7924 29.1246 18.221V18.5408V18.7294C29.1227 19.2025 29.0757 19.6745 28.9841 20.1389C28.8798 20.6881 28.7146 21.2239 28.491 21.737C28.2409 22.3051 27.9231 22.8417 27.5445 23.3353H27.5434C27.0835 23.9451 26.5343 24.4837 25.9139 24.9333L16.1862 24.9334C15.5654 24.4836 15.0163 23.9449 14.5556 23.3351C14.1766 22.8417 13.8598 22.3052 13.6096 21.737C13.3859 21.2239 13.2199 20.688 13.1151 20.1389C13.0235 19.6748 12.9764 19.2031 12.9746 18.7302V18.5408V18.221C12.9772 17.7924 13.0164 17.3645 13.0912 16.9423C13.1866 16.3944 13.3421 15.8587 13.5553 15.3443C13.7883 14.7783 14.0887 14.2419 14.4501 13.7463C14.895 13.1407 15.4264 12.6023 16.0278 12.148C17.371 11.1131 19.0244 10.5507 20.7266 10.5498ZM16.1862 24.9334H25.9109C25.8849 24.9523 25.8601 24.9722 25.8352 24.9921C25.8022 25.0186 25.7692 25.0451 25.7333 25.0693L24.2644 26.5316H24.2572L22.6488 28.1296H19.4414L17.8426 26.5315H17.8487L16.4389 25.1228C16.3881 25.0894 16.3409 25.0523 16.2936 25.0152L16.2936 25.0152C16.2584 24.9875 16.2231 24.9597 16.1862 24.9334ZM22.6535 28.1298L21.045 29.7279L19.4461 28.1298H22.6535ZM17.1605 17.7395H20.2479C20.6868 17.7395 21.0429 18.1049 21.0429 18.5551V23.7257H17.1605V20.1302L15.9085 19.3333L17.1605 17.7395ZM20.2394 15.7391C20.2394 16.4001 19.7168 16.9363 19.0725 16.9363C18.4283 16.9363 17.9056 16.4001 17.9056 15.7391V14.6055C17.9056 14.1303 18.2812 13.7462 18.7431 13.7462H20.2394V15.7391ZM22.9209 18.393H25.2656L26.4751 20.1302L25.2644 20.9321V23.7257H21.8063V19.5366C21.8063 18.9056 22.3058 18.393 22.9209 18.393ZM24.6007 16.6108C24.6007 17.1995 24.1352 17.6771 23.5615 17.6771C22.9877 17.6771 22.5222 17.1995 22.5222 16.6108V15.6007C22.5222 15.1779 22.8565 14.8349 23.2685 14.8349H24.6007V16.6108Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2606" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2606"/>
+</filter>
+<filter id="filter1_i_1302_2606" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2606"/>
+</filter>
+<filter id="filter2_i_1302_2606" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2606"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/清障驻点_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/清障驻点_fault.svg
new file mode 100644
index 00000000..86373559
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/清障驻点_fault.svg
@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2607)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2607)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2607)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path opacity="0.7" d="M14.9443 30.7375C14.9443 31.2729 15.5824 31.7864 16.7182 32.165C17.8539 32.5436 19.3944 32.7562 21.0006 32.7562C22.6068 32.7562 24.1472 32.5436 25.283 32.165C26.4188 31.7864 27.0568 31.2729 27.0568 30.7375C27.0568 30.2021 26.4188 29.6886 25.283 29.31C24.1472 28.9314 22.6068 28.7188 21.0006 28.7188C19.3944 28.7188 17.8539 28.9314 16.7182 29.31C15.5824 29.6886 14.9443 30.2021 14.9443 30.7375Z" fill="#FF5F5F"/>
+<path opacity="0.9" d="M16.9629 30.2328C16.9629 30.6344 17.3883 31.0195 18.1454 31.3034C18.9026 31.5874 19.9296 31.7469 21.0004 31.7469C22.0712 31.7469 23.0982 31.5874 23.8553 31.3034C24.6125 31.0195 25.0379 30.6344 25.0379 30.2328C25.0379 29.8313 24.6125 29.4462 23.8553 29.1622C23.0982 28.8783 22.0712 28.7188 21.0004 28.7188C19.9296 28.7188 18.9026 28.8783 18.1454 29.1622C17.3883 29.4462 16.9629 29.8313 16.9629 30.2328Z" fill="#FF5F5F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.6778 10.5498H21.3238C23.0261 10.5507 24.6795 11.1131 26.0227 12.148C26.6241 12.6023 27.1557 13.1407 27.6006 13.7463C27.962 14.2419 28.2623 14.7783 28.4953 15.3443C28.7085 15.8587 28.8644 16.3944 28.9598 16.9423C29.0346 17.3645 29.0732 17.7924 29.0758 18.221V18.5408V18.7294C29.0739 19.2025 29.0269 19.6745 28.9353 20.1389C28.831 20.6881 28.6658 21.2239 28.4422 21.737C28.1921 22.3051 27.8743 22.8417 27.4957 23.3353H27.4945C27.0347 23.9451 26.4855 24.4837 25.8651 24.9333L16.1374 24.9334C15.5166 24.4836 14.9675 23.9449 14.5068 23.3351C14.1278 22.8417 13.8109 22.3052 13.5608 21.737C13.3371 21.2239 13.1711 20.688 13.0663 20.1389C12.9747 19.6748 12.9276 19.2031 12.9258 18.7302V18.5408V18.221C12.9283 17.7924 12.9675 17.3645 13.0424 16.9423C13.1378 16.3944 13.2933 15.8587 13.5065 15.3443C13.7395 14.7783 14.0399 14.2419 14.4012 13.7463C14.8462 13.1407 15.3776 12.6023 15.979 12.148C17.3221 11.1131 18.9755 10.5507 20.6778 10.5498ZM16.1374 24.9334H25.8621C25.8361 24.9523 25.8113 24.9722 25.7864 24.9921C25.7534 25.0186 25.7204 25.0451 25.6844 25.0693L24.2156 26.5316H24.2084L22.6 28.1296H19.3926L17.7937 26.5315H17.7999L16.3901 25.1228C16.3392 25.0894 16.2921 25.0523 16.2448 25.0152L16.2448 25.0152C16.2096 24.9875 16.1743 24.9597 16.1374 24.9334ZM22.6047 28.1298L20.9962 29.7279L19.3973 28.1298H22.6047ZM17.1117 17.7395H20.1991C20.6379 17.7395 20.9941 18.1049 20.9941 18.5551V23.7257H17.1117V20.1302L15.8597 19.3333L17.1117 17.7395ZM20.1906 15.7391C20.1906 16.4001 19.6679 16.9363 19.0237 16.9363C18.3795 16.9363 17.8568 16.4001 17.8568 15.7391V14.6055C17.8568 14.1303 18.2324 13.7462 18.6943 13.7462H20.1906V15.7391ZM22.8721 18.393H25.2168L26.4263 20.1302L25.2156 20.9321V23.7257H21.7574V19.5366C21.7574 18.9056 22.257 18.393 22.8721 18.393ZM24.5519 16.6108C24.5519 17.1995 24.0864 17.6771 23.5127 17.6771C22.9389 17.6771 22.4734 17.1995 22.4734 16.6108V15.6007C22.4734 15.1779 22.8076 14.8349 23.2197 14.8349H24.5519V16.6108Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2607" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2607"/>
+</filter>
+<filter id="filter1_i_1302_2607" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2607"/>
+</filter>
+<filter id="filter2_i_1302_2607" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2607"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/边坡_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/边坡_active.svg
new file mode 100644
index 00000000..e97af496
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/边坡_active.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2602)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2602)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2602)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M19.3814 11.063C19.5019 10.979 19.6591 10.979 19.7802 11.063L20.8401 11.8022V16.1982C21.4292 15.9064 22.0728 15.755 22.7246 15.7549C23.3764 15.7547 24.0201 15.9059 24.6094 16.1974C25.1986 16.4889 25.7187 16.9135 26.1322 17.4407C26.5456 17.9678 26.8422 18.5843 27.0004 19.2458C27.1586 19.9074 27.1746 20.5973 27.0473 21.2661C26.9199 21.9348 26.6523 22.5657 26.2637 23.1132C25.8752 23.6607 25.3754 24.1112 24.8004 24.4323C24.2253 24.7534 23.5894 24.937 22.9384 24.9699V24.9748H20.8401V27.3478C22.5918 26.1522 25.323 25.4137 29.2339 25.4137L29.9398 26.5225C30.0201 26.6485 30.0201 26.813 29.9398 26.9397L29.2339 28.0485C23.6938 28.0485 20.8394 30.4068 20.8394 32H18.3216V24.9748H10.7675L10.0603 23.866C10.021 23.8042 10 23.7316 10 23.6574C10 23.5832 10.021 23.5106 10.0603 23.4488L10.7668 22.34H18.3216V11.8022L19.3814 11.063ZM20.8401 20.1448V22.34H22.9384C23.3534 22.34 23.759 22.2113 24.1041 21.97C24.4492 21.7288 24.7181 21.386 24.8769 20.9849C25.0357 20.5837 25.0773 20.1424 24.9963 19.7165C24.9154 19.2907 24.7155 18.8996 24.4221 18.5926C24.1286 18.2856 23.7547 18.0765 23.3477 17.9918C22.9407 17.9071 22.5188 17.9505 22.1354 18.1167C21.752 18.2828 21.4243 18.5642 21.1937 18.9252C20.9631 19.2862 20.8401 19.7106 20.8401 20.1448Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2602" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2602"/>
+</filter>
+<filter id="filter1_i_1302_2602" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2602"/>
+</filter>
+<filter id="filter2_i_1302_2602" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2602"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/边坡_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/边坡_fault.svg
new file mode 100644
index 00000000..75bd328d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layerb/路网设施/边坡_fault.svg
@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2603)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2603)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2603)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M19.3814 11.063C19.5019 10.979 19.6591 10.979 19.7802 11.063L20.8401 11.8022V16.1982C21.4292 15.9064 22.0728 15.755 22.7246 15.7549C23.3764 15.7547 24.0201 15.9059 24.6094 16.1974C25.1986 16.4889 25.7187 16.9135 26.1322 17.4407C26.5456 17.9678 26.8422 18.5843 27.0004 19.2458C27.1586 19.9074 27.1746 20.5973 27.0473 21.2661C26.9199 21.9348 26.6523 22.5657 26.2637 23.1132C25.8752 23.6607 25.3754 24.1112 24.8004 24.4323C24.2253 24.7534 23.5894 24.937 22.9384 24.9699V24.9748H20.8401V27.3478C22.5918 26.1522 25.323 25.4137 29.2339 25.4137L29.9398 26.5225C30.0201 26.6485 30.0201 26.813 29.9398 26.9397L29.2339 28.0485C23.6938 28.0485 20.8394 30.4068 20.8394 32H18.3216V24.9748H10.7675L10.0603 23.866C10.021 23.8042 10 23.7316 10 23.6574C10 23.5832 10.021 23.5106 10.0603 23.4488L10.7668 22.34H18.3216V11.8022L19.3814 11.063ZM20.8401 20.1448V22.34H22.9384C23.3534 22.34 23.759 22.2113 24.1041 21.97C24.4492 21.7288 24.7181 21.386 24.8769 20.9849C25.0357 20.5837 25.0773 20.1424 24.9963 19.7165C24.9154 19.2907 24.7155 18.8996 24.4221 18.5926C24.1286 18.2856 23.7547 18.0765 23.3477 17.9918C22.9407 17.9071 22.5188 17.9505 22.1354 18.1167C21.752 18.2828 21.4243 18.5642 21.1937 18.9252C20.9631 19.2862 20.8401 19.7106 20.8401 20.1448Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2603" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2603"/>
+</filter>
+<filter id="filter1_i_1302_2603" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2603"/>
+</filter>
+<filter id="filter2_i_1302_2603" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2603"/>
+</filter>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/4-active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/4-active.svg
new file mode 100644
index 00000000..a08aeb66
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/4-active.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315141">
+<g id="Group 1142815886">
+<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="#5CD87F"/>
+</g>
+</g>
+<g id="Frame">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M13.625 3.37427H2.375V6.91052H13.625V3.37427ZM4.98347 4.52164H3.76847V5.77789H4.98347V4.52164ZM7.32347 4.52164H6.10697V5.77789H7.32347V4.52164ZM9.87047 4.52164H8.65472V5.77789H9.87047V4.52164ZM12.2307 4.52164H11.0157V5.77789H12.2307V4.52164Z" fill="white"/>
+<path id="Vector" d="M2.375 6.73486H3.39125V12.6569H2.375V6.73486ZM12.6065 6.73486H13.625V12.6569H12.6065V6.73486Z" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/4.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/4.svg
new file mode 100644
index 00000000..0c307113
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/4.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315144">
+<g id="Group 1142815886">
+<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="#989898"/>
+</g>
+</g>
+<g id="Frame">
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M13.625 3.37427H2.375V6.91052H13.625V3.37427ZM4.98347 4.52164H3.76847V5.77789H4.98347V4.52164ZM7.32347 4.52164H6.10697V5.77789H7.32347V4.52164ZM9.87047 4.52164H8.65472V5.77789H9.87047V4.52164ZM12.2307 4.52164H11.0157V5.77789H12.2307V4.52164Z" fill="white"/>
+<path id="Vector" d="M2.375 6.73486H3.39125V12.6569H2.375V6.73486ZM12.6065 6.73486H13.625V12.6569H12.6065V6.73486Z" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/7-active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/7-active.svg
new file mode 100644
index 00000000..1de98cee
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/7-active.svg
@@ -0,0 +1,17 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315140">
+<g id="Group 1142815887">
+<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"/>
+</g>
+</g>
+<g id="Frame" clip-path="url(#clip0_1406_426)">
+<path id="Vector" d="M10.5938 2C9.88803 2 9.33356 2.48469 8.9355 3.23269L8.92828 3.22856C8.35009 4.36053 7.48934 5.09375 6.54644 5.09375H3.375C2.60397 5.09375 2 5.84897 2 6.8125C2 7.77672 2.60397 8.53125 3.375 8.53125C3.55704 8.53171 3.73147 8.60434 3.86003 8.73322C3.98859 8.8621 4.06078 9.03671 4.06078 9.21875V12.3125C4.06078 12.4948 4.13321 12.6697 4.26215 12.7986C4.39108 12.9276 4.56594 13 4.74828 13H6.12328C6.30562 13 6.48049 12.9276 6.60942 12.7986C6.73835 12.6697 6.81078 12.4948 6.81078 12.3125V11.9688C6.81078 11.625 6.46703 11.4713 6.46703 11.2812V8.875C6.46703 8.86709 6.47253 8.86159 6.47322 8.85369C6.47644 8.80624 6.48956 8.75999 6.51172 8.71791C6.51768 8.70731 6.52446 8.69719 6.532 8.68766C6.55918 8.64695 6.59482 8.6126 6.6365 8.58694C6.63856 8.58556 6.63925 8.5835 6.64131 8.58213C6.64269 8.58213 6.64372 8.58075 6.64509 8.58075C6.67259 8.56528 6.70559 8.56184 6.73653 8.55325C7.60416 8.64537 8.38963 9.34559 8.92863 10.4002L8.93722 10.3961C9.33562 11.1417 9.88872 11.625 10.5938 11.625C12.1736 11.625 13 9.20397 13 6.8125C13 4.42103 12.1736 2 10.5938 2ZM8.875 6.8125C8.875 6.45603 8.89597 6.11159 8.93137 5.78125H9.90625C10.2857 5.78125 10.5938 6.24325 10.5938 6.8125C10.5938 7.38244 10.2857 7.84375 9.90625 7.84375H8.93137C8.89421 7.50125 8.87539 7.15701 8.875 6.8125ZM2.6875 6.8125C2.6875 6.24325 2.9955 5.78125 3.375 5.78125H5.78606C5.57294 6.03184 5.4375 6.39553 5.4375 6.8125C5.4375 7.23016 5.57294 7.59384 5.78606 7.84375H3.375C2.9955 7.84375 2.6875 7.38244 2.6875 6.8125ZM6.12328 12.3125H4.74828V9.21875C4.74866 8.97729 4.68496 8.74005 4.56369 8.53125H4.80363V8.53537H5.83762C5.7995 8.64456 5.77986 8.75935 5.77953 8.875V11.2812C5.77953 11.6123 5.96447 11.8326 6.07481 11.9639C6.08994 11.9822 6.10781 12.0007 6.12328 12.021V12.3125ZM6.54644 7.84787H6.46875V7.84375C6.08925 7.84375 5.78125 7.38244 5.78125 6.8125C5.78125 6.24325 6.08925 5.78125 6.46875 5.78125H6.54644C7.19475 5.78125 7.80181 5.52619 8.336 5.08756C8.23643 5.65713 8.18674 6.2343 8.1875 6.8125C8.1875 7.39997 8.23769 7.98813 8.33669 8.54191C7.80216 8.10294 7.19475 7.84787 6.54644 7.84787ZM10.5938 10.9375C9.90006 10.9375 9.30469 9.95059 9.03278 8.53125H9.90625C10.6769 8.53125 11.2812 7.77672 11.2812 6.8125C11.2812 5.84897 10.6769 5.09375 9.90625 5.09375H9.03278C9.30469 3.67509 9.90006 2.6875 10.5938 2.6875C11.5432 2.6875 12.3125 4.53447 12.3125 6.8125C12.3125 9.09053 11.5432 10.9375 10.5938 10.9375Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1406_426">
+<rect width="11" height="11" fill="white" transform="translate(2 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/7.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/7.svg
new file mode 100644
index 00000000..18e0dd5a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/7.svg
@@ -0,0 +1,17 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315145">
+<g id="Group 1142815887">
+<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="#989898"/>
+</g>
+</g>
+<g id="Frame" clip-path="url(#clip0_1406_444)">
+<path id="Vector" d="M10.5938 2C9.88803 2 9.33356 2.48469 8.9355 3.23269L8.92828 3.22856C8.35009 4.36053 7.48934 5.09375 6.54644 5.09375H3.375C2.60397 5.09375 2 5.84897 2 6.8125C2 7.77672 2.60397 8.53125 3.375 8.53125C3.55704 8.53171 3.73147 8.60434 3.86003 8.73322C3.98859 8.8621 4.06078 9.03671 4.06078 9.21875V12.3125C4.06078 12.4948 4.13321 12.6697 4.26215 12.7986C4.39108 12.9276 4.56594 13 4.74828 13H6.12328C6.30562 13 6.48049 12.9276 6.60942 12.7986C6.73835 12.6697 6.81078 12.4948 6.81078 12.3125V11.9688C6.81078 11.625 6.46703 11.4713 6.46703 11.2812V8.875C6.46703 8.86709 6.47253 8.86159 6.47322 8.85369C6.47644 8.80624 6.48956 8.75999 6.51172 8.71791C6.51768 8.70731 6.52446 8.69719 6.532 8.68766C6.55918 8.64695 6.59482 8.6126 6.6365 8.58694C6.63856 8.58556 6.63925 8.5835 6.64131 8.58213C6.64269 8.58213 6.64372 8.58075 6.64509 8.58075C6.67259 8.56528 6.70559 8.56184 6.73653 8.55325C7.60416 8.64537 8.38963 9.34559 8.92863 10.4002L8.93722 10.3961C9.33562 11.1417 9.88872 11.625 10.5938 11.625C12.1736 11.625 13 9.20397 13 6.8125C13 4.42103 12.1736 2 10.5938 2ZM8.875 6.8125C8.875 6.45603 8.89597 6.11159 8.93137 5.78125H9.90625C10.2857 5.78125 10.5938 6.24325 10.5938 6.8125C10.5938 7.38244 10.2857 7.84375 9.90625 7.84375H8.93137C8.89421 7.50125 8.87539 7.15701 8.875 6.8125ZM2.6875 6.8125C2.6875 6.24325 2.9955 5.78125 3.375 5.78125H5.78606C5.57294 6.03184 5.4375 6.39553 5.4375 6.8125C5.4375 7.23016 5.57294 7.59384 5.78606 7.84375H3.375C2.9955 7.84375 2.6875 7.38244 2.6875 6.8125ZM6.12328 12.3125H4.74828V9.21875C4.74866 8.97729 4.68496 8.74005 4.56369 8.53125H4.80363V8.53537H5.83762C5.7995 8.64456 5.77986 8.75935 5.77953 8.875V11.2812C5.77953 11.6123 5.96447 11.8326 6.07481 11.9639C6.08994 11.9822 6.10781 12.0007 6.12328 12.021V12.3125ZM6.54644 7.84787H6.46875V7.84375C6.08925 7.84375 5.78125 7.38244 5.78125 6.8125C5.78125 6.24325 6.08925 5.78125 6.46875 5.78125H6.54644C7.19475 5.78125 7.80181 5.52619 8.336 5.08756C8.23643 5.65713 8.18674 6.2343 8.1875 6.8125C8.1875 7.39997 8.23769 7.98813 8.33669 8.54191C7.80216 8.10294 7.19475 7.84787 6.54644 7.84787ZM10.5938 10.9375C9.90006 10.9375 9.30469 9.95059 9.03278 8.53125H9.90625C10.6769 8.53125 11.2812 7.77672 11.2812 6.8125C11.2812 5.84897 10.6769 5.09375 9.90625 5.09375H9.03278C9.30469 3.67509 9.90006 2.6875 10.5938 2.6875C11.5432 2.6875 12.3125 4.53447 12.3125 6.8125C12.3125 9.09053 11.5432 10.9375 10.5938 10.9375Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1406_444">
+<rect width="11" height="11" fill="white" transform="translate(2 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/8-active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/8-active.svg
new file mode 100644
index 00000000..f92d9aa2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/8-active.svg
@@ -0,0 +1,17 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315142">
+<g id="Group 1142815888">
+<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="#0082EF"/>
+</g>
+</g>
+<g id="Frame" clip-path="url(#clip0_1406_428)">
+<path id="Vector" d="M13.3344 10.7874C13.1101 10.8321 12.8962 10.9187 12.704 11.0426C12.5156 11.2403 12.2777 11.384 12.015 11.4588C12.05 11.2237 12.1666 11.009 12.3427 10.8504C12.4902 10.6253 12.5964 10.3758 12.6564 10.1135C12.6561 9.97991 12.6954 9.84928 12.7694 9.73806C12.8433 9.62684 12.9485 9.54004 13.0718 9.48862C13.195 9.43719 13.3308 9.42346 13.4618 9.44915C13.5929 9.47484 13.7134 9.5388 13.8081 9.63295C13.9028 9.7271 13.9675 9.84722 13.9939 9.97812C14.0204 10.109 14.0075 10.2448 13.9568 10.3684C13.9061 10.4919 13.8199 10.5977 13.7091 10.6723C13.5983 10.7468 13.4679 10.7869 13.3344 10.7874H13.3344ZM12.0986 9.16984C11.8745 9.02132 11.6258 8.91391 11.3641 8.85263C11.2305 8.85263 11.0999 8.81302 10.9889 8.7388C10.8778 8.66458 10.7912 8.55909 10.7401 8.43567C10.689 8.31225 10.6756 8.17644 10.7016 8.04542C10.7277 7.9144 10.792 7.79405 10.8865 7.69959C10.981 7.60513 11.1013 7.5408 11.2323 7.51473C11.3634 7.48867 11.4992 7.50205 11.6226 7.55317C11.746 7.60429 11.8515 7.69087 11.9257 7.80194C11.9999 7.91302 12.0395 8.04361 12.0395 8.17719C12.0836 8.40184 12.1691 8.61631 12.2917 8.80961C12.4882 8.99953 12.6305 9.23838 12.704 9.50156C12.4705 9.4643 12.2572 9.34704 12.1006 9.16985H12.0981L12.0986 9.16984ZM10.9859 6.78929C10.7822 5.08368 9.01608 3.74731 6.87919 3.74731C4.6027 3.74731 2.7505 5.2623 2.7505 7.12551C2.76845 7.64076 2.91226 8.14378 3.16936 8.59066C3.42646 9.03754 3.78905 9.41469 4.22546 9.68918C4.36922 9.79512 4.51962 9.89171 4.67576 9.97837L4.49264 10.7093C4.55868 10.7404 4.62272 10.7734 4.69026 10.8019L5.61487 10.3396C5.74995 10.3746 5.89205 10.3971 6.03313 10.4212C6.12319 10.4372 6.21326 10.4537 6.30582 10.4647C6.88241 10.5374 7.46745 10.5038 8.03194 10.3656C8.04941 10.6158 8.09506 10.8632 8.16802 11.1031C7.74553 11.2021 7.31312 11.2527 6.87918 11.2537C6.48988 11.2515 6.10187 11.2087 5.72144 11.1261L4.04382 11.9637C3.97998 11.9963 3.90802 12.0097 3.8367 12.0023C3.76538 11.9948 3.69776 11.9668 3.64205 11.9217C3.5861 11.8768 3.54415 11.8169 3.52119 11.749C3.49823 11.6811 3.4952 11.608 3.51247 11.5384L3.81266 10.3296C3.27096 9.98512 2.82229 9.51269 2.50619 8.95394C2.19008 8.39519 2.01625 7.76727 2 7.12551C2 4.84503 4.18441 2.99683 6.87918 2.99683C9.43784 2.99683 11.5332 4.66491 11.7373 6.7853C11.6198 6.76721 11.5014 6.75552 11.3826 6.75027C11.25 6.75528 11.1174 6.76778 10.9858 6.78879L10.9859 6.78929ZM9.42734 9.45253C9.652 9.40749 9.86564 9.32144 10.0578 9.19737C10.2464 8.99993 10.4845 8.85655 10.7472 8.78209C10.7114 9.01644 10.5954 9.23111 10.419 9.38949C10.2714 9.61463 10.1653 9.8648 10.1053 10.127C10.1055 10.2605 10.0661 10.3911 9.99212 10.5022C9.91813 10.6134 9.81286 10.7001 9.6896 10.7515C9.56635 10.8028 9.43064 10.8165 9.29962 10.7907C9.1686 10.765 9.04815 10.701 8.95349 10.6068C8.85883 10.5126 8.7942 10.3925 8.76778 10.2616C8.74135 10.1308 8.75431 9.99497 8.80502 9.87145C8.85573 9.74793 8.94191 9.64221 9.05267 9.56765C9.16344 9.49308 9.29382 9.45302 9.42734 9.45253ZM10.6441 11.0776C10.8673 11.2272 11.1154 11.3353 11.3766 11.3978C11.5102 11.3978 11.6408 11.4374 11.7519 11.5116C11.8629 11.5858 11.9495 11.6913 12.0006 11.8148C12.0518 11.9382 12.0651 12.074 12.0391 12.205C12.013 12.336 11.9487 12.4564 11.8542 12.5508C11.7598 12.6453 11.6394 12.7096 11.5084 12.7357C11.3774 12.7618 11.2416 12.7484 11.1181 12.6973C10.9947 12.6461 10.8892 12.5596 10.815 12.4485C10.7408 12.3374 10.7012 12.2068 10.7012 12.0732C10.6581 11.8483 10.5733 11.6335 10.451 11.4398C10.2553 11.249 10.114 11.0095 10.0417 10.7459C10.2755 10.7843 10.4885 10.903 10.6441 11.0816V11.0776Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1406_428">
+<rect width="12" height="12" fill="white" transform="translate(2 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/8.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/8.svg
new file mode 100644
index 00000000..4997284d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/8.svg
@@ -0,0 +1,17 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315143">
+<g id="Group 1142815888">
+<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="#989898"/>
+</g>
+</g>
+<g id="Frame" clip-path="url(#clip0_1406_429)">
+<path id="Vector" d="M13.3344 10.7874C13.1101 10.8321 12.8962 10.9187 12.704 11.0426C12.5156 11.2403 12.2777 11.384 12.015 11.4588C12.05 11.2237 12.1666 11.009 12.3427 10.8504C12.4902 10.6253 12.5964 10.3758 12.6564 10.1135C12.6561 9.97991 12.6954 9.84928 12.7694 9.73806C12.8433 9.62684 12.9485 9.54004 13.0718 9.48862C13.195 9.43719 13.3308 9.42346 13.4618 9.44915C13.5929 9.47484 13.7134 9.5388 13.8081 9.63295C13.9028 9.7271 13.9675 9.84722 13.9939 9.97812C14.0204 10.109 14.0075 10.2448 13.9568 10.3684C13.9061 10.4919 13.8199 10.5977 13.7091 10.6723C13.5983 10.7468 13.4679 10.7869 13.3344 10.7874H13.3344ZM12.0986 9.16984C11.8745 9.02132 11.6258 8.91391 11.3641 8.85263C11.2305 8.85263 11.0999 8.81302 10.9889 8.7388C10.8778 8.66458 10.7912 8.55909 10.7401 8.43567C10.689 8.31225 10.6756 8.17644 10.7016 8.04542C10.7277 7.9144 10.792 7.79405 10.8865 7.69959C10.981 7.60513 11.1013 7.5408 11.2323 7.51473C11.3634 7.48867 11.4992 7.50205 11.6226 7.55317C11.746 7.60429 11.8515 7.69087 11.9257 7.80194C11.9999 7.91302 12.0395 8.04361 12.0395 8.17719C12.0836 8.40184 12.1691 8.61631 12.2917 8.80961C12.4882 8.99953 12.6305 9.23838 12.704 9.50156C12.4705 9.4643 12.2572 9.34704 12.1006 9.16985H12.0981L12.0986 9.16984ZM10.9859 6.78929C10.7822 5.08368 9.01608 3.74731 6.87919 3.74731C4.6027 3.74731 2.7505 5.2623 2.7505 7.12551C2.76845 7.64076 2.91226 8.14378 3.16936 8.59066C3.42646 9.03754 3.78905 9.41469 4.22546 9.68918C4.36922 9.79512 4.51962 9.89171 4.67576 9.97837L4.49264 10.7093C4.55868 10.7404 4.62272 10.7734 4.69026 10.8019L5.61487 10.3396C5.74995 10.3746 5.89205 10.3971 6.03313 10.4212C6.12319 10.4372 6.21326 10.4537 6.30582 10.4647C6.88241 10.5374 7.46745 10.5038 8.03194 10.3656C8.04941 10.6158 8.09506 10.8632 8.16802 11.1031C7.74553 11.2021 7.31312 11.2527 6.87918 11.2537C6.48988 11.2515 6.10187 11.2087 5.72144 11.1261L4.04382 11.9637C3.97998 11.9963 3.90802 12.0097 3.8367 12.0023C3.76538 11.9948 3.69776 11.9668 3.64205 11.9217C3.5861 11.8768 3.54415 11.8169 3.52119 11.749C3.49823 11.6811 3.4952 11.608 3.51247 11.5384L3.81266 10.3296C3.27096 9.98512 2.82229 9.51269 2.50619 8.95394C2.19008 8.39519 2.01625 7.76727 2 7.12551C2 4.84503 4.18441 2.99683 6.87918 2.99683C9.43784 2.99683 11.5332 4.66491 11.7373 6.7853C11.6198 6.76721 11.5014 6.75552 11.3826 6.75027C11.25 6.75528 11.1174 6.76778 10.9858 6.78879L10.9859 6.78929ZM9.42734 9.45253C9.652 9.40749 9.86564 9.32144 10.0578 9.19737C10.2464 8.99993 10.4845 8.85655 10.7472 8.78209C10.7114 9.01644 10.5954 9.23111 10.419 9.38949C10.2714 9.61463 10.1653 9.8648 10.1053 10.127C10.1055 10.2605 10.0661 10.3911 9.99212 10.5022C9.91813 10.6134 9.81286 10.7001 9.6896 10.7515C9.56635 10.8028 9.43064 10.8165 9.29962 10.7907C9.1686 10.765 9.04815 10.701 8.95349 10.6068C8.85883 10.5126 8.7942 10.3925 8.76778 10.2616C8.74135 10.1308 8.75431 9.99497 8.80502 9.87145C8.85573 9.74793 8.94191 9.64221 9.05267 9.56765C9.16344 9.49308 9.29382 9.45302 9.42734 9.45253ZM10.6441 11.0776C10.8673 11.2272 11.1154 11.3353 11.3766 11.3978C11.5102 11.3978 11.6408 11.4374 11.7519 11.5116C11.8629 11.5858 11.9495 11.6913 12.0006 11.8148C12.0518 11.9382 12.0651 12.074 12.0391 12.205C12.013 12.336 11.9487 12.4564 11.8542 12.5508C11.7598 12.6453 11.6394 12.7096 11.5084 12.7357C11.3774 12.7618 11.2416 12.7484 11.1181 12.6973C10.9947 12.6461 10.8892 12.5596 10.815 12.4485C10.7408 12.3374 10.7012 12.2068 10.7012 12.0732C10.6581 11.8483 10.5733 11.6335 10.451 11.4398C10.2553 11.249 10.114 11.0095 10.0417 10.7459C10.2755 10.7843 10.4885 10.903 10.6441 11.0816V11.0776Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1406_429">
+<rect width="12" height="12" fill="white" transform="translate(2 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/warningNotify/warning.png b/ruoyi-ui/src/views/JiHeExpressway/images/warningNotify/warning.png
new file mode 100644
index 00000000..4afa80e8
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/images/warningNotify/warning.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg
index 4e74f11e..7e101469 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/0.svg
@@ -1,25 +1,71 @@
-<svg width="33" height="23" viewBox="0 0 33 23" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814273">
-<g id="XMLID_21_">
-<path id="XMLID_24_" fill-rule="evenodd" clip-rule="evenodd" d="M23.9464 5.904C23.388 5.904 22.8614 5.952 22.3348 6.048C21.4093 2.56 18.4094 0 14.851 0C11.1011 0 7.97351 2.832 7.22353 6.608C3.33003 6.784 0.234375 10.208 0.234375 14.4C0.234375 18.72 3.50555 22.208 7.54267 22.208H23.9464C28.7974 22.208 32.7228 18.56 32.7228 14.048C32.7228 9.536 28.7814 5.904 23.9464 5.904Z" fill="url(#paint0_linear_193_1085)"/>
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M8.22908 8.36809C8.88332 5.00809 11.6758 2.48009 15.0268 2.48009C18.2022 2.48009 20.867 4.75209 21.6968 7.85609C22.1595 7.77609 22.6382 7.72809 23.1329 7.72809C27.17 7.72809 30.4891 10.5761 30.904 14.2241C30.9359 13.9681 30.9518 13.7121 30.9518 13.4561C30.9518 9.44009 27.4572 6.19209 23.1329 6.19209C22.6382 6.19209 22.1595 6.24009 21.6968 6.32009C20.867 3.21609 18.2022 0.944092 15.0268 0.944092C11.6918 0.944092 8.89928 3.47209 8.22908 6.83209C4.76642 6.99209 2.00586 10.0321 2.00586 13.7761C2.00586 14.0321 2.02181 14.2881 2.05373 14.5441C2.38882 11.1681 5.00577 8.52809 8.22908 8.36809Z" fill="url(#paint1_linear_193_1085)"/>
-<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M9.02666 8.35205C8.7873 8.35205 8.54795 8.36805 8.30859 8.40005C11.4362 8.80005 13.8616 11.6481 13.8616 15.1041C13.8616 16.7201 13.3191 18.2081 12.4415 19.3761C13.8457 18.2561 14.7552 16.4801 14.7552 14.4801C14.7552 11.0881 12.2021 8.35205 9.02666 8.35205Z" fill="url(#paint2_linear_193_1085)"/>
-</g>
-<path id="XMLID_20_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9835 13.1838H5.94687C5.59582 13.1838 5.30859 12.8958 5.30859 12.5438C5.30859 12.1918 5.59582 11.9038 5.94687 11.9038H24.9995C25.3506 11.9038 25.6378 12.1918 25.6378 12.5438C25.6218 12.8958 25.3346 13.1838 24.9835 13.1838Z" fill="#F7F8F8"/>
-<path id="XMLID_19_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9835 17.216H5.94687C5.59582 17.216 5.30859 16.928 5.30859 16.576C5.30859 16.224 5.59582 15.936 5.94687 15.936H24.9995C25.3506 15.936 25.6378 16.224 25.6378 16.576C25.6218 16.928 25.3346 17.216 24.9835 17.216Z" fill="#F7F8F8"/>
+<svg width="31" height="30" viewBox="0 0 31 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814242">
+<path id="XMLID_96_" d="M15.8571 23.3764C20.6409 23.3764 24.519 19.4915 24.519 14.6992C24.519 9.9069 20.6409 6.02197 15.8571 6.02197C11.0733 6.02197 7.19531 9.9069 7.19531 14.6992C7.19531 19.4915 11.0733 23.3764 15.8571 23.3764Z" fill="url(#paint0_linear_193_790)"/>
+<path id="XMLID_95_" fill-rule="evenodd" clip-rule="evenodd" d="M16.4134 4.33861H15.2862C15.1936 4.33861 15.1318 4.26141 15.1318 4.18421V0.154399C15.1318 0.0617596 15.209 0 15.2862 0H16.4134C16.506 0 16.5678 0.0771995 16.5678 0.154399V4.18421C16.5678 4.27685 16.506 4.33861 16.4134 4.33861Z" fill="url(#paint1_linear_193_790)"/>
+<path id="XMLID_94_" fill-rule="evenodd" clip-rule="evenodd" d="M10.4688 5.78998C10.1291 5.99069 9.68137 5.86717 9.48065 5.5275L8.02929 3.02623C7.82857 2.68656 7.95209 2.2388 8.29177 2.03808C8.63145 1.83736 9.07921 1.96088 9.27993 2.30056L10.7313 4.80182C10.932 5.15694 10.8085 5.58926 10.4688 5.78998Z" fill="url(#paint2_linear_193_790)"/>
+<path id="XMLID_93_" fill-rule="evenodd" clip-rule="evenodd" d="M6.53218 9.74321C6.33146 10.0829 5.8837 10.2064 5.54402 10.0057L3.04275 8.55434C2.70307 8.35362 2.57955 7.90586 2.78027 7.56618C2.98099 7.2265 3.42875 7.10299 3.76843 7.3037L6.2697 8.75506C6.60938 8.95577 6.7329 9.40353 6.53218 9.74321Z" fill="url(#paint3_linear_193_790)"/>
+<path id="XMLID_91_" fill-rule="evenodd" clip-rule="evenodd" d="M5.18825 14.5602V15.6873C5.18825 15.7799 5.11105 15.8417 5.03385 15.8417H1.00401C0.911369 15.8417 0.849609 15.7645 0.849609 15.6873V14.5602C0.849609 14.4675 0.926809 14.4058 1.00401 14.4058H5.01841C5.11105 14.3903 5.18825 14.4675 5.18825 14.5602Z" fill="url(#paint4_linear_193_790)"/>
+<path id="XMLID_90_" fill-rule="evenodd" clip-rule="evenodd" d="M6.68648 20.4583C6.8872 20.798 6.76368 21.2457 6.424 21.4464L3.92272 22.8978C3.58304 23.0985 3.13528 22.975 2.93456 22.6353C2.73384 22.2956 2.85736 21.8479 3.19704 21.6472L5.69832 20.1958C6.05344 19.9797 6.48576 20.1032 6.68648 20.4583Z" fill="url(#paint5_linear_193_790)"/>
+<path id="XMLID_88_" fill-rule="evenodd" clip-rule="evenodd" d="M10.6544 24.3183C10.994 24.5191 11.1176 24.9668 10.9168 25.3065L9.46548 27.8078C9.26476 28.1474 8.817 28.271 8.47732 28.0702C8.13764 27.8695 8.01412 27.4218 8.21484 27.0821L9.6662 24.5808C9.86692 24.2257 10.2992 24.1176 10.6544 24.3183Z" fill="url(#paint6_linear_193_790)"/>
+<path id="XMLID_87_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4405 25.6616H16.5677C16.6603 25.6616 16.7221 25.7388 16.7221 25.816V29.8458C16.7221 29.9385 16.6449 30.0002 16.5677 30.0002H15.4405C15.3479 30.0002 15.2861 29.923 15.2861 29.8458V25.816C15.2861 25.7388 15.3633 25.6616 15.4405 25.6616Z" fill="url(#paint7_linear_193_790)"/>
+<path id="XMLID_86_" fill-rule="evenodd" clip-rule="evenodd" d="M21.323 24.1636C21.6627 23.9628 22.1105 24.0864 22.3112 24.426L23.7625 26.9273C23.9633 27.267 23.8397 27.7147 23.5001 27.9155C23.1604 28.1162 22.7126 27.9927 22.5119 27.653L21.0605 25.1517C20.8598 24.7966 20.9833 24.3488 21.323 24.1636Z" fill="url(#paint8_linear_193_790)"/>
+<path id="XMLID_85_" fill-rule="evenodd" clip-rule="evenodd" d="M25.167 20.18C25.3677 19.8403 25.8154 19.7168 26.1551 19.9175L28.6564 21.3688C28.9961 21.5695 29.1196 22.0173 28.9189 22.357C28.7182 22.6967 28.2704 22.8202 27.9307 22.6195L25.4294 21.1681C25.0898 20.9674 24.9817 20.5351 25.167 20.18Z" fill="url(#paint9_linear_193_790)"/>
+<path id="XMLID_84_" fill-rule="evenodd" clip-rule="evenodd" d="M26.5264 15.3787V14.2516C26.5264 14.1589 26.6036 14.0972 26.6808 14.0972H30.6952C30.7878 14.0972 30.8496 14.1744 30.8496 14.2516V15.3787C30.8496 15.4713 30.7724 15.5331 30.6952 15.5331H26.6808C26.6036 15.5331 26.5264 15.4713 26.5264 15.3787Z" fill="url(#paint10_linear_193_790)"/>
+<path id="XMLID_75_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9365 9.51127C24.7358 9.1716 24.8593 8.72384 25.199 8.52312L27.7003 7.07177C28.04 6.87105 28.4877 6.99457 28.6884 7.33425C28.8892 7.67393 28.7656 8.12168 28.426 8.3224L25.9247 9.77375C25.585 9.97447 25.1372 9.85095 24.9365 9.51127Z" fill="url(#paint11_linear_193_790)"/>
+<path id="XMLID_74_" fill-rule="evenodd" clip-rule="evenodd" d="M20.9217 5.71283C20.582 5.51211 20.4585 5.06435 20.6592 4.72467L22.1105 2.22341C22.3113 1.88373 22.759 1.76021 23.0987 1.96093C23.4384 2.16165 23.5619 2.60941 23.3612 2.94908L21.9098 5.45035C21.7091 5.80547 21.2613 5.91355 20.9217 5.71283Z" fill="url(#paint12_linear_193_790)"/>
 </g>
 <defs>
-<linearGradient id="paint0_linear_193_1085" x1="16.4849" y1="22.2156" x2="16.4849" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
+<linearGradient id="paint0_linear_193_790" x1="15.854" y1="6.02185" x2="15.854" y2="23.3898" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint1_linear_193_790" x1="15.1307" y1="2.171" x2="16.5744" y2="2.171" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint2_linear_193_790" x1="8.75797" y1="4.27506" x2="10.0117" y2="3.55117" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint3_linear_193_790" x1="4.29299" y1="9.29711" x2="5.01777" y2="8.04178" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint4_linear_193_790" x1="3.01518" y1="15.8451" x2="3.01518" y2="14.3978" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint5_linear_193_790" x1="5.16693" y1="22.167" x2="4.44214" y2="20.9117" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint6_linear_193_790" x1="10.1961" y1="26.5629" x2="8.94231" y2="25.839" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint7_linear_193_790" x1="16.7302" y1="27.8384" x2="15.2865" y2="27.8384" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint8_linear_193_790" x1="23.0298" y1="25.683" x2="21.776" y2="26.4069" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint9_linear_193_790" x1="27.4182" y1="20.6463" x2="26.6934" y2="21.9016" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint10_linear_193_790" x1="28.6931" y1="14.0889" x2="28.6931" y2="15.5363" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
 </linearGradient>
-<linearGradient id="paint1_linear_193_1085" x1="16.471" y1="0.957852" x2="16.471" y2="14.5528" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+<linearGradient id="paint11_linear_193_790" x1="26.4522" y1="7.80238" x2="27.177" y2="9.05773" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
 </linearGradient>
-<linearGradient id="paint2_linear_193_1085" x1="11.5369" y1="8.34843" x2="11.5369" y2="19.3688" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+<linearGradient id="paint12_linear_193_790" x1="21.374" y1="3.47489" x2="22.6277" y2="4.19877" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
 </linearGradient>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/00.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/00.svg
deleted file mode 100644
index 7e101469..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/00.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<svg width="31" height="30" viewBox="0 0 31 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814242">
-<path id="XMLID_96_" d="M15.8571 23.3764C20.6409 23.3764 24.519 19.4915 24.519 14.6992C24.519 9.9069 20.6409 6.02197 15.8571 6.02197C11.0733 6.02197 7.19531 9.9069 7.19531 14.6992C7.19531 19.4915 11.0733 23.3764 15.8571 23.3764Z" fill="url(#paint0_linear_193_790)"/>
-<path id="XMLID_95_" fill-rule="evenodd" clip-rule="evenodd" d="M16.4134 4.33861H15.2862C15.1936 4.33861 15.1318 4.26141 15.1318 4.18421V0.154399C15.1318 0.0617596 15.209 0 15.2862 0H16.4134C16.506 0 16.5678 0.0771995 16.5678 0.154399V4.18421C16.5678 4.27685 16.506 4.33861 16.4134 4.33861Z" fill="url(#paint1_linear_193_790)"/>
-<path id="XMLID_94_" fill-rule="evenodd" clip-rule="evenodd" d="M10.4688 5.78998C10.1291 5.99069 9.68137 5.86717 9.48065 5.5275L8.02929 3.02623C7.82857 2.68656 7.95209 2.2388 8.29177 2.03808C8.63145 1.83736 9.07921 1.96088 9.27993 2.30056L10.7313 4.80182C10.932 5.15694 10.8085 5.58926 10.4688 5.78998Z" fill="url(#paint2_linear_193_790)"/>
-<path id="XMLID_93_" fill-rule="evenodd" clip-rule="evenodd" d="M6.53218 9.74321C6.33146 10.0829 5.8837 10.2064 5.54402 10.0057L3.04275 8.55434C2.70307 8.35362 2.57955 7.90586 2.78027 7.56618C2.98099 7.2265 3.42875 7.10299 3.76843 7.3037L6.2697 8.75506C6.60938 8.95577 6.7329 9.40353 6.53218 9.74321Z" fill="url(#paint3_linear_193_790)"/>
-<path id="XMLID_91_" fill-rule="evenodd" clip-rule="evenodd" d="M5.18825 14.5602V15.6873C5.18825 15.7799 5.11105 15.8417 5.03385 15.8417H1.00401C0.911369 15.8417 0.849609 15.7645 0.849609 15.6873V14.5602C0.849609 14.4675 0.926809 14.4058 1.00401 14.4058H5.01841C5.11105 14.3903 5.18825 14.4675 5.18825 14.5602Z" fill="url(#paint4_linear_193_790)"/>
-<path id="XMLID_90_" fill-rule="evenodd" clip-rule="evenodd" d="M6.68648 20.4583C6.8872 20.798 6.76368 21.2457 6.424 21.4464L3.92272 22.8978C3.58304 23.0985 3.13528 22.975 2.93456 22.6353C2.73384 22.2956 2.85736 21.8479 3.19704 21.6472L5.69832 20.1958C6.05344 19.9797 6.48576 20.1032 6.68648 20.4583Z" fill="url(#paint5_linear_193_790)"/>
-<path id="XMLID_88_" fill-rule="evenodd" clip-rule="evenodd" d="M10.6544 24.3183C10.994 24.5191 11.1176 24.9668 10.9168 25.3065L9.46548 27.8078C9.26476 28.1474 8.817 28.271 8.47732 28.0702C8.13764 27.8695 8.01412 27.4218 8.21484 27.0821L9.6662 24.5808C9.86692 24.2257 10.2992 24.1176 10.6544 24.3183Z" fill="url(#paint6_linear_193_790)"/>
-<path id="XMLID_87_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4405 25.6616H16.5677C16.6603 25.6616 16.7221 25.7388 16.7221 25.816V29.8458C16.7221 29.9385 16.6449 30.0002 16.5677 30.0002H15.4405C15.3479 30.0002 15.2861 29.923 15.2861 29.8458V25.816C15.2861 25.7388 15.3633 25.6616 15.4405 25.6616Z" fill="url(#paint7_linear_193_790)"/>
-<path id="XMLID_86_" fill-rule="evenodd" clip-rule="evenodd" d="M21.323 24.1636C21.6627 23.9628 22.1105 24.0864 22.3112 24.426L23.7625 26.9273C23.9633 27.267 23.8397 27.7147 23.5001 27.9155C23.1604 28.1162 22.7126 27.9927 22.5119 27.653L21.0605 25.1517C20.8598 24.7966 20.9833 24.3488 21.323 24.1636Z" fill="url(#paint8_linear_193_790)"/>
-<path id="XMLID_85_" fill-rule="evenodd" clip-rule="evenodd" d="M25.167 20.18C25.3677 19.8403 25.8154 19.7168 26.1551 19.9175L28.6564 21.3688C28.9961 21.5695 29.1196 22.0173 28.9189 22.357C28.7182 22.6967 28.2704 22.8202 27.9307 22.6195L25.4294 21.1681C25.0898 20.9674 24.9817 20.5351 25.167 20.18Z" fill="url(#paint9_linear_193_790)"/>
-<path id="XMLID_84_" fill-rule="evenodd" clip-rule="evenodd" d="M26.5264 15.3787V14.2516C26.5264 14.1589 26.6036 14.0972 26.6808 14.0972H30.6952C30.7878 14.0972 30.8496 14.1744 30.8496 14.2516V15.3787C30.8496 15.4713 30.7724 15.5331 30.6952 15.5331H26.6808C26.6036 15.5331 26.5264 15.4713 26.5264 15.3787Z" fill="url(#paint10_linear_193_790)"/>
-<path id="XMLID_75_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9365 9.51127C24.7358 9.1716 24.8593 8.72384 25.199 8.52312L27.7003 7.07177C28.04 6.87105 28.4877 6.99457 28.6884 7.33425C28.8892 7.67393 28.7656 8.12168 28.426 8.3224L25.9247 9.77375C25.585 9.97447 25.1372 9.85095 24.9365 9.51127Z" fill="url(#paint11_linear_193_790)"/>
-<path id="XMLID_74_" fill-rule="evenodd" clip-rule="evenodd" d="M20.9217 5.71283C20.582 5.51211 20.4585 5.06435 20.6592 4.72467L22.1105 2.22341C22.3113 1.88373 22.759 1.76021 23.0987 1.96093C23.4384 2.16165 23.5619 2.60941 23.3612 2.94908L21.9098 5.45035C21.7091 5.80547 21.2613 5.91355 20.9217 5.71283Z" fill="url(#paint12_linear_193_790)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_790" x1="15.854" y1="6.02185" x2="15.854" y2="23.3898" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_790" x1="15.1307" y1="2.171" x2="16.5744" y2="2.171" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_790" x1="8.75797" y1="4.27506" x2="10.0117" y2="3.55117" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_790" x1="4.29299" y1="9.29711" x2="5.01777" y2="8.04178" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_790" x1="3.01518" y1="15.8451" x2="3.01518" y2="14.3978" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_790" x1="5.16693" y1="22.167" x2="4.44214" y2="20.9117" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_790" x1="10.1961" y1="26.5629" x2="8.94231" y2="25.839" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_790" x1="16.7302" y1="27.8384" x2="15.2865" y2="27.8384" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_790" x1="23.0298" y1="25.683" x2="21.776" y2="26.4069" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_790" x1="27.4182" y1="20.6463" x2="26.6934" y2="21.9016" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_790" x1="28.6931" y1="14.0889" x2="28.6931" y2="15.5363" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_790" x1="26.4522" y1="7.80238" x2="27.177" y2="9.05773" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_790" x1="21.374" y1="3.47489" x2="22.6277" y2="4.19877" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/101.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/1.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/101.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/1.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/34.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/10.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/34.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/10.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/100.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/100.svg
deleted file mode 100644
index 7e101469..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/100.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<svg width="31" height="30" viewBox="0 0 31 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814242">
-<path id="XMLID_96_" d="M15.8571 23.3764C20.6409 23.3764 24.519 19.4915 24.519 14.6992C24.519 9.9069 20.6409 6.02197 15.8571 6.02197C11.0733 6.02197 7.19531 9.9069 7.19531 14.6992C7.19531 19.4915 11.0733 23.3764 15.8571 23.3764Z" fill="url(#paint0_linear_193_790)"/>
-<path id="XMLID_95_" fill-rule="evenodd" clip-rule="evenodd" d="M16.4134 4.33861H15.2862C15.1936 4.33861 15.1318 4.26141 15.1318 4.18421V0.154399C15.1318 0.0617596 15.209 0 15.2862 0H16.4134C16.506 0 16.5678 0.0771995 16.5678 0.154399V4.18421C16.5678 4.27685 16.506 4.33861 16.4134 4.33861Z" fill="url(#paint1_linear_193_790)"/>
-<path id="XMLID_94_" fill-rule="evenodd" clip-rule="evenodd" d="M10.4688 5.78998C10.1291 5.99069 9.68137 5.86717 9.48065 5.5275L8.02929 3.02623C7.82857 2.68656 7.95209 2.2388 8.29177 2.03808C8.63145 1.83736 9.07921 1.96088 9.27993 2.30056L10.7313 4.80182C10.932 5.15694 10.8085 5.58926 10.4688 5.78998Z" fill="url(#paint2_linear_193_790)"/>
-<path id="XMLID_93_" fill-rule="evenodd" clip-rule="evenodd" d="M6.53218 9.74321C6.33146 10.0829 5.8837 10.2064 5.54402 10.0057L3.04275 8.55434C2.70307 8.35362 2.57955 7.90586 2.78027 7.56618C2.98099 7.2265 3.42875 7.10299 3.76843 7.3037L6.2697 8.75506C6.60938 8.95577 6.7329 9.40353 6.53218 9.74321Z" fill="url(#paint3_linear_193_790)"/>
-<path id="XMLID_91_" fill-rule="evenodd" clip-rule="evenodd" d="M5.18825 14.5602V15.6873C5.18825 15.7799 5.11105 15.8417 5.03385 15.8417H1.00401C0.911369 15.8417 0.849609 15.7645 0.849609 15.6873V14.5602C0.849609 14.4675 0.926809 14.4058 1.00401 14.4058H5.01841C5.11105 14.3903 5.18825 14.4675 5.18825 14.5602Z" fill="url(#paint4_linear_193_790)"/>
-<path id="XMLID_90_" fill-rule="evenodd" clip-rule="evenodd" d="M6.68648 20.4583C6.8872 20.798 6.76368 21.2457 6.424 21.4464L3.92272 22.8978C3.58304 23.0985 3.13528 22.975 2.93456 22.6353C2.73384 22.2956 2.85736 21.8479 3.19704 21.6472L5.69832 20.1958C6.05344 19.9797 6.48576 20.1032 6.68648 20.4583Z" fill="url(#paint5_linear_193_790)"/>
-<path id="XMLID_88_" fill-rule="evenodd" clip-rule="evenodd" d="M10.6544 24.3183C10.994 24.5191 11.1176 24.9668 10.9168 25.3065L9.46548 27.8078C9.26476 28.1474 8.817 28.271 8.47732 28.0702C8.13764 27.8695 8.01412 27.4218 8.21484 27.0821L9.6662 24.5808C9.86692 24.2257 10.2992 24.1176 10.6544 24.3183Z" fill="url(#paint6_linear_193_790)"/>
-<path id="XMLID_87_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4405 25.6616H16.5677C16.6603 25.6616 16.7221 25.7388 16.7221 25.816V29.8458C16.7221 29.9385 16.6449 30.0002 16.5677 30.0002H15.4405C15.3479 30.0002 15.2861 29.923 15.2861 29.8458V25.816C15.2861 25.7388 15.3633 25.6616 15.4405 25.6616Z" fill="url(#paint7_linear_193_790)"/>
-<path id="XMLID_86_" fill-rule="evenodd" clip-rule="evenodd" d="M21.323 24.1636C21.6627 23.9628 22.1105 24.0864 22.3112 24.426L23.7625 26.9273C23.9633 27.267 23.8397 27.7147 23.5001 27.9155C23.1604 28.1162 22.7126 27.9927 22.5119 27.653L21.0605 25.1517C20.8598 24.7966 20.9833 24.3488 21.323 24.1636Z" fill="url(#paint8_linear_193_790)"/>
-<path id="XMLID_85_" fill-rule="evenodd" clip-rule="evenodd" d="M25.167 20.18C25.3677 19.8403 25.8154 19.7168 26.1551 19.9175L28.6564 21.3688C28.9961 21.5695 29.1196 22.0173 28.9189 22.357C28.7182 22.6967 28.2704 22.8202 27.9307 22.6195L25.4294 21.1681C25.0898 20.9674 24.9817 20.5351 25.167 20.18Z" fill="url(#paint9_linear_193_790)"/>
-<path id="XMLID_84_" fill-rule="evenodd" clip-rule="evenodd" d="M26.5264 15.3787V14.2516C26.5264 14.1589 26.6036 14.0972 26.6808 14.0972H30.6952C30.7878 14.0972 30.8496 14.1744 30.8496 14.2516V15.3787C30.8496 15.4713 30.7724 15.5331 30.6952 15.5331H26.6808C26.6036 15.5331 26.5264 15.4713 26.5264 15.3787Z" fill="url(#paint10_linear_193_790)"/>
-<path id="XMLID_75_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9365 9.51127C24.7358 9.1716 24.8593 8.72384 25.199 8.52312L27.7003 7.07177C28.04 6.87105 28.4877 6.99457 28.6884 7.33425C28.8892 7.67393 28.7656 8.12168 28.426 8.3224L25.9247 9.77375C25.585 9.97447 25.1372 9.85095 24.9365 9.51127Z" fill="url(#paint11_linear_193_790)"/>
-<path id="XMLID_74_" fill-rule="evenodd" clip-rule="evenodd" d="M20.9217 5.71283C20.582 5.51211 20.4585 5.06435 20.6592 4.72467L22.1105 2.22341C22.3113 1.88373 22.759 1.76021 23.0987 1.96093C23.4384 2.16165 23.5619 2.60941 23.3612 2.94908L21.9098 5.45035C21.7091 5.80547 21.2613 5.91355 20.9217 5.71283Z" fill="url(#paint12_linear_193_790)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_790" x1="15.854" y1="6.02185" x2="15.854" y2="23.3898" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_790" x1="15.1307" y1="2.171" x2="16.5744" y2="2.171" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_790" x1="8.75797" y1="4.27506" x2="10.0117" y2="3.55117" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_790" x1="4.29299" y1="9.29711" x2="5.01777" y2="8.04178" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_790" x1="3.01518" y1="15.8451" x2="3.01518" y2="14.3978" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_790" x1="5.16693" y1="22.167" x2="4.44214" y2="20.9117" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_790" x1="10.1961" y1="26.5629" x2="8.94231" y2="25.839" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_790" x1="16.7302" y1="27.8384" x2="15.2865" y2="27.8384" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_790" x1="23.0298" y1="25.683" x2="21.776" y2="26.4069" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_790" x1="27.4182" y1="20.6463" x2="26.6934" y2="21.9016" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_790" x1="28.6931" y1="14.0889" x2="28.6931" y2="15.5363" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_790" x1="26.4522" y1="7.80238" x2="27.177" y2="9.05773" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_790" x1="21.374" y1="3.47489" x2="22.6277" y2="4.19877" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/11.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/11.svg
index b4f76297..84fd91c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/11.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/11.svg
@@ -1,88 +1,43 @@
-<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814243">
-<g id="XMLID_24_">
-<path id="XMLID_37_" d="M21.8761 17.2234C25.2547 17.2234 27.9935 14.3924 27.9935 10.9003C27.9935 7.4081 25.2547 4.57715 21.8761 4.57715C18.4976 4.57715 15.7588 7.4081 15.7588 10.9003C15.7588 14.3924 18.4976 17.2234 21.8761 17.2234Z" fill="url(#paint0_linear_193_810)"/>
-<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2731 3.16156H21.4798C21.4188 3.16156 21.373 3.11437 21.373 3.05145V0.110104C21.373 0.0471874 21.4188 0 21.4798 0H22.2731C22.3341 0 22.3799 0.0471874 22.3799 0.110104V3.03572C22.3799 3.11437 22.3341 3.16156 22.2731 3.16156Z" fill="url(#paint1_linear_193_810)"/>
-<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0778 4.21498C17.8337 4.35654 17.5286 4.2779 17.376 4.02623L16.3539 2.20165C16.2166 1.94998 16.2929 1.6354 16.537 1.47811C16.7811 1.33655 17.0862 1.41519 17.2387 1.66686L18.2608 3.49144C18.3981 3.74311 18.3219 4.07342 18.0778 4.21498Z" fill="url(#paint2_linear_193_810)"/>
-<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2857 7.09388C15.1484 7.34555 14.828 7.42419 14.5839 7.28263L12.8143 6.22878C12.5703 6.08722 12.494 5.75691 12.6313 5.50524C12.7686 5.25357 13.0889 5.17493 13.333 5.31649L15.1026 6.37034C15.3467 6.52763 15.4382 6.84221 15.2857 7.09388Z" fill="url(#paint3_linear_193_810)"/>
-<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3401 10.5854V11.4034C14.3401 11.4663 14.2943 11.5135 14.2333 11.5135H11.3958C11.3348 11.5135 11.2891 11.4663 11.2891 11.4034V10.5854C11.2891 10.5225 11.3348 10.4753 11.3958 10.4753H14.2333C14.2943 10.4753 14.3401 10.5225 14.3401 10.5854Z" fill="url(#paint4_linear_193_810)"/>
-<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4078 14.8793C15.5451 15.1309 15.4688 15.4455 15.2247 15.6028L13.4551 16.6567C13.211 16.7982 12.9059 16.7196 12.7533 16.4679C12.6161 16.2162 12.6923 15.9017 12.9364 15.7444L14.706 14.6905C14.9501 14.549 15.2552 14.6276 15.4078 14.8793Z" fill="url(#paint5_linear_193_810)"/>
-<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M18.1998 17.6956C18.4439 17.8371 18.5202 18.1674 18.3829 18.4191L17.3608 20.2437C17.2235 20.4953 16.9031 20.574 16.6591 20.4324C16.415 20.2909 16.3387 19.9605 16.476 19.7089L17.4981 17.8843C17.6507 17.6326 17.9558 17.5383 18.1998 17.6956Z" fill="url(#paint6_linear_193_810)"/>
-<path id="XMLID_30_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5867 18.6699H22.38C22.441 18.6699 22.4868 18.7171 22.4868 18.78V21.7056C22.4868 21.7686 22.441 21.8157 22.38 21.8157H21.5867C21.5257 21.8157 21.4799 21.7686 21.4799 21.7056V18.78C21.4647 18.7328 21.5257 18.6699 21.5867 18.6699Z" fill="url(#paint7_linear_193_810)"/>
-<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M25.7362 17.585C25.9802 17.4435 26.2853 17.5221 26.4379 17.7738L27.46 19.5984C27.5973 19.85 27.521 20.1646 27.2769 20.3219C27.0329 20.4635 26.7278 20.3848 26.5752 20.1332L25.5531 18.3086C25.4005 18.0412 25.4921 17.7266 25.7362 17.585Z" fill="url(#paint8_linear_193_810)"/>
-<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M28.4506 14.6908C28.5879 14.4391 28.9083 14.3605 29.1524 14.502L30.922 15.5559C31.1661 15.6975 31.2423 16.0278 31.105 16.2794C30.9677 16.5311 30.6474 16.6097 30.4033 16.4682L28.6337 15.4143C28.3896 15.257 28.3133 14.9425 28.4506 14.6908Z" fill="url(#paint9_linear_193_810)"/>
-<path id="XMLID_27_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3965 11.1839V10.366C29.3965 10.303 29.4422 10.2559 29.5033 10.2559H32.3407C32.4018 10.2559 32.4475 10.303 32.4475 10.366V11.1839C32.4475 11.2468 32.4018 11.294 32.3407 11.294H29.5033C29.4575 11.3097 29.3965 11.2468 29.3965 11.1839Z" fill="url(#paint10_linear_193_810)"/>
-<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M28.2836 6.92103C28.1463 6.66936 28.2226 6.35478 28.4667 6.19749L30.2363 5.14364C30.4804 5.00208 30.7855 5.08072 30.938 5.33239C31.0753 5.58405 30.9991 5.89864 30.755 6.05593L28.9854 7.10978C28.726 7.25134 28.4209 7.1727 28.2836 6.92103Z" fill="url(#paint11_linear_193_810)"/>
-<path id="XMLID_25_" fill-rule="evenodd" clip-rule="evenodd" d="M25.4462 4.15199C25.2021 4.01043 25.1258 3.68012 25.2631 3.42845L26.2852 1.60387C26.4225 1.35221 26.7429 1.27356 26.987 1.41512C27.231 1.55668 27.3073 1.887 27.17 2.13866L26.1479 3.96324C25.9954 4.21491 25.6903 4.30928 25.4462 4.15199Z" fill="url(#paint12_linear_193_810)"/>
+<svg width="33" height="30" viewBox="0 0 33 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814249">
+<g id="XMLID_17_">
+<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M9.12812 24.1283V28.6083C9.12812 28.9603 8.8409 29.2483 8.48984 29.2483C8.13879 29.2483 7.85156 28.9603 7.85156 28.6083V24.1283C7.85156 23.7763 8.13879 23.4883 8.48984 23.4883C8.8409 23.4883 9.12812 23.7763 9.12812 24.1283Z" fill="url(#paint0_linear_193_886)"/>
+<path id="XMLID_20_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3303 24.1283V28.6083C14.3303 28.9603 14.043 29.2483 13.692 29.2483C13.3409 29.2483 13.0537 28.9603 13.0537 28.6083V24.1283C13.0537 23.7763 13.3409 23.4883 13.692 23.4883C14.059 23.4883 14.3303 23.7763 14.3303 24.1283Z" fill="url(#paint1_linear_193_886)"/>
+<path id="XMLID_19_" fill-rule="evenodd" clip-rule="evenodd" d="M19.548 24.1283V28.6083C19.548 28.9603 19.2608 29.2483 18.9098 29.2483C18.5587 29.2483 18.2715 28.9603 18.2715 28.6083V24.1283C18.2715 23.7763 18.5587 23.4883 18.9098 23.4883C19.2608 23.4883 19.548 23.7763 19.548 24.1283Z" fill="url(#paint2_linear_193_886)"/>
+<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M24.7502 24.1283V28.6083C24.7502 28.9603 24.463 29.2483 24.1119 29.2483C23.7609 29.2483 23.4736 28.9603 23.4736 28.6083V24.1283C23.4736 23.7763 23.7609 23.4883 24.1119 23.4883C24.4789 23.4883 24.7502 23.7763 24.7502 24.1283Z" fill="url(#paint3_linear_193_886)"/>
 </g>
-<g id="XMLID_20_">
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M23.2035 9.97202C22.6696 9.97202 22.1661 10.0192 21.6627 10.1136C20.7779 6.68463 17.9099 4.16797 14.508 4.16797C10.923 4.16797 7.93298 6.95203 7.21598 10.6641C3.4937 10.8371 0.53418 14.2032 0.53418 18.3242C0.53418 22.5711 3.66151 26 7.52109 26H23.2035C27.8411 26 31.5939 22.4138 31.5939 17.9781C31.5939 13.5425 27.8411 9.97202 23.2035 9.97202Z" fill="url(#paint13_linear_193_810)"/>
-<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19271 12.3945C8.81818 9.09139 11.4879 6.60619 14.6915 6.60619C17.7273 6.60619 20.2749 8.83972 21.0681 11.8912C21.5106 11.8125 21.9682 11.7653 22.4411 11.7653C26.3007 11.7653 29.4738 14.5651 29.8704 18.1514C29.9009 17.8997 29.9162 17.648 29.9162 17.3964C29.9162 13.4484 26.5753 10.2553 22.4411 10.2553C21.9682 10.2553 21.5106 10.3025 21.0681 10.3812C20.2749 7.32973 17.7273 5.09619 14.6915 5.09619C11.5031 5.09619 8.83343 7.58139 8.19271 10.8845C4.88232 11.0418 2.24316 14.0303 2.24316 17.711C2.24316 17.9626 2.25842 18.2143 2.28893 18.466C2.60929 15.1471 5.11115 12.5361 8.19271 12.3945Z" fill="url(#paint14_linear_193_810)"/>
-<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M8.95504 12.3628C8.72621 12.3628 8.49738 12.3785 8.26855 12.41C11.2586 12.8032 13.5774 15.603 13.5774 19.0005C13.5774 20.5891 13.0587 22.0519 12.2197 23.2002C13.5621 22.0991 14.4317 20.3532 14.4317 18.3871C14.4317 15.0682 11.9756 12.3628 8.95504 12.3628Z" fill="url(#paint15_linear_193_810)"/>
+<g id="XMLID_1_">
+<path id="XMLID_14_" fill-rule="evenodd" clip-rule="evenodd" d="M24.0959 5.904C23.5374 5.904 23.0108 5.952 22.4842 6.048C21.5587 2.56 18.5588 0 15.0004 0C11.2505 0 8.12292 2.832 7.37294 6.608C3.47944 6.784 0.383789 10.208 0.383789 14.4C0.383789 18.72 3.65497 22.208 7.69208 22.208H24.0959C28.9468 22.208 32.8722 18.56 32.8722 14.048C32.8722 9.536 28.9468 5.904 24.0959 5.904Z" fill="url(#paint4_linear_193_886)"/>
+<path id="XMLID_11_" fill-rule="evenodd" clip-rule="evenodd" d="M8.3785 8.36834C9.03273 5.00834 11.8252 2.48034 15.1762 2.48034C18.3516 2.48034 21.0164 4.75234 21.8462 7.85634C22.3089 7.77634 22.7877 7.72834 23.2823 7.72834C27.3194 7.72834 30.6385 10.5763 31.0534 14.2243C31.0853 13.9683 31.1012 13.7123 31.1012 13.4563C31.1012 9.44034 27.6067 6.19234 23.2823 6.19234C22.7877 6.19234 22.3089 6.24034 21.8462 6.32034C21.0164 3.21634 18.3516 0.944336 15.1762 0.944336C11.8412 0.944336 9.04869 3.47234 8.3785 6.83234C4.91583 6.99234 2.15527 10.0323 2.15527 13.7763C2.15527 14.0323 2.17123 14.2883 2.20314 14.5443C2.53824 11.1683 5.15519 8.51234 8.3785 8.36834Z" fill="url(#paint5_linear_193_886)"/>
+<path id="XMLID_9_" fill-rule="evenodd" clip-rule="evenodd" d="M9.1917 8.33594C8.95234 8.33594 8.71299 8.35194 8.47363 8.38394C11.6012 8.78394 14.0267 11.6319 14.0267 15.0879C14.0267 16.7039 13.4841 18.1919 12.6065 19.3599C14.0107 18.2399 14.9202 16.4639 14.9202 14.4639C14.9043 11.0719 12.3512 8.33594 9.1917 8.33594Z" fill="url(#paint6_linear_193_886)"/>
 </g>
 </g>
 <defs>
-<linearGradient id="paint0_linear_193_810" x1="15.7571" y1="10.9044" x2="27.9836" y2="10.9044" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_810" x1="21.36" y1="1.57976" x2="22.3788" y2="1.57976" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_810" x1="16.8603" y1="3.10924" x2="17.7585" y2="2.60629" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_810" x1="13.7082" y1="6.76682" x2="14.2436" y2="5.86754" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_810" x1="12.8094" y1="11.5294" x2="12.8094" y2="10.4763" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_810" x1="14.3236" y1="16.1296" x2="13.7883" y2="15.2303" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_810" x1="17.8762" y1="19.3326" x2="16.978" y2="18.8297" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_810" x1="22.489" y1="20.2561" x2="21.4701" y2="20.2561" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_810" x1="26.9324" y1="18.6903" x2="26.0343" y2="19.1933" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_810" x1="30.0321" y1="15.0258" x2="29.4968" y2="15.9251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
+<linearGradient id="paint0_linear_193_886" x1="8.49009" y1="29.2503" x2="8.49009" y2="23.4891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint10_linear_193_810" x1="30.9308" y1="10.2521" x2="30.9308" y2="11.3053" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
+<linearGradient id="paint1_linear_193_886" x1="13.6922" y1="29.2503" x2="13.6922" y2="23.4891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint11_linear_193_810" x1="29.3489" y1="5.67813" x2="29.8842" y2="6.57741" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
+<linearGradient id="paint2_linear_193_886" x1="18.91" y1="29.2503" x2="18.91" y2="23.4891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint12_linear_193_810" x1="25.7655" y1="2.52874" x2="26.6637" y2="3.03168" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
+<linearGradient id="paint3_linear_193_886" x1="24.1122" y1="29.2503" x2="24.1122" y2="23.4891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint13_linear_193_810" x1="16.0701" y1="26.0075" x2="16.0701" y2="4.17108" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint4_linear_193_886" x1="16.6343" y1="22.2156" x2="16.6343" y2="0.00316693" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint14_linear_193_810" x1="16.0705" y1="5.1052" x2="16.0705" y2="18.47" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint5_linear_193_886" x1="16.6237" y1="0.948864" x2="16.6237" y2="14.5438" gradientUnits="userSpaceOnUse">
 <stop stop-color="white"/>
 <stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
 </linearGradient>
-<linearGradient id="paint15_linear_193_810" x1="11.3532" y1="12.3705" x2="11.3532" y2="23.2042" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint6_linear_193_886" x1="11.6893" y1="8.33909" x2="11.6893" y2="19.3594" gradientUnits="userSpaceOnUse">
 <stop stop-color="white" stop-opacity="0.06"/>
 <stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
 </linearGradient>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/12.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/12.svg
index 976e7c2b..607373d1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/12.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/12.svg
@@ -1,29 +1,51 @@
-<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814245">
+<svg width="34" height="31" viewBox="0 0 34 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814274">
 <g id="XMLID_15_">
-<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M23.6541 5.12768C23.1055 5.12768 22.5882 5.16936 22.071 5.25274C21.1618 2.22338 18.215 0 14.7195 0C11.0359 0 7.96363 2.45962 7.22691 5.73911C3.40225 5.89196 0.361328 8.86574 0.361328 12.5065C0.361328 16.2585 3.57468 19.2878 7.54041 19.2878H23.6541C28.4193 19.2878 32.2753 16.1195 32.2753 12.2008C32.2753 8.2821 28.4036 5.12768 23.6541 5.12768Z" fill="url(#paint0_linear_193_829)"/>
-<path id="XMLID_17_" fill-rule="evenodd" clip-rule="evenodd" d="M8.21475 7.26812C8.85742 4.34993 11.6005 2.15434 14.8922 2.15434C18.0115 2.15434 20.6292 4.12759 21.4443 6.82345C21.8989 6.75397 22.3691 6.71228 22.855 6.71228C26.8208 6.71228 30.0811 9.18579 30.4887 12.3541C30.52 12.1318 30.5357 11.9094 30.5357 11.6871C30.5357 8.19916 27.1029 5.37825 22.855 5.37825C22.3691 5.37825 21.8989 5.41994 21.4443 5.48942C20.6292 2.79356 18.0115 0.820312 14.8922 0.820312C11.6162 0.820312 8.87309 3.0159 8.21475 5.93409C4.81331 6.07306 2.10156 8.71332 2.10156 11.965C2.10156 12.1874 2.11723 12.4097 2.14858 12.632C2.47775 9.69995 5.04843 7.39319 8.21475 7.26812Z" fill="url(#paint1_linear_193_829)"/>
-<path id="XMLID_16_" fill-rule="evenodd" clip-rule="evenodd" d="M9.01396 7.25391C8.77884 7.25391 8.54372 7.2678 8.30859 7.2956C11.3809 7.643 13.7634 10.1165 13.7634 13.1181C13.7634 14.5216 13.2305 15.8139 12.3684 16.8284C13.7478 15.8556 14.6412 14.3131 14.6412 12.5761C14.6256 9.63015 12.1176 7.25391 9.01396 7.25391Z" fill="url(#paint2_linear_193_829)"/>
-</g>
-<g id="XMLID_12_">
-<path id="XMLID_14_" fill-rule="evenodd" clip-rule="evenodd" d="M14.1396 24.0688C14.1396 25.1388 15.1115 26.0004 16.3185 26.0004C17.5254 26.0004 18.4973 25.1388 18.4973 24.0688C18.4973 22.9988 16.3185 20.6504 16.3185 20.6504C16.3185 20.6504 14.1396 22.9988 14.1396 24.0688Z" fill="url(#paint3_linear_193_829)"/>
-<path id="XMLID_13_" d="M15.8638 25.0408C15.2368 24.485 15.2368 23.5817 15.8638 23.0259" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
+<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M24.6584 5.904C24.0999 5.904 23.5733 5.952 23.0467 6.048C22.1212 2.56 19.1213 0 15.5629 0C11.813 0 8.68542 2.832 7.93544 6.608C4.04194 6.784 0.946289 10.208 0.946289 14.4C0.946289 18.72 4.21747 22.208 8.25458 22.208H24.6584C29.5093 22.208 33.4347 18.56 33.4347 14.048C33.4347 9.536 29.4933 5.904 24.6584 5.904Z" fill="url(#paint0_linear_193_1092)"/>
+<path id="XMLID_17_" fill-rule="evenodd" clip-rule="evenodd" d="M8.941 8.38421C9.59523 5.02421 12.3877 2.49621 15.7387 2.49621C18.9141 2.49621 21.5789 4.7682 22.4087 7.87221C22.8714 7.7922 23.3502 7.74421 23.8448 7.74421C27.8819 7.74421 31.201 10.5922 31.6159 14.2402C31.6478 13.9842 31.6637 13.7282 31.6637 13.4722C31.6637 9.45621 28.1692 6.20821 23.8448 6.20821C23.3502 6.20821 22.8714 6.25621 22.4087 6.33621C21.5789 3.23221 18.9141 0.960205 15.7387 0.960205C12.4037 0.960205 9.61119 3.48821 8.941 6.84821C5.47833 7.00821 2.71777 10.0482 2.71777 13.7922C2.71777 14.0482 2.73373 14.3042 2.76564 14.5602C3.10074 11.1682 5.71769 8.52821 8.941 8.38421Z" fill="url(#paint1_linear_193_1092)"/>
+<path id="XMLID_16_" fill-rule="evenodd" clip-rule="evenodd" d="M9.7542 8.35205C9.51484 8.35205 9.27549 8.36805 9.03613 8.40005C12.1637 8.80005 14.5892 11.6481 14.5892 15.1041C14.5892 16.7201 14.0466 18.2081 13.169 19.3761C14.5732 18.2561 15.4828 16.4801 15.4828 14.4801C15.4668 11.0881 12.9137 8.35205 9.7542 8.35205Z" fill="url(#paint2_linear_193_1092)"/>
 </g>
+<path id="XMLID_14_" d="M14.4619 30.2236C14.9555 30.2236 15.3555 29.8225 15.3555 29.3276C15.3555 28.8328 14.9555 28.4316 14.4619 28.4316C13.9684 28.4316 13.5684 28.8328 13.5684 29.3276C13.5684 29.8225 13.9684 30.2236 14.4619 30.2236Z" fill="url(#paint3_linear_193_1092)"/>
+<path id="XMLID_13_" d="M17.5252 27.3276C18.1156 27.3276 18.5943 26.8476 18.5943 26.2556C18.5943 25.6635 18.1156 25.1836 17.5252 25.1836C16.9347 25.1836 16.4561 25.6635 16.4561 26.2556C16.4561 26.8476 16.9347 27.3276 17.5252 27.3276Z" fill="url(#paint4_linear_193_1092)"/>
+<path id="XMLID_12_" d="M10.4883 26.5752C10.9818 26.5752 11.3819 26.174 11.3819 25.6792C11.3819 25.1844 10.9818 24.7832 10.4883 24.7832C9.9948 24.7832 9.59473 25.1844 9.59473 25.6792C9.59473 26.174 9.9948 26.5752 10.4883 26.5752Z" fill="url(#paint5_linear_193_1092)"/>
+<path id="XMLID_11_" d="M24.4829 26.9276C25.1703 26.9276 25.7276 26.3689 25.7276 25.6796C25.7276 24.9904 25.1703 24.4316 24.4829 24.4316C23.7955 24.4316 23.2383 24.9904 23.2383 25.6796C23.2383 26.3689 23.7955 26.9276 24.4829 26.9276Z" fill="url(#paint6_linear_193_1092)"/>
+<path id="XMLID_10_" d="M23.2383 30.6714C23.7318 30.6714 24.1319 30.2702 24.1319 29.7754C24.1319 29.2805 23.7318 28.8794 23.2383 28.8794C22.7448 28.8794 22.3447 29.2805 22.3447 29.7754C22.3447 30.2702 22.7448 30.6714 23.2383 30.6714Z" fill="url(#paint7_linear_193_1092)"/>
+<path id="XMLID_9_" d="M7.56815 29.5034C8.15861 29.5034 8.63726 29.0234 8.63726 28.4314C8.63726 27.8393 8.15861 27.3594 7.56815 27.3594C6.9777 27.3594 6.49902 27.8393 6.49902 28.4314C6.49902 29.0234 6.9777 29.5034 7.56815 29.5034Z" fill="url(#paint8_linear_193_1092)"/>
 </g>
 <defs>
-<linearGradient id="paint0_linear_193_829" x1="16.3245" y1="19.2945" x2="16.3245" y2="0.0027505" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_193_1092" x1="17.1968" y1="22.2156" x2="17.1968" y2="0.00316693" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint1_linear_193_829" x1="16.3126" y1="0.829262" x2="16.3126" y2="12.6366" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint1_linear_193_1092" x1="17.1857" y1="0.960093" x2="17.1857" y2="14.555" gradientUnits="userSpaceOnUse">
 <stop stop-color="white"/>
 <stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
 </linearGradient>
-<linearGradient id="paint2_linear_193_829" x1="11.4659" y1="7.24776" x2="11.4659" y2="16.819" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint2_linear_193_1092" x1="12.2513" y1="8.35056" x2="12.2513" y2="19.3709" gradientUnits="userSpaceOnUse">
 <stop stop-color="white" stop-opacity="0.06"/>
 <stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
 </linearGradient>
-<linearGradient id="paint3_linear_193_829" x1="16.3193" y1="26.0022" x2="16.3193" y2="20.6512" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint3_linear_193_1092" x1="14.4623" y1="30.2243" x2="14.4623" y2="28.4319" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
+</linearGradient>
+<linearGradient id="paint4_linear_193_1092" x1="17.5256" y1="27.3283" x2="17.5256" y2="25.1839" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
+</linearGradient>
+<linearGradient id="paint5_linear_193_1092" x1="10.4887" y1="26.5758" x2="10.4887" y2="24.7835" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
+</linearGradient>
+<linearGradient id="paint6_linear_193_1092" x1="24.4834" y1="26.9285" x2="24.4834" y2="24.432" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
+</linearGradient>
+<linearGradient id="paint7_linear_193_1092" x1="23.2387" y1="30.672" x2="23.2387" y2="28.8797" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
+</linearGradient>
+<linearGradient id="paint8_linear_193_1092" x1="7.56856" y1="29.5041" x2="7.56856" y2="27.3597" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/13.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/13.svg
index 26f72add..84fd91c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/13.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/13.svg
@@ -1,39 +1,45 @@
-<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814246">
-<g id="XMLID_7_">
-<path id="XMLID_10_" fill-rule="evenodd" clip-rule="evenodd" d="M23.4715 5.12768C22.9229 5.12768 22.4056 5.16936 21.8884 5.25274C20.9792 2.22338 18.0324 0 14.5369 0C10.8533 0 7.78101 2.45962 7.0443 5.73911C3.21964 5.89196 0.178711 8.86574 0.178711 12.5065C0.178711 16.2585 3.39206 19.2878 7.35779 19.2878H23.4715C28.2367 19.2878 32.0927 16.1195 32.0927 12.2008C32.0927 8.2821 28.2367 5.12768 23.4715 5.12768Z" fill="url(#paint0_linear_193_837)"/>
-<path id="XMLID_9_" fill-rule="evenodd" clip-rule="evenodd" d="M8.04776 7.26812C8.69042 4.34993 11.4335 2.15434 14.7252 2.15434C17.8445 2.15434 20.4622 4.12759 21.2773 6.82345C21.7319 6.75397 22.2021 6.71228 22.6881 6.71228C26.6538 6.71228 29.9142 9.18579 30.3217 12.3541C30.353 12.1318 30.3687 11.9094 30.3687 11.6871C30.3687 8.19916 26.9359 5.37825 22.6881 5.37825C22.2021 5.37825 21.7319 5.41994 21.2773 5.48942C20.4622 2.79356 17.8445 0.820312 14.7252 0.820312C11.4492 0.820312 8.7061 3.0159 8.04776 5.93409C4.64632 6.07306 1.93457 8.71332 1.93457 11.965C1.93457 12.1874 1.95023 12.4097 1.98158 12.632C2.31075 9.69995 4.88144 7.39319 8.04776 7.26812Z" fill="url(#paint1_linear_193_837)"/>
-<path id="XMLID_8_" fill-rule="evenodd" clip-rule="evenodd" d="M8.83134 7.25391C8.59622 7.25391 8.3611 7.2678 8.12598 7.2956C11.1982 7.643 13.5808 10.1165 13.5808 13.1181C13.5808 14.5216 13.0479 15.8139 12.1858 16.8284C13.5651 15.8556 14.4586 14.3131 14.4586 12.5761C14.4586 9.63015 11.935 7.25391 8.83134 7.25391Z" fill="url(#paint2_linear_193_837)"/>
-</g>
-<g id="XMLID_4_">
-<path id="XMLID_6_" fill-rule="evenodd" clip-rule="evenodd" d="M10.6338 24.0688C10.6338 25.1388 11.6056 26.0004 12.8126 26.0004C14.0196 26.0004 14.9914 25.1388 14.9914 24.0688C14.9914 22.9988 12.8126 20.6504 12.8126 20.6504C12.8126 20.6504 10.6338 22.9988 10.6338 24.0688Z" fill="url(#paint3_linear_193_837)"/>
-<path id="XMLID_5_" d="M12.3736 25.0408C11.7466 24.485 11.7466 23.5817 12.3736 23.0259" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
+<svg width="33" height="30" viewBox="0 0 33 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814249">
+<g id="XMLID_17_">
+<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M9.12812 24.1283V28.6083C9.12812 28.9603 8.8409 29.2483 8.48984 29.2483C8.13879 29.2483 7.85156 28.9603 7.85156 28.6083V24.1283C7.85156 23.7763 8.13879 23.4883 8.48984 23.4883C8.8409 23.4883 9.12812 23.7763 9.12812 24.1283Z" fill="url(#paint0_linear_193_886)"/>
+<path id="XMLID_20_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3303 24.1283V28.6083C14.3303 28.9603 14.043 29.2483 13.692 29.2483C13.3409 29.2483 13.0537 28.9603 13.0537 28.6083V24.1283C13.0537 23.7763 13.3409 23.4883 13.692 23.4883C14.059 23.4883 14.3303 23.7763 14.3303 24.1283Z" fill="url(#paint1_linear_193_886)"/>
+<path id="XMLID_19_" fill-rule="evenodd" clip-rule="evenodd" d="M19.548 24.1283V28.6083C19.548 28.9603 19.2608 29.2483 18.9098 29.2483C18.5587 29.2483 18.2715 28.9603 18.2715 28.6083V24.1283C18.2715 23.7763 18.5587 23.4883 18.9098 23.4883C19.2608 23.4883 19.548 23.7763 19.548 24.1283Z" fill="url(#paint2_linear_193_886)"/>
+<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M24.7502 24.1283V28.6083C24.7502 28.9603 24.463 29.2483 24.1119 29.2483C23.7609 29.2483 23.4736 28.9603 23.4736 28.6083V24.1283C23.4736 23.7763 23.7609 23.4883 24.1119 23.4883C24.4789 23.4883 24.7502 23.7763 24.7502 24.1283Z" fill="url(#paint3_linear_193_886)"/>
 </g>
 <g id="XMLID_1_">
-<path id="XMLID_3_" fill-rule="evenodd" clip-rule="evenodd" d="M17.2959 24.0688C17.2959 25.1388 18.2677 26.0004 19.4747 26.0004C20.6817 26.0004 21.6535 25.1388 21.6535 24.0688C21.6535 22.9988 19.4747 20.6504 19.4747 20.6504C19.4747 20.6504 17.2959 22.9988 17.2959 24.0688Z" fill="url(#paint4_linear_193_837)"/>
-<path id="XMLID_2_" d="M19.02 25.0408C18.3931 24.485 18.3931 23.5817 19.02 23.0259" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
+<path id="XMLID_14_" fill-rule="evenodd" clip-rule="evenodd" d="M24.0959 5.904C23.5374 5.904 23.0108 5.952 22.4842 6.048C21.5587 2.56 18.5588 0 15.0004 0C11.2505 0 8.12292 2.832 7.37294 6.608C3.47944 6.784 0.383789 10.208 0.383789 14.4C0.383789 18.72 3.65497 22.208 7.69208 22.208H24.0959C28.9468 22.208 32.8722 18.56 32.8722 14.048C32.8722 9.536 28.9468 5.904 24.0959 5.904Z" fill="url(#paint4_linear_193_886)"/>
+<path id="XMLID_11_" fill-rule="evenodd" clip-rule="evenodd" d="M8.3785 8.36834C9.03273 5.00834 11.8252 2.48034 15.1762 2.48034C18.3516 2.48034 21.0164 4.75234 21.8462 7.85634C22.3089 7.77634 22.7877 7.72834 23.2823 7.72834C27.3194 7.72834 30.6385 10.5763 31.0534 14.2243C31.0853 13.9683 31.1012 13.7123 31.1012 13.4563C31.1012 9.44034 27.6067 6.19234 23.2823 6.19234C22.7877 6.19234 22.3089 6.24034 21.8462 6.32034C21.0164 3.21634 18.3516 0.944336 15.1762 0.944336C11.8412 0.944336 9.04869 3.47234 8.3785 6.83234C4.91583 6.99234 2.15527 10.0323 2.15527 13.7763C2.15527 14.0323 2.17123 14.2883 2.20314 14.5443C2.53824 11.1683 5.15519 8.51234 8.3785 8.36834Z" fill="url(#paint5_linear_193_886)"/>
+<path id="XMLID_9_" fill-rule="evenodd" clip-rule="evenodd" d="M9.1917 8.33594C8.95234 8.33594 8.71299 8.35194 8.47363 8.38394C11.6012 8.78394 14.0267 11.6319 14.0267 15.0879C14.0267 16.7039 13.4841 18.1919 12.6065 19.3599C14.0107 18.2399 14.9202 16.4639 14.9202 14.4639C14.9043 11.0719 12.3512 8.33594 9.1917 8.33594Z" fill="url(#paint6_linear_193_886)"/>
 </g>
 </g>
 <defs>
-<linearGradient id="paint0_linear_193_837" x1="16.1419" y1="19.2945" x2="16.1419" y2="0.0027505" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_193_886" x1="8.49009" y1="29.2503" x2="8.49009" y2="23.4891" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint1_linear_193_837" x1="16.1416" y1="0.829262" x2="16.1416" y2="12.6366" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+<linearGradient id="paint1_linear_193_886" x1="13.6922" y1="29.2503" x2="13.6922" y2="23.4891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint2_linear_193_837" x1="11.2949" y1="7.24776" x2="11.2949" y2="16.819" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+<linearGradient id="paint2_linear_193_886" x1="18.91" y1="29.2503" x2="18.91" y2="23.4891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint3_linear_193_837" x1="12.8134" y1="26.0022" x2="12.8134" y2="20.6512" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint3_linear_193_886" x1="24.1122" y1="29.2503" x2="24.1122" y2="23.4891" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint4_linear_193_837" x1="19.4755" y1="26.0022" x2="19.4755" y2="20.6512" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint4_linear_193_886" x1="16.6343" y1="22.2156" x2="16.6343" y2="0.00316693" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
+<linearGradient id="paint5_linear_193_886" x1="16.6237" y1="0.948864" x2="16.6237" y2="14.5438" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
+<linearGradient id="paint6_linear_193_886" x1="11.6893" y1="8.33909" x2="11.6893" y2="19.3594" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0.06"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/14.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/14.svg
index a3c7aac6..84fd91c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/14.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/14.svg
@@ -1,49 +1,45 @@
-<svg width="34" height="30" viewBox="0 0 34 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814251">
-<g id="XMLID_61_">
-<path id="XMLID_64_" fill-rule="evenodd" clip-rule="evenodd" d="M24.5617 5.904C24.0032 5.904 23.4766 5.952 22.95 6.048C22.0245 2.56 19.0246 0 15.4662 0C11.7163 0 8.58875 2.832 7.83877 6.608C3.94526 6.784 0.849609 10.208 0.849609 14.4C0.849609 18.72 4.12079 22.208 8.15791 22.208H24.5617C29.4126 22.208 33.338 18.56 33.338 14.048C33.338 9.536 29.4126 5.904 24.5617 5.904Z" fill="url(#paint0_linear_193_848)"/>
-<path id="XMLID_63_" fill-rule="evenodd" clip-rule="evenodd" d="M8.84432 8.36834C9.49855 5.00834 12.291 2.48034 15.642 2.48034C18.8174 2.48034 21.4822 4.75234 22.312 7.85634C22.7748 7.77634 23.2535 7.72834 23.7481 7.72834C27.7853 7.72834 31.1043 10.5763 31.5192 14.2243C31.5511 13.9683 31.5671 13.7123 31.5671 13.4563C31.5671 9.44034 28.0725 6.19234 23.7481 6.19234C23.2535 6.19234 22.7748 6.24034 22.312 6.32034C21.4822 3.21634 18.8174 0.944336 15.642 0.944336C12.307 0.944336 9.51451 3.47234 8.84432 6.83234C5.38165 6.99234 2.62109 10.0323 2.62109 13.7763C2.62109 14.0323 2.63705 14.2883 2.66896 14.5443C3.02002 11.1683 5.62101 8.51234 8.84432 8.36834Z" fill="url(#paint1_linear_193_848)"/>
-<path id="XMLID_62_" fill-rule="evenodd" clip-rule="evenodd" d="M9.65752 8.33594C9.41816 8.33594 9.17881 8.35194 8.93945 8.38394C12.067 8.78394 14.4925 11.6319 14.4925 15.0879C14.4925 16.7039 13.9499 18.1919 13.0723 19.3599C14.4765 18.2399 15.3861 16.4639 15.3861 14.4639C15.3861 11.0719 12.817 8.33594 9.65752 8.33594Z" fill="url(#paint2_linear_193_848)"/>
-</g>
-<g id="XMLID_51_">
-<g id="XMLID_58_">
-<path id="XMLID_60_" fill-rule="evenodd" clip-rule="evenodd" d="M8.54199 27.7119C8.54199 28.9439 9.53132 29.9359 10.76 29.9359C11.9887 29.9359 12.978 28.9279 12.978 27.7119C12.978 26.4959 10.76 23.7759 10.76 23.7759C10.76 23.7759 8.54199 26.4799 8.54199 27.7119Z" fill="url(#paint3_linear_193_848)"/>
-<path id="XMLID_59_" d="M10.3127 28.832C9.67441 28.192 9.67441 27.152 10.3127 26.512" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-</g>
-<g id="XMLID_55_">
-<path id="XMLID_57_" fill-rule="evenodd" clip-rule="evenodd" d="M15.0684 27.7119C15.0684 28.9439 16.0577 29.9359 17.2864 29.9359C18.5151 29.9359 19.5044 28.9439 19.5044 27.7119C19.5044 26.4799 17.2864 23.7759 17.2864 23.7759C17.2864 23.7759 15.0684 26.4799 15.0684 27.7119Z" fill="url(#paint4_linear_193_848)"/>
-<path id="XMLID_56_" d="M16.8234 28.832C16.1852 28.192 16.1852 27.152 16.8234 26.512" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-</g>
-<g id="XMLID_52_">
-<path id="XMLID_54_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5947 27.7119C21.5947 28.9439 22.5841 29.9359 23.8127 29.9359C25.0414 29.9359 26.0308 28.9439 26.0308 27.7119C26.0308 26.4799 23.8127 23.7759 23.8127 23.7759C23.8127 23.7759 21.5947 26.4799 21.5947 27.7119Z" fill="url(#paint5_linear_193_848)"/>
-<path id="XMLID_53_" d="M23.3498 28.832C22.7115 28.192 22.7115 27.152 23.3498 26.512" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
+<svg width="33" height="30" viewBox="0 0 33 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814249">
+<g id="XMLID_17_">
+<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M9.12812 24.1283V28.6083C9.12812 28.9603 8.8409 29.2483 8.48984 29.2483C8.13879 29.2483 7.85156 28.9603 7.85156 28.6083V24.1283C7.85156 23.7763 8.13879 23.4883 8.48984 23.4883C8.8409 23.4883 9.12812 23.7763 9.12812 24.1283Z" fill="url(#paint0_linear_193_886)"/>
+<path id="XMLID_20_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3303 24.1283V28.6083C14.3303 28.9603 14.043 29.2483 13.692 29.2483C13.3409 29.2483 13.0537 28.9603 13.0537 28.6083V24.1283C13.0537 23.7763 13.3409 23.4883 13.692 23.4883C14.059 23.4883 14.3303 23.7763 14.3303 24.1283Z" fill="url(#paint1_linear_193_886)"/>
+<path id="XMLID_19_" fill-rule="evenodd" clip-rule="evenodd" d="M19.548 24.1283V28.6083C19.548 28.9603 19.2608 29.2483 18.9098 29.2483C18.5587 29.2483 18.2715 28.9603 18.2715 28.6083V24.1283C18.2715 23.7763 18.5587 23.4883 18.9098 23.4883C19.2608 23.4883 19.548 23.7763 19.548 24.1283Z" fill="url(#paint2_linear_193_886)"/>
+<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M24.7502 24.1283V28.6083C24.7502 28.9603 24.463 29.2483 24.1119 29.2483C23.7609 29.2483 23.4736 28.9603 23.4736 28.6083V24.1283C23.4736 23.7763 23.7609 23.4883 24.1119 23.4883C24.4789 23.4883 24.7502 23.7763 24.7502 24.1283Z" fill="url(#paint3_linear_193_886)"/>
 </g>
+<g id="XMLID_1_">
+<path id="XMLID_14_" fill-rule="evenodd" clip-rule="evenodd" d="M24.0959 5.904C23.5374 5.904 23.0108 5.952 22.4842 6.048C21.5587 2.56 18.5588 0 15.0004 0C11.2505 0 8.12292 2.832 7.37294 6.608C3.47944 6.784 0.383789 10.208 0.383789 14.4C0.383789 18.72 3.65497 22.208 7.69208 22.208H24.0959C28.9468 22.208 32.8722 18.56 32.8722 14.048C32.8722 9.536 28.9468 5.904 24.0959 5.904Z" fill="url(#paint4_linear_193_886)"/>
+<path id="XMLID_11_" fill-rule="evenodd" clip-rule="evenodd" d="M8.3785 8.36834C9.03273 5.00834 11.8252 2.48034 15.1762 2.48034C18.3516 2.48034 21.0164 4.75234 21.8462 7.85634C22.3089 7.77634 22.7877 7.72834 23.2823 7.72834C27.3194 7.72834 30.6385 10.5763 31.0534 14.2243C31.0853 13.9683 31.1012 13.7123 31.1012 13.4563C31.1012 9.44034 27.6067 6.19234 23.2823 6.19234C22.7877 6.19234 22.3089 6.24034 21.8462 6.32034C21.0164 3.21634 18.3516 0.944336 15.1762 0.944336C11.8412 0.944336 9.04869 3.47234 8.3785 6.83234C4.91583 6.99234 2.15527 10.0323 2.15527 13.7763C2.15527 14.0323 2.17123 14.2883 2.20314 14.5443C2.53824 11.1683 5.15519 8.51234 8.3785 8.36834Z" fill="url(#paint5_linear_193_886)"/>
+<path id="XMLID_9_" fill-rule="evenodd" clip-rule="evenodd" d="M9.1917 8.33594C8.95234 8.33594 8.71299 8.35194 8.47363 8.38394C11.6012 8.78394 14.0267 11.6319 14.0267 15.0879C14.0267 16.7039 13.4841 18.1919 12.6065 19.3599C14.0107 18.2399 14.9202 16.4639 14.9202 14.4639C14.9043 11.0719 12.3512 8.33594 9.1917 8.33594Z" fill="url(#paint6_linear_193_886)"/>
 </g>
 </g>
 <defs>
-<linearGradient id="paint0_linear_193_848" x1="17.1001" y1="22.2156" x2="17.1001" y2="0.00316693" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_193_886" x1="8.49009" y1="29.2503" x2="8.49009" y2="23.4891" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint1_linear_193_848" x1="17.0952" y1="0.948864" x2="17.0952" y2="14.5438" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_848" x1="12.1608" y1="8.33909" x2="12.1608" y2="19.3594" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+<linearGradient id="paint1_linear_193_886" x1="13.6922" y1="29.2503" x2="13.6922" y2="23.4891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint3_linear_193_848" x1="10.7609" y1="29.938" x2="10.7609" y2="23.7768" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint2_linear_193_886" x1="18.91" y1="29.2503" x2="18.91" y2="23.4891" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint4_linear_193_848" x1="17.2872" y1="29.938" x2="17.2872" y2="23.7768" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint3_linear_193_886" x1="24.1122" y1="29.2503" x2="24.1122" y2="23.4891" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
-<linearGradient id="paint5_linear_193_848" x1="23.8136" y1="29.938" x2="23.8136" y2="23.7768" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint4_linear_193_886" x1="16.6343" y1="22.2156" x2="16.6343" y2="0.00316693" gradientUnits="userSpaceOnUse">
 <stop stop-color="#3DE8FF"/>
 <stop offset="1" stop-color="#00A8C4"/>
 </linearGradient>
+<linearGradient id="paint5_linear_193_886" x1="16.6237" y1="0.948864" x2="16.6237" y2="14.5438" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
+<linearGradient id="paint6_linear_193_886" x1="11.6893" y1="8.33909" x2="11.6893" y2="19.3594" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0.06"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
 </defs>
 </svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg
deleted file mode 100644
index b4f76297..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814243">
-<g id="XMLID_24_">
-<path id="XMLID_37_" d="M21.8761 17.2234C25.2547 17.2234 27.9935 14.3924 27.9935 10.9003C27.9935 7.4081 25.2547 4.57715 21.8761 4.57715C18.4976 4.57715 15.7588 7.4081 15.7588 10.9003C15.7588 14.3924 18.4976 17.2234 21.8761 17.2234Z" fill="url(#paint0_linear_193_810)"/>
-<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2731 3.16156H21.4798C21.4188 3.16156 21.373 3.11437 21.373 3.05145V0.110104C21.373 0.0471874 21.4188 0 21.4798 0H22.2731C22.3341 0 22.3799 0.0471874 22.3799 0.110104V3.03572C22.3799 3.11437 22.3341 3.16156 22.2731 3.16156Z" fill="url(#paint1_linear_193_810)"/>
-<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0778 4.21498C17.8337 4.35654 17.5286 4.2779 17.376 4.02623L16.3539 2.20165C16.2166 1.94998 16.2929 1.6354 16.537 1.47811C16.7811 1.33655 17.0862 1.41519 17.2387 1.66686L18.2608 3.49144C18.3981 3.74311 18.3219 4.07342 18.0778 4.21498Z" fill="url(#paint2_linear_193_810)"/>
-<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2857 7.09388C15.1484 7.34555 14.828 7.42419 14.5839 7.28263L12.8143 6.22878C12.5703 6.08722 12.494 5.75691 12.6313 5.50524C12.7686 5.25357 13.0889 5.17493 13.333 5.31649L15.1026 6.37034C15.3467 6.52763 15.4382 6.84221 15.2857 7.09388Z" fill="url(#paint3_linear_193_810)"/>
-<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3401 10.5854V11.4034C14.3401 11.4663 14.2943 11.5135 14.2333 11.5135H11.3958C11.3348 11.5135 11.2891 11.4663 11.2891 11.4034V10.5854C11.2891 10.5225 11.3348 10.4753 11.3958 10.4753H14.2333C14.2943 10.4753 14.3401 10.5225 14.3401 10.5854Z" fill="url(#paint4_linear_193_810)"/>
-<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4078 14.8793C15.5451 15.1309 15.4688 15.4455 15.2247 15.6028L13.4551 16.6567C13.211 16.7982 12.9059 16.7196 12.7533 16.4679C12.6161 16.2162 12.6923 15.9017 12.9364 15.7444L14.706 14.6905C14.9501 14.549 15.2552 14.6276 15.4078 14.8793Z" fill="url(#paint5_linear_193_810)"/>
-<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M18.1998 17.6956C18.4439 17.8371 18.5202 18.1674 18.3829 18.4191L17.3608 20.2437C17.2235 20.4953 16.9031 20.574 16.6591 20.4324C16.415 20.2909 16.3387 19.9605 16.476 19.7089L17.4981 17.8843C17.6507 17.6326 17.9558 17.5383 18.1998 17.6956Z" fill="url(#paint6_linear_193_810)"/>
-<path id="XMLID_30_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5867 18.6699H22.38C22.441 18.6699 22.4868 18.7171 22.4868 18.78V21.7056C22.4868 21.7686 22.441 21.8157 22.38 21.8157H21.5867C21.5257 21.8157 21.4799 21.7686 21.4799 21.7056V18.78C21.4647 18.7328 21.5257 18.6699 21.5867 18.6699Z" fill="url(#paint7_linear_193_810)"/>
-<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M25.7362 17.585C25.9802 17.4435 26.2853 17.5221 26.4379 17.7738L27.46 19.5984C27.5973 19.85 27.521 20.1646 27.2769 20.3219C27.0329 20.4635 26.7278 20.3848 26.5752 20.1332L25.5531 18.3086C25.4005 18.0412 25.4921 17.7266 25.7362 17.585Z" fill="url(#paint8_linear_193_810)"/>
-<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M28.4506 14.6908C28.5879 14.4391 28.9083 14.3605 29.1524 14.502L30.922 15.5559C31.1661 15.6975 31.2423 16.0278 31.105 16.2794C30.9677 16.5311 30.6474 16.6097 30.4033 16.4682L28.6337 15.4143C28.3896 15.257 28.3133 14.9425 28.4506 14.6908Z" fill="url(#paint9_linear_193_810)"/>
-<path id="XMLID_27_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3965 11.1839V10.366C29.3965 10.303 29.4422 10.2559 29.5033 10.2559H32.3407C32.4018 10.2559 32.4475 10.303 32.4475 10.366V11.1839C32.4475 11.2468 32.4018 11.294 32.3407 11.294H29.5033C29.4575 11.3097 29.3965 11.2468 29.3965 11.1839Z" fill="url(#paint10_linear_193_810)"/>
-<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M28.2836 6.92103C28.1463 6.66936 28.2226 6.35478 28.4667 6.19749L30.2363 5.14364C30.4804 5.00208 30.7855 5.08072 30.938 5.33239C31.0753 5.58405 30.9991 5.89864 30.755 6.05593L28.9854 7.10978C28.726 7.25134 28.4209 7.1727 28.2836 6.92103Z" fill="url(#paint11_linear_193_810)"/>
-<path id="XMLID_25_" fill-rule="evenodd" clip-rule="evenodd" d="M25.4462 4.15199C25.2021 4.01043 25.1258 3.68012 25.2631 3.42845L26.2852 1.60387C26.4225 1.35221 26.7429 1.27356 26.987 1.41512C27.231 1.55668 27.3073 1.887 27.17 2.13866L26.1479 3.96324C25.9954 4.21491 25.6903 4.30928 25.4462 4.15199Z" fill="url(#paint12_linear_193_810)"/>
-</g>
-<g id="XMLID_20_">
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M23.2035 9.97202C22.6696 9.97202 22.1661 10.0192 21.6627 10.1136C20.7779 6.68463 17.9099 4.16797 14.508 4.16797C10.923 4.16797 7.93298 6.95203 7.21598 10.6641C3.4937 10.8371 0.53418 14.2032 0.53418 18.3242C0.53418 22.5711 3.66151 26 7.52109 26H23.2035C27.8411 26 31.5939 22.4138 31.5939 17.9781C31.5939 13.5425 27.8411 9.97202 23.2035 9.97202Z" fill="url(#paint13_linear_193_810)"/>
-<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19271 12.3945C8.81818 9.09139 11.4879 6.60619 14.6915 6.60619C17.7273 6.60619 20.2749 8.83972 21.0681 11.8912C21.5106 11.8125 21.9682 11.7653 22.4411 11.7653C26.3007 11.7653 29.4738 14.5651 29.8704 18.1514C29.9009 17.8997 29.9162 17.648 29.9162 17.3964C29.9162 13.4484 26.5753 10.2553 22.4411 10.2553C21.9682 10.2553 21.5106 10.3025 21.0681 10.3812C20.2749 7.32973 17.7273 5.09619 14.6915 5.09619C11.5031 5.09619 8.83343 7.58139 8.19271 10.8845C4.88232 11.0418 2.24316 14.0303 2.24316 17.711C2.24316 17.9626 2.25842 18.2143 2.28893 18.466C2.60929 15.1471 5.11115 12.5361 8.19271 12.3945Z" fill="url(#paint14_linear_193_810)"/>
-<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M8.95504 12.3628C8.72621 12.3628 8.49738 12.3785 8.26855 12.41C11.2586 12.8032 13.5774 15.603 13.5774 19.0005C13.5774 20.5891 13.0587 22.0519 12.2197 23.2002C13.5621 22.0991 14.4317 20.3532 14.4317 18.3871C14.4317 15.0682 11.9756 12.3628 8.95504 12.3628Z" fill="url(#paint15_linear_193_810)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_810" x1="15.7571" y1="10.9044" x2="27.9836" y2="10.9044" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_810" x1="21.36" y1="1.57976" x2="22.3788" y2="1.57976" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_810" x1="16.8603" y1="3.10924" x2="17.7585" y2="2.60629" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_810" x1="13.7082" y1="6.76682" x2="14.2436" y2="5.86754" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_810" x1="12.8094" y1="11.5294" x2="12.8094" y2="10.4763" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_810" x1="14.3236" y1="16.1296" x2="13.7883" y2="15.2303" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_810" x1="17.8762" y1="19.3326" x2="16.978" y2="18.8297" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_810" x1="22.489" y1="20.2561" x2="21.4701" y2="20.2561" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_810" x1="26.9324" y1="18.6903" x2="26.0343" y2="19.1933" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_810" x1="30.0321" y1="15.0258" x2="29.4968" y2="15.9251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_810" x1="30.9308" y1="10.2521" x2="30.9308" y2="11.3053" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_810" x1="29.3489" y1="5.67813" x2="29.8842" y2="6.57741" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_810" x1="25.7655" y1="2.52874" x2="26.6637" y2="3.03168" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint13_linear_193_810" x1="16.0701" y1="26.0075" x2="16.0701" y2="4.17108" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint14_linear_193_810" x1="16.0705" y1="5.1052" x2="16.0705" y2="18.47" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint15_linear_193_810" x1="11.3532" y1="12.3705" x2="11.3532" y2="23.2042" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg
deleted file mode 100644
index b4f76297..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814243">
-<g id="XMLID_24_">
-<path id="XMLID_37_" d="M21.8761 17.2234C25.2547 17.2234 27.9935 14.3924 27.9935 10.9003C27.9935 7.4081 25.2547 4.57715 21.8761 4.57715C18.4976 4.57715 15.7588 7.4081 15.7588 10.9003C15.7588 14.3924 18.4976 17.2234 21.8761 17.2234Z" fill="url(#paint0_linear_193_810)"/>
-<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2731 3.16156H21.4798C21.4188 3.16156 21.373 3.11437 21.373 3.05145V0.110104C21.373 0.0471874 21.4188 0 21.4798 0H22.2731C22.3341 0 22.3799 0.0471874 22.3799 0.110104V3.03572C22.3799 3.11437 22.3341 3.16156 22.2731 3.16156Z" fill="url(#paint1_linear_193_810)"/>
-<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0778 4.21498C17.8337 4.35654 17.5286 4.2779 17.376 4.02623L16.3539 2.20165C16.2166 1.94998 16.2929 1.6354 16.537 1.47811C16.7811 1.33655 17.0862 1.41519 17.2387 1.66686L18.2608 3.49144C18.3981 3.74311 18.3219 4.07342 18.0778 4.21498Z" fill="url(#paint2_linear_193_810)"/>
-<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2857 7.09388C15.1484 7.34555 14.828 7.42419 14.5839 7.28263L12.8143 6.22878C12.5703 6.08722 12.494 5.75691 12.6313 5.50524C12.7686 5.25357 13.0889 5.17493 13.333 5.31649L15.1026 6.37034C15.3467 6.52763 15.4382 6.84221 15.2857 7.09388Z" fill="url(#paint3_linear_193_810)"/>
-<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3401 10.5854V11.4034C14.3401 11.4663 14.2943 11.5135 14.2333 11.5135H11.3958C11.3348 11.5135 11.2891 11.4663 11.2891 11.4034V10.5854C11.2891 10.5225 11.3348 10.4753 11.3958 10.4753H14.2333C14.2943 10.4753 14.3401 10.5225 14.3401 10.5854Z" fill="url(#paint4_linear_193_810)"/>
-<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4078 14.8793C15.5451 15.1309 15.4688 15.4455 15.2247 15.6028L13.4551 16.6567C13.211 16.7982 12.9059 16.7196 12.7533 16.4679C12.6161 16.2162 12.6923 15.9017 12.9364 15.7444L14.706 14.6905C14.9501 14.549 15.2552 14.6276 15.4078 14.8793Z" fill="url(#paint5_linear_193_810)"/>
-<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M18.1998 17.6956C18.4439 17.8371 18.5202 18.1674 18.3829 18.4191L17.3608 20.2437C17.2235 20.4953 16.9031 20.574 16.6591 20.4324C16.415 20.2909 16.3387 19.9605 16.476 19.7089L17.4981 17.8843C17.6507 17.6326 17.9558 17.5383 18.1998 17.6956Z" fill="url(#paint6_linear_193_810)"/>
-<path id="XMLID_30_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5867 18.6699H22.38C22.441 18.6699 22.4868 18.7171 22.4868 18.78V21.7056C22.4868 21.7686 22.441 21.8157 22.38 21.8157H21.5867C21.5257 21.8157 21.4799 21.7686 21.4799 21.7056V18.78C21.4647 18.7328 21.5257 18.6699 21.5867 18.6699Z" fill="url(#paint7_linear_193_810)"/>
-<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M25.7362 17.585C25.9802 17.4435 26.2853 17.5221 26.4379 17.7738L27.46 19.5984C27.5973 19.85 27.521 20.1646 27.2769 20.3219C27.0329 20.4635 26.7278 20.3848 26.5752 20.1332L25.5531 18.3086C25.4005 18.0412 25.4921 17.7266 25.7362 17.585Z" fill="url(#paint8_linear_193_810)"/>
-<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M28.4506 14.6908C28.5879 14.4391 28.9083 14.3605 29.1524 14.502L30.922 15.5559C31.1661 15.6975 31.2423 16.0278 31.105 16.2794C30.9677 16.5311 30.6474 16.6097 30.4033 16.4682L28.6337 15.4143C28.3896 15.257 28.3133 14.9425 28.4506 14.6908Z" fill="url(#paint9_linear_193_810)"/>
-<path id="XMLID_27_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3965 11.1839V10.366C29.3965 10.303 29.4422 10.2559 29.5033 10.2559H32.3407C32.4018 10.2559 32.4475 10.303 32.4475 10.366V11.1839C32.4475 11.2468 32.4018 11.294 32.3407 11.294H29.5033C29.4575 11.3097 29.3965 11.2468 29.3965 11.1839Z" fill="url(#paint10_linear_193_810)"/>
-<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M28.2836 6.92103C28.1463 6.66936 28.2226 6.35478 28.4667 6.19749L30.2363 5.14364C30.4804 5.00208 30.7855 5.08072 30.938 5.33239C31.0753 5.58405 30.9991 5.89864 30.755 6.05593L28.9854 7.10978C28.726 7.25134 28.4209 7.1727 28.2836 6.92103Z" fill="url(#paint11_linear_193_810)"/>
-<path id="XMLID_25_" fill-rule="evenodd" clip-rule="evenodd" d="M25.4462 4.15199C25.2021 4.01043 25.1258 3.68012 25.2631 3.42845L26.2852 1.60387C26.4225 1.35221 26.7429 1.27356 26.987 1.41512C27.231 1.55668 27.3073 1.887 27.17 2.13866L26.1479 3.96324C25.9954 4.21491 25.6903 4.30928 25.4462 4.15199Z" fill="url(#paint12_linear_193_810)"/>
-</g>
-<g id="XMLID_20_">
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M23.2035 9.97202C22.6696 9.97202 22.1661 10.0192 21.6627 10.1136C20.7779 6.68463 17.9099 4.16797 14.508 4.16797C10.923 4.16797 7.93298 6.95203 7.21598 10.6641C3.4937 10.8371 0.53418 14.2032 0.53418 18.3242C0.53418 22.5711 3.66151 26 7.52109 26H23.2035C27.8411 26 31.5939 22.4138 31.5939 17.9781C31.5939 13.5425 27.8411 9.97202 23.2035 9.97202Z" fill="url(#paint13_linear_193_810)"/>
-<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19271 12.3945C8.81818 9.09139 11.4879 6.60619 14.6915 6.60619C17.7273 6.60619 20.2749 8.83972 21.0681 11.8912C21.5106 11.8125 21.9682 11.7653 22.4411 11.7653C26.3007 11.7653 29.4738 14.5651 29.8704 18.1514C29.9009 17.8997 29.9162 17.648 29.9162 17.3964C29.9162 13.4484 26.5753 10.2553 22.4411 10.2553C21.9682 10.2553 21.5106 10.3025 21.0681 10.3812C20.2749 7.32973 17.7273 5.09619 14.6915 5.09619C11.5031 5.09619 8.83343 7.58139 8.19271 10.8845C4.88232 11.0418 2.24316 14.0303 2.24316 17.711C2.24316 17.9626 2.25842 18.2143 2.28893 18.466C2.60929 15.1471 5.11115 12.5361 8.19271 12.3945Z" fill="url(#paint14_linear_193_810)"/>
-<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M8.95504 12.3628C8.72621 12.3628 8.49738 12.3785 8.26855 12.41C11.2586 12.8032 13.5774 15.603 13.5774 19.0005C13.5774 20.5891 13.0587 22.0519 12.2197 23.2002C13.5621 22.0991 14.4317 20.3532 14.4317 18.3871C14.4317 15.0682 11.9756 12.3628 8.95504 12.3628Z" fill="url(#paint15_linear_193_810)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_810" x1="15.7571" y1="10.9044" x2="27.9836" y2="10.9044" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_810" x1="21.36" y1="1.57976" x2="22.3788" y2="1.57976" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_810" x1="16.8603" y1="3.10924" x2="17.7585" y2="2.60629" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_810" x1="13.7082" y1="6.76682" x2="14.2436" y2="5.86754" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_810" x1="12.8094" y1="11.5294" x2="12.8094" y2="10.4763" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_810" x1="14.3236" y1="16.1296" x2="13.7883" y2="15.2303" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_810" x1="17.8762" y1="19.3326" x2="16.978" y2="18.8297" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_810" x1="22.489" y1="20.2561" x2="21.4701" y2="20.2561" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_810" x1="26.9324" y1="18.6903" x2="26.0343" y2="19.1933" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_810" x1="30.0321" y1="15.0258" x2="29.4968" y2="15.9251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_810" x1="30.9308" y1="10.2521" x2="30.9308" y2="11.3053" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_810" x1="29.3489" y1="5.67813" x2="29.8842" y2="6.57741" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_810" x1="25.7655" y1="2.52874" x2="26.6637" y2="3.03168" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint13_linear_193_810" x1="16.0701" y1="26.0075" x2="16.0701" y2="4.17108" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint14_linear_193_810" x1="16.0705" y1="5.1052" x2="16.0705" y2="18.47" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint15_linear_193_810" x1="11.3532" y1="12.3705" x2="11.3532" y2="23.2042" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/310.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/16.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/310.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/16.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/104.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/2.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/104.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/2.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/21.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/21.svg
deleted file mode 100644
index b4f76297..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/21.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814243">
-<g id="XMLID_24_">
-<path id="XMLID_37_" d="M21.8761 17.2234C25.2547 17.2234 27.9935 14.3924 27.9935 10.9003C27.9935 7.4081 25.2547 4.57715 21.8761 4.57715C18.4976 4.57715 15.7588 7.4081 15.7588 10.9003C15.7588 14.3924 18.4976 17.2234 21.8761 17.2234Z" fill="url(#paint0_linear_193_810)"/>
-<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2731 3.16156H21.4798C21.4188 3.16156 21.373 3.11437 21.373 3.05145V0.110104C21.373 0.0471874 21.4188 0 21.4798 0H22.2731C22.3341 0 22.3799 0.0471874 22.3799 0.110104V3.03572C22.3799 3.11437 22.3341 3.16156 22.2731 3.16156Z" fill="url(#paint1_linear_193_810)"/>
-<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0778 4.21498C17.8337 4.35654 17.5286 4.2779 17.376 4.02623L16.3539 2.20165C16.2166 1.94998 16.2929 1.6354 16.537 1.47811C16.7811 1.33655 17.0862 1.41519 17.2387 1.66686L18.2608 3.49144C18.3981 3.74311 18.3219 4.07342 18.0778 4.21498Z" fill="url(#paint2_linear_193_810)"/>
-<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2857 7.09388C15.1484 7.34555 14.828 7.42419 14.5839 7.28263L12.8143 6.22878C12.5703 6.08722 12.494 5.75691 12.6313 5.50524C12.7686 5.25357 13.0889 5.17493 13.333 5.31649L15.1026 6.37034C15.3467 6.52763 15.4382 6.84221 15.2857 7.09388Z" fill="url(#paint3_linear_193_810)"/>
-<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3401 10.5854V11.4034C14.3401 11.4663 14.2943 11.5135 14.2333 11.5135H11.3958C11.3348 11.5135 11.2891 11.4663 11.2891 11.4034V10.5854C11.2891 10.5225 11.3348 10.4753 11.3958 10.4753H14.2333C14.2943 10.4753 14.3401 10.5225 14.3401 10.5854Z" fill="url(#paint4_linear_193_810)"/>
-<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4078 14.8793C15.5451 15.1309 15.4688 15.4455 15.2247 15.6028L13.4551 16.6567C13.211 16.7982 12.9059 16.7196 12.7533 16.4679C12.6161 16.2162 12.6923 15.9017 12.9364 15.7444L14.706 14.6905C14.9501 14.549 15.2552 14.6276 15.4078 14.8793Z" fill="url(#paint5_linear_193_810)"/>
-<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M18.1998 17.6956C18.4439 17.8371 18.5202 18.1674 18.3829 18.4191L17.3608 20.2437C17.2235 20.4953 16.9031 20.574 16.6591 20.4324C16.415 20.2909 16.3387 19.9605 16.476 19.7089L17.4981 17.8843C17.6507 17.6326 17.9558 17.5383 18.1998 17.6956Z" fill="url(#paint6_linear_193_810)"/>
-<path id="XMLID_30_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5867 18.6699H22.38C22.441 18.6699 22.4868 18.7171 22.4868 18.78V21.7056C22.4868 21.7686 22.441 21.8157 22.38 21.8157H21.5867C21.5257 21.8157 21.4799 21.7686 21.4799 21.7056V18.78C21.4647 18.7328 21.5257 18.6699 21.5867 18.6699Z" fill="url(#paint7_linear_193_810)"/>
-<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M25.7362 17.585C25.9802 17.4435 26.2853 17.5221 26.4379 17.7738L27.46 19.5984C27.5973 19.85 27.521 20.1646 27.2769 20.3219C27.0329 20.4635 26.7278 20.3848 26.5752 20.1332L25.5531 18.3086C25.4005 18.0412 25.4921 17.7266 25.7362 17.585Z" fill="url(#paint8_linear_193_810)"/>
-<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M28.4506 14.6908C28.5879 14.4391 28.9083 14.3605 29.1524 14.502L30.922 15.5559C31.1661 15.6975 31.2423 16.0278 31.105 16.2794C30.9677 16.5311 30.6474 16.6097 30.4033 16.4682L28.6337 15.4143C28.3896 15.257 28.3133 14.9425 28.4506 14.6908Z" fill="url(#paint9_linear_193_810)"/>
-<path id="XMLID_27_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3965 11.1839V10.366C29.3965 10.303 29.4422 10.2559 29.5033 10.2559H32.3407C32.4018 10.2559 32.4475 10.303 32.4475 10.366V11.1839C32.4475 11.2468 32.4018 11.294 32.3407 11.294H29.5033C29.4575 11.3097 29.3965 11.2468 29.3965 11.1839Z" fill="url(#paint10_linear_193_810)"/>
-<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M28.2836 6.92103C28.1463 6.66936 28.2226 6.35478 28.4667 6.19749L30.2363 5.14364C30.4804 5.00208 30.7855 5.08072 30.938 5.33239C31.0753 5.58405 30.9991 5.89864 30.755 6.05593L28.9854 7.10978C28.726 7.25134 28.4209 7.1727 28.2836 6.92103Z" fill="url(#paint11_linear_193_810)"/>
-<path id="XMLID_25_" fill-rule="evenodd" clip-rule="evenodd" d="M25.4462 4.15199C25.2021 4.01043 25.1258 3.68012 25.2631 3.42845L26.2852 1.60387C26.4225 1.35221 26.7429 1.27356 26.987 1.41512C27.231 1.55668 27.3073 1.887 27.17 2.13866L26.1479 3.96324C25.9954 4.21491 25.6903 4.30928 25.4462 4.15199Z" fill="url(#paint12_linear_193_810)"/>
-</g>
-<g id="XMLID_20_">
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M23.2035 9.97202C22.6696 9.97202 22.1661 10.0192 21.6627 10.1136C20.7779 6.68463 17.9099 4.16797 14.508 4.16797C10.923 4.16797 7.93298 6.95203 7.21598 10.6641C3.4937 10.8371 0.53418 14.2032 0.53418 18.3242C0.53418 22.5711 3.66151 26 7.52109 26H23.2035C27.8411 26 31.5939 22.4138 31.5939 17.9781C31.5939 13.5425 27.8411 9.97202 23.2035 9.97202Z" fill="url(#paint13_linear_193_810)"/>
-<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19271 12.3945C8.81818 9.09139 11.4879 6.60619 14.6915 6.60619C17.7273 6.60619 20.2749 8.83972 21.0681 11.8912C21.5106 11.8125 21.9682 11.7653 22.4411 11.7653C26.3007 11.7653 29.4738 14.5651 29.8704 18.1514C29.9009 17.8997 29.9162 17.648 29.9162 17.3964C29.9162 13.4484 26.5753 10.2553 22.4411 10.2553C21.9682 10.2553 21.5106 10.3025 21.0681 10.3812C20.2749 7.32973 17.7273 5.09619 14.6915 5.09619C11.5031 5.09619 8.83343 7.58139 8.19271 10.8845C4.88232 11.0418 2.24316 14.0303 2.24316 17.711C2.24316 17.9626 2.25842 18.2143 2.28893 18.466C2.60929 15.1471 5.11115 12.5361 8.19271 12.3945Z" fill="url(#paint14_linear_193_810)"/>
-<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M8.95504 12.3628C8.72621 12.3628 8.49738 12.3785 8.26855 12.41C11.2586 12.8032 13.5774 15.603 13.5774 19.0005C13.5774 20.5891 13.0587 22.0519 12.2197 23.2002C13.5621 22.0991 14.4317 20.3532 14.4317 18.3871C14.4317 15.0682 11.9756 12.3628 8.95504 12.3628Z" fill="url(#paint15_linear_193_810)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_810" x1="15.7571" y1="10.9044" x2="27.9836" y2="10.9044" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_810" x1="21.36" y1="1.57976" x2="22.3788" y2="1.57976" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_810" x1="16.8603" y1="3.10924" x2="17.7585" y2="2.60629" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_810" x1="13.7082" y1="6.76682" x2="14.2436" y2="5.86754" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_810" x1="12.8094" y1="11.5294" x2="12.8094" y2="10.4763" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_810" x1="14.3236" y1="16.1296" x2="13.7883" y2="15.2303" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_810" x1="17.8762" y1="19.3326" x2="16.978" y2="18.8297" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_810" x1="22.489" y1="20.2561" x2="21.4701" y2="20.2561" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_810" x1="26.9324" y1="18.6903" x2="26.0343" y2="19.1933" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_810" x1="30.0321" y1="15.0258" x2="29.4968" y2="15.9251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_810" x1="30.9308" y1="10.2521" x2="30.9308" y2="11.3053" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_810" x1="29.3489" y1="5.67813" x2="29.8842" y2="6.57741" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_810" x1="25.7655" y1="2.52874" x2="26.6637" y2="3.03168" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint13_linear_193_810" x1="16.0701" y1="26.0075" x2="16.0701" y2="4.17108" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint14_linear_193_810" x1="16.0705" y1="5.1052" x2="16.0705" y2="18.47" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint15_linear_193_810" x1="11.3532" y1="12.3705" x2="11.3532" y2="23.2042" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/305.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/3.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/305.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/3.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/302.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/302.svg
deleted file mode 100644
index 240913cf..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/302.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<svg width="34" height="32" viewBox="0 0 34 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814250">
-<path id="XMLID_50_" fill-rule="evenodd" clip-rule="evenodd" d="M24.4425 5.904C23.884 5.904 23.3575 5.952 22.8309 6.048C21.9054 2.56 18.9055 0 15.3471 0C11.5972 0 8.4696 2.832 7.71962 6.608C3.82612 6.784 0.730469 10.208 0.730469 14.4C0.730469 18.72 4.00165 22.208 8.03876 22.208H24.4425C29.2935 22.208 33.2189 18.56 33.2189 14.048C33.2189 9.536 29.2935 5.904 24.4425 5.904Z" fill="url(#paint0_linear_193_863)"/>
-<path id="XMLID_49_" fill-rule="evenodd" clip-rule="evenodd" d="M8.7408 8.12761C9.39504 4.76761 12.1875 2.23961 15.5385 2.23961C18.7139 2.23961 21.3787 4.51161 22.2085 7.61561C22.6712 7.53561 23.15 7.48761 23.6446 7.48761C27.6817 7.48761 31.0008 10.3356 31.4157 13.9836C31.4476 13.7276 31.4635 13.4716 31.4635 13.2156C31.4635 9.19961 27.969 5.95161 23.6446 5.95161C23.15 5.95161 22.6712 5.99961 22.2085 6.07961C21.3787 2.97561 18.7139 0.703613 15.5385 0.703613C12.2035 0.703613 9.41099 3.23161 8.7408 6.59161C5.27814 6.75161 2.51758 9.79161 2.51758 13.5356C2.51758 13.7916 2.53354 14.0476 2.56545 14.3036C2.90055 10.9276 5.51749 8.27161 8.7408 8.12761Z" fill="url(#paint1_linear_193_863)"/>
-<path id="XMLID_48_" fill-rule="evenodd" clip-rule="evenodd" d="M9.554 8.0957C9.31465 8.0957 9.07529 8.1117 8.83594 8.1437C11.9635 8.5437 14.389 11.3917 14.389 14.8477C14.389 16.4637 13.8464 17.9517 12.9688 19.1197C14.373 17.9997 15.2826 16.2237 15.2826 14.2237C15.2826 10.8317 12.7135 8.0957 9.554 8.0957Z" fill="url(#paint2_linear_193_863)"/>
-<path id="XMLID_47_" fill-rule="evenodd" clip-rule="evenodd" d="M8.13477 27.7119C8.13477 28.9439 9.1241 29.9359 10.3528 29.9359C11.5815 29.9359 12.5708 28.9439 12.5708 27.7119C12.5708 26.4799 10.3528 23.7759 10.3528 23.7759C10.3528 23.7759 8.13477 26.4799 8.13477 27.7119Z" fill="url(#paint3_linear_193_863)"/>
-<path id="XMLID_46_" d="M9.90547 28.8317C9.26719 28.1917 9.26719 27.1517 9.90547 26.5117" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-<path id="XMLID_45_" fill-rule="evenodd" clip-rule="evenodd" d="M21.2354 27.7119C21.2354 28.9439 22.2247 29.9359 23.4534 29.9359C24.6821 29.9359 25.6714 28.9439 25.6714 27.7119C25.6714 26.4799 23.4534 23.7759 23.4534 23.7759C23.4534 23.7759 21.2354 26.4799 21.2354 27.7119Z" fill="url(#paint4_linear_193_863)"/>
-<path id="XMLID_44_" d="M23.0061 28.8317C22.3678 28.1917 22.3678 27.1517 23.0061 26.5117" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-<path id="XMLID_42_" fill-rule="evenodd" clip-rule="evenodd" d="M17.8202 23.6002L14.7724 27.7922C14.7245 27.8562 14.7724 27.9362 14.8362 27.9362H19.0967C19.1765 27.9362 19.2084 28.0322 19.1605 28.0802L16.1766 31.0882C16.1128 31.1522 16.0011 31.0882 16.033 30.9922L17.9797 23.6802C17.9957 23.5842 17.884 23.5202 17.8202 23.6002Z" fill="url(#paint5_linear_193_863)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_863" x1="16.981" y1="22.2156" x2="16.981" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_863" x1="16.9876" y1="0.708141" x2="16.9876" y2="14.3031" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_863" x1="12.0533" y1="8.09886" x2="12.0533" y2="19.1192" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_863" x1="10.3536" y1="29.938" x2="10.3536" y2="23.7768" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_863" x1="23.4542" y1="29.938" x2="23.4542" y2="23.7768" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_863" x1="14.7562" y1="27.3404" x2="19.1868" y2="27.3404" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/31.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/31.svg
deleted file mode 100644
index b4f76297..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/31.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814243">
-<g id="XMLID_24_">
-<path id="XMLID_37_" d="M21.8761 17.2234C25.2547 17.2234 27.9935 14.3924 27.9935 10.9003C27.9935 7.4081 25.2547 4.57715 21.8761 4.57715C18.4976 4.57715 15.7588 7.4081 15.7588 10.9003C15.7588 14.3924 18.4976 17.2234 21.8761 17.2234Z" fill="url(#paint0_linear_193_810)"/>
-<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2731 3.16156H21.4798C21.4188 3.16156 21.373 3.11437 21.373 3.05145V0.110104C21.373 0.0471874 21.4188 0 21.4798 0H22.2731C22.3341 0 22.3799 0.0471874 22.3799 0.110104V3.03572C22.3799 3.11437 22.3341 3.16156 22.2731 3.16156Z" fill="url(#paint1_linear_193_810)"/>
-<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0778 4.21498C17.8337 4.35654 17.5286 4.2779 17.376 4.02623L16.3539 2.20165C16.2166 1.94998 16.2929 1.6354 16.537 1.47811C16.7811 1.33655 17.0862 1.41519 17.2387 1.66686L18.2608 3.49144C18.3981 3.74311 18.3219 4.07342 18.0778 4.21498Z" fill="url(#paint2_linear_193_810)"/>
-<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2857 7.09388C15.1484 7.34555 14.828 7.42419 14.5839 7.28263L12.8143 6.22878C12.5703 6.08722 12.494 5.75691 12.6313 5.50524C12.7686 5.25357 13.0889 5.17493 13.333 5.31649L15.1026 6.37034C15.3467 6.52763 15.4382 6.84221 15.2857 7.09388Z" fill="url(#paint3_linear_193_810)"/>
-<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3401 10.5854V11.4034C14.3401 11.4663 14.2943 11.5135 14.2333 11.5135H11.3958C11.3348 11.5135 11.2891 11.4663 11.2891 11.4034V10.5854C11.2891 10.5225 11.3348 10.4753 11.3958 10.4753H14.2333C14.2943 10.4753 14.3401 10.5225 14.3401 10.5854Z" fill="url(#paint4_linear_193_810)"/>
-<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4078 14.8793C15.5451 15.1309 15.4688 15.4455 15.2247 15.6028L13.4551 16.6567C13.211 16.7982 12.9059 16.7196 12.7533 16.4679C12.6161 16.2162 12.6923 15.9017 12.9364 15.7444L14.706 14.6905C14.9501 14.549 15.2552 14.6276 15.4078 14.8793Z" fill="url(#paint5_linear_193_810)"/>
-<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M18.1998 17.6956C18.4439 17.8371 18.5202 18.1674 18.3829 18.4191L17.3608 20.2437C17.2235 20.4953 16.9031 20.574 16.6591 20.4324C16.415 20.2909 16.3387 19.9605 16.476 19.7089L17.4981 17.8843C17.6507 17.6326 17.9558 17.5383 18.1998 17.6956Z" fill="url(#paint6_linear_193_810)"/>
-<path id="XMLID_30_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5867 18.6699H22.38C22.441 18.6699 22.4868 18.7171 22.4868 18.78V21.7056C22.4868 21.7686 22.441 21.8157 22.38 21.8157H21.5867C21.5257 21.8157 21.4799 21.7686 21.4799 21.7056V18.78C21.4647 18.7328 21.5257 18.6699 21.5867 18.6699Z" fill="url(#paint7_linear_193_810)"/>
-<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M25.7362 17.585C25.9802 17.4435 26.2853 17.5221 26.4379 17.7738L27.46 19.5984C27.5973 19.85 27.521 20.1646 27.2769 20.3219C27.0329 20.4635 26.7278 20.3848 26.5752 20.1332L25.5531 18.3086C25.4005 18.0412 25.4921 17.7266 25.7362 17.585Z" fill="url(#paint8_linear_193_810)"/>
-<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M28.4506 14.6908C28.5879 14.4391 28.9083 14.3605 29.1524 14.502L30.922 15.5559C31.1661 15.6975 31.2423 16.0278 31.105 16.2794C30.9677 16.5311 30.6474 16.6097 30.4033 16.4682L28.6337 15.4143C28.3896 15.257 28.3133 14.9425 28.4506 14.6908Z" fill="url(#paint9_linear_193_810)"/>
-<path id="XMLID_27_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3965 11.1839V10.366C29.3965 10.303 29.4422 10.2559 29.5033 10.2559H32.3407C32.4018 10.2559 32.4475 10.303 32.4475 10.366V11.1839C32.4475 11.2468 32.4018 11.294 32.3407 11.294H29.5033C29.4575 11.3097 29.3965 11.2468 29.3965 11.1839Z" fill="url(#paint10_linear_193_810)"/>
-<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M28.2836 6.92103C28.1463 6.66936 28.2226 6.35478 28.4667 6.19749L30.2363 5.14364C30.4804 5.00208 30.7855 5.08072 30.938 5.33239C31.0753 5.58405 30.9991 5.89864 30.755 6.05593L28.9854 7.10978C28.726 7.25134 28.4209 7.1727 28.2836 6.92103Z" fill="url(#paint11_linear_193_810)"/>
-<path id="XMLID_25_" fill-rule="evenodd" clip-rule="evenodd" d="M25.4462 4.15199C25.2021 4.01043 25.1258 3.68012 25.2631 3.42845L26.2852 1.60387C26.4225 1.35221 26.7429 1.27356 26.987 1.41512C27.231 1.55668 27.3073 1.887 27.17 2.13866L26.1479 3.96324C25.9954 4.21491 25.6903 4.30928 25.4462 4.15199Z" fill="url(#paint12_linear_193_810)"/>
-</g>
-<g id="XMLID_20_">
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M23.2035 9.97202C22.6696 9.97202 22.1661 10.0192 21.6627 10.1136C20.7779 6.68463 17.9099 4.16797 14.508 4.16797C10.923 4.16797 7.93298 6.95203 7.21598 10.6641C3.4937 10.8371 0.53418 14.2032 0.53418 18.3242C0.53418 22.5711 3.66151 26 7.52109 26H23.2035C27.8411 26 31.5939 22.4138 31.5939 17.9781C31.5939 13.5425 27.8411 9.97202 23.2035 9.97202Z" fill="url(#paint13_linear_193_810)"/>
-<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19271 12.3945C8.81818 9.09139 11.4879 6.60619 14.6915 6.60619C17.7273 6.60619 20.2749 8.83972 21.0681 11.8912C21.5106 11.8125 21.9682 11.7653 22.4411 11.7653C26.3007 11.7653 29.4738 14.5651 29.8704 18.1514C29.9009 17.8997 29.9162 17.648 29.9162 17.3964C29.9162 13.4484 26.5753 10.2553 22.4411 10.2553C21.9682 10.2553 21.5106 10.3025 21.0681 10.3812C20.2749 7.32973 17.7273 5.09619 14.6915 5.09619C11.5031 5.09619 8.83343 7.58139 8.19271 10.8845C4.88232 11.0418 2.24316 14.0303 2.24316 17.711C2.24316 17.9626 2.25842 18.2143 2.28893 18.466C2.60929 15.1471 5.11115 12.5361 8.19271 12.3945Z" fill="url(#paint14_linear_193_810)"/>
-<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M8.95504 12.3628C8.72621 12.3628 8.49738 12.3785 8.26855 12.41C11.2586 12.8032 13.5774 15.603 13.5774 19.0005C13.5774 20.5891 13.0587 22.0519 12.2197 23.2002C13.5621 22.0991 14.4317 20.3532 14.4317 18.3871C14.4317 15.0682 11.9756 12.3628 8.95504 12.3628Z" fill="url(#paint15_linear_193_810)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_810" x1="15.7571" y1="10.9044" x2="27.9836" y2="10.9044" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_810" x1="21.36" y1="1.57976" x2="22.3788" y2="1.57976" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_810" x1="16.8603" y1="3.10924" x2="17.7585" y2="2.60629" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_810" x1="13.7082" y1="6.76682" x2="14.2436" y2="5.86754" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_810" x1="12.8094" y1="11.5294" x2="12.8094" y2="10.4763" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_810" x1="14.3236" y1="16.1296" x2="13.7883" y2="15.2303" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_810" x1="17.8762" y1="19.3326" x2="16.978" y2="18.8297" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_810" x1="22.489" y1="20.2561" x2="21.4701" y2="20.2561" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_810" x1="26.9324" y1="18.6903" x2="26.0343" y2="19.1933" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_810" x1="30.0321" y1="15.0258" x2="29.4968" y2="15.9251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_810" x1="30.9308" y1="10.2521" x2="30.9308" y2="11.3053" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_810" x1="29.3489" y1="5.67813" x2="29.8842" y2="6.57741" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_810" x1="25.7655" y1="2.52874" x2="26.6637" y2="3.03168" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint13_linear_193_810" x1="16.0701" y1="26.0075" x2="16.0701" y2="4.17108" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint14_linear_193_810" x1="16.0705" y1="5.1052" x2="16.0705" y2="18.47" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint15_linear_193_810" x1="11.3532" y1="12.3705" x2="11.3532" y2="23.2042" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/350.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/350.svg
deleted file mode 100644
index e828cded..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/350.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-<svg width="34" height="35" viewBox="0 0 34 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814256">
-<g id="XMLID_101_">
-<g id="XMLID_107_">
-<path id="XMLID_109_" fill-rule="evenodd" clip-rule="evenodd" d="M11.2959 32.2719C11.2959 33.5039 12.2852 34.4959 13.5139 34.4959C14.7426 34.4959 15.7319 33.5039 15.7319 32.2719C15.7319 31.0399 13.5139 28.3359 13.5139 28.3359C13.5139 28.3359 11.2959 31.0399 11.2959 32.2719Z" fill="url(#paint0_linear_193_905)"/>
-<path id="XMLID_108_" d="M13.051 33.392C12.4127 32.752 12.4127 31.712 13.051 31.072" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-</g>
-<g id="XMLID_103_">
-<path id="XMLID_106_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0615 32.2719C18.0615 33.5039 19.0509 34.4959 20.2795 34.4959C21.5082 34.4959 22.4976 33.5039 22.4976 32.2719C22.4976 31.0399 20.2795 28.3359 20.2795 28.3359C20.2795 28.3359 18.0615 31.0399 18.0615 32.2719Z" fill="url(#paint1_linear_193_905)"/>
-<path id="XMLID_105_" d="M19.8166 33.392C19.1783 32.752 19.1783 31.712 19.8166 31.072" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-</g>
-</g>
-<g id="XMLID_64_">
-<g id="XMLID_70_">
-<path id="XMLID_89_" d="M22.513 17.52C26.0469 17.52 28.9117 14.6403 28.9117 11.088C28.9117 7.53571 26.0469 4.65601 22.513 4.65601C18.9791 4.65601 16.1143 7.53571 16.1143 11.088C16.1143 14.6403 18.9791 17.52 22.513 17.52Z" fill="url(#paint2_linear_193_905)"/>
-<path id="XMLID_87_" fill-rule="evenodd" clip-rule="evenodd" d="M22.9278 3.2H22.098C22.0342 3.2 21.9863 3.152 21.9863 3.088V0.112C21.9863 0.0480001 22.0342 0 22.098 0H22.9278C22.9916 0 23.0395 0.0480001 23.0395 0.112V3.088C23.0395 3.152 22.9916 3.2 22.9278 3.2Z" fill="url(#paint3_linear_193_905)"/>
-<path id="XMLID_86_" fill-rule="evenodd" clip-rule="evenodd" d="M18.5391 4.2721C18.2838 4.4161 17.9647 4.3361 17.8051 4.0801L16.736 2.2241C16.5923 1.9681 16.6721 1.6481 16.9275 1.4881C17.1828 1.3441 17.5019 1.4241 17.6615 1.6801L18.7306 3.5361C18.8742 3.8081 18.7944 4.1281 18.5391 4.2721Z" fill="url(#paint4_linear_193_905)"/>
-<path id="XMLID_84_" fill-rule="evenodd" clip-rule="evenodd" d="M15.6355 7.2004C15.4919 7.4564 15.1568 7.5364 14.9015 7.3924L13.0505 6.3204C12.7952 6.1764 12.7154 5.8404 12.859 5.5844C13.0026 5.3284 13.3377 5.2484 13.593 5.3924L15.444 6.4644C15.6834 6.6244 15.7791 6.9444 15.6355 7.2004Z" fill="url(#paint5_linear_193_905)"/>
-<path id="XMLID_83_" fill-rule="evenodd" clip-rule="evenodd" d="M14.6299 10.7681V11.6001C14.6299 11.6641 14.582 11.7121 14.5182 11.7121H11.5502C11.4863 11.7121 11.4385 11.6641 11.4385 11.6001V10.7681C11.4385 10.7041 11.4863 10.6561 11.5502 10.6561H14.5182C14.582 10.6401 14.6299 10.7041 14.6299 10.7681Z" fill="url(#paint6_linear_193_905)"/>
-<path id="XMLID_82_" fill-rule="evenodd" clip-rule="evenodd" d="M15.7468 15.1203C15.8905 15.3763 15.8107 15.6963 15.5554 15.8563L13.7043 16.9283C13.449 17.0723 13.1299 16.9923 12.9703 16.7363C12.8267 16.4803 12.9065 16.1603 13.1618 16.0003L15.0128 14.9283C15.2681 14.7843 15.5873 14.8643 15.7468 15.1203Z" fill="url(#paint7_linear_193_905)"/>
-<path id="XMLID_81_" fill-rule="evenodd" clip-rule="evenodd" d="M18.667 17.984C18.9223 18.128 19.0021 18.464 18.8585 18.72L17.7894 20.576C17.6458 20.832 17.3107 20.912 17.0554 20.768C16.8001 20.624 16.7203 20.288 16.8639 20.032L17.933 18.176C18.0926 17.92 18.4117 17.84 18.667 17.984Z" fill="url(#paint8_linear_193_905)"/>
-<path id="XMLID_80_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2089 18.9924H23.0387C23.1025 18.9924 23.1504 19.0404 23.1504 19.1044V22.0804C23.1504 22.1444 23.1025 22.1924 23.0387 22.1924H22.2089C22.1451 22.1924 22.0972 22.1444 22.0972 22.0804V19.1044C22.0812 19.0404 22.1451 18.9924 22.2089 18.9924Z" fill="url(#paint9_linear_193_905)"/>
-<path id="XMLID_79_" fill-rule="evenodd" clip-rule="evenodd" d="M26.5498 17.8719C26.8051 17.7279 27.1242 17.8079 27.2838 18.0639L28.3529 19.9199C28.4965 20.1759 28.4167 20.4959 28.1614 20.6559C27.9061 20.7999 27.587 20.7199 27.4274 20.4639L26.3583 18.6079C26.1987 18.3519 26.2945 18.0159 26.5498 17.8719Z" fill="url(#paint10_linear_193_905)"/>
-<path id="XMLID_78_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3903 14.9281C29.5339 14.6721 29.869 14.5922 30.1243 14.7362L31.9753 15.8081C32.2306 15.9521 32.3104 16.2882 32.1668 16.5442C32.0232 16.8002 31.6881 16.8802 31.4328 16.7362L29.5817 15.6642C29.3264 15.5202 29.2466 15.1841 29.3903 14.9281Z" fill="url(#paint11_linear_193_905)"/>
-<path id="XMLID_77_" fill-rule="evenodd" clip-rule="evenodd" d="M30.3789 11.3761V10.5441C30.3789 10.4801 30.4268 10.4321 30.4906 10.4321H33.4586C33.5224 10.4321 33.5703 10.4801 33.5703 10.5441V11.3761C33.5703 11.4401 33.5224 11.4881 33.4586 11.4881H30.4906C30.4427 11.4881 30.3789 11.4401 30.3789 11.3761Z" fill="url(#paint12_linear_193_905)"/>
-<path id="XMLID_76_" fill-rule="evenodd" clip-rule="evenodd" d="M29.2145 7.02413C29.0709 6.76813 29.1506 6.44813 29.406 6.28813L31.257 5.21613C31.5123 5.07213 31.8314 5.15213 31.991 5.40813C32.1346 5.66413 32.0548 5.98413 31.7995 6.14413L29.9485 7.21613C29.6932 7.37613 29.3581 7.28013 29.2145 7.02413Z" fill="url(#paint13_linear_193_905)"/>
-<path id="XMLID_72_" fill-rule="evenodd" clip-rule="evenodd" d="M26.2468 4.22401C25.9915 4.08001 25.9117 3.74401 26.0553 3.48801L27.1244 1.63201C27.268 1.37601 27.6031 1.29601 27.8584 1.44001C28.1138 1.58401 28.1935 1.92001 28.0499 2.17601L26.9808 4.03201C26.8212 4.28801 26.5021 4.36801 26.2468 4.22401Z" fill="url(#paint14_linear_193_905)"/>
-</g>
-<g id="XMLID_65_">
-<path id="XMLID_69_" fill-rule="evenodd" clip-rule="evenodd" d="M23.9171 10.1281C23.3587 10.1281 22.8321 10.1761 22.3055 10.2721C21.38 6.78412 18.3801 4.22412 14.8217 4.22412C11.0718 4.22412 7.94422 7.05612 7.19424 10.8321C3.30074 11.0081 0.205078 14.4321 0.205078 18.6241C0.205078 22.9441 3.47627 26.4321 7.51338 26.4321H23.9171C28.7681 26.4321 32.6935 22.7841 32.6935 18.2721C32.6935 13.7601 28.7521 10.1281 23.9171 10.1281Z" fill="url(#paint15_linear_193_905)"/>
-<path id="XMLID_68_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19979 12.5925C8.85402 9.23246 11.6465 6.70446 14.9975 6.70446C18.1729 6.70446 20.8377 8.97646 21.6675 12.0805C22.1302 12.0005 22.6089 11.9525 23.1036 11.9525C27.1407 11.9525 30.4598 14.8005 30.8747 18.4485C30.9066 18.1925 30.9225 17.9365 30.9225 17.6805C30.9225 13.6645 27.428 10.4165 23.1036 10.4165C22.6089 10.4165 22.1302 10.4645 21.6675 10.5445C20.8377 7.44046 18.1729 5.16846 14.9975 5.16846C11.6625 5.16846 8.86998 7.69646 8.19979 11.0565C4.73712 11.2165 1.97656 14.2565 1.97656 18.0005C1.97656 18.2565 1.99253 18.5125 2.02444 18.7685C2.35954 15.3925 4.97648 12.7525 8.19979 12.5925Z" fill="url(#paint16_linear_193_905)"/>
-<path id="XMLID_66_" fill-rule="evenodd" clip-rule="evenodd" d="M8.99736 12.5759C8.75801 12.5759 8.51865 12.5919 8.2793 12.6239C11.4069 13.0239 13.8323 15.8719 13.8323 19.3279C13.8323 20.9439 13.2898 22.4319 12.4122 23.5999C13.8164 22.4799 14.7259 20.7039 14.7259 18.7039C14.7259 15.3119 12.1728 12.5759 8.99736 12.5759Z" fill="url(#paint17_linear_193_905)"/>
-</g>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_905" x1="13.5148" y1="34.4981" x2="13.5148" y2="28.3368" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_905" x1="20.2804" y1="34.4981" x2="20.2804" y2="28.3368" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_905" x1="16.114" y1="11.0815" x2="28.9029" y2="11.0815" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_905" x1="21.9742" y1="1.59622" x2="23.0399" y2="1.59622" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_905" x1="17.2651" y1="3.15071" x2="18.1919" y2="2.61705" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_905" x1="13.9688" y1="6.87236" x2="14.506" y2="5.94442" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_905" x1="13.0303" y1="11.7176" x2="13.0303" y2="10.6463" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_905" x1="14.6152" y1="16.3927" x2="14.078" y2="15.4648" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_905" x1="18.3249" y1="19.651" x2="17.3981" y2="19.1173" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_905" x1="23.1542" y1="20.5952" x2="22.0884" y2="20.5952" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_905" x1="27.8006" y1="18.9939" x2="26.8738" y2="19.5276" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_905" x1="31.0381" y1="15.2736" x2="30.5009" y2="16.2015" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_905" x1="31.9853" y1="10.4176" x2="31.9853" y2="11.4889" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint13_linear_193_905" x1="30.3254" y1="5.76034" x2="30.8626" y2="6.68827" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint14_linear_193_905" x1="26.5773" y1="2.56429" x2="27.504" y2="3.09794" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint15_linear_193_905" x1="16.4556" y1="26.4398" x2="16.4556" y2="4.22729" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint16_linear_193_905" x1="16.4414" y1="5.18289" x2="16.4414" y2="18.7778" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint17_linear_193_905" x1="11.5074" y1="12.573" x2="11.5074" y2="23.5933" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/22.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/4.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/22.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/4.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/400.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/400.svg
deleted file mode 100644
index d460d1cd..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/400.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<svg width="33" height="30" viewBox="0 0 33 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814248">
-<g id="XMLID_38_">
-<path id="XMLID_41_" fill-rule="evenodd" clip-rule="evenodd" d="M23.8068 5.904C23.2483 5.904 22.7217 5.952 22.1951 6.048C21.2696 2.56 18.2697 0 14.7113 0C10.9614 0 7.83385 2.832 7.08387 6.608C3.19037 6.784 0.0947266 10.208 0.0947266 14.4C0.0947266 18.72 3.3659 22.208 7.40301 22.208H23.8068C28.6577 22.208 32.5831 18.56 32.5831 14.048C32.5831 9.536 28.6577 5.904 23.8068 5.904Z" fill="url(#paint0_linear_193_872)"/>
-<path id="XMLID_40_" fill-rule="evenodd" clip-rule="evenodd" d="M8.08943 8.36809C8.74367 5.00809 11.5361 2.48009 14.8871 2.48009C18.0625 2.48009 20.7274 4.75209 21.5571 7.85609C22.0199 7.77609 22.4986 7.72809 22.9933 7.72809C27.0304 7.72809 30.3494 10.5761 30.7643 14.2241C30.7962 13.9681 30.8122 13.7121 30.8122 13.4561C30.8122 9.44009 27.3176 6.19209 22.9933 6.19209C22.4986 6.19209 22.0199 6.24009 21.5571 6.32009C20.7274 3.21609 18.0625 0.944092 14.8871 0.944092C11.5521 0.944092 8.75963 3.47209 8.08943 6.83209C4.62677 6.99209 1.86621 10.0321 1.86621 13.7761C1.86621 14.0321 1.88216 14.2881 1.91407 14.5441C2.24917 11.1681 4.86612 8.52809 8.08943 8.36809Z" fill="url(#paint1_linear_193_872)"/>
-<path id="XMLID_39_" fill-rule="evenodd" clip-rule="evenodd" d="M8.90263 8.35205C8.66328 8.35205 8.42393 8.36805 8.18457 8.40005C11.3121 8.80005 13.7376 11.6481 13.7376 15.1041C13.7376 16.7201 13.1951 18.2081 12.3174 19.3761C13.7216 18.2561 14.6312 16.4801 14.6312 14.4801C14.6312 11.0881 12.0621 8.35205 8.90263 8.35205Z" fill="url(#paint2_linear_193_872)"/>
-</g>
-<path id="XMLID_37_" fill-rule="evenodd" clip-rule="evenodd" d="M18.3021 26.4962H16.5149L17.7755 25.2322C17.9191 25.0882 17.9191 24.8642 17.7755 24.7202C17.6319 24.5762 17.4085 24.5762 17.2649 24.7202L16.0043 25.9842V24.1922C16.0043 23.9842 15.8447 23.8242 15.6373 23.8242C15.4299 23.8242 15.2703 23.9842 15.2703 24.1922V25.9842L14.0097 24.7202C13.8661 24.5762 13.6427 24.5762 13.4991 24.7202C13.3555 24.8642 13.3555 25.0882 13.4991 25.2322L14.7597 26.4962H12.9725C12.765 26.4962 12.6055 26.6562 12.6055 26.8642C12.6055 27.0722 12.765 27.2322 12.9725 27.2322H14.7597L13.4991 28.4962C13.3555 28.6402 13.3555 28.8642 13.4991 29.0082C13.6427 29.1522 13.8661 29.1522 14.0097 29.0082L15.2703 27.7442V29.5362C15.2703 29.7442 15.4299 29.9042 15.6373 29.9042C15.8447 29.9042 16.0043 29.7442 16.0043 29.5362V27.7442L17.2649 29.0082C17.4085 29.1522 17.6319 29.1522 17.7755 29.0082C17.9191 28.8642 17.9191 28.6402 17.7755 28.4962L16.5149 27.2322H18.3021C18.5096 27.2322 18.6691 27.0722 18.6691 26.8642C18.6691 26.6562 18.5096 26.4962 18.3021 26.4962Z" fill="url(#paint3_linear_193_872)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_872" x1="16.3452" y1="22.2156" x2="16.3452" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_872" x1="16.3375" y1="0.95918" x2="16.3375" y2="14.5541" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_872" x1="11.4031" y1="8.34976" x2="11.4031" y2="19.3701" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_872" x1="15.6385" y1="29.9063" x2="15.6385" y2="23.8251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/401.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/401.svg
deleted file mode 100644
index 7de03197..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/401.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<svg width="34" height="30" viewBox="0 0 34 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814247">
-<g id="XMLID_27_">
-<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M24.6398 5.904C24.0813 5.904 23.5547 5.952 23.0282 6.048C22.1026 2.56 19.1027 0 15.5443 0C11.7944 0 8.66686 2.832 7.91688 6.608C4.02338 6.784 0.927734 10.208 0.927734 14.4C0.927734 18.72 4.1989 22.208 8.23602 22.208H24.6398C29.4907 22.208 33.4161 18.56 33.4161 14.048C33.4161 9.536 29.4748 5.904 24.6398 5.904Z" fill="url(#paint0_linear_193_878)"/>
-<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M8.92244 8.36809C9.57668 5.00809 12.3691 2.48009 15.7201 2.48009C18.8956 2.48009 21.5604 4.75209 22.3901 7.85609C22.8529 7.77609 23.3316 7.72809 23.8263 7.72809C27.8634 7.72809 31.1824 10.5761 31.5973 14.2241C31.6292 13.9681 31.6452 13.7121 31.6452 13.4561C31.6452 9.44009 28.1506 6.19209 23.8263 6.19209C23.3316 6.19209 22.8529 6.24009 22.3901 6.32009C21.5604 3.21609 18.8956 0.944092 15.7201 0.944092C12.3851 0.944092 9.59263 3.47209 8.92244 6.83209C5.45978 6.99209 2.69922 10.0321 2.69922 13.7761C2.69922 14.0321 2.71518 14.2881 2.7471 14.5441C3.08219 11.1681 5.69913 8.52809 8.92244 8.36809Z" fill="url(#paint1_linear_193_878)"/>
-<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M9.73564 8.35205C9.49629 8.35205 9.25693 8.36805 9.01758 8.40005C12.1451 8.80005 14.5706 11.6481 14.5706 15.1041C14.5706 16.7201 14.0281 18.2081 13.1504 19.3761C14.5547 18.2561 15.4642 16.4801 15.4642 14.4801C15.4482 11.0881 12.8951 8.35205 9.73564 8.35205Z" fill="url(#paint2_linear_193_878)"/>
-</g>
-<g id="XMLID_22_">
-<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2572 26.4967H13.47L14.7306 25.2327C14.8742 25.0887 14.8742 24.8647 14.7306 24.7207C14.587 24.5767 14.3636 24.5767 14.22 24.7207L12.9594 25.9847V24.1927C12.9594 23.9847 12.7998 23.8247 12.5924 23.8247C12.3849 23.8247 12.2254 23.9847 12.2254 24.1927V25.9847L10.9648 24.7207C10.8212 24.5767 10.5977 24.5767 10.4541 24.7207C10.3105 24.8647 10.3105 25.0887 10.4541 25.2327L11.7147 26.4967H9.92757C9.72012 26.4967 9.56055 26.6567 9.56055 26.8647C9.56055 27.0727 9.72012 27.2327 9.92757 27.2327H11.7147L10.4541 28.4967C10.3105 28.6407 10.3105 28.8647 10.4541 29.0087C10.5977 29.1527 10.8212 29.1527 10.9648 29.0087L12.2254 27.7447V29.5367C12.2254 29.7447 12.3849 29.9047 12.5924 29.9047C12.7998 29.9047 12.9594 29.7447 12.9594 29.5367V27.7447L14.22 29.0087C14.3636 29.1527 14.587 29.1527 14.7306 29.0087C14.8742 28.8647 14.8742 28.6407 14.7306 28.4967L13.47 27.2327H15.2572C15.4646 27.2327 15.6242 27.0727 15.6242 26.8647C15.6242 26.6567 15.4646 26.4967 15.2572 26.4967Z" fill="url(#paint3_linear_193_878)"/>
-<path id="XMLID_24_" fill-rule="evenodd" clip-rule="evenodd" d="M24.4164 26.4967H22.6292L23.8898 25.2327C24.0334 25.0887 24.0334 24.8647 23.8898 24.7207C23.7462 24.5767 23.5228 24.5767 23.3792 24.7207L22.1186 25.9847V24.1927C22.1186 23.9847 21.959 23.8247 21.7516 23.8247C21.5441 23.8247 21.3845 23.9847 21.3845 24.1927V25.9847L20.1239 24.7207C19.9803 24.5767 19.7569 24.5767 19.6133 24.7207C19.4697 24.8647 19.4697 25.0887 19.6133 25.2327L20.8739 26.4967H19.0867C18.8793 26.4967 18.7197 26.6567 18.7197 26.8647C18.7197 27.0727 18.8793 27.2327 19.0867 27.2327H20.8739L19.6133 28.4967C19.4697 28.6407 19.4697 28.8647 19.6133 29.0087C19.7569 29.1527 19.9803 29.1527 20.1239 29.0087L21.3845 27.7447V29.5367C21.3845 29.7447 21.5441 29.9047 21.7516 29.9047C21.959 29.9047 22.1186 29.7447 22.1186 29.5367V27.7447L23.3792 29.0087C23.5228 29.1527 23.7462 29.1527 23.8898 29.0087C24.0334 28.8647 24.0334 28.6407 23.8898 28.4967L22.6292 27.2327H24.4164C24.6238 27.2327 24.7834 27.0727 24.7834 26.8647C24.7834 26.6567 24.6078 26.4967 24.4164 26.4967Z" fill="url(#paint4_linear_193_878)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_878" x1="17.1782" y1="22.2156" x2="17.1782" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_878" x1="17.1664" y1="0.95918" x2="17.1664" y2="14.5541" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_878" x1="12.232" y1="8.34976" x2="12.232" y2="19.3701" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_878" x1="12.5935" y1="29.9068" x2="12.5935" y2="23.8256" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_878" x1="21.7527" y1="29.9068" x2="21.7527" y2="23.8256" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/402.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/402.svg
deleted file mode 100644
index 81af6aeb..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/402.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<svg width="33" height="30" viewBox="0 0 33 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814253">
-<g id="XMLID_114_">
-<path id="XMLID_129_" fill-rule="evenodd" clip-rule="evenodd" d="M24.1655 5.904C23.607 5.904 23.0805 5.952 22.5539 6.048C21.6124 2.56 18.6285 0 15.0541 0C11.3042 0 8.17663 2.832 7.42666 6.608C3.53315 6.784 0.4375 10.208 0.4375 14.4C0.4375 18.72 3.70868 22.208 7.7458 22.208H24.1496C29.0005 22.208 32.9259 18.56 32.9259 14.048C32.9259 9.536 29.0165 5.904 24.1655 5.904Z" fill="url(#paint0_linear_193_896)"/>
-<path id="XMLID_128_" fill-rule="evenodd" clip-rule="evenodd" d="M8.44783 8.36834C9.10207 5.00834 11.8945 2.48034 15.2455 2.48034C18.4209 2.48034 21.0858 4.75234 21.9155 7.85634C22.3783 7.77634 22.857 7.72834 23.3517 7.72834C27.3888 7.72834 30.7078 10.5763 31.1227 14.2243C31.1546 13.9683 31.1706 13.7123 31.1706 13.4563C31.1706 9.44034 27.676 6.19234 23.3517 6.19234C22.857 6.19234 22.3783 6.24034 21.9155 6.32034C21.0858 3.21634 18.4209 0.944336 15.2455 0.944336C11.9105 0.944336 9.11803 3.47234 8.44783 6.83234C4.98517 6.99234 2.22461 10.0323 2.22461 13.7763C2.22461 14.0323 2.24057 14.2883 2.27248 14.5443C2.60758 11.1683 5.22452 8.51234 8.44783 8.36834Z" fill="url(#paint1_linear_193_896)"/>
-<path id="XMLID_115_" fill-rule="evenodd" clip-rule="evenodd" d="M9.26201 8.35254C9.02265 8.35254 8.7833 8.36854 8.54395 8.40054C11.6715 8.80054 14.097 11.6485 14.097 15.1045C14.097 16.7205 13.5544 18.2085 12.6768 19.3765C14.081 18.2565 14.9906 16.4805 14.9906 14.4805C14.9906 11.0885 12.4215 8.35254 9.26201 8.35254Z" fill="url(#paint2_linear_193_896)"/>
-</g>
-<g id="XMLID_110_">
-<path id="XMLID_113_" fill-rule="evenodd" clip-rule="evenodd" d="M11.3519 26.4962H9.56473L10.8253 25.2322C10.969 25.0882 10.969 24.8642 10.8253 24.7202C10.6817 24.5762 10.4583 24.5762 10.3147 24.7202L9.05411 25.9842V24.1922C9.05411 23.9842 8.89454 23.8242 8.6871 23.8242C8.47966 23.8242 8.32009 23.9842 8.32009 24.1922V25.9842L7.05949 24.7202C6.91588 24.5762 6.69248 24.5762 6.54887 24.7202C6.40525 24.8642 6.40525 25.0882 6.54887 25.2322L7.80947 26.4962H6.02229C5.81485 26.4962 5.65527 26.6562 5.65527 26.8642C5.65527 27.0722 5.81485 27.2322 6.02229 27.2322H7.80947L6.54887 28.4962C6.40525 28.6402 6.40525 28.8642 6.54887 29.0082C6.69248 29.1522 6.91588 29.1522 7.05949 29.0082L8.32009 27.7442V29.5362C8.32009 29.7442 8.47966 29.9042 8.6871 29.9042C8.89454 29.9042 9.05411 29.7442 9.05411 29.5362V27.7442L10.3147 29.0082C10.4583 29.1522 10.6817 29.1522 10.8253 29.0082C10.969 28.8642 10.969 28.6402 10.8253 28.4962L9.56473 27.2322H11.3519C11.5594 27.2322 11.7189 27.0722 11.7189 26.8642C11.7189 26.6562 11.5594 26.4962 11.3519 26.4962Z" fill="url(#paint3_linear_193_896)"/>
-<path id="XMLID_112_" fill-rule="evenodd" clip-rule="evenodd" d="M19.5062 26.4962H17.719L18.9796 25.2322C19.1232 25.0882 19.1232 24.8642 18.9796 24.7202C18.836 24.5762 18.6126 24.5762 18.469 24.7202L17.2084 25.9842V24.1922C17.2084 23.9842 17.0488 23.8242 16.8414 23.8242C16.634 23.8242 16.4744 23.9842 16.4744 24.1922V25.9842L15.2138 24.7202C15.0702 24.5762 14.8468 24.5762 14.7032 24.7202C14.5595 24.8642 14.5595 25.0882 14.7032 25.2322L15.9638 26.4962H14.1766C13.9691 26.4962 13.8096 26.6562 13.8096 26.8642C13.8096 27.0722 13.9691 27.2322 14.1766 27.2322H15.9638L14.7032 28.4962C14.5595 28.6402 14.5595 28.8642 14.7032 29.0082C14.8468 29.1522 15.0702 29.1522 15.2138 29.0082L16.4744 27.7442V29.5362C16.4744 29.7442 16.634 29.9042 16.8414 29.9042C17.0488 29.9042 17.2084 29.7442 17.2084 29.5362V27.7442L18.469 29.0082C18.6126 29.1522 18.836 29.1522 18.9796 29.0082C19.1232 28.8642 19.1232 28.6402 18.9796 28.4962L17.719 27.2322H19.5062C19.7137 27.2322 19.8732 27.0722 19.8732 26.8642C19.8573 26.6562 19.6977 26.4962 19.5062 26.4962Z" fill="url(#paint4_linear_193_896)"/>
-<path id="XMLID_111_" fill-rule="evenodd" clip-rule="evenodd" d="M27.3724 26.4962H25.5852L26.8458 25.2322C26.9894 25.0882 26.9894 24.8642 26.8458 24.7202C26.7022 24.5762 26.4788 24.5762 26.3352 24.7202L25.0746 25.9842V24.1922C25.0746 23.9842 24.915 23.8242 24.7076 23.8242C24.5002 23.8242 24.3406 23.9842 24.3406 24.1922V25.9842L23.08 24.7202C22.9364 24.5762 22.713 24.5762 22.5694 24.7202C22.4258 24.8642 22.4258 25.0882 22.5694 25.2322L23.83 26.4962H22.0428C21.8353 26.4962 21.6758 26.6562 21.6758 26.8642C21.6758 27.0722 21.8353 27.2322 22.0428 27.2322H23.83L22.5694 28.4962C22.4258 28.6402 22.4258 28.8642 22.5694 29.0082C22.713 29.1522 22.9364 29.1522 23.08 29.0082L24.3406 27.7442V29.5362C24.3406 29.7442 24.5002 29.9042 24.7076 29.9042C24.915 29.9042 25.0746 29.7442 25.0746 29.5362V27.7442L26.3352 29.0082C26.4788 29.1522 26.7022 29.1522 26.8458 29.0082C26.9894 28.8642 26.9894 28.6402 26.8458 28.4962L25.5852 27.2322H27.3724C27.5799 27.2322 27.7394 27.0722 27.7394 26.8642C27.7394 26.6562 27.5639 26.4962 27.3724 26.4962Z" fill="url(#paint5_linear_193_896)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_896" x1="16.688" y1="22.2156" x2="16.688" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_896" x1="16.6947" y1="0.95448" x2="16.6947" y2="14.5494" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_896" x1="11.7613" y1="8.34531" x2="11.7613" y2="19.3657" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_896" x1="8.68828" y1="29.9063" x2="8.68828" y2="23.8251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_896" x1="16.8426" y1="29.9063" x2="16.8426" y2="23.8251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_896" x1="24.7088" y1="29.9063" x2="24.7088" y2="23.8251" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/404.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/404.svg
deleted file mode 100644
index b3b8afd7..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/404.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<svg width="34" height="33" viewBox="0 0 34 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814252">
-<path id="XMLID_38_" fill-rule="evenodd" clip-rule="evenodd" d="M25.0179 28.192H23.2307L24.4913 26.928C24.635 26.784 24.635 26.56 24.4913 26.416C24.3477 26.272 24.1243 26.272 23.9807 26.416L22.7201 27.68V25.888C22.7201 25.68 22.5606 25.52 22.3531 25.52C22.1457 25.52 21.9861 25.68 21.9861 25.888V27.68L20.7255 26.416C20.5819 26.272 20.3585 26.272 20.2149 26.416C20.0713 26.56 20.0713 26.784 20.2149 26.928L21.4755 28.192H19.6883C19.4809 28.192 19.3213 28.352 19.3213 28.56C19.3213 28.768 19.4809 28.928 19.6883 28.928H21.4755L20.2149 30.192C20.0713 30.336 20.0713 30.56 20.2149 30.704C20.3585 30.848 20.5819 30.848 20.7255 30.704L21.9861 29.44V31.232C21.9861 31.44 22.1457 31.6 22.3531 31.6C22.5606 31.6 22.7201 31.44 22.7201 31.232V29.44L23.9807 30.704C24.1243 30.848 24.3477 30.848 24.4913 30.704C24.635 30.56 24.635 30.336 24.4913 30.192L23.2307 28.928H25.0179C25.2254 28.928 25.3849 28.768 25.3849 28.56C25.369 28.352 25.2094 28.192 25.0179 28.192Z" fill="url(#paint0_linear_193_955)"/>
-<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M24.2843 5.904C23.7258 5.904 23.1993 5.952 22.6727 6.048C21.7472 2.56 18.7473 0 15.1889 0C11.439 0 8.3114 2.832 7.56142 6.608C3.66792 6.8 0.572266 10.208 0.572266 14.416C0.572266 18.736 3.84345 22.224 7.88056 22.224H24.2843C29.1353 22.224 33.0607 18.576 33.0607 14.064C33.0607 9.552 29.1353 5.904 24.2843 5.904Z" fill="url(#paint1_linear_193_955)"/>
-<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M8.56697 8.36785C9.22121 5.00785 12.0137 2.47985 15.3646 2.47985C18.5401 2.47985 21.2049 4.75185 22.0347 7.85585C22.4974 7.77585 22.9761 7.72785 23.4708 7.72785C27.5079 7.72785 30.827 10.5758 31.2418 14.2238C31.2738 13.9678 31.2897 13.7119 31.2897 13.4559C31.2897 9.43985 27.7951 6.19185 23.4708 6.19185C22.9761 6.19185 22.4974 6.23985 22.0347 6.31985C21.2049 3.21585 18.5401 0.943848 15.3646 0.943848C12.0296 0.943848 9.23717 3.47185 8.56697 6.83185C5.10431 6.99185 2.34375 10.0318 2.34375 13.7759C2.34375 14.0319 2.35971 14.2878 2.39162 14.5438C2.74267 11.1678 5.34366 8.52785 8.56697 8.36785Z" fill="url(#paint2_linear_193_955)"/>
-<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M9.38017 8.35156C9.14082 8.35156 8.90146 8.36756 8.66211 8.39956C11.7897 8.79956 14.2151 11.6476 14.2151 15.1036C14.2151 16.7196 13.6726 18.2076 12.795 19.3756C14.1992 18.2556 15.1087 16.4796 15.1087 14.4796C15.1087 11.0876 12.5397 8.35156 9.38017 8.35156Z" fill="url(#paint3_linear_193_955)"/>
-<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M10.7207 27.7597C10.7207 28.9917 11.71 29.9837 12.9387 29.9837C14.1674 29.9837 15.1567 28.9917 15.1567 27.7597C15.1567 26.5277 12.9387 23.8237 12.9387 23.8237C12.9387 23.8237 10.7207 26.5277 10.7207 27.7597Z" fill="url(#paint4_linear_193_955)"/>
-<path id="XMLID_30_" d="M12.4924 28.8796C11.8541 28.2396 11.8541 27.1996 12.4924 26.5596" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M5.61426 30.2875C5.61426 31.3435 6.47593 32.2075 7.5291 32.2075C8.58226 32.2075 9.44393 31.3435 9.44393 30.2875C9.44393 29.2315 7.5291 26.8955 7.5291 26.8955C7.5291 26.8955 5.61426 29.2315 5.61426 30.2875Z" fill="url(#paint5_linear_193_955)"/>
-<path id="XMLID_25_" d="M7.14641 31.2636C6.58792 30.7036 6.58792 29.8076 7.14641 29.2476" stroke="white" stroke-width="0.16" stroke-miterlimit="10" stroke-linecap="round"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_955" x1="22.3543" y1="31.6021" x2="22.3543" y2="25.5209" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_955" x1="16.8228" y1="22.2316" x2="16.8228" y2="0.00316921" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_955" x1="16.8179" y1="0.959416" x2="16.8179" y2="14.5543" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_955" x1="11.8835" y1="8.34975" x2="11.8835" y2="19.3701" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_955" x1="12.9396" y1="29.9858" x2="12.9396" y2="23.8246" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_955" x1="7.52984" y1="32.2093" x2="7.52984" y2="26.8963" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/407.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/407.svg
deleted file mode 100644
index fe700255..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/407.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<svg width="34" height="35" viewBox="0 0 34 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814255">
-<g id="XMLID_61_">
-<path id="XMLID_63_" fill-rule="evenodd" clip-rule="evenodd" d="M14.5882 31.2487H12.8011L14.0617 29.9847C14.2053 29.8407 14.2053 29.6167 14.0617 29.4727C13.9181 29.3287 13.6946 29.3287 13.551 29.4727L12.2904 30.7367V28.9447C12.2904 28.7367 12.1309 28.5767 11.9234 28.5767C11.716 28.5767 11.5564 28.7367 11.5564 28.9447V30.7367L10.2958 29.4727C10.1522 29.3287 9.9288 29.3287 9.78519 29.4727C9.64158 29.6167 9.64158 29.8407 9.78519 29.9847L11.0458 31.2487H9.2586C9.05116 31.2487 8.8916 31.4087 8.8916 31.6167C8.8916 31.8247 9.05116 31.9847 9.2586 31.9847H11.0458L9.78519 33.2487C9.64158 33.3927 9.64158 33.6167 9.78519 33.7607C9.9288 33.9047 10.1522 33.9047 10.2958 33.7607L11.5564 32.4967V34.2887C11.5564 34.4967 11.716 34.6567 11.9234 34.6567C12.1309 34.6567 12.2904 34.4967 12.2904 34.2887V32.4967L13.551 33.7607C13.6946 33.9047 13.9181 33.9047 14.0617 33.7607C14.2053 33.6167 14.2053 33.3927 14.0617 33.2487L12.8011 31.9847H14.5882C14.7957 31.9847 14.9553 31.8247 14.9553 31.6167C14.9393 31.4247 14.7797 31.2487 14.5882 31.2487Z" fill="url(#paint0_linear_193_932)"/>
-<path id="XMLID_62_" fill-rule="evenodd" clip-rule="evenodd" d="M23.7318 31.2487H21.9446L23.2052 29.9847C23.3488 29.8407 23.3488 29.6167 23.2052 29.4727C23.0616 29.3287 22.8382 29.3287 22.6946 29.4727L21.434 30.7367V28.9447C21.434 28.7367 21.2744 28.5767 21.067 28.5767C20.8595 28.5767 20.7 28.7367 20.7 28.9447V30.7367L19.4394 29.4727C19.2958 29.3287 19.0724 29.3287 18.9288 29.4727C18.7851 29.6167 18.7851 29.8407 18.9288 29.9847L20.1893 31.2487H18.4022C18.1947 31.2487 18.0352 31.4087 18.0352 31.6167C18.0352 31.8247 18.1947 31.9847 18.4022 31.9847H20.1893L18.9288 33.2487C18.7851 33.3927 18.7851 33.6167 18.9288 33.7607C19.0724 33.9047 19.2958 33.9047 19.4394 33.7607L20.7 32.4967V34.2887C20.7 34.4967 20.8595 34.6567 21.067 34.6567C21.2744 34.6567 21.434 34.4967 21.434 34.2887V32.4967L22.6946 33.7607C22.8382 33.9047 23.0616 33.9047 23.2052 33.7607C23.3488 33.6167 23.3488 33.3927 23.2052 33.2487L21.9446 31.9847H23.7318C23.9393 31.9847 24.0988 31.8247 24.0988 31.6167C24.0988 31.4247 23.9393 31.2487 23.7318 31.2487Z" fill="url(#paint1_linear_193_932)"/>
-</g>
-<g id="XMLID_41_">
-<g id="XMLID_46_">
-<path id="XMLID_59_" d="M22.679 17.52C26.213 17.52 29.0778 14.6403 29.0778 11.088C29.0778 7.53571 26.213 4.65601 22.679 4.65601C19.1451 4.65601 16.2803 7.53571 16.2803 11.088C16.2803 14.6403 19.1451 17.52 22.679 17.52Z" fill="url(#paint2_linear_193_932)"/>
-<path id="XMLID_58_" fill-rule="evenodd" clip-rule="evenodd" d="M23.0938 3.2H22.264C22.2002 3.2 22.1523 3.152 22.1523 3.088V0.112C22.1523 0.0480001 22.2002 0 22.264 0H23.0938C23.1576 0 23.2055 0.0480001 23.2055 0.112V3.088C23.2055 3.152 23.1576 3.2 23.0938 3.2Z" fill="url(#paint3_linear_193_932)"/>
-<path id="XMLID_57_" fill-rule="evenodd" clip-rule="evenodd" d="M18.7051 4.2721C18.4498 4.4161 18.1307 4.3361 17.9711 4.0801L16.902 2.2241C16.7584 1.9681 16.8382 1.6481 17.0935 1.4881C17.3488 1.3441 17.6679 1.4241 17.8275 1.6801L18.8966 3.5361C19.0402 3.8081 18.9604 4.1281 18.7051 4.2721Z" fill="url(#paint4_linear_193_932)"/>
-<path id="XMLID_56_" fill-rule="evenodd" clip-rule="evenodd" d="M15.8015 7.19991C15.6579 7.45591 15.3228 7.53591 15.0675 7.39191L13.2165 6.31991C12.9612 6.17591 12.8814 5.83991 13.025 5.58391C13.1686 5.32791 13.5037 5.24791 13.759 5.39191L15.61 6.46391C15.8654 6.62391 15.9451 6.94391 15.8015 7.19991Z" fill="url(#paint5_linear_193_932)"/>
-<path id="XMLID_55_" fill-rule="evenodd" clip-rule="evenodd" d="M14.7959 10.7681V11.6001C14.7959 11.6641 14.748 11.7121 14.6842 11.7121H11.7162C11.6524 11.7121 11.6045 11.6641 11.6045 11.6001V10.7681C11.6045 10.7041 11.6524 10.6561 11.7162 10.6561H14.6842C14.748 10.6401 14.7959 10.7041 14.7959 10.7681Z" fill="url(#paint6_linear_193_932)"/>
-<path id="XMLID_54_" fill-rule="evenodd" clip-rule="evenodd" d="M15.9129 15.1203C16.0565 15.3763 15.9767 15.6963 15.7214 15.8563L13.8704 16.9283C13.6151 17.0723 13.2959 16.9923 13.1364 16.7363C12.9927 16.4803 13.0725 16.1603 13.3278 16.0003L15.1789 14.9283C15.4342 14.7843 15.7693 14.8643 15.9129 15.1203Z" fill="url(#paint7_linear_193_932)"/>
-<path id="XMLID_53_" fill-rule="evenodd" clip-rule="evenodd" d="M18.833 17.984C19.0883 18.128 19.1681 18.464 19.0245 18.72L17.9554 20.576C17.8118 20.832 17.4767 20.912 17.2214 20.768C16.9661 20.624 16.8863 20.288 17.0299 20.032L18.099 18.176C18.2586 17.92 18.5777 17.84 18.833 17.984Z" fill="url(#paint8_linear_193_932)"/>
-<path id="XMLID_52_" fill-rule="evenodd" clip-rule="evenodd" d="M22.3754 18.9919H23.2051C23.269 18.9919 23.3168 19.0399 23.3168 19.1039V22.0799C23.3168 22.1439 23.269 22.1919 23.2051 22.1919H22.3754C22.3116 22.1919 22.2637 22.1439 22.2637 22.0799V19.1039C22.2637 19.0399 22.3116 18.9919 22.3754 18.9919Z" fill="url(#paint9_linear_193_932)"/>
-<path id="XMLID_51_" fill-rule="evenodd" clip-rule="evenodd" d="M26.7155 17.8724C26.9708 17.7284 27.29 17.8084 27.4495 18.0644L28.5187 19.9204C28.6623 20.1764 28.5825 20.4964 28.3272 20.6564C28.0719 20.8004 27.7527 20.7204 27.5932 20.4644L26.524 18.6084C26.3804 18.3524 26.4602 18.0164 26.7155 17.8724Z" fill="url(#paint10_linear_193_932)"/>
-<path id="XMLID_50_" fill-rule="evenodd" clip-rule="evenodd" d="M29.5563 14.9279C29.6999 14.6719 30.035 14.5919 30.2903 14.7359L32.1413 15.8079C32.3966 15.9519 32.4764 16.2879 32.3328 16.5439C32.1892 16.7999 31.8541 16.8799 31.5988 16.7359L29.7477 15.6639C29.4924 15.5199 29.4127 15.1839 29.5563 14.9279Z" fill="url(#paint11_linear_193_932)"/>
-<path id="XMLID_49_" fill-rule="evenodd" clip-rule="evenodd" d="M30.5615 11.3759V10.5439C30.5615 10.4799 30.6094 10.4319 30.6732 10.4319H33.6412C33.7051 10.4319 33.7529 10.4799 33.7529 10.5439V11.3759C33.7529 11.4399 33.7051 11.4879 33.6412 11.4879H30.6732C30.6094 11.4879 30.5615 11.4399 30.5615 11.3759Z" fill="url(#paint12_linear_193_932)"/>
-<path id="XMLID_48_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3805 7.02413C29.2369 6.76813 29.3167 6.44813 29.572 6.28813L31.423 5.21613C31.6783 5.07213 31.9974 5.15213 32.157 5.40813C32.3006 5.66413 32.2208 5.98413 31.9655 6.14413L30.1145 7.21613C29.8592 7.37613 29.5241 7.28013 29.3805 7.02413Z" fill="url(#paint13_linear_193_932)"/>
-<path id="XMLID_47_" fill-rule="evenodd" clip-rule="evenodd" d="M26.4128 4.22401C26.1575 4.08001 26.0777 3.74401 26.2213 3.48801L27.2904 1.63201C27.434 1.37601 27.7691 1.29601 28.0245 1.44001C28.2798 1.58401 28.3595 1.92001 28.2159 2.17601L27.1468 4.03201C27.0032 4.28801 26.6681 4.36801 26.4128 4.22401Z" fill="url(#paint14_linear_193_932)"/>
-</g>
-<g id="XMLID_42_">
-<path id="XMLID_45_" fill-rule="evenodd" clip-rule="evenodd" d="M24.0832 10.1281C23.5247 10.1281 22.9981 10.1761 22.4715 10.2721C21.546 6.78412 18.5461 4.22412 14.9877 4.22412C11.2378 4.22412 8.11024 7.05612 7.36026 10.8321C3.46676 11.0081 0.371094 14.4321 0.371094 18.6241C0.371094 22.9441 3.64228 26.4321 7.6794 26.4321H24.0832C28.9341 26.4321 32.8595 22.7841 32.8595 18.2721C32.8595 13.7601 28.9341 10.1281 24.0832 10.1281Z" fill="url(#paint15_linear_193_932)"/>
-<path id="XMLID_44_" fill-rule="evenodd" clip-rule="evenodd" d="M8.3658 12.5925C9.02004 9.23246 11.8125 6.70446 15.1635 6.70446C18.3389 6.70446 21.0037 8.97646 21.8335 12.0805C22.2962 12.0005 22.775 11.9525 23.2696 11.9525C27.3067 11.9525 30.6258 14.8005 31.0407 18.4485C31.0726 18.1925 31.0885 17.9365 31.0885 17.6805C31.0885 13.6645 27.594 10.4165 23.2696 10.4165C22.775 10.4165 22.2962 10.4645 21.8335 10.5445C21.0037 7.44046 18.3389 5.16846 15.1635 5.16846C11.8285 5.16846 9.03599 7.69646 8.3658 11.0565C4.90314 11.2165 2.14258 14.2565 2.14258 18.0005C2.14258 18.2565 2.15854 18.5125 2.19046 18.7685C2.52555 15.3925 5.14249 12.7525 8.3658 12.5925Z" fill="url(#paint16_linear_193_932)"/>
-<path id="XMLID_43_" fill-rule="evenodd" clip-rule="evenodd" d="M9.179 12.5762C8.93965 12.5762 8.70029 12.5922 8.46094 12.6242C11.5885 13.0242 14.014 15.8722 14.014 19.3282C14.014 20.9442 13.4714 22.4322 12.5938 23.6002C13.998 22.4802 14.9076 20.7042 14.9076 18.7042C14.8916 15.3122 12.3385 12.5762 9.179 12.5762Z" fill="url(#paint17_linear_193_932)"/>
-</g>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_932" x1="11.9246" y1="34.6588" x2="11.9246" y2="28.5775" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_932" x1="21.0682" y1="34.6588" x2="21.0682" y2="28.5775" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_932" x1="16.2841" y1="11.0815" x2="29.073" y2="11.0815" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_932" x1="22.1442" y1="1.59622" x2="23.21" y2="1.59622" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_932" x1="17.4364" y1="3.15139" x2="18.3631" y2="2.61775" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_932" x1="14.14" y1="6.87122" x2="14.6773" y2="5.94327" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_932" x1="13.2004" y1="11.7176" x2="13.2004" y2="10.6463" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_932" x1="14.7864" y1="16.3934" x2="14.2492" y2="15.4654" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_932" x1="18.4962" y1="19.6503" x2="17.5694" y2="19.1166" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_932" x1="23.3247" y1="20.5947" x2="22.259" y2="20.5947" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_932" x1="27.9716" y1="18.9951" x2="27.0448" y2="19.5287" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint11_linear_193_932" x1="31.2094" y1="15.2727" x2="30.6722" y2="16.2006" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint12_linear_193_932" x1="32.156" y1="10.4173" x2="32.156" y2="11.4887" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint13_linear_193_932" x1="30.4966" y1="5.76102" x2="31.0339" y2="6.68896" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint14_linear_193_932" x1="26.7485" y1="2.56362" x2="27.6753" y2="3.09728" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint15_linear_193_932" x1="16.6216" y1="26.4398" x2="16.6216" y2="4.22729" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint16_linear_193_932" x1="16.6115" y1="5.18289" x2="16.6115" y2="18.7778" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint17_linear_193_932" x1="11.6771" y1="12.5732" x2="11.6771" y2="23.5936" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/32.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/5.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/32.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/5.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/500.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/500.svg
deleted file mode 100644
index 9d1f8a5f..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/500.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg width="33" height="27" viewBox="0 0 33 27" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814261">
-<path id="XMLID_7_" fill-rule="evenodd" clip-rule="evenodd" d="M24.1838 5.904C23.6253 5.904 23.0987 5.952 22.5721 6.048C21.6466 2.56 18.6467 0 15.0883 0C11.3384 0 8.21081 2.832 7.46084 6.608C3.56733 6.784 0.47168 10.208 0.47168 14.4C0.47168 18.72 3.74286 22.208 7.77998 22.208H24.1838C29.0347 22.208 32.9601 18.56 32.9601 14.048C32.9601 9.536 29.0347 5.904 24.1838 5.904Z" fill="url(#paint0_linear_193_996)"/>
-<path id="XMLID_6_" fill-rule="evenodd" clip-rule="evenodd" d="M8.48201 8.36785C9.13625 5.00785 11.9287 2.47985 15.2797 2.47985C18.4551 2.47985 21.1199 4.75185 21.9497 7.85585C22.4125 7.77585 22.8912 7.72785 23.3858 7.72785C27.423 7.72785 30.742 10.5758 31.1569 14.2238C31.1888 13.9678 31.2048 13.7118 31.2048 13.4558C31.2048 9.43985 27.7102 6.19185 23.3858 6.19185C22.8912 6.19185 22.4125 6.23985 21.9497 6.31985C21.1199 3.21585 18.4551 0.943848 15.2797 0.943848C11.9447 0.943848 9.15221 3.47185 8.48201 6.83185C5.01935 6.99185 2.25879 10.0318 2.25879 13.7758C2.25879 14.0318 2.27475 14.2878 2.30666 14.5438C2.64176 11.1678 5.2587 8.51185 8.48201 8.36785Z" fill="url(#paint1_linear_193_996)"/>
-<path id="XMLID_5_" fill-rule="evenodd" clip-rule="evenodd" d="M9.27959 8.33594C9.04023 8.33594 8.80088 8.35194 8.56152 8.38394C11.6891 8.78394 14.1146 11.6319 14.1146 15.0879C14.1146 16.7039 13.572 18.1919 12.6944 19.3599C14.0986 18.2399 15.0081 16.4639 15.0081 14.4639C15.0081 11.0879 12.4391 8.33594 9.27959 8.33594Z" fill="url(#paint2_linear_193_996)"/>
-<path id="XMLID_4_" fill-rule="evenodd" clip-rule="evenodd" d="M25.8755 26.2717H6.82285C6.4718 26.2717 6.18457 25.9837 6.18457 25.6317C6.18457 25.2797 6.4718 24.9917 6.82285 24.9917H25.8755C26.2265 24.9917 26.5138 25.2797 26.5138 25.6317C26.5138 25.9837 26.2265 26.2717 25.8755 26.2717Z" fill="url(#paint3_linear_193_996)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_996" x1="16.7222" y1="22.2156" x2="16.7222" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_996" x1="16.7223" y1="0.952712" x2="16.7223" y2="14.5477" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_996" x1="11.7883" y1="8.34343" x2="11.7883" y2="19.3638" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_996" x1="16.3531" y1="26.2721" x2="16.3531" y2="24.9919" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/501.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/501.svg
deleted file mode 100644
index 4c3b6b2c..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/501.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<svg width="30" height="23" viewBox="0 0 30 23" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814268">
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M15.1971 4.16H14.1439C14.0482 4.16 13.9844 4.08 13.9844 4V0.16C13.9844 0.064 14.0642 0 14.1439 0H15.1971C15.2928 0 15.3567 0.08 15.3567 0.16V4C15.3567 4.096 15.2928 4.16 15.1971 4.16Z" fill="url(#paint0_linear_193_1058)"/>
-<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M9.51686 5.56766C9.18176 5.75966 8.76688 5.64766 8.57539 5.31166L7.18713 2.91166C6.99565 2.57566 7.10736 2.15966 7.44245 1.96766C7.77755 1.77566 8.19242 1.88766 8.38391 2.22366L9.77217 4.62366C9.96365 4.94366 9.85196 5.37566 9.51686 5.56766Z" fill="url(#paint1_linear_193_1058)"/>
-<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M5.75109 9.3603C5.5596 9.6963 5.14473 9.8083 4.80963 9.6163L2.41609 8.2243C2.08099 8.0323 1.96928 7.6003 2.16077 7.2803C2.35225 6.9443 2.76714 6.8323 3.10223 7.0243L5.49578 8.4163C5.83088 8.6083 5.94257 9.0243 5.75109 9.3603Z" fill="url(#paint2_linear_193_1058)"/>
-<path id="XMLID_20_" fill-rule="evenodd" clip-rule="evenodd" d="M4.45839 13.9841V15.0401C4.45839 15.1361 4.3786 15.2001 4.29882 15.2001H0.46914C0.373398 15.2001 0.30957 15.1201 0.30957 15.0401V13.9681C0.30957 13.8721 0.389355 13.8081 0.46914 13.8081H4.29882C4.3786 13.8241 4.45839 13.8881 4.45839 13.9841Z" fill="url(#paint3_linear_193_1058)"/>
-<path id="XMLID_19_" fill-rule="evenodd" clip-rule="evenodd" d="M24.8828 14.752V13.68C24.8828 13.584 24.9626 13.52 25.0424 13.52H28.8721C28.9678 13.52 29.0316 13.6 29.0316 13.68V14.752C29.0316 14.848 28.9518 14.912 28.8721 14.912H25.0424C24.9626 14.912 24.8828 14.832 24.8828 14.752Z" fill="url(#paint4_linear_193_1058)"/>
-<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M23.3668 9.12007C23.1753 8.78407 23.287 8.36807 23.6221 8.17607L26.0157 6.78407C26.3508 6.59207 26.7657 6.70407 26.9571 7.04007C27.1486 7.37607 27.0369 7.79207 26.7018 7.98407L24.3083 9.37607C23.9732 9.56807 23.5583 9.45607 23.3668 9.12007Z" fill="url(#paint5_linear_193_1058)"/>
-<path id="XMLID_17_" fill-rule="evenodd" clip-rule="evenodd" d="M19.5215 5.48807C19.1865 5.29607 19.0748 4.86407 19.2662 4.54407L20.6545 2.14407C20.846 1.80807 21.2609 1.69607 21.596 1.88807C21.9311 2.08007 22.0428 2.51207 21.8513 2.83207L20.463 5.23207C20.2715 5.56807 19.8407 5.68007 19.5215 5.48807Z" fill="url(#paint6_linear_193_1058)"/>
-<path id="XMLID_16_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9949 18.1762H4.33064C4.01151 18.1762 3.74023 17.9042 3.74023 17.5842C3.74023 17.2642 4.01151 16.9922 4.33064 16.9922H24.9949C25.3141 16.9922 25.5853 17.2642 25.5853 17.5842C25.5853 17.9202 25.33 18.1762 24.9949 18.1762Z" fill="url(#paint7_linear_193_1058)"/>
-<path id="XMLID_15_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9949 20.6239H4.33064C4.01151 20.6239 3.74023 20.3519 3.74023 20.0319C3.74023 19.7119 4.01151 19.4399 4.33064 19.4399H24.9949C25.3141 19.4399 25.5853 19.7119 25.5853 20.0319C25.6013 20.3519 25.33 20.6239 24.9949 20.6239Z" fill="url(#paint8_linear_193_1058)"/>
-<path id="XMLID_14_" fill-rule="evenodd" clip-rule="evenodd" d="M24.9949 22.8959H4.33064C4.01151 22.8959 3.74023 22.6239 3.74023 22.3039C3.74023 21.9839 4.01151 21.7119 4.33064 21.7119H24.9949C25.3141 21.7119 25.5853 21.9839 25.5853 22.3039C25.6013 22.6239 25.33 22.8959 24.9949 22.8959Z" fill="url(#paint9_linear_193_1058)"/>
-<path id="XMLID_12_" fill-rule="evenodd" clip-rule="evenodd" d="M22.8885 15.1999C22.9364 14.8479 22.9683 14.4799 22.9683 14.1119C22.9683 9.50388 19.2503 5.77588 14.6707 5.77588C10.091 5.77588 6.37305 9.50388 6.37305 14.1119C6.37305 14.4799 6.40496 14.8479 6.45283 15.1999H22.8885Z" fill="url(#paint10_linear_193_1058)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_1058" x1="13.9763" y1="2.08354" x2="15.3581" y2="2.08354" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_1058" x1="7.87868" y1="4.10203" x2="9.0803" y2="3.41012" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_1058" x1="3.60436" y1="8.91716" x2="4.30088" y2="7.71402" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_1058" x1="2.38063" y1="15.2066" x2="2.38063" y2="13.8176" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_1058" x1="26.9573" y1="13.5209" x2="26.9573" y2="14.9099" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_1058" x1="24.8057" y1="7.48032" x2="25.5022" y2="8.68347" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_1058" x1="19.9462" y1="3.33734" x2="21.1479" y2="4.02926" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_1058" x1="14.667" y1="18.1766" x2="14.667" y2="16.9924" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_1058" x1="14.6674" y1="20.6243" x2="14.6674" y2="19.4401" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_1058" x1="14.6674" y1="22.8963" x2="14.6674" y2="21.7121" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_1058" x1="14.669" y1="5.77874" x2="14.669" y2="15.2064" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4CB65"/>
-<stop offset="1" stop-color="#FB6452"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/502.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/502.svg
deleted file mode 100644
index 4cdf73ee..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/502.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<svg width="26" height="20" viewBox="0 0 26 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814264">
-<path id="XMLID_13_" d="M13.0323 16.3198C13.5258 16.3198 13.9258 15.9187 13.9258 15.4238C13.9258 14.929 13.5258 14.5278 13.0323 14.5278C12.5387 14.5278 12.1387 14.929 12.1387 15.4238C12.1387 15.9187 12.5387 16.3198 13.0323 16.3198Z" fill="url(#paint0_linear_193_1040)"/>
-<path id="XMLID_12_" d="M18.2022 11.0879C18.6957 11.0879 19.0958 10.6867 19.0958 10.1919C19.0958 9.69705 18.6957 9.2959 18.2022 9.2959C17.7087 9.2959 17.3086 9.69705 17.3086 10.1919C17.3086 10.6867 17.7087 11.0879 18.2022 11.0879Z" fill="url(#paint1_linear_193_1040)"/>
-<path id="XMLID_11_" d="M8.05374 9.80762C8.54726 9.80762 8.94734 9.40647 8.94734 8.91162C8.94734 8.41678 8.54726 8.01562 8.05374 8.01562C7.56023 8.01562 7.16016 8.41678 7.16016 8.91162C7.16016 9.40647 7.56023 9.80762 8.05374 9.80762Z" fill="url(#paint2_linear_193_1040)"/>
-<path id="XMLID_10_" d="M17.1326 2.144C17.7231 2.144 18.2017 1.66405 18.2017 1.072C18.2017 0.479951 17.7231 0 17.1326 0C16.5421 0 16.0635 0.479951 16.0635 1.072C16.0635 1.66405 16.5421 2.144 17.1326 2.144Z" fill="url(#paint3_linear_193_1040)"/>
-<path id="XMLID_9_" d="M17.7554 6.4958C16.8459 6.4958 15.9363 6.2238 15.2183 5.6638L14.564 5.15181C13.6066 4.41581 12.0109 4.41581 11.0535 5.15181L10.4312 5.63181C9.01102 6.73581 6.77704 6.73581 5.35687 5.63181L4.84624 5.23181C3.88882 4.49581 2.29313 4.49581 1.33571 5.23181C1.06444 5.45581 0.649551 5.3918 0.442111 5.1198C0.23467 4.8478 0.282543 4.4318 0.553812 4.2238C1.97398 3.1198 4.20796 3.1198 5.62813 4.2238L6.13875 4.6238C7.09617 5.3598 8.69187 5.3598 9.64929 4.6238L10.2716 4.1438C11.6918 3.0398 13.9258 3.0398 15.3459 4.1438L16.0002 4.6558C16.9576 5.3918 18.5533 5.3918 19.5107 4.6558L20.1969 4.1278C21.617 3.0238 23.851 3.0238 25.2712 4.1278C25.5424 4.3518 25.6063 4.7518 25.3829 5.0238C25.1595 5.2958 24.7606 5.3598 24.4893 5.1358C23.5319 4.3998 21.9362 4.3998 20.9787 5.1358L20.2926 5.6638C19.5745 6.2238 18.665 6.4958 17.7554 6.4958Z" fill="url(#paint4_linear_193_1040)"/>
-<path id="XMLID_8_" d="M17.7554 13.008C16.8459 13.008 15.9363 12.736 15.2183 12.176L14.564 11.664C13.6066 10.928 12.0109 10.928 11.0535 11.664L10.4312 12.144C9.01102 13.248 6.77704 13.248 5.35687 12.144L4.84624 11.744C3.88882 11.008 2.29313 11.008 1.33571 11.744C1.06444 11.968 0.649551 11.904 0.442111 11.632C0.23467 11.36 0.282543 10.944 0.553812 10.736C1.97398 9.63201 4.20796 9.63201 5.62813 10.736L6.13875 11.136C7.09617 11.872 8.69187 11.872 9.64929 11.136L10.2716 10.656C11.6918 9.55201 13.9258 9.55201 15.3459 10.656L16.0002 11.168C16.9576 11.904 18.5533 11.904 19.5107 11.168L20.1969 10.64C21.617 9.53601 23.851 9.53601 25.2712 10.64C25.5424 10.864 25.6063 11.264 25.3829 11.536C25.1595 11.808 24.7606 11.872 24.4893 11.648C23.5319 10.912 21.9362 10.912 20.9787 11.648L20.2926 12.176C19.5745 12.736 18.665 13.008 17.7554 13.008Z" fill="url(#paint5_linear_193_1040)"/>
-<path id="XMLID_7_" d="M17.7554 19.3117C16.8458 19.3117 15.9363 19.0397 15.2182 18.4797L14.564 17.9677C13.6066 17.2317 12.0109 17.2317 11.0535 17.9677L10.4312 18.4477C9.01098 19.5517 6.777 19.5517 5.35683 18.4477L4.84621 18.0477C3.88879 17.3117 2.29309 17.3117 1.33567 18.0477C1.0644 18.2717 0.649516 18.2077 0.442075 17.9357C0.218677 17.6637 0.282507 17.2477 0.553776 17.0397C1.97395 15.9357 4.20792 15.9357 5.62809 17.0397L6.13872 17.4397C7.09614 18.1757 8.69184 18.1757 9.64925 17.4397L10.2716 16.9597C11.6918 15.8557 13.9257 15.8557 15.3459 16.9597L16.0001 17.4717C16.9576 18.2077 18.5532 18.2077 19.5107 17.4717L20.1968 16.9437C21.617 15.8397 23.851 15.8397 25.2711 16.9437C25.5424 17.1677 25.6062 17.5677 25.3828 17.8397C25.1594 18.1117 24.7605 18.1757 24.4892 17.9517C23.5318 17.2157 21.9361 17.2157 20.9787 17.9517L20.2926 18.4797C19.5745 19.0397 18.6649 19.3117 17.7554 19.3117Z" fill="url(#paint6_linear_193_1040)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_1040" x1="13.0326" y1="16.3204" x2="13.0326" y2="14.5281" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_1040" x1="18.2025" y1="11.0885" x2="18.2025" y2="9.29615" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_1040" x1="8.05409" y1="9.80824" x2="8.05409" y2="8.01588" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_1040" x1="17.133" y1="2.14474" x2="17.133" y2="0.000305741" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_1040" x1="12.9208" y1="6.4969" x2="12.9208" y2="3.30026" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_1040" x1="12.9208" y1="13.0091" x2="12.9208" y2="9.81247" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_1040" x1="12.9174" y1="19.3128" x2="12.9174" y2="16.1162" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/503.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/503.svg
deleted file mode 100644
index c4ecc598..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/503.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<svg width="27" height="23" viewBox="0 0 27 23" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814262">
-<path id="XMLID_33_" d="M1.49808 9.90382C1.9916 9.90382 2.39167 9.50266 2.39167 9.00782C2.39167 8.51297 1.9916 8.11182 1.49808 8.11182C1.00457 8.11182 0.604492 8.51297 0.604492 9.00782C0.604492 9.50266 1.00457 9.90382 1.49808 9.90382Z" fill="url(#paint0_linear_193_1018)"/>
-<path id="XMLID_32_" d="M3.95511 15.8076C4.44863 15.8076 4.84871 15.4065 4.84871 14.9116C4.84871 14.4168 4.44863 14.0156 3.95511 14.0156C3.4616 14.0156 3.06152 14.4168 3.06152 14.9116C3.06152 15.4065 3.4616 15.8076 3.95511 15.8076Z" fill="url(#paint1_linear_193_1018)"/>
-<path id="XMLID_31_" d="M8.04008 7.64796C8.53359 7.64796 8.93367 7.2468 8.93367 6.75196C8.93367 6.25711 8.53359 5.85596 8.04008 5.85596C7.54656 5.85596 7.14648 6.25711 7.14648 6.75196C7.14648 7.2468 7.54656 7.64796 8.04008 7.64796Z" fill="url(#paint2_linear_193_1018)"/>
-<path id="XMLID_30_" d="M3.95584 5.248C4.54629 5.248 5.02495 4.76805 5.02495 4.176C5.02495 3.58395 4.54629 3.104 3.95584 3.104C3.36538 3.104 2.88672 3.58395 2.88672 4.176C2.88672 4.76805 3.36538 5.248 3.95584 5.248Z" fill="url(#paint3_linear_193_1018)"/>
-<path id="XMLID_29_" d="M16.3702 7.10401C16.8637 7.10401 17.2637 6.70286 17.2637 6.20801C17.2637 5.71317 16.8637 5.31201 16.3702 5.31201C15.8766 5.31201 15.4766 5.71317 15.4766 6.20801C15.4766 6.70286 15.8766 7.10401 16.3702 7.10401Z" fill="url(#paint4_linear_193_1018)"/>
-<path id="XMLID_28_" d="M13.689 4.76797C14.3764 4.76797 14.9336 4.20922 14.9336 3.51997C14.9336 2.83072 14.3764 2.27197 13.689 2.27197C13.0016 2.27197 12.4443 2.83072 12.4443 3.51997C12.4443 4.20922 13.0016 4.76797 13.689 4.76797Z" fill="url(#paint5_linear_193_1018)"/>
-<path id="XMLID_27_" d="M12.1739 10.7998C12.6674 10.7998 13.0675 10.3987 13.0675 9.90381C13.0675 9.40897 12.6674 9.00781 12.1739 9.00781C11.6803 9.00781 11.2803 9.40897 11.2803 9.90381C11.2803 10.3987 11.6803 10.7998 12.1739 10.7998Z" fill="url(#paint6_linear_193_1018)"/>
-<path id="XMLID_26_" d="M2.56716 21.5996C3.15762 21.5996 3.63628 21.1196 3.63628 20.5276C3.63628 19.9355 3.15762 19.4556 2.56716 19.4556C1.97671 19.4556 1.49805 19.9355 1.49805 20.5276C1.49805 21.1196 1.97671 21.5996 2.56716 21.5996Z" fill="url(#paint7_linear_193_1018)"/>
-<path id="XMLID_25_" d="M8.93363 18.4478C9.42715 18.4478 9.82722 18.0466 9.82722 17.5518C9.82722 17.0569 9.42715 16.6558 8.93363 16.6558C8.44011 16.6558 8.04004 17.0569 8.04004 17.5518C8.04004 18.0466 8.44011 18.4478 8.93363 18.4478Z" fill="url(#paint8_linear_193_1018)"/>
-<path id="XMLID_24_" d="M15.3333 15.6319C15.7299 15.6319 16.0514 15.3095 16.0514 14.9119C16.0514 14.5142 15.7299 14.1919 15.3333 14.1919C14.9367 14.1919 14.6152 14.5142 14.6152 14.9119C14.6152 15.3095 14.9367 15.6319 15.3333 15.6319Z" fill="url(#paint9_linear_193_1018)"/>
-<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M26.1512 11.504C26.1512 9.856 25.082 8.368 23.3587 7.344C23.4065 7.072 23.4385 6.8 23.4385 6.512C23.4385 3.616 20.8215 1.136 17.0716 0C19.529 1.328 21.0609 3.216 21.0609 5.312C21.0609 9.328 15.4121 12.592 8.4389 12.592C7.81658 12.592 7.19426 12.56 6.58789 12.512C8.29529 13.248 10.3378 13.664 12.5398 13.664C17.8056 13.664 22.1938 11.216 23.2151 7.968C23.8853 8.736 24.2682 9.616 24.2682 10.544C24.2682 13.728 19.8003 16.304 14.2951 16.304C13.8004 16.304 13.3058 16.288 12.8271 16.24C14.1196 16.8 15.6515 17.12 17.295 17.152C17.9812 17.616 18.3641 18.144 18.3641 18.72C18.3641 20.544 14.327 22.032 9.36441 22.032C8.91761 22.032 8.47081 22.016 8.03998 22C9.26866 22.336 10.7207 22.528 12.2845 22.528C16.5929 22.528 20.0715 21.072 20.0715 19.28C20.0715 18.464 19.3535 17.728 18.1727 17.152C22.6566 16.912 26.1512 14.48 26.1512 11.504Z" fill="url(#paint10_linear_193_1018)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_1018" x1="1.49843" y1="9.90443" x2="1.49843" y2="8.11207" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_1018" x1="3.95546" y1="15.8082" x2="3.95546" y2="14.0159" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_1018" x1="8.04042" y1="7.64857" x2="8.04042" y2="5.85621" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_1018" x1="3.95625" y1="5.24874" x2="3.95625" y2="3.10431" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_1018" x1="16.3705" y1="7.10463" x2="16.3705" y2="5.31227" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_1018" x1="13.6895" y1="4.76883" x2="13.6895" y2="2.27233" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_1018" x1="12.1742" y1="10.8004" x2="12.1742" y2="9.00807" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_1018" x1="2.56758" y1="21.6003" x2="2.56758" y2="19.4559" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_1018" x1="8.93398" y1="18.4484" x2="8.93398" y2="16.656" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_1018" x1="15.3336" y1="15.6324" x2="15.3336" y2="14.1921" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_1018" x1="16.3733" y1="22.5357" x2="16.3733" y2="0.00321256" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/504.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/504.svg
deleted file mode 100644
index 65607555..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/504.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<svg width="24" height="22" viewBox="0 0 24 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814263">
-<path id="XMLID_44_" fill-rule="evenodd" clip-rule="evenodd" d="M10.497 18.2722H1.56113C1.21008 18.2722 0.922852 17.9842 0.922852 17.6322C0.922852 17.2802 1.21008 16.9922 1.56113 16.9922H10.497C10.8481 16.9922 11.1353 17.2802 11.1353 17.6322C11.1353 17.9842 10.8641 18.2722 10.497 18.2722Z" fill="url(#paint0_linear_193_1006)"/>
-<path id="XMLID_43_" fill-rule="evenodd" clip-rule="evenodd" d="M23.0078 18.2722H14.0719C13.7208 18.2722 13.4336 17.9842 13.4336 17.6322C13.4336 17.2802 13.7208 16.9922 14.0719 16.9922H23.0078C23.3588 16.9922 23.6461 17.2802 23.6461 17.6322C23.6461 17.9842 23.3588 18.2722 23.0078 18.2722Z" fill="url(#paint1_linear_193_1006)"/>
-<path id="XMLID_42_" fill-rule="evenodd" clip-rule="evenodd" d="M16.624 21.0398H7.68808C7.33703 21.0398 7.0498 20.7518 7.0498 20.3998C7.0498 20.0478 7.33703 19.7598 7.68808 19.7598H16.624C16.975 19.7598 17.2623 20.0478 17.2623 20.3998C17.2623 20.7518 16.975 21.0398 16.624 21.0398Z" fill="url(#paint2_linear_193_1006)"/>
-<path id="XMLID_41_" d="M8.74125 8.99171C9.23476 8.99171 9.63484 8.59055 9.63484 8.09571C9.63484 7.60086 9.23476 7.19971 8.74125 7.19971C8.24773 7.19971 7.84766 7.60086 7.84766 8.09571C7.84766 8.59055 8.24773 8.99171 8.74125 8.99171Z" fill="url(#paint3_linear_193_1006)"/>
-<path id="XMLID_40_" d="M11.7898 6.09615C12.3803 6.09615 12.8589 5.6162 12.8589 5.02415C12.8589 4.4321 12.3803 3.95215 11.7898 3.95215C11.1994 3.95215 10.7207 4.4321 10.7207 5.02415C10.7207 5.6162 11.1994 6.09615 11.7898 6.09615Z" fill="url(#paint4_linear_193_1006)"/>
-<path id="XMLID_39_" d="M5.39066 2.81593C5.88418 2.81593 6.28425 2.41477 6.28425 1.91993C6.28425 1.42508 5.88418 1.02393 5.39066 1.02393C4.89715 1.02393 4.49707 1.42508 4.49707 1.91993C4.49707 2.41477 4.89715 2.81593 5.39066 2.81593Z" fill="url(#paint5_linear_193_1006)"/>
-<path id="XMLID_38_" d="M19.3687 2.496C20.0561 2.496 20.6133 1.93725 20.6133 1.248C20.6133 0.558749 20.0561 0 19.3687 0C18.6813 0 18.124 0.558749 18.124 1.248C18.124 1.93725 18.6813 2.496 19.3687 2.496Z" fill="url(#paint6_linear_193_1006)"/>
-<path id="XMLID_37_" d="M17.8535 8.52784C18.3471 8.52784 18.7471 8.12669 18.7471 7.63184C18.7471 7.13699 18.3471 6.73584 17.8535 6.73584C17.36 6.73584 16.96 7.13699 16.96 7.63184C16.96 8.12669 17.36 8.52784 17.8535 8.52784Z" fill="url(#paint7_linear_193_1006)"/>
-<path id="XMLID_36_" d="M1.84842 8.27193C2.43887 8.27193 2.91754 7.79198 2.91754 7.19993C2.91754 6.60788 2.43887 6.12793 1.84842 6.12793C1.25796 6.12793 0.779297 6.60788 0.779297 7.19993C0.779297 7.79198 1.25796 8.27193 1.84842 8.27193Z" fill="url(#paint8_linear_193_1006)"/>
-<path id="XMLID_35_" d="M10.8955 13.5518C11.3891 13.5518 11.7891 13.1506 11.7891 12.6558C11.7891 12.1609 11.3891 11.7598 10.8955 11.7598C10.402 11.7598 10.002 12.1609 10.002 12.6558C10.002 13.1506 10.402 13.5518 10.8955 13.5518Z" fill="url(#paint9_linear_193_1006)"/>
-<path id="XMLID_34_" d="M20.677 11.9361C21.0736 11.9361 21.3951 11.6137 21.3951 11.2161C21.3951 10.8184 21.0736 10.4961 20.677 10.4961C20.2805 10.4961 19.959 10.8184 19.959 11.2161C19.959 11.6137 20.2805 11.9361 20.677 11.9361Z" fill="url(#paint10_linear_193_1006)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_1006" x1="6.03107" y1="18.2726" x2="6.03107" y2="16.9924" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_1006" x1="18.5418" y1="18.2726" x2="18.5418" y2="16.9924" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_1006" x1="12.158" y1="21.0402" x2="12.158" y2="19.7599" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_1006" x1="8.74159" y1="8.99232" x2="8.74159" y2="7.19996" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_1006" x1="11.7902" y1="6.09688" x2="11.7902" y2="3.95245" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_1006" x1="5.39101" y1="2.81654" x2="5.39101" y2="1.02418" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_1006" x1="19.3692" y1="2.49686" x2="19.3692" y2="0.000355937" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_1006" x1="17.8539" y1="8.52846" x2="17.8539" y2="6.7361" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint8_linear_193_1006" x1="1.84883" y1="8.27267" x2="1.84883" y2="6.12824" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint9_linear_193_1006" x1="10.8959" y1="13.5524" x2="10.8959" y2="11.76" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint10_linear_193_1006" x1="20.6773" y1="11.9366" x2="20.6773" y2="10.4963" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/507.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/507.svg
deleted file mode 100644
index be0825ef..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/507.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<svg width="34" height="25" viewBox="0 0 34 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814265">
-<path id="XMLID_22_" d="M5.78617 20.2876C6.27968 20.2876 6.67977 19.8865 6.67977 19.3916C6.67977 18.8968 6.27968 18.4956 5.78617 18.4956C5.29265 18.4956 4.89258 18.8968 4.89258 19.3916C4.89258 19.8865 5.29265 20.2876 5.78617 20.2876Z" fill="url(#paint0_linear_193_1030)"/>
-<path id="XMLID_21_" d="M1.76468 12.3198C2.2582 12.3198 2.65827 11.9187 2.65827 11.4238C2.65827 10.929 2.2582 10.5278 1.76468 10.5278C1.27116 10.5278 0.871094 10.929 0.871094 11.4238C0.871094 11.9187 1.27116 12.3198 1.76468 12.3198Z" fill="url(#paint1_linear_193_1030)"/>
-<path id="XMLID_20_" d="M32.115 15.3759C32.7055 15.3759 33.1841 14.896 33.1841 14.3039C33.1841 13.7119 32.7055 13.2319 32.115 13.2319C31.5246 13.2319 31.0459 13.7119 31.0459 14.3039C31.0459 14.896 31.5246 15.3759 32.115 15.3759Z" fill="url(#paint2_linear_193_1030)"/>
-<g id="XMLID_14_">
-<path id="XMLID_19_" fill-rule="evenodd" clip-rule="evenodd" d="M31.0456 5.28C31.0456 2.368 25.0777 0 17.7215 0C10.3654 0 4.39746 2.368 4.39746 5.28C4.39746 6.864 6.15274 8.272 8.91329 9.232C8.88138 9.376 8.86542 9.52 8.86542 9.664C8.86542 10.448 9.32817 11.168 10.126 11.808C8.45054 12.368 7.39738 13.168 7.39738 14.064C7.39738 15.088 8.78563 16 10.9398 16.56C10.8281 16.752 10.7643 16.96 10.7643 17.168C10.7643 17.888 11.5143 18.544 12.743 19.056C11.1792 19.568 10.142 20.416 10.142 21.392C10.142 22.944 12.8068 24.208 16.1099 24.208C19.413 24.208 22.0778 22.944 22.0778 21.392C22.0778 20.864 21.7587 20.352 21.2161 19.936C24.5352 19.584 26.9447 18.48 26.9447 17.184C26.9447 16.352 25.9553 15.6 24.3596 15.072C24.6469 14.768 24.8224 14.432 24.8224 14.08C24.8224 13.808 24.7267 13.552 24.5511 13.296C27.1521 12.496 28.8595 11.184 28.8595 9.68C28.8595 9.248 28.7159 8.816 28.4446 8.416C30.0722 7.536 31.0456 6.464 31.0456 5.28Z" fill="url(#paint3_linear_193_1030)"/>
-<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M28.1093 3.16797C28.588 3.72797 28.8592 4.33597 28.8592 4.95997C28.8592 7.79197 23.5296 10.08 16.9394 10.08C13.5405 10.08 10.4768 9.47197 8.30664 8.47997C10.4608 9.71197 14.0192 10.512 18.0404 10.512C24.6147 10.512 29.9603 8.36797 29.9603 5.72797C29.9603 4.78397 29.2901 3.90397 28.1093 3.16797Z" fill="url(#paint4_linear_193_1030)"/>
-<path id="XMLID_17_" opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M10.9398 3.87183C10.7005 4.12783 10.5568 4.41583 10.5568 4.71983C10.509 6.07983 13.0621 7.27983 16.2375 7.37583C17.8811 7.42383 19.3651 7.16783 20.4342 6.73583C19.3811 7.29583 17.6417 7.63183 15.695 7.56783C12.5196 7.47183 9.96643 6.35183 9.99834 5.07183C10.0303 4.62383 10.3654 4.20783 10.9398 3.87183Z" fill="url(#paint5_linear_193_1030)"/>
-<path id="XMLID_16_" fill-rule="evenodd" clip-rule="evenodd" d="M11.1788 13.4241C10.9234 13.7921 10.7958 14.1921 10.8277 14.5761C11.0032 16.3201 14.434 17.3761 18.4711 16.9601C20.5615 16.7361 22.3965 16.1761 23.6731 15.4241C22.4284 16.3201 20.2902 17.0401 17.8328 17.2961C13.7957 17.7281 10.3809 16.7521 10.2054 15.1201C10.1416 14.5441 10.5086 13.9681 11.1788 13.4241Z" fill="url(#paint6_linear_193_1030)"/>
-<path id="XMLID_15_" fill-rule="evenodd" clip-rule="evenodd" d="M20.9773 20.1763C21.2006 20.4643 21.3123 20.7683 21.2964 21.0723C21.2166 22.4483 18.5518 23.3923 15.3604 23.2003C13.7168 23.1043 12.2488 22.7043 11.2275 22.1763C12.2328 22.8323 13.9402 23.3283 15.887 23.4563C19.0784 23.6483 21.7272 22.7683 21.807 21.4883C21.8389 21.0083 21.5357 20.5603 20.9773 20.1763Z" fill="url(#paint7_linear_193_1030)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_1030" x1="5.78652" y1="20.2882" x2="5.78652" y2="18.4959" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_1030" x1="1.76503" y1="12.3204" x2="1.76503" y2="10.5281" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_1030" x1="32.1154" y1="15.3767" x2="32.1154" y2="13.2322" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_1030" x1="17.7267" y1="24.2163" x2="17.7267" y2="0.00345213" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_1030" x1="19.1377" y1="10.5145" x2="19.1377" y2="3.16902" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_1030" x1="15.2182" y1="7.57687" x2="15.2182" y2="3.87235" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint6_linear_193_1030" x1="16.9383" y1="17.3997" x2="16.9383" y2="13.4246" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint7_linear_193_1030" x1="16.5205" y1="23.4837" x2="16.5205" y2="20.1767" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/508.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/508.svg
deleted file mode 100644
index ec095a41..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/508.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="21" height="22" viewBox="0 0 21 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path id="XMLID_9_" fill-rule="evenodd" clip-rule="evenodd" d="M20.1952 11.04C20.1952 7.936 18.424 5.2 15.7751 3.696C15.2964 3.376 14.7858 3.088 14.2592 2.848C14.5624 2.816 14.8656 2.8 15.1688 2.8C16.5411 2.8 17.8336 3.088 18.9985 3.6C17.0677 1.408 14.1316 0 10.8444 0C5.02014 0 0.296875 4.4 0.296875 9.84C0.296875 9.936 0.296881 10.048 0.312838 10.144C0.312838 10.256 0.296875 10.384 0.296875 10.496C0.296875 13.6 2.06811 16.336 4.71697 17.84C5.19568 18.16 5.7063 18.448 6.23288 18.688C5.9297 18.72 5.62651 18.736 5.32332 18.736C3.95102 18.736 2.65851 18.448 1.49365 17.936C3.42444 20.128 6.36052 21.536 9.64766 21.536C15.472 21.536 20.1952 17.136 20.1952 11.696C20.1952 11.6 20.1952 11.488 20.1793 11.392C20.1952 11.264 20.1952 11.152 20.1952 11.04ZM10.7806 14.016C8.99344 14.016 7.54135 12.56 7.54135 10.768C7.54135 8.976 8.99344 7.52 10.7806 7.52C12.5678 7.52 14.0199 8.976 14.0199 10.768C14.0199 12.544 12.5678 14.016 10.7806 14.016Z" fill="url(#paint0_linear_193_1070)"/>
-<defs>
-<linearGradient id="paint0_linear_193_1070" x1="10.2499" y1="21.5434" x2="10.2499" y2="0.0030711" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/509.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/509.svg
deleted file mode 100644
index 45337c0d..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/509.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<svg width="33" height="29" viewBox="0 0 33 29" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814277">
-<path id="XMLID_13_" fill-rule="evenodd" clip-rule="evenodd" d="M20.2275 28.3679H11.2916C10.9405 28.3679 10.6533 28.0799 10.6533 27.7279C10.6533 27.3759 10.9405 27.0879 11.2916 27.0879H20.2275C20.5786 27.0879 20.8658 27.3759 20.8658 27.7279C20.8658 28.0799 20.5786 28.3679 20.2275 28.3679Z" fill="url(#paint0_linear_193_988)"/>
-<g id="Group 1142814260">
-<g id="XMLID_9_">
-<path id="XMLID_12_" fill-rule="evenodd" clip-rule="evenodd" d="M24.0656 5.904C23.5071 5.904 22.9805 5.952 22.4539 6.048C21.5284 2.56 18.5285 0 14.9701 0C11.2202 0 8.09265 2.832 7.34267 6.608C3.44917 6.784 0.353516 10.208 0.353516 14.4C0.353516 18.72 3.6247 22.208 7.66181 22.208H24.0656C28.9165 22.208 32.8419 18.56 32.8419 14.048C32.8419 9.536 28.9165 5.904 24.0656 5.904Z" fill="url(#paint1_linear_193_988)"/>
-<path id="XMLID_11_" fill-rule="evenodd" clip-rule="evenodd" d="M8.34822 8.36834C9.00246 5.00834 11.7949 2.48033 15.1459 2.48033C18.3213 2.48033 20.9861 4.75234 21.8159 7.85634C22.2787 7.77634 22.7574 7.72834 23.252 7.72834C27.2892 7.72834 30.6082 10.5763 31.0231 14.2243C31.055 13.9683 31.071 13.7123 31.071 13.4563C31.071 9.44034 27.5764 6.19233 23.252 6.19233C22.7574 6.19233 22.2787 6.24033 21.8159 6.32033C20.9861 3.21633 18.3213 0.944336 15.1459 0.944336C11.8109 0.944336 9.01842 3.47233 8.34822 6.83233C4.88556 6.99233 2.125 10.0323 2.125 13.7763C2.125 14.0323 2.14096 14.2883 2.17287 14.5443C2.52392 11.1683 5.12491 8.52834 8.34822 8.36834Z" fill="url(#paint2_linear_193_988)"/>
-<path id="XMLID_10_" fill-rule="evenodd" clip-rule="evenodd" d="M9.16142 8.35205C8.92207 8.35205 8.68271 8.36805 8.44336 8.40005C11.5709 8.80005 13.9964 11.6481 13.9964 15.1041C13.9964 16.7201 13.4539 18.2081 12.5762 19.3761C13.9804 18.2561 14.89 16.4801 14.89 14.4801C14.89 11.0881 12.3209 8.35205 9.16142 8.35205Z" fill="url(#paint3_linear_193_988)"/>
-</g>
-<path id="XMLID_8_" fill-rule="evenodd" clip-rule="evenodd" d="M25.342 25.4719H6.30527C5.95422 25.4719 5.66699 25.1839 5.66699 24.8319C5.66699 24.4799 5.95422 24.1919 6.30527 24.1919H25.3579C25.709 24.1919 25.9962 24.4799 25.9962 24.8319C25.9802 25.1839 25.693 25.4719 25.342 25.4719Z" fill="url(#paint4_linear_193_988)"/>
-</g>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_988" x1="15.7615" y1="28.3683" x2="15.7615" y2="27.0881" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_988" x1="16.604" y1="22.2156" x2="16.604" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_988" x1="16.6004" y1="0.95768" x2="16.6004" y2="14.5526" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_988" x1="11.666" y1="8.34802" x2="11.666" y2="19.3684" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_988" x1="15.8355" y1="25.4723" x2="15.8355" y2="24.1921" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/514.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/514.svg
deleted file mode 100644
index df9b640f..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/514.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<svg width="33" height="29" viewBox="0 0 33 29" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814276">
-<g id="XMLID_16_">
-<path id="XMLID_19_" fill-rule="evenodd" clip-rule="evenodd" d="M23.7179 5.904C23.1594 5.904 22.6329 5.952 22.1063 6.048C21.1808 2.56 18.1809 0 14.6225 0C10.8726 0 7.745 2.832 6.99502 6.608C3.10152 6.784 0.00585938 10.208 0.00585938 14.4C0.00585938 18.72 3.27705 22.208 7.31416 22.208H23.7179C28.5689 22.208 32.4943 18.56 32.4943 14.048C32.4943 9.536 28.5689 5.904 23.7179 5.904Z" fill="url(#paint0_linear_193_980)"/>
-<path id="XMLID_18_" fill-rule="evenodd" clip-rule="evenodd" d="M8.00057 8.36834C8.6548 5.00834 11.4473 2.48034 14.7982 2.48034C17.9737 2.48034 20.6385 4.75234 21.4683 7.85634C21.931 7.77634 22.4097 7.72834 22.9044 7.72834C26.9415 7.72834 30.2606 10.5763 30.6754 14.2243C30.7073 13.9683 30.7233 13.7123 30.7233 13.4563C30.7233 9.44034 27.2287 6.19234 22.9044 6.19234C22.4097 6.19234 21.931 6.24034 21.4683 6.32034C20.6385 3.21634 17.9737 0.944336 14.7982 0.944336C11.4632 0.944336 8.67076 3.47234 8.00057 6.83234C4.5379 6.99234 1.77734 10.0323 1.77734 13.7763C1.77734 14.0323 1.7933 14.2883 1.82521 14.5443C2.17627 11.1683 4.77726 8.51234 8.00057 8.36834Z" fill="url(#paint1_linear_193_980)"/>
-<path id="XMLID_17_" fill-rule="evenodd" clip-rule="evenodd" d="M8.81377 8.33594C8.57441 8.33594 8.33506 8.35194 8.0957 8.38394C11.2233 8.78394 13.6487 11.6319 13.6487 15.0879C13.6487 16.7039 13.1062 18.1919 12.2286 19.3599C13.6328 18.2399 14.5423 16.4639 14.5423 14.4639C14.5423 11.0879 11.9732 8.33594 8.81377 8.33594Z" fill="url(#paint2_linear_193_980)"/>
-</g>
-<path id="XMLID_15_" fill-rule="evenodd" clip-rule="evenodd" d="M14.1113 25.4719H5.17539C4.82434 25.4719 4.53711 25.1839 4.53711 24.8319C4.53711 24.4799 4.82434 24.1919 5.17539 24.1919H14.1113C14.4624 24.1919 14.7496 24.4799 14.7496 24.8319C14.7496 25.1839 14.4624 25.4719 14.1113 25.4719Z" fill="url(#paint3_linear_193_980)"/>
-<path id="XMLID_14_" fill-rule="evenodd" clip-rule="evenodd" d="M26.622 25.4719H17.6861C17.3351 25.4719 17.0479 25.1839 17.0479 24.8319C17.0479 24.4799 17.3351 24.1919 17.6861 24.1919H26.622C26.9731 24.1919 27.2603 24.4799 27.2603 24.8319C27.2603 25.1839 26.9731 25.4719 26.622 25.4719Z" fill="url(#paint4_linear_193_980)"/>
-<path id="XMLID_13_" fill-rule="evenodd" clip-rule="evenodd" d="M20.2392 28.2395H11.3033C10.9523 28.2395 10.665 27.9515 10.665 27.5995C10.665 27.2475 10.9523 26.9595 11.3033 26.9595H20.2392C20.5903 26.9595 20.8775 27.2475 20.8775 27.5995C20.8775 27.9515 20.5903 28.2395 20.2392 28.2395Z" fill="url(#paint5_linear_193_980)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_980" x1="16.2564" y1="22.2156" x2="16.2564" y2="0.00316693" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_980" x1="16.2511" y1="0.953696" x2="16.2511" y2="14.5486" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_193_980" x1="11.3167" y1="8.34392" x2="11.3167" y2="19.3643" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.06"/>
-<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_193_980" x1="9.64532" y1="25.4723" x2="9.64532" y2="24.1921" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint4_linear_193_980" x1="22.1561" y1="25.4723" x2="22.1561" y2="24.1921" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-<linearGradient id="paint5_linear_193_980" x1="15.7733" y1="28.2399" x2="15.7733" y2="26.9597" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/304.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/6.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/304.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/6.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/306.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/7.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/306.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/7.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/33.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/8.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/33.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/8.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/307.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/9.svg
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/images/weather/307.svg
rename to ruoyi-ui/src/views/JiHeExpressway/images/weather/9.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/900.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/900.svg
deleted file mode 100644
index fdbb76eb..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/weather/900.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg width="12" height="21" viewBox="0 0 12 21" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814267">
-<path id="XMLID_6_" d="M5.8908 0.64C7.16736 0.64 8.36414 1.648 8.36414 2.88V11.12C9.75239 11.888 10.5183 13.344 10.5183 14.992C10.5183 17.472 8.44392 19.472 5.8908 19.472C3.33769 19.472 1.26328 17.472 1.26328 14.992C1.26328 13.328 2.02921 11.888 3.41747 11.12V2.88C3.41747 1.648 4.61425 0.64 5.8908 0.64ZM5.8908 0C4.19936 0 2.77919 1.312 2.77919 2.88V10.768C1.42285 11.68 0.625 13.232 0.625 15.008C0.625 17.824 2.98663 20.128 5.8908 20.128C8.79497 20.128 11.1566 17.824 11.1566 15.008C11.1566 13.232 10.3588 11.68 9.00242 10.768V2.88C9.00242 1.328 7.58224 0 5.8908 0Z" fill="url(#paint0_linear_193_1071)"/>
-<path id="XMLID_1_" fill-rule="evenodd" clip-rule="evenodd" d="M7.85393 11.4245V3.48851C7.85393 2.40051 6.97631 1.52051 5.89123 1.52051C4.80616 1.52051 3.92852 2.40051 3.92852 3.48851V11.4245C2.76366 12.1125 1.96582 13.3765 1.96582 14.8325C1.96582 17.0085 3.72108 18.7685 5.89123 18.7685C8.06138 18.7685 9.81665 17.0085 9.81665 14.8325C9.81665 13.3765 9.03475 12.1125 7.85393 11.4245ZM5.36465 8.84851H4.40723C4.2317 8.84851 4.08809 8.70451 4.08809 8.52851C4.08809 8.35251 4.2317 8.20851 4.40723 8.20851H5.36465C5.54017 8.20851 5.68378 8.35251 5.68378 8.52851C5.68378 8.70451 5.54017 8.84851 5.36465 8.84851ZM5.36465 7.79251H4.40723C4.2317 7.79251 4.08809 7.64851 4.08809 7.47251C4.08809 7.29651 4.2317 7.15251 4.40723 7.15251H5.36465C5.54017 7.15251 5.68378 7.29651 5.68378 7.47251C5.68378 7.64851 5.54017 7.79251 5.36465 7.79251ZM5.36465 6.73651H4.40723C4.2317 6.73651 4.08809 6.59251 4.08809 6.41651C4.08809 6.24051 4.2317 6.09651 4.40723 6.09651H5.36465C5.54017 6.09651 5.68378 6.24051 5.68378 6.41651C5.68378 6.59251 5.54017 6.73651 5.36465 6.73651Z" fill="url(#paint1_linear_193_1071)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_193_1071" x1="0.631319" y1="10.0635" x2="11.1629" y2="10.0635" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5ECAFF"/>
-<stop offset="1" stop-color="#B6D1FF"/>
-</linearGradient>
-<linearGradient id="paint1_linear_193_1071" x1="5.89276" y1="18.7744" x2="5.89276" y2="1.52297" gradientUnits="userSpaceOnUse">
-<stop stop-color="#3DE8FF"/>
-<stop offset="1" stop-color="#00A8C4"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/index.vue
index 6aa9ce68..5b999c7c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/index.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="pageBox">
-    <HeaderMenu class="header" :style="headerStyle" />
-    <!-- @onChange="handleChange" -->
-    <Adaptation class="content" :headerHeight="headerHeight">
-      <Transition name="fade">
-        <router-view v-if="isShowContent" />
-      </Transition>
-    </Adaptation>
+    <div class="header" :style="{ background: '#1f2632',zIndex: 1, height: headerHeight + 'px' }">
+      <HeaderMenu :isRecent="headerHeight === 100" />
+    </div>
+    <div class="content">
+      <router-view :key="$route.fullPath" v-if="isShowContent" />
+    </div>
   </div>
 </template>
 
@@ -25,64 +24,45 @@ export default {
   },
   data() {
     return {
-      
-      isShowContent:false,
-      headerHeight:100,
-      header: {
-        scale: 1,
-        originW: 1920,
-        originH: 100 //打开最近标签页时高100，不开启时高68
-      },
+
+      isShowContent: false,
+      headerHeight: 100,
     };
   },
-  watch:{
-    isRecentOpen:{
-      handler(newV){
-        if(newV){
-          this.header.originH = 100;
-        }else{
-          this.header.originH = 68;
+  watch: {
+    isRecentOpen: {
+      handler(newV) {
+        if (newV) {
+          this.headerHeight = 100;
+        } else {
+          this.headerHeight = 68;
         }
-        this.calcHeaderScale();
       },
-      immediate:true
+      immediate: true
     }
   },
-  computed:{
-    ...mapGetters("menu",["isRecentOpen"]),
-    headerStyle(){
+  computed: {
+    ...mapGetters("menu", ["isRecentOpen"]),
+    headerStyle() {
       return {
-        width : `${this.header.originW}px`,
-        height : `${this.header.originH}px`,
-        transform : `scale(${this.header.scale}, ${this.header.scale})`
+        width: `${this.header.originW}px`,
+        height: `${this.header.originH}px`,
+        transform: `scale(${this.header.scale}, ${this.header.scale})`
       }
     }
   },
-  mounted(){
+  mounted() {
     getBoardBaseData().then(res => {
       this.isShowContent = true;
-    });
-    window.addEventListener(
-      "resize",
-      _.debounce(this.calcHeaderScale.bind(this), 360)
-    );
-    this.calcHeaderScale();
+    });;
   },
   methods: {
-    
-    calcHeaderScale(){
-      let winW = window.innerWidth;
-      this.header.scale = winW / this.header.originW;
-      this.headerHeight = this.header.scale * this.header.originH;
-    },
-    // handleChange(activeMenu) {
-    //   this.$route.path != activeMenu.path && this.$router.push(activeMenu.path);
-    // }
+
   }
 };
 </script>
 
-<style lang="scss" scope src="./scss/reset.scss" />  
+<style lang="scss" scope src="./scss/reset.scss" />
 <style lang="scss" scope src="./scss/el-reset.scss" />
 <style scoped lang="scss">
 .pageBox {
@@ -104,33 +84,13 @@ export default {
     opacity: 0;
   }
 
-  .header {
-    position: fixed;
-    transform-origin: left top;
-    left: 0; top:0; z-index: 1000;
-    overflow: hidden;
-    transition: all ease-out 0.3s;
-  }
-
   .content {
-    // display: flex;
-    // flex-direction: row;
-    pointer-events: none;
-
-    ::v-deep {
-      >div {
-        // top: -6px;
-        z-index: -1;
-        pointer-events: auto;
-        // height: calc(100% + 6px);
-      }
-    }
+    flex: 1;
+    width: 100%;
+  }
 
-    &>* {
-      flex: 1;
-      width: 100%;
-      position: absolute;
-    }
+  .header {
+    transition: all ease-out 0.3s;
   }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
index a750c92d..564a38ab 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
@@ -105,7 +105,7 @@ export default {
                 // this.saveLog(content);
                 this.$message({
                   type: "success",
-                  message: "发布成功!",
+                  message: "发布成功",
                 });
                 !isMultiControl && this.____getDeviceInfo();
               })
@@ -152,7 +152,7 @@ export default {
         if (res.code == 200) {
           console.log("情报板日志已保存:::", data);
         } else {
-          console.log("情报板日志保存失败！");
+          console.log("情报板日志保存失败");
         }
       });
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/mixins/broadcast.js b/ruoyi-ui/src/views/JiHeExpressway/mixins/broadcast.js
index c3ac3d18..9a2b8c05 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/mixins/broadcast.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/mixins/broadcast.js
@@ -65,10 +65,39 @@ export default {
             publishToBoard(data)
               .then((res) => {
                 // this.saveLog(content);
-                this.$message({
-                  type: "success",
-                  message: "发布成功!",
-                });
+                const cbMsg = {
+                  0: '成功',
+                  1: '非法控制台标识',
+                  2: '鉴权失败',
+                  3: '非法分区标识',
+                  4: '非法终端号码',
+                  5: '非法分区名称',
+                  6: '非法终端类型',
+                  7: '非法控制话机号码',
+                  8: '控制话机离线',
+                  9: '控制话机忙',
+                  10: '非法被叫号码',
+                  11: '非法音乐标识',
+                  12: '非法音乐资源链接',
+                  13: '非法广播任务标识',
+                  14: '非法文字广播内容',
+                  15: '非法广播重复次数',
+                  16: '非法广播文件列表',
+                  17: '非法广播终端列表',
+                  18: '非法呼叫标识'
+                }
+                if(res.retCode === 0){
+                  this.$message({
+                    type: "success",
+                    message: "发布成功",
+                  });
+                } else {
+                  this.$message({
+                    type: "error",
+                    message: "发布失败，"+cbMsg[res.retCode],
+                  });
+                }
+                
                 // !isMultiControl && this.____getDeviceInfo();
               })
               .catch((err) => {})
@@ -114,7 +143,7 @@ export default {
         if (res.code == 200) {
           console.log("情报板日志已保存:::", data);
         } else {
-          console.log("情报板日志保存失败！");
+          console.log("情报板日志保存失败");
         }
       });
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue
index 5a217264..f0438d3f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/AMapContainer/index.vue
@@ -14,7 +14,7 @@ const lcz = require("./data/lcz.json");
 
 export default {
   name: "AMapContainer",
-  inject: ["adpScale"],
+  // inject: ["adpScale"],
   data() {
     return {
       size: null,
@@ -24,7 +24,7 @@ export default {
   computed: {
     getReverseStyle() {
       return {
-        transform: `scale(${1 / this.adpScale.scaleX}, ${1 / this.adpScale.scaleY})`,
+        // transform: `scale(${1 / this.adpScale.scaleX}, ${1 / this.adpScale.scaleY})`,
       };
     },
   },
@@ -227,7 +227,9 @@ export default {
       } else {
         this.trafficLayer.hide();
       }
-      
+    },
+    setMapZoomAndCenter(zoom,lnglat){
+      this.aMapIns.setZoomAndCenter(zoom, lnglat);
     }
   },
   // unmounted() {
@@ -241,14 +243,12 @@ export default {
 <style lang='scss' scoped>
 .AMapContainer {
   position: absolute;
-  z-index: -1;
+  z-index: 0;
   width: 100%;
   height: 100%;
   transform-origin: left top;
   background-color: #103253 !important;
   transition: all 0.15s linear;
-  left: 0;
-  top: 0;
 
   ::v-deep {
     .el-loading-mask {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue
index ff5eaf28..5d67f79a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/BMapContainer/index.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="BMapContainer">
-    <gisMap2d ref="gisMap2d" :mapBoxHeight = "mapBoxHeight" @clickPointEvent="clickPointEvent"
-></gisMap2d>
+    <gisMap2d ref="gisMap2d"
+    :mapZoom = "mapZoom"
+    :mapCenter="mapCenter"
+
+    radarSliderBottom="33%"
+      radarSliderRight="14%"
+    :mapBoxHeight="height" @clickPointEvent="clickPointEvent" widgetBoxDisplay="none"></gisMap2d>
   </div>
 </template>
 
@@ -10,29 +15,53 @@ import Vue from "vue";
 import { gisMap2d } from 'gis-map-universal'
 export default {
   name: "BMapContainer",
-  inject: ["adpScale"],
   components: {
     gisMap2d,
   },
   data() {
     return {
-      mapBoxHeight: '100vh'
+      mapBoxHeight: '100vh',
+      mapZoom: '7.5',   // 默认值'7.5'   String类型
+         mapCenter: [116.329514, 35.505288], //默认值[118.75, 36.46] Array类型
+
     };
   },
   computed: {
   },
+  props: {
+    height: {
+      default: '100vh',
+      type: String
+    },
+  },
   async mounted() {
     this.$refs.gisMap2d.zoomInBylatlon(
-      [116.629514, 35.805288]
+      [116.329514, 35.505288],7.5
     );
-    Vue.prototype.map2d = this.$refs.gisMap2d;
+    // Vue.prototype.map2d = this.$refs.gisMap2d;
+    Vue.prototype.mapIns = this.$refs.gisMap2d;
     this.$emit("update:isGisCompleted", true);
   },
   methods: {
+    getMapInstance() {
+      return this.$refs.gisMap2d;
+    },
     clickPointEvent(obj) {
-      console.log(obj); //此处可以拿到点位的所有字段信息
+      if(obj && obj.otherInfo){
+        obj.otherInfo.config.markerClick?.(obj.otherInfo.extData, obj.otherInfo.config?.item);
+      }
+      // console.log(obj); //此处可以拿到点位的所有字段信息
     },
-
+    setMapZoomAndCenter(zoom,lnglat){
+      this.$refs.gisMap2d.zoomInBylatlon(lnglat,zoom)
+    },
+    showRoadConditions(visible){
+      if(visible){
+        // TODO 展示云图
+      } else {
+        // TODO 隐藏云图
+      }
+    }
   },
   // unmounted() {
   beforeDestroy() {
@@ -44,14 +73,12 @@ export default {
 <style lang='scss' scoped>
 .BMapContainer {
   position: absolute;
-  z-index: -1;
+  z-index: 0;
   width: 100%;
   height: 100%;
   transform-origin: left top;
   background-color: #103253 !important;
   transition: all 0.15s linear;
-  left: 0;
-  top: 0;
 
   ::v-deep {
     .el-loading-mask {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue
index 6fc4f9b5..0dd1b837 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue
@@ -1,35 +1,56 @@
 <template>
   <Bg2 class='ConditionStatistics'>
     <div class="statistics-header">
-      <div class="title keep-ratio" origin="left"></div>
-      <img class="icon-right keep-ratio" origin="right" src="@screen/images/icon/icon_right.png" />
+      <div class="title " ></div>
+      <!-- <img class="icon-right " src="@screen/images/icon/icon_right.png" /> -->
     </div>
-    <div class="content-r-t-box">
-      <div class="box-title keep-ratio" origin="left"><span>交通事件</span></div>
-      <div class="box-content">
+    <div class="content-box">
+      <div class="box-title " style="margin-top: 15px;"><span>天气预报</span></div>
+      <div class="box-content0">
+        <div class="box-content0-t">
+          <div>当前天气</div><div class="sline"></div><img :src="require('./location.svg')" /><div>济南市</div>
+        </div>
+        <div class="box-content0-m">
+          
+          <img :src="require(`@screen/images/weather/${cityWeather.icon}.svg`)" class="img" />
+          <div class="temp">{{ cityWeather.temp }}</div>
+          <div class="wind">
+            <div>{{ cityWeather.text }}</div>
+            <div>℃</div>
+          </div>
+          <div class="tags">
+            <div class="tagstitle"><img :src="require('./triangle.svg')" /><div class="tagslabel">能见度</div></div>
+            <div class="tagsValue">{{ cityWeather.vis }}㎞</div>
+          </div>
+          <div class="tags">
+            <div class="tagstitle"><img :src="require('./triangle.svg')" /><div class="tagslabel">降雨量</div></div>
+            <div class="tagsValue">{{ cityWeather.precip }}mm</div>
+          </div>
+        </div>
+      </div>
+      <div class="box-title "><span>交通事件</span></div>
+      <div class="box-content1">
         <div class="box-content-l">
-          <div class="event-item keep-ratio" origin="left">今日：<span>{{ earlyWarningEvents.day }}</span> 起</div>
-          <div class="event-item keep-ratio" origin="left">本月：<span>{{ earlyWarningEvents.month }}</span> 起</div>
+          <div class="event-item " origin="left">今日：<span>{{ earlyWarningEvents.day }}</span> 起</div>
+          <div class="event-item " origin="left">本月：<span>{{ earlyWarningEvents.month }}</span> 起</div>
         </div>
-        <div class="box-content-c keep-ratio">
+        <div class="box-content-c ">
           <span class="num">{{ earlyWarningEvents.processing }}</span>
           <span class="text">处理中</span>
         </div>
         <div class="box-content-r">
-          <div class="event-item keep-ratio" origin="right">本周：<span>{{ earlyWarningEvents.week }}</span> 起</div>
-          <div class="event-item keep-ratio" origin="right">本年：<span>{{ earlyWarningEvents.year }}</span> 起</div>
+          <div class="event-item " origin="right">本周：<span>{{ earlyWarningEvents.week }}</span> 起</div>
+          <div class="event-item " origin="right">本年：<span>{{ earlyWarningEvents.year }}</span> 起</div>
         </div>
       </div>
-    </div>
-    <div class="content-r-c-box">
       <div class="box-title"><span>在途车辆统计</span></div>
-      <div class="box-content">
+      <div class="box-content2">
         <div class="count">
-          <div class="charts keep-ratio" ref="carStatisticsEchartBox"></div>
+          <div class="charts " ref="carStatisticsEchartBox"></div>
           <div class="count-item cars">
             <span class="icon"></span>
             <span class="label">数量：</span>
-            <span class="value">1006</span>
+            <span class="value">{{p0}}</span>
             <span class="unit">辆</span>
           </div>
         </div>
@@ -38,7 +59,7 @@
           <div class="count-item focus">
             <span class="icon"></span>
             <span class="label">数量：</span>
-            <span class="value">1006</span>
+            <span class="value">{{p1}}</span>
             <span class="unit">辆</span>
           </div>
         </div>
@@ -47,15 +68,13 @@
           <div class="count-item other">
             <span class="icon"></span>
             <span class="label">数量：</span>
-            <span class="value">1006</span>
+            <span class="value">{{p2}}</span>
             <span class="unit">辆</span>
           </div>
         </div>
       </div>
-    </div>
-    <div class="content-r-b-box">
-      <div class="box-title"><span>今日交通异常</span></div>
-      <div class="box-content">
+      <!-- <div class="box-title"><span>今日交通异常</span></div>
+      <div class="box-content3">
         <div class="processed">
           <span class="text">处理中：</span>
           <div class="sections">
@@ -87,7 +106,7 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
   </Bg2>
 </template>
@@ -100,7 +119,11 @@ import focusStatistics from "./js/focusStatistics.js";
 import otherStatistics from "./js/otherStatistics.js";
 import Bg2 from "@screen/components/Decorations/bg-2.vue"
 import request from "@/utils/request";
+import {toDecimal} from '@screen/utils/common'
 
+import { getWeatherFormat }from '../../../perception/meteorologyCheck/data.js'
+import moment from "moment";
+import { forEach } from "lodash";
 export default {
   name: 'ConditionStatistics',
   components: {
@@ -114,77 +137,149 @@ export default {
         month: 0,
         week: 0,
         year: 0,
-      }
+      },
+      cityWeather:{
+        icon:'0',
+        temp:'-',
+        text:'-',
+        humidity:'-'
+      },
+      p0:0,
+      p1:0,
+      p2:0
     }
   },
-  created() {
-    // 预警事件
-    request({
-      url: `/business/trafficIncidents/getTrafficIncidentsNum`,
-      method: "get",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) return;
-
-        this.earlyWarningEvents = data;
+  methods:{
+    bind(){
+      this.bindTrafficIncident();
+      this.bindWeather();
+      this.bindCharts();
+    },
+    bindCharts(){
+      const today = moment().format('YYYY-MM-DD')
+      request({
+        url: '/business/traffic-statistics/history/realTimeTrafficFlow',
+        method: 'get',
+        params: {
+          startDate: today,
+          periodType: 4,
+          direction: 1
+        }
+      }).then(res1=>{
+        request({
+        url: '/business/traffic-statistics/history/realTimeTrafficFlow',
+        method: 'get',
+        params: {
+          startDate: today,
+          periodType: 4,
+          direction: 3
+          }
+        }).then(res3=>{
+          // totalPassengerFlow 客车 typeSpecialVehicleFlow//特种车 typeTruckFlow 其他
+          let total = 0, p0 = 0, p1=0,p2=0,_p0 = 0, _p1=0,_p2=0;
+          res1.data.forEach(x=>{
+            total+=(x.totalPassengerFlow+x.typeTruckFlow+x.typeSpecialVehicleFlow)  
+            p0 += x.totalPassengerFlow
+            p1 += x.typeSpecialVehicleFlow
+            p2 += x.typeTruckFlow
+          })
+          res3.data.forEach(x=>{
+
+            total+=(x.totalPassengerFlow+x.typeTruckFlow+x.typeSpecialVehicleFlow)  
+            p0 += x.totalPassengerFlow
+            p1 += x.typeSpecialVehicleFlow
+            p2 += x.typeTruckFlow
+          })
+          
+          if(total > 0){
+            _p0 = parseFloat((p0/total*100).toFixed(1))
+            _p1 = parseFloat((p1/total*100).toFixed(1))
+            _p2 = parseFloat((p2/total*100).toFixed(1))
+          }
+          
+          this.p0 = p0;
+          this.p1 = p1;
+          this.p2 = p2;
+          carStatistics.series[0].data[0].value = _p0;
+          carStatistics.series[2].data[0].value = _p0;
+          const myChart1 = echarts.init(this.$refs.carStatisticsEchartBox);
+          myChart1.setOption(carStatistics);
+
+          focusStatistics.series[0].data[0].value = _p1;
+          focusStatistics.series[2].data[0].value = _p1;
+          const myChart2 = echarts.init(this.$refs.focusStatisticsEchartBox);
+          myChart2.setOption(focusStatistics);
+
+          otherStatistics.series[0].data[0].value = _p2;
+          otherStatistics.series[2].data[0].value = _p2;
+          const myChart3 = echarts.init(this.$refs.otherStatisticsEchartBox);
+          myChart3.setOption(otherStatistics);
+
+        })
+      })
+    },
+    bindTrafficIncident(){
+      // 预警事件
+      request({
+            url: `/business/trafficIncidents/getTrafficIncidentsNum`,
+            method: "get",
+          })
+            .then(({ code, data }) => {
+              if (code != 200) return;
+
+              this.earlyWarningEvents = data;
+            })
+    },
+    bindWeather(){
+      request({url: '/weatherForecast/currentWeatherAndForecastInformation',
+        method: 'post',
+        data: {
+          "roadId":"G003537",
+          "stakeNum":'K60+000',
+          "forecastHour":"0",
+          "managerId":"YG10201"
+        }
+      }).then(res=>{
+        if (res.code != 200) return this.$message.error(res?.msg)
+        if(res.data.length > 0){
+          const data = res.data[0]
+          this.cityWeather = getWeatherFormat(data)
+        }
       })
+    }
+  },
+  created() {
+   
   },
   mounted() {
-    setTimeout(() => {
-      this.$nextTick(() => {
-        const myChart1 = echarts.init(this.$refs.carStatisticsEchartBox);
-        myChart1.setOption(carStatistics);
-
-        const myChart2 = echarts.init(this.$refs.focusStatisticsEchartBox);
-        myChart2.setOption(focusStatistics);
-
-        const myChart3 = echarts.init(this.$refs.otherStatisticsEchartBox);
-        myChart3.setOption(otherStatistics);
-      });
-    });
+    this.bind();
   }
 }
 </script>
 
 <style lang='scss' scoped>
 .ConditionStatistics {
-  position: relative;
-  // background: url("~@screen/images/bg/box_bg_003.png") no-repeat;
-  // background-size: 100% 100%;
-  height: 100%;
-
+  width:100%;
   ::v-deep {
     .BackgroundClip.bg {
-      padding-top: 51px;
       display: flex;
       flex-direction: column;
       justify-content: space-around;
     }
   }
-
-  // .icon-right {
-  //   position: absolute;
-  //   right: 23px;
-  //   top: 35px;
-  // }
-
   .statistics-header {
     width: 100%;
-    position: absolute;
-    top: 0;
     display: flex;
     align-items: center;
-    width: 100%;
     justify-content: space-between;
-
     .icon-right {
       margin-right: 24px;
       margin-top: 36px;
     }
 
     .title {
-      width: 240px;
-      height: 51px;
+      width: 220px;
+      height: 40px;
       margin-top: 10px;
       margin-left: 10px;
       display: flex;
@@ -208,10 +303,9 @@ export default {
   }
 
   .box-title {
-    width: 449px;
+    width: 100%;
     height: 26px;
-    margin-top: 24px;
-    margin-left: 7px;
+    margin: 7px;
     background: url("~@screen/images/title/title_bg_002.png") no-repeat;
 
     span {
@@ -224,16 +318,100 @@ export default {
     }
   }
 
-  .content-r-t-box {
+  .content-box {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+   
+  }
+  .box-content0{
+    background: linear-gradient(180deg,
+        #25394a00 0%,
+        #25394a00 20%,
+        #2AD9FD88 100%);
+        border: 1px solid;
+    border-image: linear-gradient(360deg,
+        rgba(55, 231, 255, 0.42),
+        rgba(55, 231, 255, 0.1),
+        rgba(55, 231, 255, 0)) 1 1;
+        border-top: 0px;
+        height: 80px;
+        width: 90%;
+        margin: 15px 5%;
+        padding: 0px 10px 10px 10px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      .box-content0-t{
+        font-size: 12px;
+        display: flex;
+        align-items: center;
+        width: 100%;
+        .sline{
+          width: 2px;
+          background-color: #2AD9FD;
+          height: 10px;
+          margin:0px 8px;
+        }
+        img{
+          width: 19px;
+          height: 14px;
+          margin-right: 4px;
+        }
+      }
+      .box-content0-m{
+        flex: 1;
+        width: 100%;
+        display: flex;
+        align-items: flex-end;
+        justify-content: center;
+        .img{
+          width: 40px;
+          height: 40px;
+          background-size: 100% 100%;
+        }
+        .temp{
+          font-size: 30px;
+          font-weight: bold;
+          margin: 0px 8px 0px 20px;
+        }
+        .wind{
+          display: flex;
+          flex-direction: column;
+          align-items: flex-start;
+          justify-content: flex-end;
+          font-size: 10px;
+          flex: 1;
+          height: 100%;
+          padding-bottom: 5px;
+        }
+        .tags{
+          margin-right: 30px;
+          height: 45px;
+          .tagstitle{
+            display: flex;
+            margin-bottom: 5px;
+          }
+          .tagslabel{
+            opacity: .5;
+            font-size: 14px;
+            margin-left: 8px;
+          }
+          .tagsValue{
+            padding-left: 18px;
+          }
+        }
+      }
 
-    .box-content {
+  }
+  .box-content1 {
       display: flex;
       justify-content: space-between;
-      margin-top: 22px;
-
+      
       .box-content-l {
         width: 163px;
-        height: 80px;
+        height: 100%;
         margin-top: 21px;
         margin-left: 22px;
         background: url("~@screen/images/bg/box_bg_left.png") no-repeat;
@@ -310,24 +488,18 @@ export default {
         }
       }
     }
-  }
-
-  .content-r-c-box {
-    .box-content {
+    .box-content2 {
       width: 85%;
       margin: 0 auto;
       display: flex;
       justify-content: space-between;
 
       .count {
-        margin-top: 20px;
-
         .charts {
           width: 120px;
           height: 120px;
           margin: auto;
         }
-
         .count-item {
           width: 118px;
           height: 26px;
@@ -339,13 +511,6 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
-
-          // border-image: linear-gradient(
-          //     90deg,
-          //     rgba(42, 217, 253, 1),
-          //     rgba(42, 217, 253, 0)
-          //   )
-          //   1 1;
           .icon {
             width: 6px;
             height: 6px;
@@ -411,17 +576,12 @@ export default {
         }
       }
     }
-  }
-
-  .content-r-b-box {
-    margin-top: 30px;
 
-    .box-content {
+    .box-content3{
       .processed {
         display: flex;
         justify-content: center;
         align-items: center;
-        margin-top: 20px;
 
         .text {
           font-size: 14px;
@@ -566,6 +726,5 @@ export default {
 
       }
     }
-  }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/carStatistics.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/carStatistics.js
index 3bd29572..8dd2cefd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/carStatistics.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/carStatistics.js
@@ -1,6 +1,6 @@
 var getmax = 100;
 //要改变的数据
-var getvalue = 58.34;
+var getvalue = 0;
 
 var carStatistics = {
   // backgroundColor: "#132A7F",
@@ -98,8 +98,7 @@ var carStatistics = {
       },
       detail: {
         formatter: function (params) {
-          // return '完成率\n'+getvalue + '%';
-          return `{cn|}\n{number|${getvalue + "%"}\n}{wcl|小客车}`;
+          return `{cn|}\n{number|${params + "%"}\n}{wcl|小客车}`;
         },
         rich: {
           fontFamily: "PangMenZhengDao-Regular",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/focusStatistics.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/focusStatistics.js
index 1fa75224..dc9abc30 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/focusStatistics.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/focusStatistics.js
@@ -98,8 +98,7 @@ var focusStatistics = {
       },
       detail: {
         formatter: function (params) {
-          // return '完成率\n'+getvalue + '%';
-          return `{cn|}\n{number|${getvalue + "%"}\n}{wcl|重点车辆}`;
+          return `{cn|}\n{number|${params + "%"}\n}{wcl|重点车辆}`;
         },
         rich: {
           fontFamily: "PangMenZhengDao-Regular",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/otherStatistics.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/otherStatistics.js
index da009764..7a1b4d6f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/otherStatistics.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/js/otherStatistics.js
@@ -98,8 +98,7 @@ var otherStatistics = {
       },
       detail: {
         formatter: function (params) {
-          // return '完成率\n'+getvalue + '%';
-          return `{cn|}\n{number|${getvalue + "%"}\n}{wcl|其他}`;
+          return `{cn|}\n{number|${params + "%"}\n}{wcl|其他}`;
         },
         rich: {
           fontFamily: "PangMenZhengDao-Regular",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/location.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/location.svg
new file mode 100644
index 00000000..1e716a28
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/location.svg
@@ -0,0 +1,11 @@
+<svg width="13" height="17" viewBox="0 0 13 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814771">
+<path id="Vector" d="M9.15615 11.5461L7.23148 13.5375C6.69876 14.0878 5.91257 14.0852 5.38414 13.5298C4.80309 12.9199 4.06093 12.1378 3.49813 11.5383C1.51761 11.8996 0 12.6312 0 13.4741C0 14.677 2.91278 16.1401 6.30566 16.1401C9.69854 16.1401 12.6113 14.677 12.6113 13.4741C12.6113 12.6376 11.1141 11.9099 9.15615 11.5461Z" fill="#FFC741"/>
+<path id="Vector_2" d="M10.649 6.00303C10.5416 3.2891 8.71574 1.08792 6.46349 0.992101C3.99106 0.887221 1.95898 3.27227 1.95898 6.22962C1.95898 8.55511 3.54426 10.4209 5.1478 12.143C5.81692 12.8617 6.82544 12.8655 7.50208 12.1573C9.24739 10.3277 10.7467 8.46706 10.649 6.00303ZM6.30561 9.32552C4.86747 9.32552 3.69785 7.91547 3.69785 6.18171C3.69785 4.44796 4.86747 3.03791 6.30561 3.03791C7.74374 3.03791 8.91337 4.44796 8.91337 6.18171C8.91337 7.91547 7.74374 9.32552 6.30561 9.32552Z" fill="#D2D2D2"/>
+<path id="Vector_3" d="M6.30575 4.01416C5.31441 4.01416 4.50781 4.98656 4.50781 6.18168C4.50781 7.37679 5.31441 8.3492 6.30575 8.3492C7.29708 8.3492 8.10368 7.37679 8.10368 6.18168C8.10368 4.98656 7.29708 4.01416 6.30575 4.01416Z" fill="#FEFEFE"/>
+<path id="Vector_4" d="M9.95846 11.7222C9.70284 11.6562 9.43433 11.5979 9.15723 11.5461L7.7728 12.9782C6.92968 13.8509 5.68272 13.8444 4.84497 12.9626C4.38636 12.4797 3.8966 11.963 3.49813 11.5383C1.51761 11.8996 0 12.6312 0 13.4741C0 14.2846 1.32643 15.2143 3.2307 15.7335C5.8782 15.6403 8.327 14.1383 9.95846 11.7222Z" fill="#FFB509"/>
+<path id="Vector_5" d="M10.0713 3.63334C9.3463 2.11712 8.01664 1.06832 6.48722 0.993218C4.00405 0.871506 1.95801 3.26303 1.95801 6.22944C1.95801 8.0875 2.9719 9.65293 4.19737 11.0863C5.11997 10.6331 5.98349 10.022 6.76002 9.27485C6.61288 9.30592 6.46144 9.32405 6.3057 9.32405C4.86757 9.32405 3.69795 7.914 3.69795 6.18024C3.69795 4.44649 4.86757 3.03643 6.3057 3.03643C7.74384 3.03643 8.91346 4.44649 8.91346 6.18024C8.91346 6.27735 8.90917 6.37187 8.90165 6.46639C9.39156 5.58703 9.78472 4.63473 10.0713 3.63334Z" fill="#E9E9E9"/>
+<path id="Vector_6" d="M6.06137 4.0376C5.33532 4.15672 4.74782 4.80024 4.56738 5.64058C5.10547 5.16667 5.60705 4.63062 6.06137 4.0376Z" fill="#E9E9E9"/>
+<path id="Vector_7" d="M3.69804 6.1817C3.69804 4.44795 4.86767 3.0379 6.3058 3.0379C6.44865 3.0379 6.58827 3.05214 6.72468 3.07933C7.07911 2.51091 7.39487 1.90105 7.6666 1.25624C7.28523 1.10293 6.8879 1.01489 6.48624 0.994683C4.00307 0.872971 1.95703 3.26449 1.95703 6.23091C1.95703 6.5831 1.99462 6.92363 2.06121 7.2564C2.63045 7.00391 3.17821 6.69057 3.69912 6.32284C3.69912 6.27623 3.69804 6.22961 3.69804 6.1817Z" fill="white"/>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/triangle.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/triangle.svg
new file mode 100644
index 00000000..8585fb7e
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/triangle.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="10" viewBox="0 0 8 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path id="Polygon 101" d="M6.81972 4.0582C7.40373 4.455 7.40373 5.31568 6.81972 5.71248L2.07107 8.93889C1.40714 9.38999 0.509079 8.91443 0.509079 8.11175L0.509079 1.65893C0.509079 0.856252 1.40714 0.38069 2.07107 0.83179L6.81972 4.0582Z" fill="#FFB509"/>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue
index ef8e87a9..75c5b07e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue
@@ -112,10 +112,10 @@ export default {
         .then((data) => {
           // console.log(data);
           if (data.retCode == "0") {
-            Message.success("广播设置成功!");
+            Message.success("广播控制成功");
             this.modelVisible = false;
           } else {
-            Message.error("广播设置失败!");
+            Message.error("广播设置失败");
           }
         })
         .finally(() => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
index 10e19ac0..de43c2bc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
@@ -4,8 +4,8 @@
       <div class="top-content">
         <Video v-if="!isMultiControl" class="item-video" :pileNum="pileNum" />
 
-        <label style="width: 99px;">发布内容: </label>
-        <ElInput type="textarea" v-model="releaseMessage" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
+        <label style="width: 98px;">发布内容: </label>
+        <ElInput type="textarea"  class="inputarea" v-model="releaseMessage" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
           showWordLimit placeholder="请输入发布内容" />
       </div>
 
@@ -120,7 +120,7 @@ export default {
           ]
         })
         .then((data) => {
-          multiResultShow(data.data, item => item.result.retCode == 0, "广播设置");
+          multiResultShow(data.data, item => item.result.retCode == '0', "广播控制");
         })
         .finally(() => {
           // this.submitting = false;
@@ -168,7 +168,13 @@ export default {
     }
   }
 }
-
+.inputarea{
+  width: 100%;
+  ::v-deep textarea{
+    border: 0px !important;
+    border-radius: 2px !important;
+  }
+}
 .footer {
   display: flex;
   align-items: center;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
index 81061944..8c751946 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
@@ -199,10 +199,10 @@ export default {
         .then((data) => {
           // console.log(data);
           if (data.code == "200") {
-            Message.success("广播设置成功!");
+            Message.success("广播控制成功");
             this.modelVisible = false;
           } else {
-            Message.error("广播设置失败!");
+            Message.error("广播设置失败");
           }
         })
         .finally(() => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
index 033773fa..0a76eed1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="obverseVisible" title="语音广播" width="655px">
-    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+    <Video class="video-stream" :camId="camId"  />
 
     <div class="Broadcast">
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
@@ -58,7 +58,7 @@ export default {
       releaseVisible: false,
       data: {
         deviceName: "LH24",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         stakeMark: "k094+079",
         direction: "1",
         organizationName: "山东高速济南发展公司",
@@ -98,10 +98,19 @@ export default {
           enum: "DeviceTypeEnum",
         },
       ],
+      camId:null
     };
   },
   async created() {
-    this.data = { ...this.dialogData, roadName: null };
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
+
+    this.data = { ...this.dialogData, roadName: '济菏高速' };
+
 
     getProduct(this.dialogData.productId).then((data) => {
       this.dialogData.brand = data.brand;
@@ -111,14 +120,8 @@ export default {
       this.dialogData.organizationName = data?.organizationName;
     });
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
-    console.log(
-      "%c [ roadInfo ]-103-「index.vue」",
-      "font-size:15px; background:#36347c; color:#7a78c0;",
-      roadInfo.roadName
-    );
-
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
     handleClickTabs() { },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
index 80c0ae0d..3daa9362 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
@@ -1,5 +1,6 @@
 <template>
-  <Dialog v-model="modelVisible" title="相机控制" noneMask width="600px">
+  <!-- margin-left: 450px;margin-top: 250px; -->
+  <Dialog v-model="modelVisible" title="相机控制" style="z-index: 2051;" top="50%" width="550px">
     <div class="CameraControlDialog">
       <div class="direction">
         <div class="control-container top" @click="controlClick(21)">
@@ -28,6 +29,34 @@
           <img src="../images/add.svg" @click="controlClick(item.add)" />
         </div>
       </div>
+      <div class="position">
+
+
+        <div class="ptitle">
+          预置位列表
+          <el-popover v-model="addVisible" placement="bottom" width="200" trigger="manual">
+            <div style="display: flex;">
+              <el-input placeholder="请输入名称" v-model="pName" style="flex:1"></el-input>
+              <ButtonGradient @click.native="addName">确认</ButtonGradient>
+            </div>
+            <div class="add" slot="reference" @click="addVisible= !addVisible">
+              新增 <i class="el-icon-plus"></i> 
+            </div>
+          </el-popover>
+        </div>
+        <div class="plist">
+          <div v-if="pList.length === 0" class="nodata">暂无数据</div>
+          <div v-for="(item,index) in pList" class="pItem">
+            <div>{{ item.presetName }}</div>
+            <el-tooltip class="item" effect="dark" content="转到预置位" placement="top">
+              <i class="el-icon-view" @click="onControl(item.presetId, 39)"></i>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="覆盖预置位" placement="top">
+            <i class="el-icon-setting" @click="onControl(item.presetId, 8)"></i>
+            </el-tooltip>
+          </div>
+        </div>
+      </div>
     </div>
   </Dialog>
 </template>
@@ -38,6 +67,8 @@ import { controlCamera } from "@screen/pages/Home/components/RoadAndEvents/utils
 import { throttle } from "lodash";
 import Switcher from "@screen/pages/service/PublishingChannelManagement/components/Switcher.vue";
 import Button from "@screen/components/Buttons/Button.vue";
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
+import request from '@/utils/request'
 
 //开 49 关 48
 export default {
@@ -45,6 +76,7 @@ export default {
   components: {
     Dialog,
     Button,
+    ButtonGradient
   },
   model: {
     prop: "visible",
@@ -57,12 +89,15 @@ export default {
   },
   data() {
     return {
+      pName: '',
+      pList: [],
+      addVisible: false,
       options: [
         {
           label: "变倍",
           key: "zoom",
-          add: "12",
-          sub: "11",
+          add: "11",
+          sub: "12",
         },
         {
           label: "光圈",
@@ -93,14 +128,37 @@ export default {
   computed: {
     modelVisible: {
       get() {
+        if(this.visible){
+          this.bindPosition();
+        }
         return this.visible;
+        
       },
       set(val) {
         this.$emit("update:value", val);
       },
     },
+  },
+  mounted() {
+    
   },
   methods: {
+    onControl(speed,type){
+      controlCamera(this.deviceId, type, false, speed);
+      this.$message.success(type===8?'保存成功':'指令已发送')
+    },
+    bindPosition(){
+      if(this.deviceId){
+        request({
+          url: `/video/presetList?camId=${this.deviceId}`,
+          method: 'get'
+        }).then(result=>{
+          if (result.code != 200) return this.$message.error(result?.msg);
+          this.pList = result.data;
+        })
+      }
+      
+    },
     controlClick: throttle(function (type) {
       if (this.dialogData.deviceState != "0")
         controlCamera(this.deviceId, type);
@@ -117,16 +175,28 @@ export default {
 
       if (!isContinue) return;
     },
+    addName() {
+      if(this.pName === ''){
+        this.$message.error('请输入预置位名称')
+        return
+      }
+      request({
+        url: `/video/addPreset?camId=${this.deviceId}&presetName=${this.pName}`,
+        method: 'get'
+      }).then(result=>{
+        if (result.code != 200) return this.$message.error(result?.msg);
+        this.bindPosition();
+        this.addVisible = false;
+      })
+    }
   },
 };
 </script>
 
 <style lang="scss" scoped>
 .CameraControlDialog {
-  width: 360px;
+  width: 100%;
   height: 210px;
-  display: flex;
-
   display: flex;
   align-items: center;
   justify-content: space-around;
@@ -156,17 +226,15 @@ export default {
     }
 
     .icon-horizontal {
-      clip-path: path(
-        "M53.807 19.0734C51.1049 21.3657 47.1722 21.2685 44.0948 19.512C35.7042 14.7227 25.2544 13.7636 15.6704 17.82C14.5092 18.3114 13.3921 18.8632 12.321 19.4703C9.23352 21.2201 5.29428 21.3087 2.59447 19.0054V19.0054C-0.433686 16.4219 -0.827317 11.8122 2.24787 9.28482C4.93936 7.07281 7.91063 5.2081 11.093 3.74265C16.4653 1.26882 22.3109 -0.00817108 28.2253 6.86646e-05C34.1398 0.0083065 39.9818 1.30157 45.3471 3.79036C48.527 5.26539 51.4944 7.13947 54.1807 9.36039C57.2464 11.8949 56.8402 16.5002 53.807 19.0734V19.0734Z"
-      );
+      clip-path: path("M53.807 19.0734C51.1049 21.3657 47.1722 21.2685 44.0948 19.512C35.7042 14.7227 25.2544 13.7636 15.6704 17.82C14.5092 18.3114 13.3921 18.8632 12.321 19.4703C9.23352 21.2201 5.29428 21.3087 2.59447 19.0054V19.0054C-0.433686 16.4219 -0.827317 11.8122 2.24787 9.28482C4.93936 7.07281 7.91063 5.2081 11.093 3.74265C16.4653 1.26882 22.3109 -0.00817108 28.2253 6.86646e-05C34.1398 0.0083065 39.9818 1.30157 45.3471 3.79036C48.527 5.26539 51.4944 7.13947 54.1807 9.36039C57.2464 11.8949 56.8402 16.5002 53.807 19.0734V19.0734Z"
+        );
       width: 57px;
       height: 21px;
     }
 
     .icon-vertical {
-      clip-path: path(
-        "M2.33992 53.8068C0.0475853 51.1047 0.14481 47.172 1.90137 44.0945C6.69064 35.7039 7.64974 25.2542 3.59338 15.6702C3.10192 14.509 2.55008 13.3918 1.94307 12.3208C0.193261 9.23327 0.1046 5.29403 2.40796 2.59423V2.59423C4.99146 -0.433928 9.60116 -0.827561 12.1285 2.24762C14.3405 4.93912 16.2052 7.91038 17.6707 11.0928C20.1445 16.465 21.4215 22.3106 21.4133 28.2251C21.405 34.1395 20.1117 39.9816 17.623 45.3469C16.1479 48.5267 14.2738 51.4941 12.0529 54.1805C9.51843 57.2461 4.91315 56.84 2.33992 53.8068V53.8068Z"
-      );
+      clip-path: path("M2.33992 53.8068C0.0475853 51.1047 0.14481 47.172 1.90137 44.0945C6.69064 35.7039 7.64974 25.2542 3.59338 15.6702C3.10192 14.509 2.55008 13.3918 1.94307 12.3208C0.193261 9.23327 0.1046 5.29403 2.40796 2.59423V2.59423C4.99146 -0.433928 9.60116 -0.827561 12.1285 2.24762C14.3405 4.93912 16.2052 7.91038 17.6707 11.0928C20.1445 16.465 21.4215 22.3106 21.4133 28.2251C21.405 34.1395 20.1117 39.9816 17.623 45.3469C16.1479 48.5267 14.2738 51.4941 12.0529 54.1805C9.51843 57.2461 4.91315 56.84 2.33992 53.8068V53.8068Z"
+        );
       width: 21px;
       height: 57px;
     }
@@ -209,13 +277,68 @@ export default {
     }
   }
 
+  .position {
+    width: 220px;
+    display: flex;
+    font-size: 14px;
+    flex-direction: column;
+
+    .ptitle {
+      width: 100%;
+      background-color: #375f80;
+      padding: 10px 10px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .add {
+        cursor: pointer;
+        background-color: #379df1;
+        border-radius: 5px;
+        padding: 1px 10px;
+      }
+    }
+
+    .plist {
+      margin-top: 10px;
+      height: 150px;
+      width: 100%;
+      overflow-y: auto;
+      background-color: #375f80;
+      .pItem{
+        display: flex;
+        padding: 5px 10px;
+        cursor: pointer;
+        justify-content: space-between;
+        align-items: center;
+        > div{
+          width: 140px;
+        }
+        > i{
+          color: #379df1;
+          font-weight: bold;
+        }
+      }
+      .pItem:hover{
+        background-color: #379df1;
+        > i{
+          color: #fff;
+        }
+      }
+    }
+  }
+  .nodata{
+    width:100%;
+    text-align: center;
+    line-height: 50px;
+  }
   .options {
     display: flex;
     flex-direction: column;
     justify-content: center;
     gap: 18px;
 
-    > div {
+    >div {
       display: flex;
       align-items: center;
       justify-content: center;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index 8fc6ae1e..8245ff27 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="obverseVisible" :title="dialogData.deviceName" width="650px">
+  <Dialog v-model="obverseVisible" :title="dialogData.deviceName" @update:close="visibleClose" width="450px">
     <div class="Camera">
       <Video class="video-stream" :camId="dialogData.iotDeviceId" />
       <ElTabs v-model="activeName" class="tabs">
@@ -63,7 +63,8 @@
     <CameraControlDialog
       :deviceId="dialogData.iotDeviceId"
       :dialogData="dialogData"
-      v-model="controlDialogVisible"
+      @update:value="handleClose"
+      :visible="controlDialogVisible"
     />
   </Dialog>
 </template>
@@ -108,33 +109,28 @@ export default {
         {
           label: "设备名称",
           key: "deviceName",
+          gridColumn: 2
         },
         {
           label: "道路名称",
           key: "roadName",
         },
-        // {
-        //   label: "设备编号",
-        //   key: "deviceCode",
-        // },
-        // {
-        //   label: "所属机构",
-        //   key: "organizationName",
-        // },
         {
           label: "设备桩号",
           key: "stakeMark",
+          
         },
         {
           label: "设备方向",
           key: "direction",
           enum: "CameraDirectionEnum",
+          
         },
         {
           label: "设备状态",
           key: "deviceState",
           enum: "DeviceTypeEnum",
-          // gridColumn: 2,
+          
         },
         // {
         //   label: "状态更新时间",
@@ -160,9 +156,12 @@ export default {
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
     if (roadInfo) this.data.roadName = roadInfo.roadName;
-    console.log(this.data, "this.data");
   },
   methods: {
+
+    handleClose() {
+      this.controlDialogVisible = false;
+    },
     controlClick: throttle(function (type) {
       // console.log(this.dialogData, "dialogData")
       if (this.dialogData.deviceState != "0")
@@ -179,12 +178,12 @@ export default {
 
 <style lang="scss" scoped>
 .Camera {
-  width: 600px;
+  width: 400px;
   height: 510px;
   color: #fff;
   display: flex;
   flex-direction: column;
-
+  
   .icon-content {
     display: flex;
     gap: 9px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/components/DeviceControlDialog.vue
index 4cc6af4e..87b14165 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/components/DeviceControlDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="设备操作" width="600px">
+  <Dialog v-model="modelVisible" title="设备操作" width="800px">
     <div class="DeviceControlDialog">
       <div style="height: 500px;overflow-y:auto;">
       <Form
@@ -7,7 +7,7 @@
         v-if="formList && formList.length"
         class="form"
         ref="FormConfigRef"
-        label-width='150px'
+        label-width='200px'
         :formList="formList"
         :value="formData"
       />
@@ -249,7 +249,7 @@ export default {
 
 <style lang="scss" scoped>
 .DeviceControlDialog {
-  width: 550px;
+  width: 750px;
   display: flex;
   flex-direction: column;
   gap: 15px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/index.vue
index 476c0f97..604830b5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/index.vue
@@ -1,13 +1,13 @@
 <template>
   <Dialog v-model="obverseVisible" title="合流区预警" width="550px">
-    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+    <Video class="video-stream" :camId="camId" />
 
     <div class="confluencearea">
       <ElTabs v-model="activeName" class="tabs">
-        <ElTabPane label="基本信息" name="first">
-          <Descriptions :list="list" :data="data" style="gap: 18px" />
+        <ElTabPane label="基本信息" name="first" style="height: 180px; ">
+          <Descriptions :list="list" :data="data" style="gap: 18px;overflow: hidden;" />
         </ElTabPane>
-        <ElTabPane label="设备参数" name="second">
+        <ElTabPane label="设备参数" name="second" style="height: 180px;overflow-y:auto ;">
           <DeviceParams ref="refParam" disabled :dialogData="dialogData" />
         </ElTabPane>
         <ElTabPane label="在线率统计" name="third">
@@ -64,7 +64,7 @@ export default {
       deviceControlVisible: false,
       data: {
         deviceName: "LH24",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         stakeMark: "k094+079",
         direction: "1",
         organizationName: "山东高速济南发展公司",
@@ -100,20 +100,28 @@ export default {
           key: "manufacturer",
         },
       ],
+      camId:null
     };
   },
   async created() {
+       // 修改camid
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
     this.data = {
       ...this.dialogData,
-      roadName: null,
+      roadName: '济菏高速',
     };
     //厂商
     getProduct(this.dialogData.productId).then((data) => {
       this.dialogData.brand = data.brand;
     });
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
     rebind(){
@@ -160,11 +168,11 @@ div.switcher {
     flex: 1;
     display: flex;
     flex-direction: column;
-
+    overflow: hidden;
     ::v-deep {
       .el-tabs__content {
         flex: 1;
-
+        overflow: hidden;
         .el-tab-pane {
           height: 100%;
         }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
index 9b9decee..3a907a66 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceParam.vue
@@ -179,12 +179,11 @@ export default {
   },
   methods: {
     reDisplay() {
-      console.log(this.requestURL)
       this.requestURL().then(async (data) => {
         await delay(0);
         const formData = this.$refs.FormConfigRef?.formData;
 
-        formData.controlType = data.mode;
+        formData.controlType = data.mode === '04'?'00':data.mode;
 
         await handle3CResult(data, formData, this.requestURL);
 
@@ -267,24 +266,21 @@ export default {
           // );
           break;
       }
-      console.log(result, "resultxxxxx")
       batchFunctions({
         devices: devices,
         functions: functions
       })
         // Promise.all(promise)
-        .then(() => {
+        .then(res => {
           this.$emit("update:value", false); // this.modelVisible = false;
-          Message.success(`操作成功`);
-          this.updateFormData({ ...result, workMode: result.mode });
+    
+          Message.success(res.data[0].result.msg);
+          if(this.updateFormData){
+            this.updateFormData({ ...result, workMode: result.mode });
+          }
         })
         .catch((err) => {
-          console.log(
-            "%c [ err ]-110-「DeviceControlDialog.vue」",
-            "font-size:15px; background:#547bf2; color:#98bfff;",
-            err
-          );
-          Message.error(`设备操作失败!`);
+          Message.error(`设备操作失败`);
         })
         .finally(() => {
           this.$emit("update:submitting", false);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 4efbf63b..94df0383 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog v-model="obverseVisible" title="行车诱导" width="650px">
     <div class="DrivingGuidance">
-      <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+      <Video class="video-stream" :camId="camId" />
 
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
@@ -60,12 +60,13 @@ export default {
   },
   data() {
     return {
+      camId: '',
       activeName: "first",
       deviceControlVisible: false,
       data: {
         deviceType: "行车诱导",
         deviceStation: "k094+079",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         direction: "1",
         deviceState: "0",
         deviceVendors: "XXX厂家",
@@ -110,10 +111,19 @@ export default {
           key: "inWorkStatus",
         },
       ],
+      camId:null
     };
   },
   async created() {
-    this.data = { ...this.dialogData, roadName: null };
+    // 修改camid
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
+    
+    this.data = { ...this.dialogData, roadName: '济菏高速' };
 
     getProduct(this.dialogData.productId)
       .then((data) => {
@@ -139,15 +149,14 @@ export default {
       await handle3CResult(data, formData, this.requestURL);
       this.updateFormData({ ...formData, workMode: data.mode });
     });
-
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
-    console.log(
-      "%c [ roadInfo ]-103-「index.vue」",
-      "font-size:15px; background:#36347c; color:#7a78c0;",
-      roadInfo.roadName
-    );
-
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // console.log(
+    //   "%c [ roadInfo ]-103-「index.vue」",
+    //   "font-size:15px; background:#36347c; color:#7a78c0;",
+    //   roadInfo.roadName
+    // );
+
+    // if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
     onControlClick(){
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
index d96b92cc..a7d9fbf4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
@@ -373,7 +373,7 @@ export default {
             ]
           });
           if (res.code == 200) {
-            Message.success("设置成功！");
+            Message.success("设置成功");
             this.$emit("update:value", false);
           }
         });
@@ -406,13 +406,12 @@ export default {
           functions: rData
         });
         if (res.code == 200) {
-          Message.success("设置成功！");
+          Message.success("设置成功");
           this.$emit("update:value", false);
         }
         //设定时长
         // let res = await this.requestURL("SETTM", { SET: this.onWorkStatus2 });
         // if (res.code == 200) {
-        //   Message.success("设置成功！");
         //   this.$emit("update:value", false);
         // }
       }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
index afc444cb..f7f18756 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog v-model="obverseVisible" title="疲劳唤醒弹窗" width="470px">
     <div class="FatigueWakesUp">
-      <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+      <Video class="video-stream" :camId="camId" />
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
           <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
@@ -14,7 +14,7 @@
     </div>
 
     <template #footer>
-      <Button @click.native="deviceControlVisible = true">设备操作</Button>
+      <Button @click.native="onControlClick" disabled :style="dialogData.iotDeviceId?'':'background-color:#4E5969'">设备操作</Button>
     </template>
     <!-- 设备操作弹窗 -->
     <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" :productId="dialogData.id"
@@ -56,7 +56,7 @@ export default {
       data: {
         deviceType: "行车诱导",
         deviceStation: "k094+079",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         direction: "1",
         deviceState: "0",
         deviceVendors: "XXX厂家",
@@ -92,17 +92,30 @@ export default {
     };
   },
   async created() {
-    this.data = { ...this.dialogData };
+    // 修改camid
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
+    this.data = { ...this.dialogData, roadName: '济菏高速' };
+
 
     getProduct(this.dialogData.productId).then((data) => {
       this.dialogData.brand = data.brand;
     });
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
-    if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
+    // if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
   },
   methods: {
+    onControlClick(){
+      if(this.dialogData.iotDeviceId){
+        this.deviceControlVisible = true
+      }
+    },
     handleClickTabs() { },
   },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
index ef3fe2e2..0ae763a0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="obverseVisible" title="护栏碰撞弹窗" width="600px">
-    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+    <Video class="video-stream" :camId="camId" />
 
     <div class="GuardrailCollision">
       <ElTabs v-model="activeName" class="tabs">
@@ -55,7 +55,7 @@ export default {
       secondLoading: true,
       data: {
         deviceName: "LH24",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         stakeMark: "k094+079",
         direction: "1",
         organizationName: "山东高速济南发展公司",
@@ -64,8 +64,8 @@ export default {
       },
 
       roadTypeList: [
-        { key: "1", label: "济南方向" },
-        { key: "3", label: "菏泽方向" },
+        { key: "1", label: "菏泽方向" },
+        { key: "3", label: "济南方向" },
       ],
       roadType: "1",
       list: [
@@ -105,27 +105,32 @@ export default {
         },
       },
       devicesList: [],
+      camId:null
     };
   },
   async created() {
     // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
 
-    this.data = { ...this.dialogData, roadName: null };
 
-    console.log(
-      "%c [ dialogData ]-103-「index.vue」",
-      "font-size:15px; background:#36347c; color:#7a78c0;",
-      this.dialogData
-    );
+      // 修改camid
+      if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
+    
+    this.data = { ...this.dialogData, roadName: '济菏高速' };
 
+    
     // getProduct(this.dialogData.productId)
     //   .then(data => {
     //     this.dialogData.brand = data.brand;
     //   })
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    // if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
index 042cfe2e..d860cdae 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="obverseVisible" title="一类交调站弹窗" width="600px">
-    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+    <Video class="video-stream" :camId="camId" />
 
     <div class="Intermodulation">
       <ElTabs v-model="activeName" class="tabs">
@@ -71,7 +71,7 @@ export default {
       secondLoading: true,
       data: {
         deviceName: "LH24",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         stakeMark: "k094+079",
         direction: "1",
         organizationName: "山东高速济南发展公司",
@@ -130,31 +130,30 @@ export default {
         },
       },
       devicesList: [],
+      camId:null
     };
   },
   async created() {
     // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
 
-    this.data = { ...this.dialogData, roadName: null };
+      // 修改camid
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
 
-    console.log(
-      "%c [ dialogData ]-103-「index.vue」",
-      "font-size:15px; background:#36347c; color:#7a78c0;",
-      this.dialogData
-    );
+    this.data = { ...this.dialogData, roadName: '济菏高速' };
 
-    // getProduct(this.dialogData.productId)
-    //   .then(data => {
-    //     this.dialogData.brand = data.brand;
-    //   })
 
     if (this.dialogData.iotDeviceId) {
       this.getPropertiesHistory(this.dialogData.iotDeviceId);
     }
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    // if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
     changeRadio(value) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue
index aa7965a7..a049cb25 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/components/DeviceControlDialog.vue
@@ -87,10 +87,10 @@ export default {
         lastPath = 'deviceHour'
       } else if (this.pickerType == 'month') {
         lastPath = 'deviceDay'
-        _time += '-01'
+        _time = _time.substr(0,7)+ '-01'
       } else if (this.pickerType == 'year') {
         lastPath = 'deviceYears'
-        _time += '-01-01'
+        _time = _time.substr(0,4)+ '-01-01'
       }
 
       let qsData = await request({
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
index 335c20c1..dc847cd6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MeteorologicalDetection/index.vue
@@ -1,14 +1,17 @@
 <template>
   <Dialog v-model="obverseVisible" title="气象设备" width="470px">
     <div class="MeteorologicalDetection">
-      <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+      <Video class="video-stream" :camId="camId" />
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
-        <ElTabPane label="基本信息" name="first">
-          <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
+        <ElTabPane label="基本信息" name="first"  style="height: 150px">
+          <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px;" />
         </ElTabPane>
-        <ElTabPane label="气象情况" name="second">
+        <ElTabPane label="气象情况" name="second" style="height: 150px;overflow-y: auto;">
           <Descriptions labelWidth="104px" :list="weatherList" :data="weatherData" style="gap: 14px" />
         </ElTabPane>
+        <ElTabPane label="在线率统计" name="third" style="height: 150px">
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 150px" />
+        </ElTabPane>
       </ElTabs>
     </div>
 
@@ -27,6 +30,7 @@
 import Dialog from "@screen/components/Dialog/index.vue";
 import Descriptions from "@screen/components/Descriptions.vue";
 import Button from "@screen/components/Buttons/Button.vue";
+import LineChart from "../../LineChart/index.vue";
 import {
   getRoadInfoByStakeMark,
   getProduct,
@@ -37,8 +41,6 @@ import DeviceControlDialog from "./components/DeviceControlDialog.vue";
 
 import request from "@/utils/request";
 import { dialogDelayVisible } from "./../mixin";
-import LineChart from "../../LineChart/index.vue";
-
 // 疲劳唤醒弹窗
 export default {
   name: "MeteorologicalDetection",
@@ -58,7 +60,7 @@ export default {
       data: {
         deviceType: "行车诱导",
         deviceStation: "k094+079",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         direction: "1",
         deviceState: "0",
         deviceVendors: "XXX厂家",
@@ -109,7 +111,7 @@ export default {
           enum: "precipitationType",
         },
         {
-          label: "雨量(mm)",
+          label: "雨量( mm )",
           key: "rainfall",
         },
         {
@@ -118,31 +120,31 @@ export default {
           enum: "visibilityType",
         },
         {
-          label: "能见度(km)",
+          label: "能见度( km )",
           key: "visibility",
         },
         {
-          label: "温度(℃)",
+          label: "温度( ℃ )",
           key: "temperature",
         },
         {
-          label: "湿度",
+          label: "湿度( % )",
           key: "humidity",
         },
         {
-          label: "风向",
+          label: "风向( ° )",
           key: "windDirection",
         },
         {
-          label: "风速(m/s)",
+          label: "风速( m/s )",
           key: "windSpeed",
         },
         {
-          label: "水膜厚度(mm)",
+          label: "水膜厚度( mm )",
           key: "waterFilmIceSnowValue",
         },
         {
-          label: "大气压力(hPa)",
+          label: "大气压力( hPa )",
           key: "atmosphericPressure",
         },
         {
@@ -150,21 +152,31 @@ export default {
           key: "createTime",
           gridColumn: 2,
         },
-      ]
+      ],
+      camId:null
     };
   },
   async created() {
-    this.data = { ...this.dialogData };
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
+
+    this.data = { ...this.dialogData, roadName:'济菏高速' };
 
     getProduct(this.dialogData.productId).then((data) => {
       this.dialogData.brand = data.brand;
     });
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
-
-    if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
 
     const weatherInfo = await getMeteorologicalDetector(this.dialogData.deviceName)
+    if(weatherInfo.visibility){
+      weatherInfo.visibility = parseInt(weatherInfo.visibility)
+    }
     this.weatherData = { ...weatherInfo }
   },
   methods: {
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 0e55e892..ad4fd99b 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
@@ -148,6 +148,7 @@ export default {
     initData(){
     let time = new Date().format('yyyy-MM-dd')
     this.dateRange = [time,time];
+    this.eventType = 'all',
      this.bindData();
     },
     bindData(){
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/index.vue
index 8239ef90..27ec7e37 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/MillimeterWaveRadar/index.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog v-model="obverseVisible" title="毫米波雷达" width="470px">
     <div class="MillimeterWaveRadar">
-      <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+      <Video class="video-stream" :camId="camId" />
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
           <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
@@ -54,7 +54,7 @@ export default {
       data: {
         deviceType: "行车诱导",
         deviceStation: "k094+079",
-        roadName: "G35济泽高速",
+        roadName: "",
         direction: "1",
         deviceState: "0",
         deviceVendors: "XXX厂家",
@@ -146,19 +146,29 @@ export default {
           key: "createTime",
           gridColumn: 2,
         },
-      ]
+      ],
+      camId:null
     };
   },
   async created() {
-    this.data = { ...this.dialogData };
+
+
+      // 修改camid
+      if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
+
+    this.data = { ...this.dialogData , roadName: '济菏高速' };
 
     getProduct(this.dialogData.productId).then((data) => {
       this.dialogData.brand = data.brand;
     });
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
-
-    if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
 
     const weatherInfo = await getMeteorologicalDetector(this.dialogData.deviceName)
     this.weatherData = { ...weatherInfo }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/chart.js
index e4e54324..c1ad5c49 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/chart.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/chart.js
@@ -6,7 +6,7 @@ export const lineChartOption = {
     type: "category",
     // boundaryGap: ["15%", "15%"],
     boundaryGap: false,
-    data: ["17:07", "17:11", "17:15", "17:19", "17:23", "17:27", "17:31"],
+    data: ["00", "01", "02", "03", "04","05","06","07","08","09","10","11","12","13", "14","15","16","17","18","19","20","21","22","23","24"],
     axisTick: {
       show: false,
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/index.vue
index 92a25021..dc73843c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/components/LineChart/index.vue
@@ -15,13 +15,33 @@
 import * as echarts from "echarts";
 import { lineChartOption } from "./chart"
 import { cloneDeep } from "lodash";
+import request from '@/utils/request'
+import moment from "moment";
+
 export default {
   name: 'LineChart',
+  props:{
+    stakeMark:{
+      type:String,
+      default:'',
+    },
+  },
   mounted() {
     const chartIns = echarts.init(this.$refs.LineChartRef);
-    const options = cloneDeep(lineChartOption);
-    options.tooltip.formatter = "{b}：{c}(辆)";
-    chartIns.setOption(options);
+    request({
+      url: 'business/traffic-statistics/history/queryTheGantryDataByPileNumber',
+      method: 'get',
+      params:{
+        startDate: moment().format('YYYY-MM-DD'),
+        stakeMark: this.stakeMark
+      }
+    }).then(res=>{
+      const options = cloneDeep(lineChartOption);
+      options.series[0].data = res.data.map(x=>x.totalFlow);
+      options.tooltip.formatter = "{b}时：{c}(辆)";
+      chartIns.setOption(options);
+    })
+    
   },
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index b80b50af..13e46958 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -1,437 +1,52 @@
 <template>
-  <Dialog v-model="obverseVisible" title="感知事件" width="950px">
-    <div class="PerceiveEvent">
-      <!-- <Video class="item-video" /> -->
-      <div class="video-pic">
-        <!-- <Video style="height: 100%; flex: 1" :showHeader="false" :url="dialogData.formData.videoList[0]"
-          videoType="mp4" /> -->
-        <Carousel style="flex: 1; height: 100%;max-width: 350px;" :videos="dialogData.videoList || []" />
-        <Carousel style="flex: 1; height: 100%;max-width: 300px;" :pictures="dialogData.pictures || []" />
-      </div>
-      <LineChart class="chart" />
-      <Form class="form" v-loading="loading" v-model="data" ref="FormConfigRef" :formList="formList" column="1" />
-    </div>
-
-    <template #footer>
-      <Button @click.native="onDelete" :loading="loading">误报</Button>
-      <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="obverseVisible = false">取消</Button>
-      <Button @click.native="updateEvent" :loading="btnLoading">确定</Button>
-    </template>
-  </Dialog>
+  <!-- 事件弹窗 感知 - 首页 -->
+   <EventDetailDialog :visible="obverseVisible" :formData="data" :activeName="activeName"
+    @update:value="handleDialogClose" @queryData="reData" />
 </template>
 
 <script>
-import Dialog from "@screen/components/Dialog/index.vue";
-import Button from "@screen/components/Buttons/Button.vue";
-import Descriptions from "@screen/components/Descriptions.vue";
-import LineChart from "./components/LineChart/index.vue";
-import Video from "@screen/components/Video";
-import Form from "@screen/components/FormConfig";
+
 import request from "@/utils/request";
-import { Message } from "element-ui";
-import moment, { fn } from "moment";
-import Carousel from "@screen/pages/control/event/event/EventDetailDialog/Carousel";
-import {
-  WarningTypeList,
-  WarningSubclassList,
-  LaneOccupancyList,
-  DirectionTypes,
-} from "@screen/utils/enum.js";
-// import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
 import { dialogDelayVisible } from "./../mixin";
-import { markerClusterIns } from "@screen/pages/Home/components/RoadAndEvents/utils/map.js";
-import { eventMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
-
-let vehicleTypeList = [];
-const _formList = [{
-    label: "报警时间:",
-    key: "warningTime",
-    type: "text",
-  },
-  {
-    label: "事件地点:",
-    key: "stakeMark",
-    type: "text",
-  },
-  {
-    label: "路段方向:",
-    key: "direction",
-    type: "text",
-    isAlone: true,
-  },
-  {
-    label: "事件来源:",
-    key: "warningSource",
-    type: "text",
-    enum: "InfoWarningSource",
-  },
-  {
-    label: "事件类型:",
-    key: "warningType",
-    type: "select",
-    options: {
-      disabled: true,
-      options: WarningTypeList,
-    },
-    ons: {
-      change: (value, { data }) => {
-        this.formList[5].options.options =
-          WarningSubclassList[value] || [];
-        data.warningSubclass = null;
-      },
-    },
-  },
-  {
-    label: "细分类型:",
-    key: "warningSubclass",
-    type: "select",
-    options: {
-      options: [],
-    },
-  },
-  // {
-  //   label: "车辆类型:",
-  //   key: "vehicleType",
-  //   type: "select",
-  //   options: {
-  //     options: vehicleTypeList
-  //   },
-  // },
-  {
-    label: "事件描述:",
-    key: "remark",
-    options: {
-      type: "textarea",
-      maxlength: 100,
-      autosize: { minRows: 3, maxRows: 3 },
-      showWordLimit: true,
-    },
-  },
-  {
-    label: "影响车道:",
-    key: "lane",
-    type: "CheckboxGroup",
-    options: {
-      // activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
-      options: LaneOccupancyList,
-      gap: "12px",
-    },
-  },
-  {
-    label: "持续时长:",
-    key: "duration",
-    type: "text",
-  },
-  // {
-  //   label: "天气情况:",
-  //   key: "weather",
-  //   type: "text",
-  // },
-]
-function getDuration(warningTime) {
-  const currentTime = moment();
-  const specifiedTime = moment(warningTime);
-
-  const duration = moment.duration(currentTime.diff(specifiedTime));
-
-  const hours = Math.floor(duration.asHours());
-  const minutes = Math.floor(duration.asMinutes()) % 60;
-  const seconds = Math.floor(duration.asSeconds()) % 60;
-
-  return `${padZero(hours)}:${padZero(minutes)}:${padZero(seconds)}`;
-}
-
-function padZero(num) {
-  num = num.toString();
-  while (num.length < 2) {
-    num = "0" + num;
-  }
-  return num;
-}
-
 // 感知事件
 export default {
   name: "PerceiveEvent",
   mixins: [dialogDelayVisible],
   components: {
-    Dialog,
-    Button,
-    Descriptions,
-    LineChart,
-    Video,
-    Carousel,
-    Form,
   },
   data() {
     return {
-      interval: null,
-      loading: true,
-      activeName: "first",
-      deviceControlVisible: false,
-      btnLoading: false,
+      activeName:'-1',
       data: {
-        // deviceType: "行车诱导",
-        // deviceStation: "k094+079",
-        // roadName: "G35济泽高速",
-        // direction: "1",
-        // deviceState: "0",
-        // deviceVendors: "XXX厂家",
-        // time: "2023/01/02 09:09:09"
       },
-      formList: [],
-      loading:false,
     };
   },
-  async created() {
-    let self = this;
-    this.getVehicleTypeList(function(){
-      self.getDetails();
-    });
-  },
-  async mounted() {
-    
-    if (this.dialogData.otherConfig) {
-      const otherConfig = JSON.parse(this.dialogData.otherConfig);
-      this.dialogData.videoList = otherConfig.videoList
-      this.dialogData.pictures = otherConfig.pictures
-    }
-
-    this.formList = [..._formList]
-  },
-  beforeDestroy() {
-    clearInterval(this.interval);
-  },
-  methods: {
-    onDelete() {
-      const self = this;
-      if(this.formList.length === _formList.length ){
-        this.formList.splice(6,0,{
-          label: "解除类型:",
-          key: "relieveType",
-          type: "RadioGroup",
-          isAlone: true,
-          required: true,
-          options: {
-            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
-            options: [
-              {
-                key: "1",
-                label: "误报解除",
-              },
-              {
-                key: "2",
-                label: "已结束",
-              },
-              {
-                key: "3",
-                label: "无需处理",
-              },
-              {
-                key: "4",
-                label: "其它",
-              }
-            ],
-          },
-        })
-        this.formList.splice(7,0,{
-          label: "解除原因:", // 标题
-          key: "relieveReason", //数据存储字段
-          isAlone: true, //  单独一行
-          type: "input", //组件类型(el-input 去掉el-即可) 不填默认为input
-          options: {  //element原生formItem属性
-            type: "textarea",
-            autosize: true,
-            maxlength: 200,
-            autosize: { minRows: 3, maxRows: 3 },
-            showWordLimit: true,
-          }
-        })
-      } else {
-        this.$refs.FormConfigRef.validate()
-          .then((result) => {
-            this.loading = true;
-            request({
-              url: `/business/warning/falseAlarm`,
-              method: "post",
-              data: {
-                id: this.dialogData.id,
-                relieveType: result.relieveType,
-                relieveReason: result.relieveReason
-              },
-            }).then((result) => {
-              
-              if (result.code == 200) Message.success("成功！");
-              else Message.error(result?.msg);
-              this.obverseVisible = false;
-              this.loading = false;
-              setTimeout(() => {
-                self.$root.$emit('delete-event');
-              //触发全局监听事件
-                self.$root.$emit('refresh-event');  
-              }, 500);
-              
-            
-              });
-          })
-          .catch((err) => {
-          });
-      }
-      // 2024-05-18 修改为二次确认，增加误报类型和误报原因
-      // const id = this.dialogData.id;
-      // id &&
-      //   this.$confirm("确定误报吗？", "提示", {
-      //     confirmButtonText: "确定",
-      //     cancelButtonText: "取消",
-      //     type: "warning",
-      //   }).then(() => {
-      //     request({
-      //       url: `/business/warning/delete`,
-      //       method: "post",
-      //       data: { id },
-      //     }).then((result) => {
-      //       if (result.code == 200) Message.success("成功！");
-      //       else Message.error(result?.msg);
-      //       const item = { title: "感知事件" };
-
-      //       eventMap[`事件专题/${item.title}_close`]?.call(
-      //         this,
-      //         item,
-      //         (item) => {
-      //           return item?.extData?.id == id;
-      //         },
-      //         "special"
-      //       );
-      //       //触发全局监听事件
-      //       this.$root.$emit('refresh-event');
-      //       // markerClusterIns.setData();
-      //     });
-      //   });
-    },
-    getVehicleTypeList(fn) {
-      if (vehicleTypeList.length) {
-        fn()
-        return
-      };
-
-      request({
-        url: `/system/dict/data/type/${"sys_vehicle_type"}`,
-        method: "GET",
-        params: {},
-      })
-        .then(({ data, code }) => {
-          if (code != 200) return Message.error("详情获取失败");
-          vehicleTypeList = this.formList[5].options.options = data.map(
-            (item) => ({
-              key: item.dictValue,
-              label: item.dictLabel,
-            })
-          );
-          fn();
-        })
-        .catch((err) => { });
-    },
-    convertSecToHHmmss(sec) {
-      let currentTime = moment.duration(sec, "seconds");
-      return moment({
-        h: currentTime.hours(),
-        m: currentTime.minutes(),
-        s: currentTime.seconds(),
-      }).format("HH:mm:ss");
-    },
-    getDetails() {
-      request({
+  created() {
+    this.data = { ...this.dialogData };
+    request({
         url: `/perceivedEvents/warning/getWarningById`,
         method: "POST",
         data: {
           id: this.dialogData.id,
         },
+      }).then(result => {
+        if (result.code != 200) return Message.error("详情获取失败");
+        this.data = { ...data, ...this.data };
       })
-        .then(({ data, code }) => {
-          if (code != 200) return Message.error("详情获取失败");
-
-          data.duration = this.convertSecToHHmmss(data.duration);
-          this.data = {
-            ...data,
-            roadName: null,
-            lane: data.lane?.split(",") || [],
-          };
-
-          this.formList[5].options = {
-            options:
-              WarningSubclassList[data.warningType] || []
-          };
+      .catch((err) => { });
+  },
+  methods: {
+    reData(){
 
-          setTimeout(() => {
-            this.$refs.FormConfigRef.reset(true);
-          });
-          this.data.direction = DirectionTypes[this.data.direction];
-          this.data.duration = getDuration(this.data.warningTime);
-          this.interval = setInterval(() => {
-            this.data.duration = getDuration(this.data.warningTime);
-          }, 1000);
-        })
-        .catch((e) => {
-          Message.error("详情获取失败" + e);
-        })
-        .finally(() => {
-          this.loading = false;
-        });
     },
-    updateEvent() {
-      this.btnLoading = true;
-      request({
-        url: `/perceivedEvents/warning/updateWarning`,
-        method: "post",
-        data: {
-          id: this.dialogData.id,
-          warningType: this.data.warningType,
-          warningSubclass: this.data.warningSubclass,
-          // vehicleType: this.data.vehicleType,
-          remark: this.data.remark,
-          lane: this.data.lane.join(","),
-        },
-      })
-        .then(() => {
-          Message.success("提交成功");
-        })
-        .catch(() => {
-          Message.error("提交失败");
-        })
-        .finally(() => {
-          this.btnLoading = false;
-        });
+    handleDialogClose() {
+      this.obverseVisible = false;
+      this.$root.$emit('refresh-event-list');
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.PerceiveEvent {
-  width: 870px;
-  color: #fff;
-  display: grid;
-  grid-template-columns: 1.2fr 1fr;
-  grid-template-rows: repeat(2, 1fr);
-  gap: 9px;
-
-  .video-pic {
-    display: flex;
-    height: 190px;
-    gap: 15px;
-    justify-content: space-around;
-    max-width: 470px;
-  }
-
-  .item-video {
-    grid-area: 1/1/1/1;
-  }
-
-  .chart {
-    grid-area: 2/1/2/1;
-  }
 
-  .form {
-    grid-area: 1/2/3/3;
-  }
-}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index_v1.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index_v1.vue
new file mode 100644
index 00000000..5fd828fb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index_v1.vue
@@ -0,0 +1,439 @@
+<template>
+  <Dialog v-model="obverseVisible" title="感知事件" width="950px">
+    <div class="PerceiveEvent">
+      <div class="left">
+      <div class="video-pic">
+
+        <Carousel style="flex: 1; height: 100%;max-width: 350px;" :list="dialogData.videoList || []"  type="video" />
+        <Carousel style="flex: 1; height: 100%;max-width: 300px;" :list="dialogData.pictures || []" type="picture" />
+      </div>
+      <LineChart class="chart" :stakeMark="dialogData.stakeMark" />
+    </div>
+      <Form class="form" label-width="90px" v-loading="loading" v-model="data" ref="FormConfigRef" :formList="formList" column="1" />
+    </div>
+
+    <template #footer>
+      <Button @click.native="onDelete" :loading="loading">误报</Button>
+      <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="obverseVisible = false">取消</Button>
+      <Button v-if="!isError" @click.native="updateEvent" :loading="btnLoading">确定</Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Descriptions from "@screen/components/Descriptions.vue";
+import LineChart from "./components/LineChart/index.vue";
+import Video from "@screen/components/Video";
+import Form from "@screen/components/FormConfig";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import moment, { fn } from "moment";
+import Carousel from "@screen/pages/control/event/event/EventDetailDialog/Carousel";
+import {
+  WarningTypeList,
+  WarningSubclassList,
+  LaneOccupancyList,
+  DirectionTypes,
+} from "@screen/utils/enum.js";
+// import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import { dialogDelayVisible } from "./../mixin";
+import { markerClusterIns } from "@screen/pages/Home/components/RoadAndEvents/utils/map.js";
+import { eventMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
+
+let vehicleTypeList = [];
+const _formList = [{
+    label: "报警时间:",
+    key: "warningTime",
+    type: "text",
+  },
+  {
+    label: "事件地点:",
+    key: "stakeMark",
+    type: "text",
+  },
+  {
+    label: "路段方向:",
+    key: "direction",
+    type: "text",
+    isAlone: true,
+  },
+  {
+    label: "事件来源:",
+    key: "warningSource",
+    type: "text",
+    enum: "InfoWarningSource",
+  },
+  {
+    label: "事件类型:",
+    key: "warningType",
+    type: "select",
+    options: {
+      disabled: true,
+      options: WarningTypeList,
+    },
+    ons: {
+      change: (value, { data }) => {
+        this.formList[5].options.options =
+          WarningSubclassList[value] || [];
+        data.warningSubclass = null;
+      },
+    },
+  },
+  {
+    label: "细分类型:",
+    key: "warningSubclass",
+    type: "select",
+    options: {
+      options: [],
+    },
+  },
+  // {
+  //   label: "车辆类型:",
+  //   key: "vehicleType",
+  //   type: "select",
+  //   options: {
+  //     options: vehicleTypeList
+  //   },
+  // },
+  {
+    label: "事件描述:",
+    key: "remark",
+    options: {
+      type: "textarea",
+      maxlength: 100,
+      autosize: { minRows: 3, maxRows: 3 },
+      showWordLimit: true,
+    },
+  },
+  {
+    label: "影响车道:",
+    key: "lane",
+    type: "CheckboxGroup",
+    options: {
+      // activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+      options: LaneOccupancyList,
+      gap: "12px",
+    },
+  },
+  {
+    label: "持续时长:",
+    key: "duration",
+    type: "text",
+  },
+  // {
+  //   label: "天气情况:",
+  //   key: "weather",
+  //   type: "text",
+  // },
+]
+function getDuration(warningTime) {
+  const currentTime = moment();
+  const specifiedTime = moment(warningTime);
+
+  const duration = moment.duration(currentTime.diff(specifiedTime));
+
+  const hours = Math.floor(duration.asHours());
+  const minutes = Math.floor(duration.asMinutes()) % 60;
+  const seconds = Math.floor(duration.asSeconds()) % 60;
+
+  return `${padZero(hours)}:${padZero(minutes)}:${padZero(seconds)}`;
+}
+
+function padZero(num) {
+  num = num.toString();
+  while (num.length < 2) {
+    num = "0" + num;
+  }
+  return num;
+}
+
+// 感知事件
+export default {
+  name: "PerceiveEvent",
+  mixins: [dialogDelayVisible],
+  components: {
+    Dialog,
+    Button,
+    Descriptions,
+    LineChart,
+    Video,
+    Carousel,
+    Form,
+  },
+  data() {
+    return {
+      interval: null,
+      loading: true,
+      activeName: "first",
+      deviceControlVisible: false,
+      btnLoading: false,
+      data: {
+        // deviceType: "行车诱导",
+        // deviceStation: "k094+079",
+        // roadName: "G35济泽高速",
+        // direction: "1",
+        // deviceState: "0",
+        // deviceVendors: "XXX厂家",
+        // time: "2023/01/02 09:09:09"
+      },
+      formList: [],
+      loading:false,
+      isError:false //是否误报
+    };
+  },
+  async created() {
+    let self = this;
+    this.getVehicleTypeList(function(){
+      self.getDetails();
+    });
+  },
+  async mounted() {
+    
+    if (this.dialogData.otherConfig) {
+      const otherConfig = JSON.parse(this.dialogData.otherConfig);
+      this.dialogData.videoList = otherConfig.videoList
+      this.dialogData.pictures = otherConfig.pictures
+    }
+
+    this.formList = [..._formList]
+  },
+  beforeDestroy() {
+    clearInterval(this.interval);
+  },
+  methods: {
+    onDelete() {
+      const self = this;
+      if(this.formList.length === _formList.length ){
+        this.isError = true;
+        this.formList.splice(6,0,{
+          label: "解除类型:",
+          key: "relieveType",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "误报解除",
+              },
+              {
+                key: "2",
+                label: "已结束",
+              },
+              {
+                key: "3",
+                label: "无需处理",
+              },
+              {
+                key: "4",
+                label: "其它",
+              }
+            ],
+          },
+        })
+        this.formList.splice(7,0,{
+          label: "解除原因:", // 标题
+          key: "relieveReason", //数据存储字段
+          isAlone: true, //  单独一行
+          type: "input", //组件类型(el-input 去掉el-即可) 不填默认为input
+          options: {  //element原生formItem属性
+            type: "textarea",
+            autosize: true,
+            maxlength: 200,
+            autosize: { minRows: 3, maxRows: 3 },
+            showWordLimit: true,
+          }
+        })
+      } else {
+        this.$refs.FormConfigRef.validate()
+          .then((result) => {
+            this.loading = true;
+            request({
+              url: `/business/warning/falseAlarm`,
+              method: "post",
+              data: {
+                id: this.dialogData.id,
+                relieveType: result.relieveType,
+                relieveReason: result.relieveReason
+              },
+            }).then((result) => {
+              if (result.code == 200) Message.success("操作成功");
+              else Message.error(result?.msg);
+
+              setTimeout(() => {
+                self.$root.$emit('delete-event');
+              //触发全局监听事件
+                self.$root.$emit('refresh-event');  
+              }, 500);
+              this.obverseVisible = false;
+              this.loading = false;
+              
+            
+              });
+          })
+          .catch((err) => {
+          });
+      }
+      // 2024-05-18 修改为二次确认，增加误报类型和误报原因
+      // const id = this.dialogData.id;
+      // id &&
+      //   this.$confirm("确定误报吗？", "提示", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "warning",
+      //   }).then(() => {
+      //     request({
+      //       url: `/business/warning/delete`,
+      //       method: "post",
+      //       data: { id },
+      //     }).then((result) => {
+      //       if (result.code == 200) Message.success("成功");
+      //       else Message.error(result?.msg);
+      //       const item = { title: "感知事件" };
+
+      //       eventMap[`事件专题/${item.title}_close`]?.call(
+      //         this,
+      //         item,
+      //         (item) => {
+      //           return item?.extData?.id == id;
+      //         },
+      //         "special"
+      //       );
+      //       //触发全局监听事件
+      //       this.$root.$emit('refresh-event');
+      //       // markerClusterIns.setData();
+      //     });
+      //   });
+    },
+    getVehicleTypeList(fn) {
+      if (vehicleTypeList.length) {
+        fn()
+        return
+      };
+
+      request({
+        url: `/system/dict/data/type/${"sys_vehicle_type"}`,
+        method: "GET",
+        params: {},
+      })
+        .then(({ data, code }) => {
+          if (code != 200) return Message.error("详情获取失败");
+          vehicleTypeList = this.formList[5].options.options = data.map(
+            (item) => ({
+              key: item.dictValue,
+              label: item.dictLabel,
+            })
+          );
+          fn();
+        })
+        .catch((err) => { });
+    },
+    convertSecToHHmmss(sec) {
+      let currentTime = moment.duration(sec, "seconds");
+      return moment({
+        h: currentTime.hours(),
+        m: currentTime.minutes(),
+        s: currentTime.seconds(),
+      }).format("HH:mm:ss");
+    },
+    getDetails() {
+      request({
+        url: `/perceivedEvents/warning/getWarningById`,
+        method: "POST",
+        data: {
+          id: this.dialogData.id,
+        },
+      })
+        .then(({ data, code }) => {
+          if (code != 200) return Message.error("详情获取失败");
+
+          data.duration = this.convertSecToHHmmss(data.duration);
+          this.data = {
+            ...data,
+            roadName: null,
+            lane: data.lane?.split(",") || [],
+          };
+
+          this.formList[5].options = {
+            options:
+              WarningSubclassList[data.warningType] || []
+          };
+
+          setTimeout(() => {
+            this.$refs.FormConfigRef.reset(true);
+          });
+          this.data.direction = DirectionTypes[this.data.direction];
+          this.data.duration = getDuration(this.data.warningTime);
+          this.interval = setInterval(() => {
+            this.data.duration = getDuration(this.data.warningTime);
+          }, 1000);
+        })
+        .catch((e) => {
+          Message.error("详情获取失败" + e);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    updateEvent() {
+      this.btnLoading = true;
+      request({
+        url: `/perceivedEvents/warning/updateWarning`,
+        method: "post",
+        data: {
+          id: this.dialogData.id,
+          warningType: this.data.warningType,
+          warningSubclass: this.data.warningSubclass,
+          // vehicleType: this.data.vehicleType,
+          remark: this.data.remark,
+          lane: this.data.lane.join(","),
+        },
+      })
+        .then(() => {
+          Message.success("提交成功");
+        })
+        .catch(() => {
+          Message.error("提交失败");
+        })
+        .finally(() => {
+          this.btnLoading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.PerceiveEvent {
+  width: 870px;
+  color: #fff;
+  display: flex;
+  flex-direction: row;
+  gap: 9px;
+  .left{
+    width: 470px;
+    display: flex;
+    flex-direction: column;
+  }
+  .video-pic {
+    display: flex;
+    height: 200px;
+    gap: 15px;
+    justify-content: space-around;
+    max-width: 470px;
+  }
+
+  .chart {
+    margin-top: 20px;
+    height: 200px;
+  }
+
+  .form {
+    flex: 1;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index_v2.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index_v2.vue
new file mode 100644
index 00000000..1a14908a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index_v2.vue
@@ -0,0 +1,501 @@
+<template>
+  <!-- 事件弹窗 感知 - 首页 旧 -->
+  <Dialog v-model="obverseVisible" style="z-index: 2050;"  title="感知事件" width="950px">
+    <div class="EventDetail">
+    <Form ref="FormConfigRef" :formList="formList" v-model="data" label-width="110px" />
+
+    <div class="video-pic" v-if="[1,2,5].indexOf(data.warningSource) !== -1">
+      <div style="flex: 1; height: 100%;position: relative;">
+        <div class="radio">
+          <span @click="videoClick('downCamera')" :class="{ active: realVideo === 'downCamera' }">菏泽</span>
+          <span @click="videoClick('upCamera') " :class="{ active: realVideo === 'upCamera' }">济南</span>
+        </div>
+        <Video v-if="realVideo"
+            class="item-video"
+            :pileNum="dialogData.stakeMark"
+            :rangeIndex="realVideo"
+            :showHeader="false"
+          />
+      </div>
+      <div style="flex: 1; height: 100%;width:0;position: relative;">
+        <div class="radio">
+          <span @click="realType = 'video'" :class="{ active: realType === 'video' }">视频</span>
+          <span @click="realType = 'picture'" :class="{ active: realType === 'picture' }">图像</span>
+        </div>
+        <Carousel style="height: 100%;" :list="realType === 'video'?(dialogData.videoList || []):dialogData.pictures || []"  :type="realType" />
+      </div>
+   </div>
+   <!-- 除了视频ai，雷达，扫码报警，只展示实时视频 -->
+   <div  v-if="[1,2,5].indexOf(data.warningSource) === -1" class="video-stream">
+        <div class="item"> <Video
+            class="item-video"
+            :pileNum="dialogData.stakeMark"
+            rangeIndex="upCamera"
+            :showHeader="false"
+          />
+      <span>济南方向</span></div>
+      <div class="item"> 
+          <Video
+            class="item-video"
+            :pileNum="dialogData.stakeMark"
+             rangeIndex="downCamera"
+            :showHeader="false"
+          />
+          <span>菏泽方向</span></div>
+      </div>
+  </div>
+    <template #footer>
+      <Button @click.native="onDelete" :loading="loading">解除</Button>
+      <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="obverseVisible = false">取消</Button>
+      <Button v-if="!isError" @click.native="updateEvent" :loading="btnLoading">处置</Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Descriptions from "@screen/components/Descriptions.vue";
+import Video from "@screen/components/VideoMulti";
+import Form from "@screen/components/FormConfig";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import moment, { fn } from "moment";
+
+import Carousel from "@screen/pages/control/event/event/EventDetailDialog/Carousel";
+import {
+  WarningTypeList,
+  WarningSubclassOptions,
+  LaneOccupancyList,
+  DirectionTypes,
+} from "@screen/utils/enum.js";
+// import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import { dialogDelayVisible } from "./../mixin";
+import { markerClusterIns } from "@screen/pages/Home/components/RoadAndEvents/utils/map.js";
+import { eventMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
+
+const _formList = [
+  {
+    label: "事件源:",
+    key: "warningSource",
+    type: "text",
+    enum: "InfoWarningSource",
+  },
+  {
+    label: "桩号:",
+    key: "stakeMark",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "行驶方向:",
+    key: "direction",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "事件类型:",
+    key: "warningType",
+    type: "select",
+    options: {
+      disabled: true,
+      options: [
+        {value:1,label: "交通拥堵"},
+        {value:2,label: "行人"},
+        {value:3,label: "非机动车"},
+        {value:4,label: "停车"},
+        {value:5,label: "违规驾驶"},
+        {value:6,label: "路障"},
+        {value:7,label: "道路施工"},
+        {value:8,label: "异常天气"},
+        {value:9,label: "护栏碰撞"},
+        {value:10,label: "交通事故"},
+        {value:11,label: "车辆故障"},
+        {value:99,label: "其他事件"},
+      ],
+    },
+    ons: {
+      change: (value, { data }) => {
+        this.formList[4].options.options =
+        WarningSubclassOptions[value] || [];
+        data.warningSubclass = null;
+      },
+    },
+  },
+  {
+    label: "细分类型:",
+    key: "warningSubclass",
+    type: "select",
+    options: {
+      options: [],
+    },
+  },
+  {
+    label: "高速名称:",
+    key: "roadName",
+    type: "text",
+  },
+  {
+    label: "发生时间:",
+    key: "warningTime",
+    type: "text",
+  },
+  {
+    label: "持续时长:",
+    key: "duration",
+    type: "text",
+  },
+  {
+    label: "事件描述:",
+    key: "remark",
+    isAlone: true,
+    options: {
+      type: "textarea",
+      maxlength: 100,
+      autosize: { minRows: 1, maxRows: 1 },
+    },
+  },
+  {
+    label: "影响车道:",
+    key: "lane",
+    type: "CheckboxGroup",
+    isAlone: true,
+    options: {
+      options: LaneOccupancyList,
+      gap: "12px",
+    },
+  },
+]
+function getDuration(warningTime) {
+  const currentTime = moment();
+  const specifiedTime = moment(warningTime);
+
+  const duration = moment.duration(currentTime.diff(specifiedTime));
+
+  const hours = Math.floor(duration.asHours());
+  const minutes = Math.floor(duration.asMinutes()) % 60;
+  const seconds = Math.floor(duration.asSeconds()) % 60;
+
+  return `${padZero(hours)}:${padZero(minutes)}:${padZero(seconds)}`;
+}
+
+function padZero(num) {
+  num = num.toString();
+  while (num.length < 2) {
+    num = "0" + num;
+  }
+  return num;
+}
+
+// 感知事件
+export default {
+  name: "PerceiveEvent",
+  mixins: [dialogDelayVisible],
+  components: {
+    Dialog,
+    Button,
+    Descriptions,
+    Video,
+    Carousel,
+    Form,
+  },
+  data() {
+    return {
+      interval: null,
+      loading: true,
+      activeName: "first",
+      deviceControlVisible: false,
+      btnLoading: false,
+      data: {
+       
+      },
+      realType: 'video',
+      realVideo: 'downCamera',
+      formList: [],
+      loading:false,
+      isError:false //是否误报
+    };
+  },
+  mounted() {
+    if (this.dialogData.otherConfig) {
+      const otherConfig = JSON.parse(this.dialogData.otherConfig);
+      this.dialogData.videoList = otherConfig.videoList
+      this.dialogData.pictures = otherConfig.pictures
+    }
+
+    this.getDetails();
+  },
+
+  methods: {
+    videoClick(type){
+      this.realVideo = '';
+      setTimeout(() => {
+        this.realVideo = type
+      }, 300);
+    },
+    onDelete() {
+      const self = this;
+      if(this.formList.length === _formList.length ){
+        this.isError = true;
+        this.formList.push({
+          label: "解除类型:",
+          key: "relieveType",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "误报解除",
+              },
+              {
+                key: "2",
+                label: "已结束",
+              },
+              {
+                key: "3",
+                label: "无需处理",
+              },
+              {
+                key: "4",
+                label: "其它",
+              }
+            ],
+          },
+        })
+        this.formList.push({
+          label: "解除原因:", // 标题
+          key: "relieveReason", //数据存储字段
+          isAlone: true, //  单独一行
+          type: "input", //组件类型(el-input 去掉el-即可) 不填默认为input
+          options: {  //element原生formItem属性
+            type: "textarea",
+            autosize: true,
+            maxlength: 200,
+            autosize: { minRows: 3, maxRows: 3 },
+            showWordLimit: true,
+          }
+        })
+      } else {
+        this.$refs.FormConfigRef.validate()
+          .then((result) => {
+            this.loading = true;
+            request({
+              url: `/business/warning/falseAlarm`,
+              method: "post",
+              data: {
+                id: this.dialogData.id,
+                relieveType: result.relieveType,
+                relieveReason: result.relieveReason
+              },
+            }).then((result) => {
+              if (result.code == 200) Message.success("操作成功");
+              else Message.error(result?.msg);
+
+              setTimeout(() => {
+                self.$root.$emit('delete-event');
+              //触发全局监听事件
+                self.$root.$emit('refresh-event');  
+              }, 500);
+              this.obverseVisible = false;
+              this.loading = false;
+              
+            
+              });
+          })
+          .catch((err) => {
+          });
+      }
+    },
+ 
+    convertSecToHHmmss(sec) {
+      let currentTime = moment.duration(sec, "seconds");
+      return moment({
+        h: currentTime.hours(),
+        m: currentTime.minutes(),
+        s: currentTime.seconds(),
+      }).format("HH:mm:ss");
+    },
+    getDetails() {
+      request({
+        url: `/perceivedEvents/warning/getWarningById`,
+        method: "POST",
+        data: {
+          id: this.dialogData.id,
+        },
+      })
+        .then(result => {
+          if (result.code != 200) return Message.error("详情获取失败");
+
+          result.data.duration = this.convertSecToHHmmss(result.data.duration);
+          let _data = {
+            ...result.data,
+            roadName: '济菏高速',
+            lane: result.data.lane?.split(",") || [],
+          };
+          _formList[4].options.options = WarningSubclassOptions[_data.warningType];
+         
+          _data.direction = DirectionTypes[_data.direction];
+          // _data.duration = getDuration(_data.warningTime);
+          
+          this.formList = [..._formList];
+          this.data = _data;  
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    updateEvent() {
+      this.btnLoading = true;
+
+
+      request({
+        url: `/perceivedEvents/warning/updateWarning`,
+        method: "post",
+        data: {
+          id: this.dialogData.id,
+          warningType: this.data.warningType,
+          warningSubclass: this.data.warningSubclass,
+          // vehicleType: this.data.vehicleType,
+          remark: this.data.remark,
+          lane: this.data.lane.join(","),
+        },
+      })
+        .then(() => {
+          
+
+      let reData = {
+        id: this.dialogData.id,
+        stakeMark: this.data.stakeMark,
+        direction: this.data.direction == '济南方向' ? 3 : 1,
+        warningType: this.data.warningType,
+        warningSource: this.data.warningSource,
+        deptId: this.data.deptId,
+        warningTime: this.data.warningTime,
+        warningLevel: this.data.warningLevel,
+        warningSubclass: this.data.warningSubclass,
+        warningTitle: this.data.warningTitle,
+        lane: this.data.lane.join(","),
+        remark: this.data.remark,
+      }
+        this.btnLoading = true
+        request({
+          url: '/business/warning/updateWarningConvert',
+          method: "post",
+          data: reData,
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          Message.success("成功，等待跳转调度页面。");
+
+          this.obverseVisible = false;
+          this.$emit("queryData", true);
+          this.$root.$emit('refresh-event');
+          const self = this;
+          setTimeout(() => {
+            self.$router.push(`/control/event/commandDispatch?eventId=${self.dialogData.id}`);  
+          }, 300);
+          this.btnLoading = false
+        });
+
+
+        })
+        .catch(() => {
+          Message.error("提交失败");
+        })
+        .finally(() => {
+          this.btnLoading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.EventDetail {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  gap: 9px;
+
+}
+
+.video-stream{
+  margin-top: 10px;
+  width: 100%;
+  display: flex;
+  gap: 15px;
+  justify-content: space-around;
+
+  .item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    max-height: 250px;
+    align-items: center;
+    gap: 6px;
+    span {
+      font-size: 12px;
+    }
+
+    .item-video {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+.video-pic {
+  gap: 9px;
+  display: flex;
+  height: 270px;
+  flex-direction: row;
+  justify-content: space-around;
+  width: 98%;
+}
+
+
+.radio {
+      position: absolute;
+      right: 10px;
+      top: 30px;
+      z-index: 999;
+      background: #265A70;
+      border-radius: 41px 41px 41px 41px;
+      overflow: hidden;
+      opacity: 1;
+      border: 1px solid #3DE8FF;
+      font-size: 12px;
+      // font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      color: #FFFFFF;
+      line-height: 14px;
+      height: fit-content;
+
+      // -webkit-background-clip: text;
+      // -webkit-text-fill-color: transparent;
+
+      .active {
+        background-color: rgba(61, 232, 255, 1);
+      }
+
+      span {
+        background-color: rgba(38, 90, 112, 1);
+        padding: 4px 9px;
+        display: inline-block;
+        cursor: pointer;
+
+        &:hover {
+          background-color: rgba(61, 232, 255, 1);
+        }
+      }
+    }
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue
index 200357eb..84fd6dcc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/components/DeviceControlDialog.vue
@@ -1,25 +1,45 @@
 <template>
-  <Dialog v-model="modelVisible" title="设备操作" width="600px">
-    <div class="DeviceControlDialog">
+  <Dialog v-model="modelVisible" title="设备操作" width="500px">
+    <div class="DeviceControlDialog" v-if="locked">
       <DeviceParams :dialogData="dialogData" />
     </div>
+    <div class="devForm" v-else>
+      <div style="color:#3de8ff">操作口令：</div>
+      <el-input
+        v-model="lockText"
+        style="width: 200px;margin-right: 10px;"
+        placeholder="请输入操作口令解锁面板"
+      ></el-input>
+      <ButtonGradient 
+      style="background-color: #00B3CC;cursor: pointer; padding:2px 10px; font-size: 14px;" 
+      @click.native="onLockClick">解锁</ButtonGradient>
+    </div>
   </Dialog>
 </template>
 
 <script>
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import Dialog from "@screen/components/Dialog/index.vue";
 import DeviceParams from "./DeviceParams.vue";
+import request from "@/utils/request";
 
 export default {
   name: "DeviceControlDialog",
   components: {
     Dialog,
     DeviceParams,
+    ButtonGradient
   },
   model: {
     prop: "visible",
     event: "update:value",
   },
+  data() {
+    return {
+      locked: false,
+      lockText: ''
+    }
+  },
   props: {
     visible: Boolean,
     dialogData: {
@@ -27,6 +47,29 @@ export default {
       default: () => ({}),
     },
   },
+
+  methods:{
+    onLockClick(){
+      if(this.lockText === ''){
+        this.$message.error('请输入解锁口令')
+        return;
+      }
+      request({
+            url: `business/device/kouling/${this.lockText}`,
+            method: "get",
+        }).then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            if(result.data){
+              this.locked = true;
+            } else {
+              this.$message.error("解锁口令错误");
+            }
+        }).catch(() => {
+            this.$message.error("解锁失败");
+        })
+
+    }
+  },
   computed: {
     modelVisible: {
       get() {
@@ -42,7 +85,7 @@ export default {
 
 <style lang="scss" scoped>
 .DeviceControlDialog {
-  width: 510px;
+  width: 100%;
   display: flex;
   flex-direction: column;
   gap: 15px;
@@ -52,4 +95,10 @@ export default {
     font-size: 12px;
   }
 }
+.devForm{
+  display: flex;
+  height: 360px;
+  justify-content: center;
+  align-items: center;
+}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue
index 3053c351..445fcabd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue
@@ -1,6 +1,6 @@
 <template>
     <Dialog v-model="obverseVisible" title="远端机" width="600px">
-        <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+        <Video class="video-stream" :camId="camId" />
 
         <div class="RemoteMachine">
             <ElTabs v-model="activeName" class="tabs">
@@ -66,7 +66,7 @@ export default {
             deviceControlVisible: false,
             data: {
                 deviceName: "LH24",
-                roadName: "G35济泽高速",
+                roadName: "济菏高速",
                 stakeMark: "k094+079",
                 direction: "1",
                 organizationName: "山东高速济南发展公司",
@@ -107,18 +107,24 @@ export default {
                     key: "manufacturer",
                 },
             ],
+            camId:null
         };
     },
     async created() {
-        if (this.dialogData) {
-            this.data = {
-                ...this.dialogData,
-            }
+       // 修改camid
+        if(typeof this.dialogData.otherConfig === 'string'){
+        const oConfig = JSON.parse(this.dialogData.otherConfig)
+        if(oConfig && oConfig.camId){
+            this.camId = oConfig.camId
+        }
         }
 
+        this.data = { ...this.dialogData };
+
+
         let deviceInfo = await this.getDeviceInfo();
         this.data = {
-            roadName: null,
+            roadName: '济菏高速',
             deviceStateLiteral: deviceInfo?.data.formatValue.deviceState,
             ...this.data
         };
@@ -130,7 +136,6 @@ export default {
         const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
         if (roadInfo) this.data.roadName = roadInfo.roadName;
-        console.log('this.data', this.data)
     },
     methods: {
         async getDeviceInfo() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js
index faf755c5..d01f70f3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/chart.js
@@ -34,7 +34,7 @@ export const chartOption ={
       color: "#2AD9FD",
       // align: "right",
       fontSize: 15,
-      // padding: [0, -15, 0, 0],
+      padding: [0, -15, 0, 0],
     },
     // nameGap: 24,
     splitLine: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
index 7ba7631a..6e206650 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
@@ -500,38 +500,96 @@ export const tabList = {
         
       ],
     },
+    // {
+    //   name: "边坡测点数据",
+    //   key: "second",
+    //   labelWidth: "70px",
+    //   list: [
+    //     {
+    //       label:"醒目编号",
+    //       key: "pro_code",
+    //       gridColumn: "3"
+    //     },
+    //     {
+    //       label: "标段编号",
+    //       key: "con_code",
+    //       gridColumn: "3",
+    //     },
+    //     {
+    //       label: "项目单位工程编号",
+    //       key: "unit_code",
+    //       gridColumn: "3",
+    //     },
+    //     {
+    //       label: "测点编号",
+    //       key: "meaPointNum",
+    //       gridColumn: "3",
+    //     },
+    //     {
+    //       label: "测点名称",
+    //       key: "meaPointName",
+    //       gridColumn: "3",
+    //     },
+        
+    //   ],
+    // },
+  ],
+  999:[
     {
-      name: "边坡测点数据",
-      key: "second",
-      labelWidth: "70px",
+      name: "基本信息",
+      key: "first",
+      labelWidth: "80px",
       list: [
         {
-          label:"醒目编号",
-          key: "pro_code",
-          gridColumn: "3"
-        },
-        {
-          label: "标段编号",
-          key: "con_code",
-          gridColumn: "3",
-        },
-        {
-          label: "项目单位工程编号",
-          key: "unit_code",
-          gridColumn: "3",
-        },
-        {
-          label: "测点编号",
-          key: "meaPointNum",
-          gridColumn: "3",
-        },
-        {
-          label: "测点名称",
-          key: "meaPointName",
-          gridColumn: "3",
-        },
-        
-      ],
-    },
-  ],
+          label:"地址",
+          key: "orgName",
+          gridColumn: 3
+        }, {
+          label:"桩号",
+          key: "stakeMark",
+          gridColumn: 3
+        },  {
+          label:"天气",
+          key: "text",
+          gridColumn: 3
+        },{
+          label:"温度",
+          key: "temp",
+          gridColumn: 3
+        },{
+          label:"湿度",
+          key: "humidity",
+          gridColumn: 3
+        },{
+          label:"降水量",
+          key: "precip",
+          gridColumn: 3
+        },{
+          label:"风向",
+          key: "windDir",
+          gridColumn: 3
+        },{
+          label:"风力",
+          key: "windScale",
+          gridColumn: 3
+        },{
+          label:"风速",
+          key: "windSpeed",
+          gridColumn: 3
+        },{
+          label:"能见度",
+          key: "vis",
+          gridColumn: 3
+        },{
+          label:"能见度等级",
+          key: "visDesc",
+          gridColumn: 3
+        },{
+          label:"发布时间",
+          key: "obsTime",
+          gridColumn: 3
+        },
+      ]
+    }
+  ]
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
index 08c1349d..24f8ad43 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
@@ -13,9 +13,25 @@
           <ElTabPane v-for="item in formList" :key="item.key" :label="item.name" :name="item.key">
             <Descriptions :labelWidth="item.labelWidth" :list="item.list" :data="data" style="gap: 12px" column="6" />
           </ElTabPane>
+          <ElTabPane label="边坡测点数据" v-if="dialogData.facilityType === 9">
+            <Table :data="bianpoData" height="200px" >
+              <ElTableColumn label="项目编号" prop="pro_code" width="80" ></ElTableColumn>
+              <ElTableColumn label="标段编号" prop="con_code" width="80" ></ElTableColumn>
+              <ElTableColumn label="测点名称" prop="meaPointName" width="80" ></ElTableColumn>
+              <ElTableColumn label="工程编号" prop="unit_code" ></ElTableColumn>
+            <ElTableColumn label="测点编号" prop="meaPointNum"  ></ElTableColumn>
+        </Table>
+          </ElTabPane>
           <ElTabPane label="测点历史数据" v-if="dialogData.facilityType === 9">
+            <el-select v-model="bindpoSelecte" placeholder="" @change="bindListAsync" transfer="true"
+                style="width: 240px;">
+                <el-option v-for="item in bianpoOptions"
+                 :key="item.key" :label="item.label" 
+                 :value="item.key">
+                </el-option>
+            </el-select>
             <el-date-picker v-model="daterangeChangeTime" size="mini"
-              style="width: 320px;float:right;margin-bottom: 10px;" value-format="yyyy-MM-dd" type="daterange"
+              style="width: 190px;float:right;margin-bottom: 10px;" value-format="yyyy-MM-dd" type="daterange"
               range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             <div class='chart LineChart' ref="chartRef" />
           </ElTabPane>
@@ -46,6 +62,8 @@ import * as echarts from "echarts";
 import { chartOption } from "./chart"
 import moment from "moment";
 
+import Table from "@screen/components/Table.vue";
+
 // 所有交通事件的详情
 export default {
   name: "RoadNetworkFacilities",
@@ -54,12 +72,16 @@ export default {
     Dialog,
     Descriptions,
     Video,
+    Table
   },
   data() {
     return {
       tabList,
       activeName: "first",
       deviceControlVisible: false,
+      bianpoData:[],
+      bianpoOptions:[],
+      bindpoSelecte:"",
       data: {
         deviceType: "",
         deviceStation: "",
@@ -74,7 +96,8 @@ export default {
       upsForm:[],
       upsData:{},
       // 收费站增加UPS
-      upsList:[]
+      upsList:[],
+      
     };
   },
   watch: {
@@ -85,6 +108,7 @@ export default {
         }
       }
     },
+    
     daterangeChangeTime: {
       handler(val) {
         if(this.dialogData.facilityType === 9){
@@ -113,24 +137,39 @@ export default {
         if (dData.direction) {
           dData.direction = DirectionTypes[dData.direction]
         }
-        let resPointList = await request({
-          url: `sideSlope/GetMeasurePointList`,
-          method: "get",
-        });
-        if (resPointList.code != 200) return Message.error(resPointList?.msg);
-        let pointList = {};
-        if (resPointList.data && resPointList.data.result && resPointList.data.result.length > 0) {
-          pointList = resPointList.data.result[0]
+        if(dData.facilityType === 9){
+          let resPointList = await request({
+            url: `sideSlope/GetMeasurePointList`,
+            method: "get",
+          });
+          if (resPointList.code != 200) return Message.error(resPointList?.msg);
+          this.bianpoData = resPointList.data.result;
+          let _options = [];
+          for(let i of resPointList.data.result){
+            _options.push({
+              key: i['pro_code']+'|'+i['unit_code']+'|'+i['meaPointNum'],
+              label: i['meaPointName']+' '+i['meaPointNum']
+            })
+          }
+          console.log(_options)
+          this.bindpoSelecte = _options[0].key
+          this.bianpoOptions = _options
+          //获取历史数据echart
+          this.daterangeChangeTime = [moment().startOf('months').format('YYYY-MM-DD'), moment().endOf('months').format('YYYY-MM-DD')]
         }
-        dData = { ...dData, ...otherConfig, ...pointList }
-        //获取历史数据echart
+        
+        // let pointList = {};
+        // if (resPointList.data && resPointList.data.result && resPointList.data.result.length > 0) {
+        //   pointList = resPointList.data.result[0]
+        // }
+        dData = { ...dData, ...otherConfig,}
+        
 
         this.upsList=otherConfig.UPSList||[]
       }
     this.data = dData;
-    this.daterangeChangeTime = [moment().startOf('months').format('YYYY-MM-DD'), moment().endOf('months').format('YYYY-MM-DD')]
+    
 
-    console.log('this.data', this.data)
   },
   methods: {
     camClose(){
@@ -158,14 +197,16 @@ export default {
         this.upsData = _data;
       })
     },
+   
     async bindListAsync() {
+      let aryParam = _.find(this.bianpoOptions,{key:this.bindpoSelecte}).key.split('|')
       let res = await request({
         url: `sideSlope/GetPointDataListAsync`,
         method: "get",
         params: {
-          projCode: this.data.pro_code,
-          unitCode: this.data.unit_code,
-          meaPointNum: this.data.meaPointNum,
+          projCode: aryParam[0],
+          unitCode: aryParam[1],
+          meaPointNum: aryParam[2],
           starttime: this.dateRange[0],
           endtime: this.dateRange[1],
         }
@@ -174,12 +215,30 @@ export default {
       const cdata = [];
       const cseries1 = [];
       const cseries2 = [];
+      let title = '';
+      const enum_title = {
+        displacementH: "水平位移",
+        displacementV: "垂直位移",
+        displacementE: "东位移",
+        displacementN: "北位移",
+        absoluteDisplacement: "裂缝",
+        stress: "应力",
+        accelerationX: "X轴加速度",
+        accelerationY: "Y轴加速度",
+        accelerationZ: "Z轴加速度",
+        precipitation: "降雨量",
+      }
       res.data.forEach(e => {
         cdata.push((moment(e.measureTime).format('YYYY-MM-DD')))
+        if(title === ''){
+          title = enum_title[e.data[0].type]
+        }
         cseries1.push(e.data[0].value)
         cseries2.push(e.data[0].cum)
       });
       chartOption.xAxis.data = cdata;
+      chartOption.yAxis[0].name =title+'日计'
+      chartOption.yAxis[1].name =title+'累计'
       chartOption.series[0].data = cseries1;
       chartOption.series[1].data = cseries2;
       const chartIns = echarts.init(this.$refs.chartRef);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
index 200357eb..0a5e9963 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
@@ -1,25 +1,45 @@
 <template>
-  <Dialog v-model="modelVisible" title="设备操作" width="600px">
-    <div class="DeviceControlDialog">
+  <Dialog v-model="modelVisible" title="设备操作" width="500px">
+    <div class="DeviceControlDialog" v-if="locked">
       <DeviceParams :dialogData="dialogData" />
     </div>
+    <div class="devForm" v-else>
+      <div style="color:#3de8ff">操作口令：</div>
+      <el-input
+        v-model="lockText"
+        style="width: 200px;margin-right: 10px;"
+        placeholder="请输入操作口令解锁面板"
+      ></el-input>
+      <ButtonGradient 
+      style="background-color: #00B3CC;cursor: pointer; padding:2px 10px; font-size: 14px;" 
+      @click.native="onLockClick">解锁</ButtonGradient>
+    </div>
   </Dialog>
 </template>
 
 <script>
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import Dialog from "@screen/components/Dialog/index.vue";
 import DeviceParams from "./DeviceParams.vue";
+import request from "@/utils/request";
 
 export default {
   name: "DeviceControlDialog",
   components: {
     Dialog,
     DeviceParams,
+    ButtonGradient
   },
   model: {
     prop: "visible",
     event: "update:value",
   },
+  data() {
+    return {
+      locked: false,
+      lockText: ''
+    }
+  },
   props: {
     visible: Boolean,
     dialogData: {
@@ -27,12 +47,36 @@ export default {
       default: () => ({}),
     },
   },
+  methods:{
+    onLockClick(){
+      if(this.lockText === ''){
+        this.$message.error('请输入解锁口令')
+        return;
+      }
+      request({
+            url: `business/device/kouling/${this.lockText}`,
+            method: "get",
+        }).then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            if(result.data){
+              this.locked = true;
+            } else {
+              this.$message.error("解锁口令错误");
+            }
+        }).catch(() => {
+            this.$message.error("解锁失败");
+        })
+
+    }
+  },
   computed: {
     modelVisible: {
       get() {
         return this.visible;
       },
       set(val) {
+        this.locked = false;
+        this.lockText = '';
         this.$emit("update:value", val);
       },
     },
@@ -42,7 +86,7 @@ export default {
 
 <style lang="scss" scoped>
 .DeviceControlDialog {
-  width: 510px;
+  width: 100%;
   display: flex;
   flex-direction: column;
   gap: 15px;
@@ -52,4 +96,10 @@ export default {
     font-size: 12px;
   }
 }
+.devForm{
+  display: flex;
+  height: 360px;
+  justify-content: center;
+  align-items: center;
+}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
index 556bcb0f..1faae5b9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="obverseVisible" title="智能设备箱" width="600px">
-    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+    <Video class="video-stream"  :camId="camId" />
 
     <div class="SmartDevice">
       <ElTabs v-model="activeName" class="tabs">
@@ -67,7 +67,7 @@ export default {
       deviceControlVisible: false,
       data: {
         deviceName: "LH24",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         stakeMark: "k094+079",
         direction: "1",
         organizationName: "山东高速济南发展公司",
@@ -108,18 +108,24 @@ export default {
           key: "manufacturer",
         },
       ],
+      camId:null
     };
   },
   async created() {
     // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
-    if(this.dialogData){
-      this.data = {
-        ...this.dialogData,
+ 
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
       }
     }
+
+    this.data = { ...this.dialogData, roadName: '济菏高速' };
+
     let deviceInfo = await this.getDeviceInfo();
     this.data = {
-      roadName: null,
+      roadName: '济菏高速' ,
       deviceStateLiteral: deviceInfo?.data.formatValue.deviceState,
       ...this.data
     };
@@ -135,9 +141,9 @@ export default {
       this.dialogData.brand = data.brand;
     });
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    // if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
     async getDeviceInfo() {
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 a5e4e6bf..20f1d90d 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
@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="obverseVisible" title="太阳能板" width="550px">
-    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+    <Video class="video-stream" :camId="camId" />
 
     <div class="SolarEnergy">
       <ElTabs v-model="activeName" class="tabs">
@@ -67,7 +67,7 @@ export default {
       deviceControlVisible: false,
       data: {
         deviceName: "LH24",
-        roadName: "G35济泽高速",
+        roadName: "济菏高速",
         stakeMark: "k094+079",
         direction: "1",
         organizationName: "山东高速济南发展公司",
@@ -107,32 +107,33 @@ export default {
           key: "manufacturer",
         },
       ],
+      camId:null
     };
   },
   async created() {
     // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
 
     // let deviceInfo = await this.getDeviceInfo();
+    // 修改camid
+    if(typeof this.dialogData.otherConfig === 'string'){
+      const oConfig = JSON.parse(this.dialogData.otherConfig)
+      if(oConfig && oConfig.camId){
+        this.camId = oConfig.camId
+      }
+    }
     this.data = {
       ...this.dialogData,
-      roadName: null,
+      roadName: '济菏高速',
       // deviceStateLiteral: deviceInfo.data.formatValue.deviceState,
     };
 
-    // console.log(
-    //   "%c [ dialogData ]-103-「index.vue」",
-    //   "font-size:15px; background:#36347c; color:#7a78c0;",
-    //   this.dialogData,
-    //   "+++========"
-    // );
     //厂商
     getProduct(this.dialogData.productId).then((data) => {
       this.dialogData.brand = data.brand;
     });
 
-    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
-
-    if (roadInfo) this.data.roadName = roadInfo.roadName;
+    // const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+    // if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
     async getDeviceInfo() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
index 72252cdb..e16ded6c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
@@ -1,126 +1,24 @@
 <template>
-  <Dialog v-model="obverseVisible" :title="dialogData._itemData && dialogData._itemData.title" width="650px"  @update:close="camClose">
-    <div class="TrafficIncidents">
-      <div class="header">
-        <Video ref="refVideo1" class="video-stream" :pileNum="dialogData.stakeMark" rangeIndex="upCamera" :showHeader="false" />
-        <Video ref="refVideo2" class="video-stream" :pileNum="dialogData.stakeMark" rangeIndex="downCamera" :showHeader="false" />
-      </div>
-      <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
-    </div>
-    <div class="foote">
-      <Button @click.native="handleEventRelieve" style="width: 100px;" v-if="data.eventState == '0'">
-        误报
-      </Button>
-      <Button @click.native="goDispatch" style="width: 100px;">
-        设备管控
-      </Button>
-      <Button @click.native="goDispatch" style="width: 100px;">
-        调度处置
-      </Button>
-    </div>
-  </Dialog>
+    <!-- 事件弹窗 事件 - 首页 -->
+    <EventDetailDialog :visible="obverseVisible" :formData="data" :activeName="activeName"
+    @update:value="handleDialogClose" @queryData="reData" />
 </template>
 
 <script>
-import Button from "@screen/components/Buttons/Button.vue";
-import Dialog from "@screen/components/Dialog/index.vue";
-import Descriptions from "@screen/components/Descriptions.vue";
-// import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
-import Video from "@screen/components/VideoMulti";
 
 import request from "@/utils/request";
 import { dialogDelayVisible } from "./../mixin";
-import {
-  postCompleteEvent,
-} from "@/api/commandDispatch";
-// 所有交通事件的详情
 export default {
   name: "TrafficIncidents",
   mixins: [dialogDelayVisible],
   components: {
-    Dialog,
-    Descriptions,
-    Video,
-    Button
+
   },
   data() {
     return {
-      activeName: "first",
-      deviceControlVisible: false,
+      activeName:'1',
       data: {
-        deviceType: "行车诱导",
-        deviceStation: "k094+079",
-        roadName: "G35济泽高速",
-        direction: "1",
-        deviceState: "0",
-        deviceVendors: "XXX厂家",
       },
-      list: [
-        // {
-        //   label: "机构",
-        //   key: "organizationName",
-        //   gridColumn: "3",
-        // },
-        {
-          label: "高速名称",
-          key: "roadName",
-          gridColumn: "3",
-        },
-        {
-          label: "感知时间",
-          key: "occurrenceTime",
-          gridColumn: "3",
-          visible: () => this.isPerceived,
-        },
-        {
-          label: "桩号",
-          key: "stakeMark",
-          gridColumn: "3",
-        },
-        {
-          label: "事件源",
-          key: "stringEventSource",
-          gridColumn: "3",
-        },
-        {
-          label: "影响车道",
-          key: "lang",
-          enum: "LaneOccupancy",
-          gridColumn: "3",
-        },
-        {
-          label: "事件状态",
-          key: "eventState",
-          enum: "EventType",
-          gridColumn: "3",
-        },
-        {
-          label: "经/纬度",
-          key: "${longitude} / ${latitude}",
-          gridColumn: "5",
-        },
-        {
-          label: "发生时间",
-          key: "occurrenceTime",
-          gridColumn: "3",
-        },
-        {
-          label: "行驶方向",
-          key: "direction",
-          enum: "CameraDirectionEnum",
-          gridColumn: "3",
-        },
-        // {
-        //   label: "完结时间",
-        //   key: "endTime",
-        //   gridColumn: "3",
-        // },
-        {
-          label: "事件描述",
-          key: "description",
-          gridColumn: "5",
-        },
-      ],
     };
   },
   async created() {
@@ -137,112 +35,16 @@ export default {
       .catch((err) => { });
   },
   methods: {
-    camClose(){
-      this.$refs.refVideo1.closeContrl()
-      this.$refs.refVideo2.closeContrl()
-    },
-    handleClickTabs() { },
-    goDispatch() {
-      request({
-      url: `/dc/system/event/dcEventState/${this.dialogData.id}/1`,
-      method: "put",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) return;
-        this.$router.push(`/control/event/commandDispatch?id=${this.dialogData.id}`);
-      })
-      .catch((err) => { });
-    },
-    goStrategy() {
-      this.$router.push(`/control/device/strategy`);
-    },
-    handleEventRelieve() {
-
-      this.$confirm("确定事件误报吗？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          request({
-            url: `dc/system/event/${this.dialogData.id}`,
-            method: "delete",
-          }).then((result) => {
-            if (result.code == 200) this.$message.success("成功！");
-            else this.$message.error(result?.msg);
-
-            this.$emit('traffic-relieve', this.data);
-            //触发全局监听事件
-            this.$root.$emit('refresh-event');
-          });
+    reData(){
 
-        })
-        .catch(() => { });
     },
-  },
+    handleDialogClose() {
+      this.obverseVisible = false;
+      this.$root.$emit('refresh-event-list');
+    },
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-.TrafficIncidents {
-  width: 600px;
-  overflow:hidden;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-
-  .camera-video {
-    flex: 1.5;
-  }
-
-  .header {
-    display: flex;
-    gap: 9px;
-
-    >div.video-stream {
-      height: 210px;
-    }
-  }
-
-  .tabs {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-
-    ::v-deep {
-      .el-tabs__content {
-        flex: 1;
-
-        .el-tab-pane {
-          height: 100%;
-        }
-      }
-    }
-  }
-
-  .bottom {
-    margin-top: 12px;
-    display: flex;
-    gap: 9px;
-    align-items: center;
-    justify-content: end;
-
-    >div {
-      font-size: 16px;
-      padding: 6px 12px;
-    }
-  }
-}
-
-.foote {
-  display: flex;
-  align-items: center;
-  gap: 9px;
-  width: 100%;
-  justify-content: flex-end;
-  // margin: 20px 0px -20px 0px;
-  height: 40px;
-
-}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index_v1.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index_v1.vue
new file mode 100644
index 00000000..bcc8344c
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index_v1.vue
@@ -0,0 +1,255 @@
+<template>
+    <!-- 事件弹窗 事件 - 首页 旧 -->
+  <Dialog v-model="obverseVisible" :title="dialogData._itemData && dialogData._itemData.title" width="650px"  @update:close="camClose">
+    <div class="TrafficIncidents">
+      <div class="header">
+        <Video ref="refVideo1" class="video-stream" :pileNum="dialogData.stakeMark" rangeIndex="upCamera" :showHeader="false" />
+        <Video ref="refVideo2" class="video-stream" :pileNum="dialogData.stakeMark" rangeIndex="downCamera" :showHeader="false" />
+      </div>
+      <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
+    </div>
+    <div class="foote">
+      <Button @click.native="handleEventRelieve" style="padding: 0 24px;" v-if="data.eventState == '0'">
+        误报
+      </Button>
+      <!-- <Button @click.native="goDispatch" style="width: 100px;">
+        设备管控
+      </Button> -->
+      <Button style="background: #0e708b; padding: 0 24px"
+          @click.native="(obverseVisible = false), (submitting = false)">取消</Button>
+      <Button @click.native="goDispatch" style="padding: 0 24px;">
+        {{data.eventState == '0'?'确认':'处置'}}
+      </Button>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Button from "@screen/components/Buttons/Button.vue";
+import Dialog from "@screen/components/Dialog/index.vue";
+import Descriptions from "@screen/components/Descriptions.vue";
+// import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import Video from "@screen/components/VideoMulti";
+
+import request from "@/utils/request";
+import { dialogDelayVisible } from "./../mixin";
+import {
+  postCompleteEvent,
+} from "@/api/commandDispatch";
+// 所有交通事件的详情
+export default {
+  name: "TrafficIncidents",
+  mixins: [dialogDelayVisible],
+  components: {
+    Dialog,
+    Descriptions,
+    Video,
+    Button
+  },
+  data() {
+    return {
+      activeName: "first",
+      deviceControlVisible: false,
+      data: {
+        deviceType: "行车诱导",
+        deviceStation: "k094+079",
+        roadName: "G35济泽高速",
+        direction: "1",
+        deviceState: "0",
+        deviceVendors: "XXX厂家",
+      },
+      list: [
+        // {
+        //   label: "机构",
+        //   key: "organizationName",
+        //   gridColumn: "3",
+        // },
+        {
+          label: "高速名称",
+          key: "roadName",
+          gridColumn: "3",
+        },
+        {
+          label: "感知时间",
+          key: "occurrenceTime",
+          gridColumn: "3",
+          visible: () => this.isPerceived,
+        },
+        {
+          label: "桩号",
+          key: "stakeMark",
+          gridColumn: "3",
+        },
+        {
+          label: "事件源",
+          key: "stringEventSource",
+          gridColumn: "3",
+        },
+        {
+          label: "影响车道",
+          key: "lang",
+          enum: "LaneOccupancy",
+          gridColumn: "3",
+        },
+        {
+          label: "事件状态",
+          key: "eventState",
+          enum: "EventType",
+          gridColumn: "3",
+        },
+        {
+          label: "经/纬度",
+          key: "${longitude} / ${latitude}",
+          gridColumn: "5",
+        },
+        {
+          label: "发生时间",
+          key: "occurrenceTime",
+          gridColumn: "3",
+        },
+        {
+          label: "行驶方向",
+          key: "direction",
+          enum: "CameraDirectionEnum",
+          gridColumn: "3",
+        },
+        // {
+        //   label: "完结时间",
+        //   key: "endTime",
+        //   gridColumn: "3",
+        // },
+        {
+          label: "事件描述",
+          key: "description",
+          gridColumn: "5",
+        },
+      ],
+    };
+  },
+  async created() {
+    this.data = { ...this.dialogData };
+    request({
+      url: `/business/trafficIncidents/getEventInfo/${this.dialogData.id}`,
+      method: "get",
+    })
+      .then(({ code, data }) => {
+        if (code != 200) return;
+
+        this.data = { ...data, ...this.data };
+      })
+      .catch((err) => { });
+  },
+  methods: {
+    camClose(){
+      this.$refs.refVideo1.closeContrl()
+      this.$refs.refVideo2.closeContrl()
+    },
+    handleClickTabs() { },
+    goDispatch() {
+      if(this.data.eventState === 1){
+        this.$router.push(`/control/event/commandDispatch?id=${this.dialogData.id}`);
+      } else {
+        request({
+        url: `/dc/system/event/dcEventState/${this.dialogData.id}/1`,
+        method: "put",
+        }).then(({ code, data }) => {
+          if (code != 200) return;
+          this.$router.push(`/control/event/commandDispatch?id=${this.dialogData.id}`);
+        })
+        .catch((err) => { });
+      }
+      
+    },
+    goStrategy() {
+      this.$router.push(`/control/device/strategy`);
+    },
+    handleEventRelieve() {
+
+      this.$confirm("确定事件误报吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          request({
+            url: `dc/system/event/${this.dialogData.id}`,
+            method: "delete",
+          }).then((result) => {
+            if (result.code == 200) this.$message.success("成功");
+            else this.$message.error(result?.msg);
+
+            this.$emit('traffic-relieve', this.data);
+            //触发全局监听事件
+            this.$root.$emit('refresh-event');
+          });
+
+        })
+        .catch(() => { });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.TrafficIncidents {
+  width: 600px;
+  overflow:hidden;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+
+  .camera-video {
+    flex: 1.5;
+  }
+
+  .header {
+    display: flex;
+    gap: 9px;
+
+    >div.video-stream {
+      height: 210px;
+    }
+  }
+
+  .tabs {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+
+    ::v-deep {
+      .el-tabs__content {
+        flex: 1;
+
+        .el-tab-pane {
+          height: 100%;
+        }
+      }
+    }
+  }
+
+  .bottom {
+    margin-top: 12px;
+    display: flex;
+    gap: 9px;
+    align-items: center;
+    justify-content: end;
+
+    >div {
+      font-size: 16px;
+      padding: 6px 12px;
+    }
+  }
+}
+
+.foote {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  width: 100%;
+  justify-content: flex-end;
+  // margin: 20px 0px -20px 0px;
+  height: 40px;
+
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js
index b1fb3932..df82a589 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/mixin.js
@@ -25,13 +25,13 @@ export const dialogDelayVisible = {
   computed: {
     obverseVisible: {
       set(bool) { 
-        try {
-          typeof this.visibleClose === "function" && this.visibleClose?.(bool);
-        } catch (error) {}
+        // console.log(this.visibleClose,'333333')
+        // try {
+        //   typeof this.visibleClose === "function" && this.visibleClose?.(bool);
+        // } catch (error) {}
         setTimeout(() => {
           this.$emit("change", bool);
         }, 180);
-
         setTimeout(() => {
           this.visibleData = bool;
         });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue
index 465d412a..fb69daa9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue
@@ -1,44 +1,45 @@
 <template>
   <Bg2 class="content-l-t">
-    <div class="content-l-t-title keep-ratio" origin="left">
+      <div class="focuse-header">
+        <div class="title"></div>
+      <!-- <img class="icon_005" src="@screen/images/icon/icon_005.png" /> -->
     </div>
-    <img class="icon_005" src="@screen/images/icon/icon_005.png" />
     <div class="content-l-t-content">
-      <div class="monitor-item keep-ratio">
-        <span>59676</span>
+      <div class="monitor-item">
+        <span>{{trafficVolume}}</span>
         <div>日累计车流量</div>
       </div>
-      <div class="monitor-item keep-ratio">
-        <span>4618</span>
+      <div class="monitor-item">
+        <span>{{ transitVehicles }}</span>
         <div>当前在途车辆</div>
       </div>
-      <div class="monitor-item keep-ratio">
+      <div class="monitor-item">
         <p>
           <span class="abnormal">{{ trafficIncidents[0] }}</span>
           <span>/{{ trafficIncidents[1] }}</span>
         </p>
         <div>交通事故</div>
       </div>
-      <div class="monitor-item keep-ratio">
+      <div class="monitor-item">
         <span>{{ constructionSection }}</span>
         <span class="unit">处</span>
         <div>施工路段</div>
       </div>
-      <div class="monitor-item keep-ratio">
+      <div class="monitor-item">
         <span class="fault">{{ weatherForecast }}</span>
         <span class="unit">处</span>
         <div>气象预警</div>
       </div>
-      <div class="monitor-item keep-ratio">
+      <div class="monitor-item" >
         <span class="abnormal">{{ abnormalDeviceNum }}</span>
         <div>异常设备</div>
       </div>
-      <div class="monitor-item keep-ratio">
+      <div class="monitor-item">
         <span>{{ perceiveEvent }}</span>
         <div>感知事件</div>
       </div>
-      <div class="monitor-item keep-ratio">
-        <span class="num">96.3</span>
+      <div class="monitor-item">
+        <span class="num">{{ averageSpeed }}</span>
         <div>平均车速</div>
       </div>
     </div>
@@ -48,7 +49,7 @@
 <script>
 import Bg2 from "@screen/components/Decorations/bg-2.vue"
 import request from "@/utils/request";
-
+import {toDecimal} from "@screen/utils/common";
 export default {
   name: "FocusedMonitoring",
   components: {
@@ -56,6 +57,9 @@ export default {
   },
   data() {
     return {
+      transitVehicles: 0, //当前在途车辆
+      trafficVolume: 0, //日累计车流量
+      averageSpeed: 0, //平均车速
       trafficIncidents: [0, 0],
       constructionSection: 0,
       perceiveEvent: 0,
@@ -64,6 +68,7 @@ export default {
     }
   },
   created() {
+    // ==================
     Promise.allSettled([
       // 交通事件, 施工路段
       request({
@@ -82,13 +87,13 @@ export default {
         data: {}
       }),
       // 首页天气预报
-      // request({url: '/weatherForecast/currentWeatherWarningInformationQuery',
-      //   method: 'post',
-      //   data: {
-      //     "roadId":"G003537",
-      //     "earlyWorningLevel":"1|2|3"
-      //   }
-      // }),
+      request({url: '/weatherForecast/currentWeatherWarningInformationQuery',
+        method: 'post',
+        data: {
+          "roadId":"G003537",
+          "earlyWorningLevel":"1|2|3"
+        }
+      }),
     ])
       .then(([trafficIncidents, perceiveEvent, abnormalDeviceNum, weatherForecast]) => {
         if (trafficIncidents.status === 'fulfilled' && trafficIncidents.value.code == 200) {
@@ -116,66 +121,104 @@ export default {
           this.weatherForecast = data.length;
         }
       })
+    //-----当前在途车辆
+    request({
+        url: `/business/traffic-statistics/current/in-transit-vehicles`,
+        method: "get",
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        let _count = 0;
+        for(let i in result.data[0]){
+          _count += result.data[0][i]
+        }
+        this.transitVehicles = _count;
+      })
+
+    //-----日累计车流量
+    request({
+        url: `/business/traffic-statistics/history/trafficFlowAtToll`,
+        method: "get",
+        params: {
+          periodType: 4,
+          startTime: moment().format('YYYY-MM-DD')+ ' 00:00:00',
+          endTime: moment().format('YYYY-MM-DD')+ ' 23:59:59',
+      }
+    }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        this.trafficVolume = result.data;
+    })
+    //-----平均车速
+     request({
+        url: `/business/traffic-statistics/current/average-speed`,
+        method: "get",
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        if(result.data.length > 0){
+          let _count = 0;
+          result.data.map(x=>_count+=x.avgSpeed)
+          this.averageSpeed = toDecimal(_count/result.data.length)
+        }
+      })
   }
 }
 </script>
 
 <style lang="less">
 .content-l-t {
-  width: 100%;
-  margin: auto;
-  height: 332px;
-  position: relative;
-
-  >div:first-child {
-    padding-top: 10px;
-  }
-
-  .icon_005 {
-    position: absolute;
-    right: 25px;
-    top: 40px;
-    width: 19px;
-    height: 15px;
+  ::v-deep {
+    .BackgroundClip.bg {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-around;
+    }
   }
-
-  .content-l-t-title {
-    width: 240px;
-    height: 51px;
-    overflow: hidden;
+  .focuse-header {
+    width: 100%;
     display: flex;
     align-items: center;
-    margin-left: 10px;
-    background: url("~@screen/images/title/title_bg_003.png") no-repeat;
-    background-size: 100% 100%;
+    justify-content: space-between;
+    .icon_005 {
+      margin-right: 24px;
+      margin-top: 36px;
+    }
+
+    .title {
+      width: 220px;
+      height: 40px;
+      margin-top: 10px;
+      margin-left: 10px;
+      display: flex;
+      align-items: center;
+      background: url("~@screen/images/title/title_bg_003.png") no-repeat;
+      background-size: 100% 100%;
 
-    span {
-      margin-left: 24px;
-      font-size: 30px;
-      font-family: YouSheBiaoTiHei;
-      font-weight: 400;
-      line-height: 36px;
-      letter-spacing: 2px;
-      text-shadow: 0px 5px 0px rgba(0, 0, 0, 0.25);
-      background: linear-gradient(180deg, #ffffff 0%, #4dd4ff 100%);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
+      span {
+        font-size: 30px;
+        font-family: YouSheBiaoTiHei;
+        font-weight: 400;
+        letter-spacing: 2px;
+        text-shadow: 0px 5px 0px rgba(0, 0, 0, 0.25);
+        background: linear-gradient(180deg, #ffffff 0%, #4dd4ff 100%);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        margin-left: 24px;
+      }
     }
   }
 
   .content-l-t-content {
-    padding: 27px 14px 0 21px;
+    margin-top: 10px;
+    padding: 10px;
     display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: .5vw 1.4vw;
     // justify-content: center;
+    flex:1;
     flex-wrap: wrap;
-
     .monitor-item {
-      // width: 130px;
-      // height: 100px;
       text-align: center;
-      margin-bottom: 20px;
-      margin-right: 10px;
-
+      width: 7vw;
       span {
         font-size: 20px;
         font-family: PangMenZhengDao;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
index 95855b2c..f6aa0f42 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
@@ -201,6 +201,7 @@ div.el-popper.global-input-search-popover {
 
 <style lang='scss' scoped>
 .HomeFilter {
+  z-index: 9;
   .btn {
     padding: 9px;
     background: linear-gradient(180deg, #152e3c 0%, #163a45 100%);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue
index 2643ca6b..5c14d0f2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrame/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="HomeFrame">
     <ElPopover trigger="manual" :value="activeIcon === 'Frame'" :visibleArrow="false" placement="left"
-      popper-class="global-input-search-popover">
+      popper-class="global-input-search-popoverIcon global-input-search-popoverIcon2">
 
       <div slot="reference">
         <el-tooltip effect="light" content="图标含义" placement="left">
@@ -20,8 +20,6 @@
         <!-- <Form labelWidth="90px" column="1" class="form" ref="FormConfigRef" :formList="formList" /> -->
         <img class="image" src="@screen/images/home-Frame/logoMean.png" />
       </div>
-        <!-- <div class="footer">
-        </div> -->
       </div>
     </ElPopover>
   </div>
@@ -58,14 +56,16 @@ export default {
 </script>
 
 <style lang="scss">
-div.el-popper.global-input-search-popover {
+.global-input-search-popoverIcon2{
+  top: 100px !important;
+}
+div.el-popper.global-input-search-popoverIcon {
   background: rgba(6, 66, 88, 0.8);
   border: 1px solid rgba(42, 217, 253, 0.6);
   position: relative;
   padding-top: 36px;
   transform: translateY(24px);
   // margin-top: 6vh;
-
   .body3 {
     width: 1000px;
     .title {
@@ -94,7 +94,7 @@ div.el-popper.global-input-search-popover {
 <style lang="scss" scoped>
 .image {
   width: 1000px;
-  height: 700px;
+  height: 555px;
 }
 
 .HomeFrame {
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 69f97065..57659d8e 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
@@ -26,6 +26,7 @@
           <Form v-model="data" labelWidth="90px" column="2" class="form" ref="FormConfigRef" :formList="formList" />
           <!-- 设备管控表单 -->
           <component ref="ControlComponent" 
+          style="width: 100% !important;"
             :is="componentMap[DeviceTopics[data.deviceType]]" 
             :isMultiControl="true"
             :visible="true" 
@@ -49,10 +50,21 @@
             <div style="height:300px;width:100%;overflow-y: auto;display: flex;flex-wrap: wrap;">
               <div class="cardBox" v-for="(item, index) in data2" :key="index">
                 <Card :buttonIcon="null" :keyMap="keyMap" :cardData="item" class="card" buttonText="详情">
+                  <template #form-groupName="{ data }">
+                    <el-tooltip effect="dark" :content="data.groupName" placement="top-start">
+                      <div class="groupName">
+                      {{ data.groupName }}
+                    </div>
+                    </el-tooltip>
+      
+                  </template>
                   <template #form-remark="{ data }">
+                    <el-tooltip  effect="dark" :content="data.remark" placement="top-start">
+                     
                     <div class="remark">
                       {{ data.remark }}
                     </div>
+                    </el-tooltip>
                   </template>
                   <template #button>
                     <el-switch v-model="item.status" active-color="#0BD" inactive-color="#999" active-value="0"
@@ -80,20 +92,39 @@
           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">
+          <Table :data="tableData"  height="500px" style="margin: 20px 20px 0px 20px;width:95%">
+            <ElTableColumn label="管控时间" prop="operTime" width="180" />
+            <ElTableColumn label="管控方式" prop="operType" width="80" />
+            <ElTableColumn label="操作人" prop="operName" width="80" />
+            <ElTableColumn label="设备类型"  width="80">
+              <template slot-scope="scope">
+                <div>
+                  <p v-for="item in scope.row.arydcDeviceType">{{ item }}</p>
+                </div>
+              </template>
+            </ElTableColumn>
+            <ElTableColumn label="设备名称" width="180">
+              <template slot-scope="scope">
+                <div>
+                  <p v-for="item in scope.row.arydcDeviceName">{{ item }}</p>
+                </div>
+              </template>
+            </ElTableColumn>
+            <ElTableColumn label="执行内容" prop="remark"  :show-overflow-tooltip="true" >
               <template slot-scope="scope">
-               {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
+                <div>
+                  <p v-for="item in scope.row.aryRemark">{{ item }}</p>
+                </div>
               </template>
             </ElTableColumn>
-            <ElTableColumn label="管控方式" prop="operType" width="100" />
-            <ElTableColumn label="操作人" prop="operName" width="100" />
-            <ElTableColumn label="执行结果" prop="remark" width="200">
+            <ElTableColumn label="结果" prop="status" width="80" align="center" header-align="center">
               <template slot-scope="scope">
-                <el-popover placement="top-start" width="200" trigger="hover" :content="scope.row.remark || '暂无结果'">
-                  <el-button slot="reference" class="btnResult">查看</el-button>
-                </el-popover>
+                <div>
+                  <p v-for="item in scope.row.aryState">
+                    <i class="el-icon-success" style="font-size: 20px; color:#0c0;" v-if="item === 200"></i>
+                    <i class="el-icon-error" style="font-size: 20px; color:#BBB;" v-else></i> 
+                  </p>
+                </div>
               </template>
             </ElTableColumn>
           </Table>
@@ -135,8 +166,9 @@ import moment from "moment";
 import { getDicts } from "@/api/system/dict/data";
 import _ from "lodash";
 
+// "设备箱": "SmartDeviceParams", 2024-07-03 删除
 const componentMap = {
-  "设备箱": "SmartDeviceParams", "语音广播": "BroadcastParam", "疲劳唤醒": "FatigueWakesUpParam",
+  "语音广播": "BroadcastParam", "疲劳唤醒": "FatigueWakesUpParam",
   "行车诱导": "DrivingGuidanceParam", "情报板": "InfoBoardParam",
 }
 
@@ -518,7 +550,7 @@ export default {
         this.bindTimeing();
       } else if (this.tabAction === '3') {
         this.dataRecord.operTime = [moment().startOf('month').format('YYYY-MM-DD 00:00:00'), moment().endOf('month').format('YYYY-MM-DD 23:59:59'),]
-        this.bindRecord();
+        // this.bindRecord();
       } else if (this.tabAction === '1') {
       }
     },
@@ -556,7 +588,7 @@ export default {
         .then((result) => {
           item.status = result.data.status;
           if (result.code != 200) return;
-          Message.success(`操作成功!`);
+          Message.success(`操作成功`);
         })
     },
     bindTimeing() {
@@ -591,10 +623,30 @@ export default {
         }
       })
         .then((result) => {
+          const enum_deviceType = {
+            2: "可变信息标志",
+            5: "语音广播",
+            10: "疲劳唤醒",
+            12: "行车诱导",
+            13: "设备箱",
+            16: "远端机"
+          }
           if (result.code != 200) return;
           result.rows.forEach(e => {
-            e.operTime = moment(e.operTime).format('YYYY-MM-DD HH:mm:ss')
-            e.operType = _.find(this.Enum_ControlType, { key: e.operType }).label
+            const resJson = JSON.parse(e.jsonResult)
+            const resParam = JSON.parse(e.operParam)[0].devices
+            const aryRemark = [];
+            e.remark.split(',').filter(x=>{
+              x.split('、').filter(y=>{
+                aryRemark.push(y)
+              })
+            })
+            e.operTime= moment(e.operTime).format('YYYY-MM-DD HH:mm:ss')
+            e.operType= _.find(this.Enum_ControlType, { key: e.operType }).label
+            e.arydcDeviceName = e.dcDeviceName.replace(/[\[\]]/g,'').split(',');
+            e.aryRemark = aryRemark;
+            e.aryState = resJson.map(x=>x.result.code)
+            e.arydcDeviceType = resParam.map(x=>enum_deviceType[x.deviceType])
           });
           this.tableData = result.rows;
           this.tableTotal = result.total;
@@ -643,7 +695,6 @@ div.el-popper.global-input-search-popover {
   padding-top: 36px;
   transform: translateY(24px);
   // margin-top: 6vh;
-
   .body2 {
     width: 1000px;
 
@@ -713,8 +764,14 @@ div.el-popper.global-input-search-popover {
   justify-content: center;
   align-items: center;
 }
-
+.groupName{
+  width: 100px;
+  white-space: nowrap; /* 确保文本在一行内显示 */
+  overflow: hidden; /* 超出容器部分的文本隐藏 */
+  text-overflow: ellipsis; /* 使用省略符号表示超出的文本 */
+}
 .remark {
+  width: 100px;
   font-size: 14px;
   line-height: 20px;
   height: 40px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeTraffic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeTraffic/index.vue
new file mode 100644
index 00000000..57d38230
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeTraffic/index.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="HomeTraffic">
+    <el-tooltip effect="light" content="实时路况" placement="left">
+      <Button :class="['btn', { 'btn-active': activeIcon }]" @click.native="handleClick('Traffic')">
+        <img src="@screen/images/home-Vector/traffic.png" class="imgicon" />
+      </Button>
+    </el-tooltip>
+
+    <div class="radarControlBox" v-if="silderVisible" style="bottom: 30%; right:20%;">
+      <button class="radarButton" @click="play">{{isPlay?'暂停':'播放'}}</button> 
+      <el-slider
+        ref="slider"
+      tooltip-class="radarSliderTooltip"
+        style="width: 400px;margin-left: 30px;"
+        v-model="timeTick"
+        :show-tooltip="true"
+        :step="1"
+        :max="max"
+        :marks="marks"
+        :format-tooltip="formatTooltip"
+        show-stops>
+      </el-slider>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from "vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import request from '@/utils/request'
+import { line } from "@antv/x6/lib/registry/port-layout/line";
+import moment from "moment";
+import { re } from "mathjs";
+const enum_color = {
+  0: '#A9AEB8', //未知
+  1: '#23C343', //畅行
+  2: '#FADC19', //缓行
+  3: '#F53F3F', //拥堵
+  4: '#770813' //严重拥堵
+}
+export default {
+  name: "HomeTraffic",
+  components: {
+    Button,
+    Form,
+  },
+  data() {
+    return {
+      activeIcon: null,
+      timeTick: 0,
+      steps:[],
+      marks:null,
+      max:100,
+      silderVisible: false,
+      isPlay: false,
+      lnglats:{}
+    };
+  },
+  created() {
+    this.activeIcon = window.showStakeText ? 'Vector' : null;
+  },
+  methods: {
+    formatTooltip(val) {
+       
+        if(this.marks[val]){
+          return this.marks[val].remark;
+        } else {
+          return this.marks[0].remark;
+        }
+    },
+    play(){
+      this.isPlay =  !this.isPlay;
+      this.updateTick();
+    },
+    updateTick(){
+      if(this.isPlay){
+        if(this.timeTick === this.max){
+          this.timeTick = 0
+        } else {
+          this.timeTick = (this.timeTick + 1)
+        }
+        this.showLnglat();
+        setTimeout(() => {
+          this.updateTick()
+        }, 2000);
+      }
+    },
+    handleClick(type) {
+      if(this.activeIcon === type){
+        this.activeIcon = null;
+        this.isPlay = false;
+        setTimeout(() => {
+          Vue.prototype.mapIns.addPointByArr( {pointList:[]},  'lineLayer', true);
+          Vue.prototype.mapIns.removeLayerByName('lineLayer');  
+        }, 200);
+        
+        this.silderVisible = false;
+      } else {
+        this.activeIcon = type;
+        this.lnglats = {};
+        request({
+          url: '/system/information/listTime',
+          method: 'get'
+        }).then(result=>{
+          if (result.code != 200) return this.$message.error(result?.msg);
+          this.silderVisible = true;
+
+          const style = {
+            color: '#9fe4fe'
+          }
+          const now = moment().format('YYYY-MM-DD HH:mm:ss');
+          const list = result.rows;
+          let marks = {0: {
+            style,
+            label: now.substr(11,5),
+            remark: now,
+            cid:0,
+          }};
+          let total = list.length>9?9:list.length;
+          for(let i = 0; i<total;i++){
+            marks[(i+1).toString()] = {
+              style,
+              label: list[i].createTime.substr(11,5),
+              remark: list[i].createTime,
+              cid: list[i].id
+            }
+          }
+          this.max = total;
+          this.marks = marks;
+          this.showLnglat();
+        })
+      }
+    },
+    async showLnglat(){
+      if(!this.lnglats[this.timeTick]){
+        if(this.timeTick === 0){
+          let res = await request({ url: '/business/traffic-statistics/current/getTheCurrentCongestedSection', method: 'get'});
+          let aryLine = [];
+          res.data.forEach(e => {
+            const lines = e.link_lng_lats.split(';').map(x=>x.split(','))
+            aryLine.push({
+              width: 3,            // 线宽度
+                color: enum_color[e.pub_run_status], // 线颜色
+                xyArr: lines
+            })
+           });
+          this.lnglats[this.timeTick] = _.cloneDeep(aryLine);
+        } else {
+          let res = await request({ url: `/system/information/${this.marks[this.timeTick].cid}`, method: 'get'});
+          let _line = JSON.parse(res.data.otherConfig)
+          let aryLine = [];
+          _line.forEach(e => {
+            const lines = e.link_lng_lats.split(';').map(x=>x.split(','))
+            aryLine.push({
+              width: 3,            // 线宽度
+                color: '#FF0000', // 线颜色
+                xyArr: lines
+            })
+           });
+          this.lnglats[this.timeTick] = _.cloneDeep(aryLine);
+        }
+      }
+      Vue.prototype.mapIns.addPointByArr( {pointList:[]},  'lineLayer', true);
+      Vue.prototype.mapIns.removeLayerByName('lineLayer');
+      setTimeout(()=>{
+        Vue.prototype.mapIns.addLineByArr(
+          this.lnglats[this.timeTick] 
+        );
+      },100)
+      
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+.radarSliderTooltip .el-tooltip {
+  display: block;
+}
+div.el-popper.global-input-search-popover {
+  background: rgba(6, 66, 88, 0.8);
+  border: 1px solid rgba(42, 217, 253, 0.6);
+  position: relative;
+  padding-top: 36px;
+  transform: translateY(24px);
+  // margin-top: 6vh;
+
+  .body {
+    .title {
+      background: linear-gradient(90deg,
+          #237e9b 0%,
+          rgba(23, 145, 184, 0) 100%);
+      padding: 3px 9px;
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+    }
+
+    .close {
+      padding: 3px 9px;
+      cursor: pointer;
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: fit-content;
+    }
+
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.imgicon {
+  width: 25px;
+  height: 25x;
+}
+
+.HomeTraffic {
+  .btn {
+    padding: 9px;
+    background: linear-gradient(180deg, #152e3c 0%, #163a45 100%);
+    border-radius: 4px;
+    overflow: hidden;
+    height: unset;
+    border: 1px solid rgba(40, 144, 167, 1);
+  }
+
+  .btn-active {
+    background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue
index cabf11e3..d7d68305 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVector/index.vue
@@ -9,6 +9,7 @@
 </template>
 
 <script>
+import Vue from "vue";
 import Button from "@screen/components/Buttons/Button.vue";
 import Form from "@screen/components/FormConfig";
 import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
@@ -31,14 +32,11 @@ export default {
   methods: {
     handleClick(type) {
       this.activeIcon = this.activeIcon === type ? null : type;
-      if (this.activeIcon) window.showStakeText = true;
-      else window.showStakeText = false;
-      markerClusterIns.setData();
-    },
-    filterEnd(data) {
-      this.activeIcon = null;
-      // this.filterData = data;
-      this.$parent.$refs.RoadAndEventsRef?.setFilterData?.(data);
+      Vue.prototype.isMapStatck = (this.activeIcon === type);
+      Vue.prototype.mapIns.pileIsShow("jhlayers", (this.activeIcon === type));
+      // if (this.activeIcon) window.showStakeText = true;
+      // else window.showStakeText = false;
+      // markerClusterIns.setData();
     },
   },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue
index 9dd29d39..b8883062 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue
@@ -27,12 +27,9 @@ export default {
   methods: {
     handleClick(type) {
       this.activeIcon = this.activeIcon === type ? null : type;
-
-      // markerClusterIns.setData();
     },
     filterEnd(data) {
       this.activeIcon = null;
-      // this.filterData = data;
       this.$parent.$refs.RoadAndEventsRef?.setFilterData?.(data);
     },
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/button_bg.png b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/button_bg.png
new file mode 100644
index 00000000..b349b421
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/button_bg.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/button_hover.png b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/button_hover.png
new file mode 100644
index 00000000..6ac5f210
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/button_hover.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/spanPoint.png b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/spanPoint.png
new file mode 100644
index 00000000..05588ee4
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/assets/spanPoint.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/index.vue
new file mode 100644
index 00000000..79a974a3
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/index.vue
@@ -0,0 +1,430 @@
+<template>
+  <div class="HomeWeather">
+    <ElPopover trigger="manual" :value="activeIcon === 'Weather'" :visibleArrow="false" placement="left"
+      :popper-class="bodyVisible?'global-input-search-popoverIcon':'global-input-search-popoverIcon global-input-search-popoverIcon3'">
+
+      <div slot="reference">
+        <el-tooltip effect="light" content="短临预报" placement="left">
+          <Button :class="['btn', { 'btn-active': activeIcon }]" @click.native="handleClick('Weather')">
+            <img src="@screen/images/home-Frame/weather.svg" />
+          </Button>
+        </el-tooltip>
+      </div>
+      <div v-if="bodyVisible" class="body4">
+        <div class="title">短临预报</div>
+        <span class="close" @click="() =>{this.bodyVisible = false}">
+          <i class="el-icon-close" />
+        </span>
+        <div class="bodyPanel">
+          <div class="bicon bicona el-icon-arrow-left" @click="handleScroll(-1)"></div>
+          <div class="showRoad" v-horizontal-scroll ref="refWrapper">
+            <div class="topButtons">
+              <div v-for="(item, index) in buttons" class="btnItems" @click="selectItem(item.id, index)">
+                <button :class="selectIndex == index ? 'btn action' : 'btn'">
+                  {{ item.text }}
+                </button>
+                <div class="btnIcon">
+                  <div class="line" :style="index === 0 ? 'background-color: transparent !important;' : ''"></div>
+                  <div :class="selectIndex == index ? 'circle circleSel' : 'circle'">
+                    <div></div>
+                  </div>
+                  <div class="line" :style="index === buttons.length - 1 ? 'background-color: transparent !important;' : ''">
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="bicon biconb el-icon-arrow-right" @click="handleScroll(1)"></div>
+        </div>
+      </div>
+    </ElPopover>
+  </div>
+</template>
+
+<script>
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import request from '@/utils/request'
+
+import Vue from "vue";
+import { getWeatherFormat }from '../../../perception/meteorologyCheck/data.js'
+import {resWeather} from './mock'
+export default {
+  name: "HomeWeather",
+  components: {
+    Button,
+    Form,
+  },
+  data() {
+    return {
+      activeIcon: null,
+      selectIndex: -1,
+      bodyVisible: false,
+      regions:[],
+      buttons: [
+        {
+          text: "实时",
+          id: 0,
+        },
+        {
+          text: "1小时",
+          id: 1,
+        },
+        {
+          text: "2小时",
+          id: 2,
+        },
+        {
+          text: "3小时",
+          id: 3,
+        },
+        {
+          text: "4小时",
+          id: 4,
+        },
+        {
+          text: "5小时",
+          id: 5,
+        },
+        {
+          text: "6小时",
+          id: 6,
+        },
+        {
+          text: "10小时",
+          id: 10,
+        },
+        {
+          text: "14小时",
+          id: 14,
+        },
+        {
+          text: "20小时",
+          id: 20,
+        },
+        {
+          text: "24小时",
+          id: 24,
+        },
+      ],
+    };
+  },
+  directives: {
+    'horizontal-scroll': {
+      bind: function (el) {
+        el.addEventListener('wheel', function (event) {
+          event.preventDefault();
+          el.scrollLeft += event.deltaY;
+        });
+      }
+    }
+  },
+  methods: {
+    async selectItem(id, index) {
+      this.selectIndex = index;
+      if(this.regions.length === 0){
+        const _regions = await request({url: '/business/region/list',method: 'get'})
+        this.regions = _regions.rows;
+      }
+      const mapStakeNum = this.regions.map(x=>x.stakeNum).join('|')
+      // let result = resWeather; //MOCK ===================
+      // this.refreshLayer(result.data)
+      // return
+      request({url: '/weatherForecast/currentWeatherAndForecastInformation',
+        method: 'post',
+        data: {
+          "roadId":"G003537",
+          "stakeNum":mapStakeNum,
+          "forecastHour":id,
+          "managerId":"YG10201"
+        }
+      }).then(result=>{
+        if (result.code != 200) return this.$message.error(result?.msg);
+        if(result.data.length===0){
+          this.$message.warning('未查询到短临预报信息')
+          return;
+        }
+        this.refreshLayer(result.data)
+      })
+    },
+
+    refreshLayer(list){
+      const map2d = Vue.prototype.mapIns
+      
+      map2d.addPointByArr( {pointList:[]},  'jhweather', true);
+      map2d.removeLayerByName('jhweather')
+      const aryPoints = [];
+      list.forEach(e=>{
+        let cityWeather = getWeatherFormat(e,true)
+          const item = {
+            title:'短临预报',
+          };
+          const extData = {
+            latitude: e.lat,
+            longitude: e.lon,
+            stakeMark: cityWeather.stakeMark,
+            facilityType: 999,
+            direction:1,
+            facilityName:e.name,
+            otherConfig: JSON.stringify(cityWeather),
+          }
+          aryPoints.push({
+            type: 'event',
+            longitude: e.lon,
+            latitude: e.lat,
+            iconUrl: require(`@screen/images/weather/${cityWeather.icon}.svg`),     // 图标  【必传字段】
+            otherInfo: {
+              name: e.name,
+              stakeMark: cityWeather.stakeMark,
+              weight: 1,
+              extData:extData,
+              config:{
+                item:item,
+                stateCallback: () => true,
+                markerClick:(extData, item) => {
+                  // 兼容不同的返回类型
+                  let formData = cityWeather
+                  this.$parent.$refs['RoadAndEventsRef'].dialogConfig = {
+                    component:'RoadNetworkFacilities',
+                    data: {
+                      ...extData,
+                      formData,
+                      parseOtherConfig: formData,
+                      _itemData: item,
+                    },
+                  };
+                },
+              }
+            }
+          })
+      })
+      if(aryPoints.length > 0){
+        map2d.addPointByArr(
+          {pointList:aryPoints},
+          'jhweather', 
+          false
+      );
+      }
+    },
+    handleClick(type) {
+      const map2d = Vue.prototype.mapIns
+
+      map2d.addPointByArr( {pointList:[]},  'jhweather', true);
+      map2d.removeLayerByName('jhweather')
+      this.selectIndex = -1;
+      this.bodyVisible = this.activeIcon === type ? false : true;
+      this.activeIcon = this.activeIcon === type ? null : type;
+    },
+    filterEnd(data) {
+      this.activeIcon = null;
+      // this.filterData = data;
+      this.$parent.$refs.RoadAndEventsRef?.setFilterData?.(data);
+    },
+    handleScroll(t){
+      if(t===1){ //向右
+        // 保存滚动盒子左侧已滚动的距离
+        let left=this.$refs.refWrapper.scrollLeft
+        // 保存元素的整体宽度
+        let scrollWidth=this.$refs.refWrapper.scrollWidth
+        // 保存元素的可见宽度
+        let clientWidth=this.$refs.refWrapper.clientWidth
+        let num=0
+        clearInterval(this.timer)
+        this.timer=setInterval(()=>{
+          // 已经滚动距离+可见宽度
+          // left+clientWidth>=scrollWidth：滚动到最右侧
+          // num>=300一次性滚动距离
+          if(left+clientWidth>=scrollWidth||num>=300){
+            clearInterval(this.timer)
+            return
+          }
+          // 给滚动盒子元素赋值向左滚动距离
+          this.$refs.refWrapper.scrollLeft=left+=30
+          // 保存向左滚动距离（方便判断一次性滚动多少距离）
+          num+=30
+        },20)
+        // 20：速度（可调节）
+      } else {
+        // 保存滚动盒子左侧已滚动的距离
+        let left=this.$refs.refWrapper.scrollLeft
+        let num=0
+        clearInterval(this.timer)
+        this.timer=null
+        this.timer=setInterval(()=>{
+          //   !left:已经滚动到最左侧
+          //   一次性滚动距离（可调节）
+          if(!left||num>=300){
+            // 停止滚动
+            clearInterval(this.timer)
+            this.timer=null
+            return
+          }
+          // 给滚动盒子元素赋值向左滚动距离
+          this.$refs.refWrapper.scrollLeft=left-=30
+          // 保存向左滚动距离（方便判断一次性滚动多少距离）
+          num+=30
+        },20)
+      }
+   
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+.global-input-search-popoverIcon3{
+  background: #ffffff00 !important;
+  top:0 !important;
+  width:0 !important;
+  height: 0 !important;
+  border: 0px !important;
+}
+div.el-popper.global-input-search-popoverIcon {
+  background: rgba(6, 66, 88, 0.8);
+  border: 1px solid rgba(42, 217, 253, 0.6);
+  position: relative;
+  padding-top: 36px;
+  transform: translateY(24px);
+
+  // margin-top: 6vh;
+  .body4 {
+    width: 600px;
+
+    .title {
+      background: linear-gradient(90deg,
+          #237e9b 0%,
+          rgba(23, 145, 184, 0) 100%);
+      padding: 3px 9px;
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+    }
+
+    .close {
+      padding: 3px 9px;
+      cursor: pointer;
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: fit-content;
+    }
+
+  }
+}
+</style>
+<style lang="scss" scoped>
+.HomeWeather {
+  .btn {
+    padding: 9px;
+    background: linear-gradient(180deg, #152e3c 0%, #163a45 100%);
+    border-radius: 4px;
+    overflow: hidden;
+    height: unset;
+    border: 1px solid rgba(40, 144, 167, 1);
+  }
+
+  .btn-active {
+    background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+  }
+}
+
+.bodyPanel{
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    .bicon{
+      color: #39D5BF;
+      font-size: 25px;
+      font-weight: bold;
+      margin:0px 3px;
+      cursor: pointer;
+    }
+}
+.showRoad {
+
+  width: 600px;
+  padding-top: 10px;
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: none;
+ 
+  .topButtons {
+    display: inline-flex;
+    width: 1200px;
+    justify-content: space-between;
+
+    .btnItems {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .btnIcon {
+
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      height: 40px;
+
+      .circle {
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        border: 1px solid #CACACA;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        div {
+          width: 10px;
+          height: 10px;
+          border-radius: 50%;
+          background-color: #CACACA;
+        }
+      }
+
+      .circleSel {
+        border: 1px solid #39D5BF !important;
+
+        div {
+          background-color: #39D5BF !important;
+        }
+      }
+
+      .line {
+        width: 47px;
+        height: 2px;
+        background-color: #CACACA;
+
+      }
+    }
+
+    .btn {
+      display: inline-flex;
+      width: 90px;
+      height: 26px;
+      justify-content: center;
+      align-items: center;
+      background-color: transparent;
+      background-image: url(./assets/button_bg.png);
+      background-size: 100% 100%;
+
+      border: 0px;
+      font-size: 14px;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      color: #ffffff;
+      cursor: pointer;
+    }
+
+    .btn:hover,
+    .btn.action {
+      background-image: url(./assets/button_hover.png);
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/mock.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/mock.js
new file mode 100644
index 00000000..b249be0e
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeather/mock.js
@@ -0,0 +1,230 @@
+export const resWeather = {
+    "msg": "操作成功",
+    "code": 200,
+    "data": [
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 2,
+            "roadId": "G003537",
+            "lon": 116.505453151,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速济南段",
+            "visLevel": 1,
+            "orgCode": "370100",
+            "visDescription": "优",
+            "windDirection": "南",
+            "windSpeed": 2.274950548913097,
+            "tem": 26.94,
+            "lat": 36.3014073378,
+            "vis": 11865,
+            "pre": 0.0, //降雨量
+            "orgName": "济南",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353701",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 61.04,
+            "stakeNum": "K105+000"
+        },
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 1,
+            "roadId": "G003537",
+            "lon": 116.407531555,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速泰安段",
+            "visLevel": 2,
+            "orgCode": "370900",
+            "visDescription": "良",
+            "windDirection": "南",
+            "windSpeed": 1.2887590930814028,
+            "tem": 26.88,
+            "lat": 35.9501949666,
+            "vis": 7470,
+            "pre": 0.0,
+            "orgName": "泰安",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353709",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 62.97,
+            "stakeNum": "K145+000"
+        },
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 1,
+            "roadId": "G003537",
+            "lon": 116.336087357,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速济宁段",
+            "visLevel": 2,
+            "orgCode": "370800",
+            "visDescription": "良",
+            "windDirection": "南",
+            "windSpeed": 0.7022819946431775,
+            "tem": 26.84,
+            "lat": 35.7865302111,
+            "vis": 7738,
+            "pre": 0.0,
+            "orgName": "济宁",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353708",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 63.46,
+            "stakeNum": "K165+000"
+        },
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 1,
+            "roadId": "G003537",
+            "lon": 116.263185123,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速济宁段",
+            "visLevel": 2,
+            "orgCode": "370800",
+            "visDescription": "良",
+            "windDirection": "南",
+            "windSpeed": 1.0517128885774862,
+            "tem": 26.61,
+            "lat": 35.7262816547,
+            "vis": 8037,
+            "pre": 0.0,
+            "orgName": "济宁",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353708",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 64.36,
+            "stakeNum": "K175+000"
+        },
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 2,
+            "roadId": "G003537",
+            "lon": 116.161834677,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速济宁段",
+            "visLevel": 2,
+            "orgCode": "370800",
+            "visDescription": "良",
+            "windDirection": "南",
+            "windSpeed": 1.771016657177453,
+            "tem": 26.79,
+            "lat": 35.6273879312,
+            "vis": 9208,
+            "pre": 0.0,
+            "orgName": "济宁",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353708",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 63.19,
+            "stakeNum": "K190+000"
+        },
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 2,
+            "roadId": "G003537",
+            "lon": 116.136668367,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速济宁段",
+            "visLevel": 1,
+            "orgCode": "370800",
+            "visDescription": "优",
+            "windDirection": "南",
+            "windSpeed": 1.88904737897174,
+            "tem": 27.11,
+            "lat": 35.5408714114,
+            "vis": 10851,
+            "pre": 0.0,
+            "orgName": "济宁",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353708",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 62.68,
+            "stakeNum": "K200+000"
+        },
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 2,
+            "roadId": "G003537",
+            "lon": 116.107750739,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速菏泽段",
+            "visLevel": 1,
+            "orgCode": "371700",
+            "visDescription": "优",
+            "windDirection": "南",
+            "windSpeed": 1.885576834817399,
+            "tem": 27.27,
+            "lat": 35.5032518881,
+            "vis": 12145,
+            "pre": 0.0,
+            "orgName": "菏泽",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353717",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 62.9,
+            "stakeNum": "K205+000"
+        },
+        {
+            "managerCorpName": "齐鲁高速公路股份有限公司",
+            "forecastList": null,
+            "windLevel": 2,
+            "roadId": "G003537",
+            "lon": 116.812597061,
+            "managerName": "济菏运管中心",
+            "managerCorpId": "YG102",
+            "roadName": "G35济广高速",
+            "sectionName": "G35济广高速济南段",
+            "visLevel": 2,
+            "orgCode": "370100",
+            "visDescription": "良",
+            "windDirection": "南",
+            "windSpeed": 1.7214238292762185,
+            "tem": 27.05,
+            "lat": 36.578150041,
+            "vis": 9383,
+            "pre": 0.0,
+            "orgName": "济南",
+            "preLevel": 0,
+            "pph": 0,
+            "managerId": "YG10201",
+            "sectionId": "G00353701",
+            "weatherTime": "2024-06-17T08:00:00",
+            "rhu": 60.26,
+            "stakeNum": "K60+000"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeatherLayer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeatherLayer/index.vue
new file mode 100644
index 00000000..ed653e9b
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWeatherLayer/index.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="HomeWeatherLayer">
+    <el-tooltip effect="light" content="气象云图" placement="left">
+      <Button :class="['btn', { 'btn-active': activeIcon }]" @click.native="handleClick('weatherLayer')">
+        <img src="@screen/images/home-Vector/Weather.svg" class="imgicon" />
+      </Button>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+import Vue from "vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import { merge, cloneDeep } from "lodash";
+import { markerClusterIns } from "@screen/pages/Home/components/RoadAndEvents/utils/map.js"
+export default {
+  name: "HomeWeatherLayer",
+  components: {
+    Button,
+    Form,
+  },
+  data() {
+    return {
+      activeIcon: null,
+    };
+  },
+  created() {
+    this.activeIcon = window.showStakeText ? 'Vector' : null;
+  },
+  methods: {
+    handleClick(type) {
+      if(this.activeIcon === type){
+        this.activeIcon = null;
+        Vue.prototype.mapIns.closeRadarCloud();
+      } else {
+        this.activeIcon = type;
+        Vue.prototype.mapIns.showRadarCloud();
+      }
+      
+      
+     
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+div.el-popper.global-input-search-popover {
+  background: rgba(6, 66, 88, 0.8);
+  border: 1px solid rgba(42, 217, 253, 0.6);
+  position: relative;
+  padding-top: 36px;
+  transform: translateY(24px);
+  // margin-top: 6vh;
+
+  .body {
+    .title {
+      background: linear-gradient(90deg,
+          #237e9b 0%,
+          rgba(23, 145, 184, 0) 100%);
+      padding: 3px 9px;
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+    }
+
+    .close {
+      padding: 3px 9px;
+      cursor: pointer;
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: fit-content;
+    }
+
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.imgicon {
+  width: 25px;
+  height: 25x;
+}
+
+.HomeWeatherLayer {
+  .btn {
+    padding: 9px;
+    background: linear-gradient(180deg, #152e3c 0%, #163a45 100%);
+    border-radius: 4px;
+    overflow: hidden;
+    height: unset;
+    border: 1px solid rgba(40, 144, 167, 1);
+  }
+
+  .btn-active {
+    background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+  }
+}
+</style>
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 5d60882c..8d4b8830 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
@@ -335,7 +335,11 @@ export default {
               this.selectedBdMsg = res.data["3A"].content;
             })
             .catch((err) => { });
-        else this.$message.error("设备未接入");
+        else {
+      //     this.$emit("update:visible", false);
+      // this.isShowTemplate = false;
+          this.$message.error("设备未接入");
+        }
       }
     },
     // 设置当前设备可用的模板
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 4f7f30e0..82cb47d0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -9,11 +9,11 @@
 
     <!-- group -->
     <div name="fade-group" tag="div" class="tabs-content">
-      <div class="device-item keep-ratio" v-for="(item, index) in tabContentData" :key="item.id"
+      <div class="device-item" v-for="(item, index) in tabContentData" :key="item.id"
         @click="handleDevice(item)" :style="getStart(index)">
         <div class="device-icon"
           :style="{ backgroundImage: `url(${require(`@screen/images/layer/${active}/${item.title}${item.status}.svg`)})`, '--bgColor': `rgba(0, 209, 255, ${item.status ? 0.3 : 0})` }" />
-        <span>{{ item.title }}</span>
+        <span class="device-title">{{ item.title }}</span>
       </div>
     </div>
 
@@ -155,6 +155,9 @@ export default {
     isGisCompleted: {
       type: Boolean,
       default: () => false
+    },
+    mapContainer: {
+      type: String,
     }
   },
   watch: {
@@ -191,8 +194,10 @@ export default {
         this.minLayers = mapIns.getLayers().length - 1;
       }, time);
     }
-
-    getMinMapLayers();
+    if(this.mapContainer === 'AMapContainer'){
+      getMinMapLayers();
+    }
+    markerClusterIns.mapContainer = this.mapContainer;
     this.$root.$on('delete-event', this.handleRefresh);
 
     //启动监听事件
@@ -299,19 +304,25 @@ export default {
       })
     },
     handleCleared() {
-      const { mapIns } = this.getMap();
+
       this.layerData.forEach(({ children }) => {
         children.forEach(item => item.status = "")
       });
-      if (!mapIns) return;
-
       for (const key in cacheRemoveFunc) {
         cacheRemoveFunc[key]?.();
       }
 
-      // mapIns.clearMap();
-      mapIns.getLayers().forEach((layer, index) => index > this.minLayers && mapIns.remove(layer))
-      window.infoWindow.close();
+
+      this.layerData.forEach(({ children }) => {
+        children.forEach(item => item.status = "")
+      });
+      if(this.mapContainer === 'AMapContainer'){
+        const { mapIns } = this.getMap();
+        if (!mapIns) return;
+        // mapIns.clearMap();
+        mapIns.getLayers().forEach((layer, index) => index > this.minLayers && mapIns.remove(layer))
+        window.infoWindow.close();
+      }
     },
 
     // 摄像机 可控 不可控 弹窗 回调traffic-relieve
@@ -374,56 +385,51 @@ export default {
   position: relative;
   display: flex;
   flex-direction: column;
-  padding: 24px 18px;
+  padding: 18px 18px;
   padding-bottom: 15px;
   overflow: hidden;
   max-height: min-content;
 
   .tabs-content {
-    margin-top: 15px;
-    margin-bottom: 6px;
-    display: grid;
-    grid-template-columns: repeat(5, 1fr);
-    grid-auto-rows: 60px;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
     flex: 1;
-    max-height: 100%;
-    // overflow: auto;
+    align-content: flex-start;
     position: relative;
-    gap: 6px;
     transition: all .24s linear;
-
+    height: 0px;
+    overflow-y: auto;
     .device-item {
       // position: absolute;
       position: relative;
-      width: 70px;
+      width: 4.5vw;
       cursor: pointer;
       display: flex;
       flex-direction: column;
       align-items: center;
-      --height-svg: 24px;
-      --gap: 12px;
       transition: all .15s linear;
       padding-top: calc(var(--height-svg) + var(--gap));
 
+      margin-top: 20px;
       .device-icon {
         display: flex;
         align-items: center;
         justify-content: center;
         position: absolute;
         transition: all .15s linear;
-        top: 0;
-        height: 33px;
-        width: 100%;
+        height: 16px;
+        width: 16px; 
         background-repeat: no-repeat;
-        background-size: auto;
+        background-size: 22px;
         background-position: center;
         transition: all .18s linear;
 
         &::before {
           content: "";
           position: absolute;
-          width: 33px;
-          height: 33px;
+          width: 30px;
+          height: 30px;
           border: 1px solid rgba(0, 209, 255, .5);
           background-color: var(--bgColor);
           border-radius: 50%;
@@ -431,15 +437,12 @@ export default {
         }
       }
 
-      span {
-        display: block;
+    
+      .device-title {
         text-align: center;
-        font-size: 13px;
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 500;
+        font-size: 12px;
         color: #ffffff;
-        line-height: 15px;
-        min-height: 27px;
+        margin-top: 25px;
       }
     }
   }
@@ -448,6 +451,7 @@ export default {
     display: flex;
     overflow: hidden;
     gap: 24px;
+    height: 30px;
 
     .tabs-item {
       display: flex;
@@ -456,7 +460,7 @@ export default {
       cursor: pointer;
       // width: 128px;
       flex: 1;
-      height: 36px;
+      height: 30px;
       background: url("~@screen/images/bg/box_bg_005.png") no-repeat;
       background-size: 100% 100%;
       font-size: 15px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index 339d5d58..4effcaec 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -13,8 +13,8 @@ import Vue from "vue";
 import { markerClusterIns, getContent, getLatAndLng } from "./map";
 const cameraIcon = {
   // 球机
-  "00": require("@screen/images/deviceType/ball_active.svg"),
-  "01": require("@screen/images/deviceType/ball_fault.svg"),
+  "00": require("@screen/images/deviceType/ballb_active.svg"),
+  "01": require("@screen/images/deviceType/ballb_fault.svg"),
 };
 
 export const cacheRemoveFunc = {};
@@ -248,6 +248,7 @@ export const eventMap = {
     );
     addDataPreHandle(removeData);
     markerClusterIns.addData(removeData, isDefault);
+    
     this.emitter.emit("selectedCompleted", item);
 
     cacheRemoveFunc[`地图事件专题/${item.title}`] = () => {
@@ -273,7 +274,6 @@ export const eventMap = {
         iconClass: "el-icon-loading",
       });
     }
-    console.log("deviceType", deviceType);
     const data = await getRoadNetworkFacilitiesList(deviceType, filterData)
       .then(async (data) => {
         await delay(600);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index 747f510b..800ceec0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -94,7 +94,7 @@ function padZero(num) {
 99 /各⽅向动作停⽌/
  * @returns
  */
-export function controlCamera(camId, cmdType, isMsgType = true) {
+export function controlCamera(camId, cmdType, isMsgType = true, speed = 1) {
   return request({
     url: "/video/PTZControl",
     method: "get",
@@ -102,14 +102,14 @@ export function controlCamera(camId, cmdType, isMsgType = true) {
       ...(isMsgType ? { msgType: 3 } : undefined),
       camId,
       cmdType,
-      speed: 1,
+      speed,
     },
   })
     .then((result) => {
-      if (result.code != 200) return Message.error(`相机操作失败!`);
+      if (result.code != 200) return Message.error(`相机操作失败`);
     })
     .catch((err) => {
-      Message.error(`相机操作失败!`);
+      Message.error(`相机操作失败`);
     });
 }
 
@@ -172,7 +172,7 @@ export function getRoadInfoByStakeMark(stakeMark) {
 const DeviceTypeMap = {
   1: "摄像机",
   2: "可变信息标志",
-  3: "气象监测器",
+  3: "气象检测器",
   4: "出口诱导灯",
   5: "路段语音广播",
   6: "护栏碰撞",
@@ -191,7 +191,7 @@ const DeviceTypeMap = {
  * @param {number} deviceType
   1: "摄像机",
   2: "可变信息标志",
-  3: "气象监测器",
+  3: "气象检测器",
   4: "出口诱导灯",
   5: "路段语音广播",
   6: "护栏碰撞",
@@ -207,7 +207,7 @@ const DeviceTypeMap = {
 export function getDeviceList(deviceType, options) {
   return new Promise((resolve, reject) => {
     if (!deviceType) {
-      // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
+      // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败`);
       return reject();
     }
     let newEndStakeMark = [];
@@ -252,13 +252,13 @@ export function getDeviceList(deviceType, options) {
       .then(({ code, data }) => {
         if (code != 200) {
           reject();
-          return Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
+          return Message.error(`${DeviceTypeMap[deviceType]}设备加载失败`);
         }
 
         resolve(data);
       })
       .catch(() => {
-        Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
+        Message.error(`${DeviceTypeMap[deviceType]}设备加载失败`);
         reject();
       });
   });
@@ -279,13 +279,13 @@ export function getDeviceInfo(iotDeviceId, options) {
       .then(({ code, data }) => {
         if (code != 200) {
           reject();
-          // return Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
+          // return Message.error(`${DeviceTypeMap[deviceType]}设备加载失败`);
         }
 
         resolve(data);
       })
       .catch(() => {
-        // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
+        // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败`);
         reject();
       });
   });
@@ -348,7 +348,7 @@ export function getProduct(productId) {
 export function getEventTopicList(eventType, options = {}) {
   return new Promise((resolve, reject) => {
     if (!eventType) {
-      Message.error(`事件加载失败!`);
+      Message.error(`事件加载失败`);
       return reject();
     }
 
@@ -373,13 +373,13 @@ export function getEventTopicList(eventType, options = {}) {
       .then(({ code, data }) => {
         if (code != 200) {
           reject();
-          return Message.error(`事件加载失败!`);
+          return Message.error(`事件加载失败`);
         }
 
         resolve(data);
       })
       .catch(() => {
-        Message.error(`事件加载失败!`);
+        Message.error(`事件加载失败`);
         reject();
       });
   });
@@ -418,12 +418,12 @@ export function getPerceiveEventList(data = {}, options = {}) {
       .then(({ code, data: rows }) => {
         if (code != 200) {
           reject();
-          return Message.error(`事件加载失败!`);
+          return Message.error(`事件加载失败`);
         }
         resolve(rows);
       })
       .catch(() => {
-        Message.error(`事件加载失败!`);
+        Message.error(`事件加载失败`);
         reject();
       });
   });
@@ -436,7 +436,7 @@ export function getPerceiveEventList(data = {}, options = {}) {
 export function getRoadNetworkFacilitiesList(facilityType, options = {}) {
   return new Promise((resolve, reject) => {
     if (!facilityType) {
-      Message.error(`事件加载失败!`);
+      Message.error(`事件加载失败`);
       return reject();
     }
 
@@ -455,13 +455,13 @@ export function getRoadNetworkFacilitiesList(facilityType, options = {}) {
       .then(({ code, data }) => {
         if (code != 200) {
           reject();
-          return Message.error(`事件加载失败!`);
+          return Message.error(`事件加载失败`);
         }
 
         resolve(data);
       })
       .catch(() => {
-        Message.error(`事件加载失败!`);
+        Message.error(`事件加载失败`);
         reject();
       });
   });
@@ -474,7 +474,7 @@ export function getRoadNetworkFacilitiesList(facilityType, options = {}) {
 export function getMeteorologicalDetector(deviceName, options = {}) {
   return new Promise((resolve, reject) => {
     if (!deviceName) {
-      Message.error(`气象信息加载失败!`);
+      Message.error(`气象信息加载失败`);
       return reject();
     }
 
@@ -485,13 +485,13 @@ export function getMeteorologicalDetector(deviceName, options = {}) {
       .then(({ code, rows }) => {
         if (code != 200) {
           reject();
-          return Message.error(`气象信息加载失败!`);
+          return Message.error(`气象信息加载失败`);
         }
 
         resolve(rows[0] || {});
       })
       .catch(() => {
-        Message.error(`气象信息加载失败!`);
+        Message.error(`气象信息加载失败`);
         reject();
       });
   });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index cb0625a2..e3870be2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -38,7 +38,7 @@ export class MarkerCluster {
   map;
   markerCluster;
   infoWindow;
-
+  mapContainer;
   data = []; //标注集合
 
   constructor() {}
@@ -49,40 +49,93 @@ export class MarkerCluster {
 
   async addData(data, isDefault) {
     this.infoWindow?.close?.();
-    if (!isDefault) {
-      marksAddInGraph(data);
-    }
-
+    marksAddInGraph(data);
+  
     if (!data) return;
     if (!Array.isArray(data)) data = [data];
 
     this.data.push(...data);
-    if (
-      !this.markerCluster ||
-      this.markerCluster.getMap() !== Vue.prototype.mapIns
-    ){
-      await this.setMarkerCluster();
-    }
-
-    // console.log(
-    //   "%c [ data ]-227-「map.js」",
-    //   "font-size:15px; background:#641f14; color:#a86358;"
-    // );
-    this.markerCluster.addData(data);
-    // console.log(
-    //   "%c [ this.markerCluster ]-234-「map.js」",
-    //   "font-size:15px; background:#fe94d3; color:#ffd8ff;",
-    //   this.markerCluster
-    // );
 
-    const map = this.getMap();
-    map.setZoom(10);
+    if(this.mapContainer === 'BMapContainer'){
+      this.refreshLayer();
+    } else {
+      // 高德地图接口----------------------
+      if (
+        !this.markerCluster ||
+        this.markerCluster.getMap() !== Vue.prototype.mapIns
+      ){
+        await this.setMarkerCluster();
+      }
 
-    setTimeout(() => {
-      map.setFitView([...this.markerCluster.U], false, [0, 0, 0, 0], 10); //自适应. 覆盖物数组, 动画过渡到指定位置, 周围边距，上、下、左、右,  最大 zoom 级别
-    }, 150);
+      // console.log(
+      //   "%c [ data ]-227-「map.js」",
+      //   "font-size:15px; background:#641f14; color:#a86358;"
+      // );
+      this.markerCluster.addData(data);
+      // console.log(
+      //   "%c [ this.markerCluster ]-234-「map.js」",
+      //   "font-size:15px; background:#fe94d3; color:#ffd8ff;",
+      //   this.markerCluster
+      // );
+
+      const map = this.getMap();
+      map.setZoom(10);
+
+      setTimeout(() => {
+        map.setFitView([...this.markerCluster.U], false, [0, 0, 0, 0], 10); //自适应. 覆盖物数组, 动画过渡到指定位置, 周围边距，上、下、左、右,  最大 zoom 级别
+      }, 150);
+    }
+    
   }
 
+  refreshLayer(){
+    const map2d = Vue.prototype.mapIns
+    map2d.addPointByArr(
+      {pointList:[]},          //  点位数据数组（按以下规范组装）
+      'jhlayers',  //  当前添加的数据 唯一标识（删除该图层时也会用到）//./事件专题/交通事故.svg
+      true    //  当前新加图层是否启用聚合效果
+   );
+    map2d.removeLayerByName('jhlayers')
+    const aryPoints = [];
+    this.data.forEach(e=>{
+      if(e.lnglat){
+        let _name = e.config.item.title;
+        if(e.config.item.id.indexOf('./路测设备') !== -1){
+          _name = e.extData.deviceName;
+        } else if(e.config.item.id.indexOf('./路网设施') !== -1){
+          _name = e.extData.facilityName;
+        }
+        let _stake = e.extData.stakeMark;
+        const state = getState(e);
+        aryPoints.push({
+          type: 'event', //类型。例如：交通事件、故障停车、摄像机等 【必传字段】
+          longitude: e.lnglat[0], //点坐标经度    【必传字段】
+          latitude: e.lnglat[1],  //点坐标纬度    【必传字段】
+          iconUrl: getIcon(e,'b'),     // 图标  【必传字段】
+          // offset:[0,-65],
+          // size:[64,120],
+          otherInfo: {
+            ...e,
+            stake: _stake,
+            state: state?1:0,
+            name: e.extData.deviceName ||
+            e.extData.warningTitle ||
+            e.config?.item.title,
+          }
+        })
+      }
+    })
+    if(aryPoints.length > 0){
+      map2d.addPointByArr(
+        {pointList:aryPoints},          //  点位数据数组（按以下规范组装）
+        'jhlayers',  //  当前添加的数据 唯一标识（删除该图层时也会用到）//./事件专题/交通事故.svg
+        true    //  当前新加图层是否启用聚合效果
+     );
+    }
+    if(Vue.prototype.isMapStatck){
+      Vue.prototype.mapIns.pileIsShow("jhlayers", true);
+    }
+  }
   async showInfoWindow(data) {
     const AMap = await loadAMap();
 
@@ -382,12 +435,15 @@ export class MarkerCluster {
       }
       if (findIndex > -1) this.data.splice(findIndex, 1);
     });
-
-    this.markerCluster.setData(this.data);
+    this.setData()
   }
 
   setData() {
-    this.markerCluster.setData(this.data);
+    if(this.mapContainer === 'BMapContainer'){
+      this.refreshLayer();
+    }  else {
+      this.markerCluster.setData(this.data); //高德地图
+    }
   }
   clear() {
     this.data = [];
@@ -455,13 +511,13 @@ export function getContent(data) {
   }
 }
 
-function getIcon({ config, extData }) {
-  const normal = require(`@screen/images/layer${config.item.id.replace(
+function getIcon({ config, extData }, type = '') {
+  const normal = require(`@screen/images/layer${type}${config.item.id.replace(
     /^\.|[^/]+(?=.svg$)/g,
     (str) => (str === "." ? "" : `${str}_active`)
   )}`);
 
-  const fault = require(`@screen/images/layer${config.item.id.replace(
+  const fault = require(`@screen/images/layer${type}${config.item.id.replace(
     /^\.|[^/]+(?=.svg$)/g,
     (str) => (str === "." ? `` : `${str}_fault`)
   )}`);
@@ -525,8 +581,8 @@ export function addInGraphHandle(data) {
       graphInstance.addNode({
         x: distance,
         y: 60,
-        width: 20,
-        height: 20,
+        width: 25,
+        height: 25,
         ...node,
         zIndex: 1,
         id: id,
@@ -546,6 +602,7 @@ function getDataConf(data, extData) {
       nowBg,
       src: `${getIcon(data[0])}`,
       extData,
+      extNode: data[0]
     };
   } else {
     dataConf = {
@@ -554,6 +611,7 @@ function getDataConf(data, extData) {
       // width: `${36 + `${data.length}`.length * 15}px`,
       length: data.length,
       extData,
+      extNode: data
     };
   }
   return dataConf;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/index.vue
deleted file mode 100644
index eedc3c6e..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/index.vue
+++ /dev/null
@@ -1,476 +0,0 @@
-<template>
-  <Bg1 class='RoadAndEvents'>
-    <div class="tabs">
-      <div class="tabs-item" :class="layer.title === active ? 'tabs-active' : ''" v-for="layer in layerData"
-        :key="layer.title" @click="handleClick(layer)">
-        {{ layer.title }}
-      </div>
-    </div>
-
-    <!-- group -->
-    <div name="fade-group" tag="div" class="tabs-content">
-      <div class="device-item keep-ratio" v-for="(item, index) in tabContentData" :key="item.id"
-        @click="handleDevice(item)" :style="getStart(index)">
-        <div class="device-icon"
-          :style="{ backgroundImage: `url(${require(`@screen/images/layer/${active}/${item.title}${item.status}.svg`)})`, '--bgColor': `rgba(0, 209, 255, ${item.status ? 0.3 : 0})` }" />
-        <span>{{ item.title }}</span>
-      </div>
-    </div>
-
-    <div class="bottom">
-      <!-- <div class="cleared-btn" @click="updateEventState">
-        <img src="@screen/images/clearLayer.svg" />
-        <span>debug</span>
-      </div> -->
-      <div class="cleared-btn" @click="handleCleared">
-        <img src="@screen/images/clearLayer.svg" />
-        <span>清空图层</span>
-      </div>
-    </div>
-
-    <!-- 摄像机设备 控制 弹窗  球机 可打开-->
-    <!-- 摄像机 G35 K094+079 下行（可控） 枪机 可打开-->
-    <!-- <Camera :data="dialogConfig.data" :visible="dialogConfig.visibleType === 1" /> -->
-    <component :dialogData="dialogConfig.data" visible :selectedDevice="dialogConfig.data" :is="dialogConfig.component"
-      @change="handleCameraChange" @update:visible="handleCameraChange" @traffic-relieve="handleTrafficRelieve" />
-  </Bg1>
-</template>
-
-<script>
-import { getLayerData } from "./utils/layerImages";
-import { debounce } from "lodash";
-import { eventMap, cacheRemoveFunc, getHandleDeviceType } from "./utils/buttonEvent";
-
-import Bg1 from "@screen/components/Decorations/bg-1.vue"
-import InfoBoard from "./../InfoBoard/index.vue"
-
-import DrivingGuidance from "./../Dialogs/DrivingGuidance/index.vue"
-import Camera from "./../Dialogs/Camera/index.vue";
-import Broadcast from "./../Dialogs/Broadcast/index.vue";
-import TrafficIncidents from "./../Dialogs/TrafficIncidents/index.vue";
-import PerceiveEvent from "./../Dialogs/PerceiveEvent/index.vue";
-import RoadNetworkFacilities from "./../Dialogs/RoadNetworkFacilities/index.vue";
-import SmartDevice from "./../Dialogs/SmartDevice/index.vue";
-import RemoteMachine from "./../Dialogs/RemoteMachine/index.vue";
-import SolarEnergy from "./../Dialogs/SolarEnergy/index.vue";
-import ConfluenceArea from "./../Dialogs/ConfluenceArea/index.vue";
-import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
-import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue";
-import MeteorologicalDetection from "./../Dialogs/MeteorologicalDetection/index.vue";
-import MillimeterWaveRadar from "./../Dialogs/MillimeterWaveRadar/index.vue";
-
-import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue";
-import { addInGraphHandle, markerClusterIns } from "./utils/map"
-import { lngLatMap } from "./utils/buttonEvent";
-
-export default {
-  name: 'RoadAndEvents',//首页弹窗 渲染基类
-  components: {
-    // ControlCamera,
-    Camera,
-    DrivingGuidance,
-    Bg1,
-    InfoBoard,
-    Broadcast,
-    TrafficIncidents,
-    PerceiveEvent,
-    SmartDevice,
-    SolarEnergy,
-    Intermodulation,
-    GuardrailCollision,
-    FatigueWakesUp,
-    RoadNetworkFacilities,
-    RemoteMachine,
-    MeteorologicalDetection,
-    MillimeterWaveRadar,
-    ConfluenceArea
-  },
-  data() {
-    return {
-      layerData: [],
-      active: "事件专题",
-      tabContentData: [],
-      nowSelected: null, //当前点击选中的事件 title
-      nowSelectedCompleted: true, //选中事件的处理是否完成
-      // 路测设备-摄像机
-      dialogConfig: {
-        // 0 有 可控（球机） ControlCamera | 1 ⽆ 不可控（枪机） Camera
-        component: void 0,
-        data: void 0,
-        // component: "SmartDevice",
-        data: {
-          "searchValue": null,
-          "createBy": null,
-          "createTime": "2024-07-23 14:18:58",
-          "updateBy": null,
-          "updateTime": null,
-          "remark": null,
-          "params": {},
-          "id": 11,
-          "stakeMark": "k103+900",
-          "direction": "1",
-          "deptId": null,
-          "warningState": 1,
-          "warningTime": null,
-          "userId": null,
-          "warningSource": 1,
-          "warningLevel": null,
-          "warningType": 1,
-          "warningSubclass": null,
-          "warningTitle": null,
-          "otherConfig": null,
-          "sectionName": null,
-          "number": 0,
-          "type": null,
-          "sectionId": null,
-          "longitude": "116.493888",
-          "latitude": "36.291145"
-        }
-      }
-    }
-  },
-  props: {
-    isGisCompleted: {
-      type: Boolean,
-      default: () => false
-    }
-  },
-  watch: {
-    // GIS加载完毕后执行
-    isGisCompleted: {
-      async handler(bool) {
-        if (!bool) return;
-        this.tabContentData.map(item=>{
-          if(item.title === '交通事故'){
-            this.handleDeviceImmediate(item, true)
-          }
-          
-        })
-        // Object.keys(lngLatMap).forEach(key => {
-        //   addInGraphHandle(lngLatMap[key]);
-        // });
-      }
-    }
-  },
-  inject: ['activeDeviceTypes'],
-  created() {
-    const defaultActive = 0;
-    // 获取图层数据
-    const layerData = getLayerData();
-    console.log(JSON.stringify(layerData))
-    this.layerData = layerData;
-    // 指定默认图层
-    this.tabContentData = layerData[defaultActive].children || [];
-    // 指定默认图层名称
-    this.active = layerData[defaultActive].title;
-    // 注册全局监听，选中的事件是否处理完成
-    this.emitter.on("selectedCompleted", this.selectedCompletedHandle);
-  },
-  mounted() {
-    this.$root.$on('delete-event', this.handleRefresh);
-
-    //启动监听事件
-    this.EventBus.$on("deviceState", deviceList => {
-      this.updateEventState(deviceList)
-    });
-
-  },
-  destroyed(){
-    this.EventBus.$off("deviceState");
-  },
-  beforeDestroy() {
-    this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
-    Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
-    markerClusterIns.clear();
-    window.renderData = undefined;
-
-    this.$root.$off('delete-event', this.handleRefresh);
-
-  },
-  methods: {
-
-    async handleDeviceImmediate(item, isDefault) {
-      
-      // 根据选中类型获取对象 如：地图事件专题/map
-      const key = getHandleDeviceType(item) || `${this.active}/${item.title}`;
-
-      const status = item.status;
-      if (!status) { //开启
-        this.nowSelected = item.title;
-        this.nowSelectedCompleted = false;
-      }
-      else if (this.nowSelected === item.title && this.nowSelectedCompleted === false) return;
-
-      item.status = item.status ? "" : "_active";
-      const event = `${key}${status ? "_close" : ""}`;        
-      if (!eventMap[event]) {
-          this.emitter.emit("selectedCompleted", item);
-          return this.$emit("onClickItem", item);
-        }
-      await eventMap[event]?.call(this, item, this.filterData, isDefault, this.cb);
-      
-    },
-
-    // 选中事件处理完成
-    selectedCompletedHandle(item) {
-      if (this.nowSelected === item.title) {
-        this.nowSelectedCompleted = true;
-      }
-    },
-    setFilterDataNoAction(data) { //纯更新data
-      this.filterData = data;
-    },
-    async setFilterData(data) {//更新并调用接口
-      this.filterData = data;
-      const tabContentData = [];
-      this.layerData.forEach((layerDataItem => {
-        layerDataItem.children.forEach(item => {
-          if (!item.status) return;
-          tabContentData.push(item);
-        })
-      }));
-      const eventMapCall = async (item, isDefault) => {
-        const key = getHandleDeviceType(item) || `${this.active}/${item.title}`;
-        const status = item.status;
-        await eventMap[`${key}${status ? "" : "_close"}`]?.call(this, item, this.filterData, isDefault, this.cb);
-      }
-      await Promise.allSettled(tabContentData.map(item => eventMapCall(item, true)))
-      Object.keys(lngLatMap).forEach(key => {
-        addInGraphHandle(lngLatMap[key]);
-      });
-    },
-    handleClick(item) {
-      this.active = item.title;
-      this.tabContentData = item.children;
-    },
-    cb(item, config) {
-      const deviceType = config.deviceType;
-      const activeDeviceTypes = this.activeDeviceTypes;
-      const findIndex = activeDeviceTypes.indexOf(deviceType);
-      if (item.status) findIndex === -1 && activeDeviceTypes.push(deviceType);
-      else findIndex !== -1 && activeDeviceTypes.splice(findIndex, 1);
-    },
-    handleDevice: debounce(async function (item) {
-      await this.handleDeviceImmediate(item);
-    }, 360),
-    //更新设备状态
-    async updateEventState(eventList){
-      markerClusterIns.data.forEach(e => {
-        const device = _.find(eventList,{iotDeviceId: e.extData.iotDeviceId})
-        if(device){
-          e.extData.deviceState = device.deviceState;
-        }
-      });
-      markerClusterIns.setData()
-    },
-    async handleRefresh(){
-      const tab = _.filter(this.tabContentData,{status:'_active'})
-      try{
-        this.handleCleared();
-      } catch(e){
-      }
-      tab.forEach(async item=>{
-        await this.handleDeviceImmediate(item,true);
-      })
-    },
-    handleCleared() {
-      const { mapIns } = this.getMap();
-      this.layerData.forEach(({ children }) => {
-        children.forEach(item => item.status = "")
-      });
-      if (!mapIns) return;
-
-      for (const key in cacheRemoveFunc) {
-        cacheRemoveFunc[key]?.();
-      }
-
-      window.infoWindow.close();
-    },
-
-    // 摄像机 可控 不可控 弹窗 回调traffic-relieve
-    handleCameraChange() {
-      this.dialogConfig = {
-        // 0 有 可控（球机）ControlCamera | 1 ⽆ 不可控（枪机）Camera
-        component: null,
-        data: null
-      }
-    },
-    getStart(index) {
-      const columns = 5;
-
-      return {
-        gridRowStart: Math.floor(index / columns) + 1,
-        gridColumnStart: (index % columns) + 1,
-      }
-    },
-    async handleTrafficRelieve(e) {
-      await this.handleDeviceImmediate(e._itemData)
-      setTimeout(async () => {
-        await this.handleDeviceImmediate(e._itemData)
-      }, 500);
-      this.dialogConfig = {
-        // 0 有 可控（球机）ControlCamera | 1 ⽆ 不可控（枪机）Camera
-        component: null,
-        data: null
-      }
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity .24s;
-}
-
-.fade-enter,
-.fade-leave-to {
-  opacity: 0;
-}
-
-.fade-group-enter-active,
-.fade-group-leave-active {
-  transition: all 0.24s ease;
-}
-
-.fade-group-enter-from,
-.fade-group-leave-to {
-  opacity: 0;
-}
-
-.RoadAndEvents {
-  width: 100%;
-  // background: url("~@screen/images/bg/box_bg_002.png") no-repeat;
-  // clip-path: polygon(13% 0, 87% 0, 100% 14%, 100% 85%, 85% 100%, 11% 100%, 0 87%, 0 15%);
-  // background-size: 100% 100%;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  padding: 24px 18px;
-  padding-bottom: 15px;
-  overflow: hidden;
-  max-height: min-content;
-
-  .tabs-content {
-    margin-top: 15px;
-    margin-bottom: 6px;
-    display: grid;
-    grid-template-columns: repeat(5, 1fr);
-    grid-auto-rows: 60px;
-    flex: 1;
-    max-height: 100%;
-    // overflow: auto;
-    position: relative;
-    gap: 6px;
-    transition: all .24s linear;
-
-    .device-item {
-      // position: absolute;
-      position: relative;
-      width: 70px;
-      cursor: pointer;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      --height-svg: 24px;
-      --gap: 12px;
-      transition: all .15s linear;
-      padding-top: calc(var(--height-svg) + var(--gap));
-
-      .device-icon {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        position: absolute;
-        transition: all .15s linear;
-        top: 0;
-        height: 33px;
-        width: 100%;
-        background-repeat: no-repeat;
-        background-size: auto;
-        background-position: center;
-        transition: all .18s linear;
-
-        &::before {
-          content: "";
-          position: absolute;
-          width: 33px;
-          height: 33px;
-          border: 1px solid rgba(0, 209, 255, .5);
-          background-color: var(--bgColor);
-          border-radius: 50%;
-          z-index: -1;
-        }
-      }
-
-      span {
-        display: block;
-        text-align: center;
-        font-size: 13px;
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 500;
-        color: #ffffff;
-        line-height: 15px;
-        min-height: 27px;
-      }
-    }
-  }
-
-  .tabs {
-    display: flex;
-    overflow: hidden;
-    gap: 24px;
-
-    .tabs-item {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
-      // width: 128px;
-      flex: 1;
-      height: 36px;
-      background: url("~@screen/images/bg/box_bg_005.png") no-repeat;
-      background-size: 100% 100%;
-      font-size: 15px;
-      font-family: PingFang SC, PingFang SC;
-      font-weight: 500;
-      color: #ffffff;
-      transition: all .3s linear;
-    }
-
-    .tabs-active {
-      color: #00d1ff;
-      background: url("~@screen/images/bg/box_bg_005_active.png") no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-
-  .bottom {
-    display: flex;
-    justify-content: end;
-
-    .cleared-btn {
-      // position: absolute;
-      cursor: pointer;
-      width: 98px;
-      height: 31px;
-      border-radius: 20px;
-      border: 1px solid #25d8ff;
-      font-size: 12px;
-      font-family: PingFang SC, PingFang SC;
-      font-weight: 500;
-      color: #ffffff;
-      display: flex;
-      align-items: center;
-
-      img {
-        width: 16px;
-        height: 16px;
-        display: inline-block;
-        margin: 0 10px;
-      }
-    }
-  }
-}
-</style>../Dialogs/ConfluenceArea/index.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/buttonEvent.js
deleted file mode 100644
index 29acc676..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/buttonEvent.js
+++ /dev/null
@@ -1,465 +0,0 @@
-import {
-  getDeviceList,
-  getEventTopicList,
-  getPerceiveEventList,
-  getRoadNetworkFacilitiesList,
-} from "./httpList";
-import { delay } from "@screen/utils/common";
-import { Message } from "element-ui";
-import { EventTopics, RoadNFTopics } from "@screen/utils/enum.js";
-import { debounce, cloneDeep, find } from "lodash";
-import Vue from "vue";
-
-import { markerClusterIns, getContent, getLatAndLng } from "./map";
-const cameraIcon = {
-  // 球机
-  "00": require("@screen/images/deviceType/ball_active.svg"),
-  "01": require("@screen/images/deviceType/ball_fault.svg"),
-};
-
-export const cacheRemoveFunc = {};
-
-export const DeviceForMap = {
-  摄像机: {
-    deviceType: "1",
-    dialog: "Camera",
-    options: {
-      iconCallback(bool, item) {
-        /**
-         * 0 球机 可控
-         * 1 枪机 不可控
-         */
-        const type = JSON.parse(item.otherConfig || "{}")?.ptzCtrl || 1;
-
-        return cameraIcon[`${type}${+!bool}`];
-      },
-    },
-  },
-  行车诱导: {
-    deviceType: "12",
-    dialog: "DrivingGuidance",
-  },
-  情报板: {
-    deviceType: "2",
-    dialog: "InfoBoard",
-  },
-  语音广播: {
-    deviceType: "5",
-    dialog: "Broadcast",
-  },
-  设备箱: {
-    deviceType: "13",
-    dialog: "SmartDevice",
-  },
-  交调: {
-    deviceType: "11",
-    dialog: "Intermodulation",
-  },
-  合流区: {
-    deviceType: "8",
-    dialog:"ConfluenceArea",
-  },
-  护栏碰撞: {
-    deviceType: "6",
-    dialog: "GuardrailCollision",
-  },
-  智慧锥桶: {
-    deviceType: "9",
-  },
-  毫米波雷达: {
-    deviceType: "7",
-    dialog: "MillimeterWaveRadar",
-  },
-  气象检测器: {
-    deviceType: "3",
-    dialog: "MeteorologicalDetection",
-  },
-  疲劳唤醒: {
-    deviceType: "10",
-    dialog: "FatigueWakesUp",
-  },
-  太阳能板: {
-    deviceType: "15",
-    dialog: "SolarEnergy",
-  },
-  远端机: {
-    deviceType: "16",
-    dialog: "RemoteMachine",
-  },
-};
-
-export const lngLatMap = {}; //优化  缩略图 + 地图 复用lngLatmap
-export function getHandleDeviceType(item) {
-  if (DeviceForMap[item.title]) return "地图路测设备/map";
-  if (EventTopics[item.title]) return "地图事件专题/map";
-  if (RoadNFTopics[item.title]) return "路网设施/map";
-}
-
-let debounceNoneLngLatMessage = debounce(() => {
-  // Message.warning("部分设备经纬度为空");
-  console.log("部分设备经纬度为空");
-});
-
-function resolveDataOptions(data, config, component, isDefault) {
-  let lnglat =
-    data.longitude && data.latitude
-      ? [parseFloat(data.longitude), parseFloat(data.latitude)]
-      : null;
-
-  if (!lnglat && !isDefault) debounceNoneLngLatMessage();
-
-  return {
-    weight: 1,
-    lnglat,
-    name: "",
-    config: {
-      markerClick: (extData, item) => {
-        // 兼容不同的返回类型
-        let formData = extData.otherConfig;
-        try{
-          formData = JSON.parse(extData.otherConfig)
-        }catch(e){
-          // formData = null;
-        }
-        // formData.pictures = ["https://pic1.zhimg.com/80/v2-c00beaae1f6e3c09a6d77c16c70002fe_1440w.webp?source=1def8aca","https://pic1.zhimg.com/80/v2-c56626621906417a453d262ac11f3385_1440w.webp?source=1def8aca"]
-        // console.log(component, "DialogComponent",extData);
-        this.dialogConfig = {
-          component,
-          data: {
-            ...extData,
-            formData,
-            parseOtherConfig: formData,
-            _itemData: item,
-          },
-        };
-      },
-      ...config,
-    },
-    extData: data,
-  };
-}
-
-export const eventMap = {
-  // 设备 需要在地图显示的
-  async "地图路测设备/map"(item, filterData, isDefault, cb) {
-    const config = DeviceForMap[item.title];
-    let loadingMessage;
-    if (!isDefault) {
-      loadingMessage = Message.info({
-        message: `${item.title}设备加载中...`,
-        duration: 0,
-        customClass: "loading-message",
-        iconClass: "el-icon-loading",
-      });
-    }
-    const data = await getDeviceList(config.deviceType, filterData)
-      .then(async (data) => {
-        await delay(600);
-        return data;
-      })
-      .catch(() => {});
-
-    loadingMessage?.close();
-
-    if (!data) return this.emitter.emit("selectedCompleted", item);
-    if (!data.length && !isDefault) {
-      this.emitter.emit("selectedCompleted", item);
-      return Message.warning(`未查询到${item.title}设备!`);
-    }
-
-    eventMap[`地图路测设备/map_close`](item);
-    const cbCall = () =>
-      cb?.(item, { deviceType: `路测设备_${config.deviceType}` });
-    cbCall();
-    const options = {
-      item,
-      ...config.options,
-    };
-
-    let removeData = data.map((item) =>
-      resolveDataOptions.call(this, item, options, config.dialog, isDefault)
-    );
-    console.log(
-      "%c [ removeData ]-112-「buttonEvent.js」",
-      "font-size:15px; background:#83c806; color:#c7ff4a;",
-      removeData
-    );
-    addDataPreHandle(removeData);
-    markerClusterIns.addData(removeData, isDefault);
-    this.emitter.emit("selectedCompleted", item);
-
-    cacheRemoveFunc[`地图路测设备/${item.title}`] = () => {
-      cbCall();
-      removeDataPreHandle(removeData);
-      markerClusterIns.removeData(removeData);
-    };
-  },
-  "地图路测设备/map_close"(item) {
-    cacheRemoveFunc[`地图路测设备/${item.title}`]?.();
-  },
-
-  // 事件 需要在地图显示的
-  async "地图事件专题/map"(item, filterData, isDefault, cb) {
-    const deviceType = EventTopics[item.title];
-    let loadingMessage;
-    if (!isDefault) {
-      loadingMessage = Message.info({
-        message: `${item.title}事件位置加载中...`,
-        duration: 0,
-        customClass: "loading-message",
-        iconClass: "el-icon-loading",
-      });
-    }
-    const data = await getEventTopicList(deviceType, filterData)
-      .then(async (data) => {
-        await delay(600);
-        return data;
-      })
-      .catch(() => {});
-
-    loadingMessage?.close();
-
-    if (!data) return this.emitter.emit("selectedCompleted", item);
-    if (!data.length && !isDefault) {
-      this.emitter.emit("selectedCompleted", item);
-      return Message.warning(`没有${item.title}事件数据!`);
-    }
-
-    eventMap[`地图事件专题/map_close`](item);
-    const cbCall = () => cb?.(item, { deviceType: `事件专题_${deviceType}` });
-    cbCall();
-
-    console.log(item,'-------------')
-    const aryPoints=[];
-    data.forEach(e => {
-      if(e.longitude && e.latitude){
-        aryPoints.push({
-          type: 'event', //类型。例如：交通事件、故障停车、摄像机等 【必传字段】
-          longitude: parseFloat(e.longitude), //点坐标经度    【必传字段】
-          latitude: parseFloat(e.latitude),  //点坐标纬度    【必传字段】
-          otherInfo: {   //其他定位需要展示的信息   【必传字段】
-              ...e,
-              imgUrl:"https://respub.xrdz.dzng.com/pic_file/20201023/461129d3468cc633138e3d9b4a64897a.jpg",
-              item
-          }
-        })
-      }
-    });
-    if(aryPoints.length > 0){
-      const map2d = Vue.prototype.map2d
-      map2d.addPointByArr(
-        aryPoints,          //  点位数据数组（按以下规范组装）
-        item.title,  //  当前添加的数据 唯一标识（删除该图层时也会用到）
-        true    //  当前新加图层是否启用聚合效果
-     );
-    }
-    
-  
-    // console.log(data,'===========',map2d)
-
-    // 地图打点
-    // const options = {
-    //   stateCallback: () => true,
-    //   item,
-    // };
-
-    // let removeData = data.map((item) =>
-    //   resolveDataOptions.call(
-    //     this,
-    //     item,
-    //     options,
-    //     "TrafficIncidents",
-    //     isDefault
-    //   )
-    // );
-    // addDataPreHandle(removeData); 
-    // console.log('---$$$------',removeData)
-    // markerClusterIns.addData(removeData, isDefault);
-    // this.emitter.emit("selectedCompleted", item);
-
-    // cacheRemoveFunc[`地图事件专题/${item.title}`] = () => {
-    //   cbCall();
-    //   removeDataPreHandle(removeData);
-    //   markerClusterIns.removeData(removeData);
-    // };
-  },
-  "地图事件专题/map_close"(item) {
-    cacheRemoveFunc[`地图事件专题/${item.title}`]?.();
-  },
-
-  // 路网设施 需要在地图显示的
-  async "路网设施/map"(item, filterData, isDefault, cb) {
-    const deviceType = RoadNFTopics[item.title];
-
-    let loadingMessage;
-    if (!isDefault) {
-      loadingMessage = Message.info({
-        message: `${item.title}路网设施位置加载中...`,
-        duration: 0,
-        customClass: "loading-message",
-        iconClass: "el-icon-loading",
-      });
-    }
-    console.log("deviceType", deviceType);
-    const data = await getRoadNetworkFacilitiesList(deviceType, filterData)
-      .then(async (data) => {
-        await delay(600);
-        data.forEach((item) => {
-          if (item.otherConfig) {
-            let otherConfig = JSON.parse(item.otherConfig);
-            item.latitude = otherConfig.dimension
-            item.longitude = otherConfig.longitude
-          }
-        });
-        return data;
-      })
-      .catch(() => {});
-
-    loadingMessage?.close();
-
-    if (!data) return this.emitter.emit("selectedCompleted", item);
-
-    if (!data.length && !isDefault) {
-      this.emitter.emit("selectedCompleted", item);
-      return Message.warning(`没有${item.title}路网设施数据!`);
-    }
-
-    eventMap[`路网设施/map_close`](item);
-    const cbCall = () => cb?.(item, { deviceType: `路网设施_${deviceType}` });
-    cbCall();
-
-    const options = {
-      stateCallback: () => true,
-      item,
-    };
-
-    let removeData = data.map((item) =>
-      resolveDataOptions.call(
-        this,
-        item,
-        options,
-        "RoadNetworkFacilities",
-        isDefault
-      )
-    );
-    addDataPreHandle(removeData);
-    markerClusterIns.addData(removeData, isDefault);
-    this.emitter.emit("selectedCompleted", item);
-
-    cacheRemoveFunc[`路网设施/${item.title}`] = () => {
-      cbCall();
-      removeDataPreHandle(removeData);
-      markerClusterIns.removeData(removeData);
-    };
-  },
-  "路网设施/map_close"(item) {
-    cacheRemoveFunc[`路网设施/${item.title}`]?.();
-  },
-
-  // 感知事件
-  async "事件专题/感知事件"(item, filterData, isDefault, cb) {
-    let loadingMessage;
-    if(!isDefault){
-      loadingMessage = Message.info({
-        message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
-        duration: 0,
-        customClass: "loading-message",
-        iconClass: "el-icon-loading",
-      });
-    }
-    // if (!isDefault) {
-     
-    // } 
-    const warningState = 1;
-    const data = await getPerceiveEventList({ warningState }, filterData)
-      .then(async (data) => {
-        await delay(600);
-        return data;
-      })
-      .catch(() => {});
-
-    loadingMessage?.close();
-    if (!data) return this.emitter.emit("selectedCompleted", item);
-    if (!data?.length && !isDefault) {
-      this.emitter.emit("selectedCompleted", item);
-      return Message.warning(`没有${item.title}数据!`);
-    }
-
-    eventMap[`事件专题/感知事件_close`](item);
-    const cbCall = () => cb?.(item, { deviceType: `感知事件_${warningState}` });
-    cbCall();
-
-    const options = {
-      stateCallback: () => true,
-      item,
-    };
-
-    let removeData = data.map((item) =>
-      resolveDataOptions.call(this, item, options, "PerceiveEvent", isDefault)
-    );
-    addDataPreHandle(removeData);
-    markerClusterIns.addData(removeData, isDefault);
-    this.emitter.emit("selectedCompleted", item);
-
-    loadingMessage?.close();
-
-    cacheRemoveFunc[`事件专题/${item.title}`] = (filter, type) => {
-      //type为special才重新赋值removeData
-      let handleData = removeData;
-      if (filter && type == "special") {
-        //走误报删除处理 只删除一个
-        const findItem = find(removeData, filter);
-        handleData = [findItem];
-        window.infoWindow.close();
-        this.emitter.emit("updateDialogVisible", false);
-      } else cbCall(); //非误报执行,需更新选中事件集合
-      removeDataPreHandle(handleData);
-      markerClusterIns.removeData(handleData);
-    };
-  },
-  "事件专题/感知事件_close"(item, filter, type) {
-    //感知事件 误报删除兼容
-    cacheRemoveFunc[`事件专题/${item.title}`]?.(filter, type);
-  },
-};
-
-function lngLatMapHandle(markers, cb) {
-  markers.forEach((markerData) => {
-    const lnglat = markerData.lnglat;
-    if (lnglat) {
-      const { lat, lng } = getLatAndLng(lnglat);
-      const lngLatStr = `${lng}/${lat}`;
-      cb(lngLatStr, markerData);
-    }
-  });
-}
-
-function addDataPreHandle(markers) {
-  const cb = (lngLatStr, markerData) => {
-    if (lngLatMap[lngLatStr])
-      !lngLatMap[lngLatStr].includes(markerData) &&
-        lngLatMap[lngLatStr].push(markerData);
-    else lngLatMap[lngLatStr] = [markerData];
-  };
-  lngLatMapHandle(markers, cb);
-}
-
-function removeDataPreHandle(markers) {
-  // 完善校验逻辑 避免删除额外节点
-  const cb = (lngLatStr, markerData) => {
-    const lngLatArr = lngLatMap[lngLatStr];
-    if (lngLatArr) {
-      if (lngLatArr.length === 0) delete lngLatMap[lngLatStr];
-      else if (lngLatArr.length === 1 && lngLatArr[0] === markerData)
-        delete lngLatMap[lngLatStr];
-      else {
-        const findIndex = lngLatArr.findIndex(
-          (removeData) => removeData === markerData
-        );
-        if (findIndex !== -1) lngLatArr.splice(findIndex, 1);
-      }
-    }
-  };
-  lngLatMapHandle(markers, cb);
-  window.renderData?.(window.page); //移除后,重新渲染弹出框更新数据
-}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/data.json b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/data.json
deleted file mode 100644
index 9ac21202..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/data.json
+++ /dev/null
@@ -1,464 +0,0 @@
-[
-  {
-    "id": 1882,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K60+000—K65+000",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1883,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K75+000—K81+000",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1884,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K101+000—K104+000",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1885,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K110+000—K112+000",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1886,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K147+000—K152+000",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1887,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K162+000—K166+000",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1888,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K205+000—K207+000",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1889,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K59+290",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1890,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K72+844",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1891,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K83+885",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1892,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K86+499",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1893,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K99+750",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1894,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K105+904",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1895,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K117+878",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1896,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K126+224",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1897,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K145+934",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1898,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K155+652",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1899,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K163+250",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1900,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K173+600",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1901,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K179+140",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  },
-  {
-    "id": 1902,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 285,
-    "stakeMark": "K190+500",
-    "direction": null,
-    "deviceName": "智能行车诱导系统",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": "2024-01-17T22:50:56.000+08:00",
-    "updateTime": null,
-    "longitude": "116.147183",
-    "latitude": "35.612834"
-  },
-  {
-    "id": 99999,
-    "iotDeviceId": null,
-    "groupId": null,
-    "productId": 286,
-    "stakeMark": "k59+289",
-    "direction": "2",
-    "deviceName": "不知",
-    "deviceType": 12,
-    "installationDate": null,
-    "productionDate": null,
-    "durableYears": null,
-    "installationSite": null,
-    "useState": null,
-    "otherConfig": null,
-    "remark": null,
-    "createTime": null,
-    "updateTime": null,
-    "longitude": null,
-    "latitude": null
-  }
-]
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/httpList.js
deleted file mode 100644
index 747f510b..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/httpList.js
+++ /dev/null
@@ -1,498 +0,0 @@
-import { Message } from "element-ui";
-// import { axiosIns } from "@screen/utils/axios/auth.js";
-import moment from "moment";
-import request from "@/utils/request";
-
-export function batchFunctions(data) {
-  return request({
-    url: `/business/device/batchFunctions`,
-    method: "post",
-    data: data,
-  });
-}
-
-/**
- *
- * @param {string} camId 相机 ID
- * @param {1 | 2 | 3} media 参数说明: 1: http+flv; 2: rtmp; 3: hls
- * @returns
- */
-export async function getCameraStream(camId, media = 1) {
-  let data = await request({
-    url: "/video/externalVideoStreaming",
-    method: "get",
-    params: {
-      camId,
-    },
-  });
-
-  /*if (data.code == 200) {
-    data.data.liveUrl =
-      "https://10.0.81.202/camera?target=" + data.data.liveUrl.substring(7);
-  }*/
-  return data;
-}
-
-/**
- *
- * @param {*} pileNum
- * @returns
- */
-export function getNearCamera(pileNum) {
-  return request({
-    url: "/video/nearCamListPileNum",
-    method: "get",
-    params: {
-      pileNum,
-    },
-  });
-}
-
-export function getNearCameraNew(pileNum) {
-  return request({
-    url: "/video/nearCamPileNum",
-    method: "get",
-    params: {
-      pileNum,
-    },
-  });
-}
-
-function padZero(num) {
-  num = num.toString();
-  while (num.length < 3) {
-    num = "0" + num;
-  }
-  return num;
-}
-/**
- *  球机进行控制
- * @param {string} camId 相机 ID
- * @param {number} cmdType 12 /焦距变⼤(倍率变⼤)/
-11 /焦距变⼩(倍率变⼩)/
-13 /焦点前调/
-14 /焦点后调/
-15 /光圈扩⼤/
-16 /光圈缩⼩/
-21 /云台向上/
-22 /云台向下/
-23 /云台左转/
-24 /云台右转/
-50 /云台左上转/
-51 /云台左下转/
-52 /云台右上转/
-53 /云台右下转/
-8 /设置预置位/
-39 /调⽤预置位/
-49 /辅助开关开、如⾬刷/
-48 /辅助开关关、如⾬刷/
-51 /设置巡航起始点/
-52 /设置巡航结束点/
-53 /开始巡航/
-54 /停⽌巡航/
-(-1) /⾃动⾬刷/
-99 /各⽅向动作停⽌/
- * @returns
- */
-export function controlCamera(camId, cmdType, isMsgType = true) {
-  return request({
-    url: "/video/PTZControl",
-    method: "get",
-    params: {
-      ...(isMsgType ? { msgType: 3 } : undefined),
-      camId,
-      cmdType,
-      speed: 1,
-    },
-  })
-    .then((result) => {
-      if (result.code != 200) return Message.error(`相机操作失败!`);
-    })
-    .catch((err) => {
-      Message.error(`相机操作失败!`);
-    });
-}
-
-/**
- * 通过 桩号获取 道路信息
- * @param {*} stakeMark 桩号
- * @returns
- */
-export function getRoadInfoByStakeMark(stakeMark) {
-  return new Promise(async (resolve, reject) => {
-    if (!stakeMark) return reject();
-
-    // 获取桩号信息
-    const stakeMarkInfo = await request({
-      // url: `/business/stakeMark/${stakeMark}`,
-      url: `/business/stakeMark/query`,
-      method: "get",
-      params: {
-        stakeMark: stakeMark,
-        direction: 1,
-      },
-    })
-      .then(({ code, data }) => {
-        if (code != 200) return;
-
-        return data[0];
-      })
-      .catch(() => {});
-
-    if (!stakeMarkInfo?.sectionId) return reject();
-
-    // 获取 管辖路段信息
-    const roadSectionInfo = await request({
-      url: `/business/roadSection/${stakeMarkInfo.sectionId}`,
-      method: "get",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) return;
-
-        return data;
-      })
-      .catch(() => {});
-
-    if (!roadSectionInfo?.roadId) return reject();
-
-    // 获取 道路信息
-    request({
-      url: `/business/road/${roadSectionInfo.roadId}`,
-      method: "get",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) return reject();
-
-        resolve(data);
-      })
-      .catch(() => reject());
-  });
-}
-
-const DeviceTypeMap = {
-  1: "摄像机",
-  2: "可变信息标志",
-  3: "气象监测器",
-  4: "出口诱导灯",
-  5: "路段语音广播",
-  6: "护栏碰撞",
-  7: "毫米波雷达",
-  8: "合流区预警",
-  9: "智慧锥桶",
-  10: "激光疲劳唤醒",
-  11: "一类交通量调查站",
-  12: "行车诱导",
-  13: "智能设备箱",
-  14: "光线在线监测",
-};
-
-/**
- * @description {DeviceTypeMap}
- * @param {number} deviceType
-  1: "摄像机",
-  2: "可变信息标志",
-  3: "气象监测器",
-  4: "出口诱导灯",
-  5: "路段语音广播",
-  6: "护栏碰撞",
-  7: "毫米波雷达",
-  8: "合流区预警",
-  9: "智慧锥桶",
-  10: "激光疲劳唤醒",
-  11: "一类交通量调查站",
-  12: "行车诱导",
-  13: "智能设备箱",
-  14: "光线在线监测",
- */
-export function getDeviceList(deviceType, options) {
-  return new Promise((resolve, reject) => {
-    if (!deviceType) {
-      // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
-      return reject();
-    }
-    let newEndStakeMark = [];
-    let newStartStakeMark = [];
-    if(options && options.endStakeMark){
-      options.endStakeMark.forEach((item) => {
-        newEndStakeMark.push(String(item));
-      });
-    }
-    if(options && options.startStakeMark){
-      options.startStakeMark.forEach((item) => {
-        newStartStakeMark.push(String(item));
-      });
-    }
-    let data = {
-      deviceType: deviceType,
-      endStakeMark: newEndStakeMark,
-      startStakeMark: newStartStakeMark,
-    };
-    if (options && options.childType && options.childType.split("-")[0] === deviceType) {
-      data.childType = options.childType;
-    }
-    if (options && options.deviceState && options.deviceState !== "") {
-      data["deviceState"] = options.deviceState;
-    }
-    if (options && options.direction && options.direction !== "") {
-      data["direction"] = options.direction;
-    }
-    request(
-      Object.keys(options || {}).length
-        ? {
-            url: "/business/device/pileNumberQuery",
-            method: "POST",
-            data,
-          }
-        : {
-            url: "/business/device/query",
-            method: "GET",
-            params: data,
-          }
-    )
-      .then(({ code, data }) => {
-        if (code != 200) {
-          reject();
-          return Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
-        }
-
-        resolve(data);
-      })
-      .catch(() => {
-        Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
-        reject();
-      });
-  });
-}
-
-export function getDeviceInfo(iotDeviceId, options) {
-  return new Promise((resolve, reject) => {
-    const data = {
-      iotDeviceId,
-      ...options,
-    };
-
-    request({
-      url: "/business/device/query",
-      method: "GET",
-      params: data,
-    })
-      .then(({ code, data }) => {
-        if (code != 200) {
-          reject();
-          // return Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
-        }
-
-        resolve(data);
-      })
-      .catch(() => {
-        // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
-        reject();
-      });
-  });
-}
-
-/**
- * 获取 所属机构
- * @param {*} iotDeviceId 设备ID iotDeviceId
- * @returns
- */
-export function getOrganizationName(iotDeviceId) {
-  return new Promise((resolve, reject) => {
-    if (!iotDeviceId) return reject();
-
-    request({
-      url: `/business/organization/${iotDeviceId}`,
-      method: "get",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) return reject();
-
-        // organizationName
-        resolve(data);
-      })
-      .catch(() => {
-        reject();
-      });
-  });
-}
-
-/**
- * 获取 产品 设备厂商
- * @param {*} iotDeviceId 设备ID iotDeviceId
- * @returns
- */
-export function getProduct(productId) {
-  return new Promise((resolve, reject) => {
-    if (!productId) return reject();
-
-    request({
-      url: `/business/product/${productId}`,
-      method: "get",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) return reject();
-
-        // brand
-        resolve(data);
-      })
-      .catch(() => {
-        reject();
-      });
-  });
-}
-
-/**
- * 交通事件 列表 根据类型获取
- * @param {number} eventType
- */
-export function getEventTopicList(eventType, options = {}) {
-  return new Promise((resolve, reject) => {
-    if (!eventType) {
-      Message.error(`事件加载失败!`);
-      return reject();
-    }
-
-    const { endStakeMark, startStakeMark } = options;
-    let url = `/business/trafficIncidents/getEventList?eventType=${eventType}`;
-    if (endStakeMark) {
-      let formatEndStakeMark = `K${padZero(endStakeMark[0])}%2B${padZero(
-        endStakeMark[1]
-      )}`;
-      url += `&endStakeMark=${formatEndStakeMark}`;
-    }
-    if (startStakeMark) {
-      let formatStartStakeMark = `K${padZero(startStakeMark[0])}%2B${padZero(
-        startStakeMark[1]
-      )}`;
-      url += `&startStakeMark=${formatStartStakeMark}`;
-    }
-    request({
-      url: url,
-      method: "post",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) {
-          reject();
-          return Message.error(`事件加载失败!`);
-        }
-
-        resolve(data);
-      })
-      .catch(() => {
-        Message.error(`事件加载失败!`);
-        reject();
-      });
-  });
-}
-
-/**
- * 感知事件根据类型获取
- * @param {number} eventType
- */
-export function getPerceiveEventList(data = {}, options = {}) {
-  return new Promise((resolve, reject) => {
-    // const completeTime = moment().add(1, "d").format("YYYY-MM-DD");
-    // const startTime = moment().add(-7, "d").format("YYYY-MM-DD");
-    // data.startTime = startTime;
-    // data.completeTime = completeTime;
-
-    const { endStakeMark, startStakeMark } = options;
-    if (endStakeMark) {
-      let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero(
-        endStakeMark[1]
-      )}`;
-      data.endStakeMark = formatEndStakeMark;
-    }
-    if (startStakeMark) {
-      let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero(
-        startStakeMark[1]
-      )}`;
-      data.startStakeMark = formatStartStakeMark;
-    }
-
-    request({
-      url: `/perceivedEvents/warning/warningList`,
-      method: "POST",
-      data: { ...data },
-    })
-      .then(({ code, data: rows }) => {
-        if (code != 200) {
-          reject();
-          return Message.error(`事件加载失败!`);
-        }
-        resolve(rows);
-      })
-      .catch(() => {
-        Message.error(`事件加载失败!`);
-        reject();
-      });
-  });
-}
-
-/**
- * 路网设施 列表 根据类型获取
- * @param {number} facilityType
- */
-export function getRoadNetworkFacilitiesList(facilityType, options = {}) {
-  return new Promise((resolve, reject) => {
-    if (!facilityType) {
-      Message.error(`事件加载失败!`);
-      return reject();
-    }
-
-    const { stakeMark } = options;
-    let url = `/business/facility/query?facilityType=${facilityType}`;
-    if (stakeMark) {
-      let formatStartStakeMark = `K${padZero(stakeMark[0])}%2B${padZero(
-        stakeMark[1]
-      )}`;
-      url += `&stakeMark=${formatStartStakeMark}`;
-    }
-    request({
-      url: url,
-      method: "get",
-    })
-      .then(({ code, data }) => {
-        if (code != 200) {
-          reject();
-          return Message.error(`事件加载失败!`);
-        }
-
-        resolve(data);
-      })
-      .catch(() => {
-        Message.error(`事件加载失败!`);
-        reject();
-      });
-  });
-}
-
-/**
- * 气象检测器 获取气象信息
- * @param {string} deviceName
- */
-export function getMeteorologicalDetector(deviceName, options = {}) {
-  return new Promise((resolve, reject) => {
-    if (!deviceName) {
-      Message.error(`气象信息加载失败!`);
-      return reject();
-    }
-
-    request({
-      url: `/dc/system/meteorologicalDetector/device/${deviceName}`,
-      method: "get",
-    })
-      .then(({ code, rows }) => {
-        if (code != 200) {
-          reject();
-          return Message.error(`气象信息加载失败!`);
-        }
-
-        resolve(rows[0] || {});
-      })
-      .catch(() => {
-        Message.error(`气象信息加载失败!`);
-        reject();
-      });
-  });
-}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/layerImages.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/layerImages.js
deleted file mode 100644
index 60a3f9ba..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/layerImages.js
+++ /dev/null
@@ -1,228 +0,0 @@
-import { EventTopics } from "@screen/utils/enum.js";
-export const LayerData = [
-  {
-    "title": "事件专题",
-    "status": "",
-    "children": [
-      {
-        "id": "./事件专题/交通事故.svg",
-        "title": "交通事故",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/交通拥堵.svg",
-        "title": "交通拥堵",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/交通管制.svg",
-        "title": "交通管制",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/其他事件.svg",
-        "title": "其他事件",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/异常天气.svg",
-        "title": "异常天气",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/感知事件.svg",
-        "title": "感知事件",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/施工建设.svg",
-        "title": "施工建设",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/服务区异常.svg",
-        "title": "服务区异常",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/设施设备隐患.svg",
-        "title": "设施设备隐患",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/路障清除.svg",
-        "title": "路障清除",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/车辆故障.svg",
-        "title": "车辆故障",
-        "status": ""
-      },
-      {
-        "id": "./事件专题/非法上路.svg",
-        "title": "非法上路",
-        "status": ""
-      }
-    ]
-  },
-  {
-    "title": "路测设备",
-    "status": "",
-    "children": [
-      {
-        "id": "./路测设备/交调.svg",
-        "title": "交调",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/合流区.svg",
-        "title": "合流区",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/太阳能板.svg",
-        "title": "太阳能板",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/情报板.svg",
-        "title": "情报板",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/护栏碰撞.svg",
-        "title": "护栏碰撞",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/摄像机.svg",
-        "title": "摄像机",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/智慧锥桶.svg",
-        "title": "智慧锥桶",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/毫米波雷达.svg",
-        "title": "毫米波雷达",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/气象检测器.svg",
-        "title": "气象检测器",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/疲劳唤醒.svg",
-        "title": "疲劳唤醒",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/行车诱导.svg",
-        "title": "行车诱导",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/设备箱.svg",
-        "title": "设备箱",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/语音广播.svg",
-        "title": "语音广播",
-        "status": ""
-      },
-      {
-        "id": "./路测设备/远端机.svg",
-        "title": "远端机",
-        "status": ""
-      }
-    ]
-  },
-  {
-    "title": "路网设施",
-    "status": "",
-    "children": [
-      {
-        "id": "./路网设施/停车区.svg",
-        "title": "停车区",
-        "status": ""
-      },
-      {
-        "id": "./路网设施/收费站.svg",
-        "title": "收费站",
-        "status": ""
-      },
-      {
-        "id": "./路网设施/服务区.svg",
-        "title": "服务区",
-        "status": ""
-      },
-      {
-        "id": "./路网设施/枢纽立交.svg",
-        "title": "枢纽立交",
-        "status": ""
-      },
-      {
-        "id": "./路网设施/桥梁.svg",
-        "title": "桥梁",
-        "status": ""
-      },
-      {
-        "id": "./路网设施/清障驻点.svg",
-        "title": "清障驻点",
-        "status": ""
-      },
-      {
-        "id": "./路网设施/边坡.svg",
-        "title": "边坡",
-        "status": ""
-      }
-    ]
-  }
-]
-
-export function getLayerData() {
-  const layerData = require.context(
-    "@screen/images/layer",
-    true,
-    /^\.\/[^_a-zA-Z]+\.svg$/
-  );
-
-  const layerDatas = {};
-  const resultData = [];
-
-  layerData.keys().forEach((item) => {
-    const [_, topic, file] = item.match(/[^/]+/g);
-    const fileName = file.match(/[^._]+/)[0];
-    switch (topic) {
-      case "事件专题":
-        if (
-          !EventTopics[fileName.match(/[^._]+/)[0]] &&
-          !["感知事件"].includes(fileName)
-        )
-          return;
-        break;
-    }
-    if (!layerDatas[topic]) {
-      resultData.push(
-        (layerDatas[topic] = {
-          title: topic,
-          status: "",
-          children: [],
-        })
-      );
-    }
-
-    layerDatas[topic].children.push({
-      id: item,
-      title: fileName,
-      status: "",
-    });
-  });
-
-  return resultData;
-}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/map.js
deleted file mode 100644
index cb0625a2..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents2/utils/map.js
+++ /dev/null
@@ -1,567 +0,0 @@
-import { loadAMap } from "@screen/pages/Home/components/AMapContainer/loadAMap.js";
-// import { Message } from "element-ui";
-import Vue from "vue";
-import { lngLatMap } from "./buttonEvent";
-import { upperFirst, filter } from "lodash";
-/**
- * @typedef {Object} Point
- * @property {number} weight - The weight of the item.
- * @property {number[]} lngLat - The longitude and latitude coordinates.
- * @property {string} name - The name of the item.
- * @property {string} icon - The icon of the item.
- * @property {Object} extData - The icon of the item.
- * @property {*} [x] - Additional properties of the item.
- */
-
-/**
- * https://lbs.amap.com/api/javascript-api-v2/documentation#markercluster 2.x
- * https://lbs.amap.com/demo/javascript-api/example/marker/markerclusterer 1.x
- * @param {*} map
- * @param {Point[]} points
- * @param {Marker[]} markers
- * @param {Function} markerFun
- * @returns
- */
-const faultBg = require(`@screen/images/mapBg/fault.svg`);
-const normalBg = require(`@screen/images/mapBg/active.svg`);
-const faultTitleBg = require(`@screen/images/mapBg/fault_title.svg`);
-const normalTitleBg = require(`@screen/images/mapBg/active_title.svg`);
-
-const eventRegex = "./事件专题";
-/**
- * 聚合点
- */
-export class MarkerCluster {
-  /**
-   * @type {}
-   */
-  map;
-  markerCluster;
-  infoWindow;
-
-  data = []; //标注集合
-
-  constructor() {}
-
-  getMap() {
-    return (this.map = Vue.prototype.mapIns);
-  }
-
-  async addData(data, isDefault) {
-    this.infoWindow?.close?.();
-    if (!isDefault) {
-      marksAddInGraph(data);
-    }
-
-    if (!data) return;
-    if (!Array.isArray(data)) data = [data];
-
-    this.data.push(...data);
-    if (
-      !this.markerCluster ||
-      this.markerCluster.getMap() !== Vue.prototype.mapIns
-    ){
-      await this.setMarkerCluster();
-    }
-
-    // console.log(
-    //   "%c [ data ]-227-「map.js」",
-    //   "font-size:15px; background:#641f14; color:#a86358;"
-    // );
-    this.markerCluster.addData(data);
-    // console.log(
-    //   "%c [ this.markerCluster ]-234-「map.js」",
-    //   "font-size:15px; background:#fe94d3; color:#ffd8ff;",
-    //   this.markerCluster
-    // );
-
-    const map = this.getMap();
-    map.setZoom(10);
-
-    setTimeout(() => {
-      map.setFitView([...this.markerCluster.U], false, [0, 0, 0, 0], 10); //自适应. 覆盖物数组, 动画过渡到指定位置, 周围边距，上、下、左、右,  最大 zoom 级别
-    }, 150);
-  }
-
-  async showInfoWindow(data) {
-    const AMap = await loadAMap();
-
-    const map = this.getMap();
-
-    if (!this.infoWindow)
-      this.infoWindow = new AMap.InfoWindow({
-        content: "",
-        isCustom: true,
-        anchor: "bottom-center",
-        offset: new AMap.Pixel(0, -60),
-      });
-
-    console.log(
-      "%c [ this.infoWindow ]-330-「map.js」",
-      "font-size:15px; background:#6f5757; color:#b39b9b;",
-      this.infoWindow
-    );
-    //data.length 大于 5 取前5个数, 否则直接返回data
-    const pageSize = 6;
-    let page = 1;
-    const totalPages = Math.ceil(data.length / pageSize);
-    const currentPageData =
-      totalPages > 1 ? data.slice((page - 1) * pageSize, pageSize) : data;
-    window.currentPageData = currentPageData;
-    window.pageSize = pageSize;
-    window.page = page;
-    window.totalPages = totalPages;
-    let num = (page - 1) * pageSize;
-    function renderData(page) {
-      if (!data || page < 1 || page > totalPages) return;
-      window.page = page;
-      const pageSize = window.pageSize;
-      const dataContainer = document.getElementById("dataContainer");
-      const dataPage = document.getElementById("dataPage");
-      // 清空数据容器
-      // dataContainer.innerHTML = "";
-
-      // 计算当前页起始索引和结束索引
-      const startIndex = (page - 1) * pageSize;
-      const endIndex = startIndex + pageSize;
-      let num = (page - 1) * pageSize;
-      if (data.length === 0 || data.length === 1) {
-        return this.infoWindow.close();
-      }
-      const { latitude: lat, longitude: lng } = data[0].extData;
-      const lngLatStr = `${parseFloat(lng)}/${parseFloat(lat)}`; //更新清除节点后的数据
-      data = lngLatMap[lngLatStr];
-      // 截取当前页的数据
-      const currentPageData = data.slice(startIndex, endIndex);
-      window.currentPageData = currentPageData;
-      const itemsTpl = currentPageData
-        .map((item) => {
-          return `
-          <div style="cursor: pointer; padding: 3px 6px;display: flex;align-items: center; gap: 6px;" class="info-window-item">
-            ${++num}<img  style="width: 18px;" src="${getIcon(item)}" />
-            <span style="white-space: nowrap; word-break: break-all;">${(
-              item.extData.deviceName ||
-              item.extData.warningTitle ||
-              item.config?.item.title
-            ).replace("G35 ", "")}</span>
-          </div>
-        `;
-        })
-        .join("");
-      // 渲染当前页数据
-      dataContainer.innerHTML = itemsTpl;
-      dataPage && (dataPage.innerHTML = `第${page}页`);
-      bindItemClick();
-    }
-
-    window.renderData = renderData;
-
-    // min-width: 240px;
-    // min-height: 90px;
-    // width: 90px;
-    this.infoWindow.setContent(`<div
-    style="
-      display: flex;
-      flex-direction: column;
-      position: relative;
-      background: rgba(6,66,88,0.8);
-      border: 1px solid rgba(42,217,253,0.6);
-    ">
-      <div style="height: 26px; width: 100%; display: flex;align-items: center; justify-content: space-between; padding: 0 15px; background: linear-gradient(90deg, #237E9B 0%, rgba(23,145,184,0) 100%);">
-        <span>重叠</span>
-        <img class="info-close" style="width: 12px;cursor: pointer;" src="${require("@screen/images/dialog/icon-close.svg")}" />
-      </div>
-      <div id="dataContainer" style="padding: 15px 9px;flex: 1; overflow: auto;" class="info-window-content">
-        ${currentPageData
-          .map(
-            (item) => `
-              <div style="cursor: pointer; padding: 3px 6px;display: flex;align-items: center; gap: 6px;" class="info-window-item">
-               ${++num} <img  style="width: 18px;" src="${getIcon(item)}" />
-                <span style="white-space: nowrap; word-break: break-all;">${(
-                  item.extData.deviceName ||
-                  item.extData.warningTitle ||
-                  item.config?.item.title
-                ).replace("G35 ", "")}</span>
-              </div>
-            `
-          )
-          .join("")}
-      </div>
-      ${
-        totalPages > 1
-          ? `
-      <div id="paginationContainer" style="text-align:center;margin-bottom:5px;">
-      <button style="padding: 0 15px;background: #00B3CC;border-radius: 48px;cursor: pointer;opacity: 1;gap: 6px;font-size: 14px;font-weight: 500;color: #FFFFFF;border: 1px solid rgba(42, 217, 253, 0.6);" onclick="renderData(window.page-1)">上一页</button>
-      <span id="dataPage" style="font-size: 14px;font-weight: 500;color: #FFFFFF;"> 第${page} 页</span>
-      <button style="padding: 0 15px;background: #00B3CC;border-radius: 48px;cursor: pointer;opacity: 1;gap: 6px;font-size: 14px;font-weight: 500;color: #FFFFFF;border: 1px solid rgba(42, 217, 253, 0.6);" onclick="renderData(window.page+1)">下一页</button>
-      </div>`
-          : ""
-      }
-    </div>`);
-    window.infoWindow = this.infoWindow;
-    this.infoWindow.open(map, currentPageData[0].lnglat);
-    window.openInfoWindow = true;
-    this.infoWindow.dom.querySelector(".info-close").onclick = () =>
-      this.infoWindow.close();
-
-    this.infoWindow.dom.querySelector(".info-window-content").onmousewheel = (
-      e
-    ) => e.stopPropagation();
-
-    this.infoWindow.dom.querySelector(".info-window-content").onwheel = (e) =>
-      e.stopPropagation();
-
-    function bindItemClick() {
-      window.infoWindow.dom
-        .querySelectorAll(".info-window-item")
-        .forEach((item, index) => {
-          item.onclick = () => {
-            const currentPageData = window.currentPageData;
-            currentPageData[index].config.markerClick?.(
-              currentPageData[index].extData,
-              currentPageData[index].config?.item
-            );
-          };
-        });
-    }
-    bindItemClick();
-  }
-
-  async setMarkerCluster() {
-    const AMap = await loadAMap();
-
-    const map = this.getMap();
-
-    let hasClick = false;
-
-    const reset = () => {
-      if (!window.openInfoWindow) {
-        // console.log("窗口movestart中", new Date());
-        this.infoWindow?.close?.();
-      }
-    };
-
-    map.on("zoomstart", reset);
-    map.on("zoomend", reset);
-    map.on("movestart", reset);
-    map.on("moveend", async () => {
-      if (window.openInfoWindow) {
-        // console.log("窗口位移结束", new Date());
-        window.openInfoWindow = false;
-        // !window.infoWindow.getIsOpen() && window.infoWindow?.open?.();
-      }
-    });
-
-    const markerCluster = new AMap.MarkerCluster(map, [], {
-      // gridSize: 15,
-      maxZoom: 15,
-      // 自定义聚合点样式
-      renderClusterMarker(context) {
-        // 聚合中点个数
-        const clusterCount = context.count;
-        const div = document.createElement("div");
-        let bgColor = "204,235,197";
-
-        div.style.backgroundColor = `rgba(${bgColor}, .6)`;
-
-        const size = Math.round(24 + `${clusterCount}`.length * 15);
-
-        div.style.borderRadius =
-          div.style.lineHeight =
-          div.style.width =
-          div.style.height =
-            `${size}px`;
-        div.style.border = `solid 1px rgba(${bgColor}, 1)`;
-        div.innerHTML = context.count;
-        div.style.color = "#ffffff";
-        div.style.fontSize = "24px";
-        div.style.textAlign = "center";
-
-        context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2));
-        context.marker.setContent(div);
-      },
-      renderMarker: (context) => {
-        const markerData = context.data[0];
-        const {
-          extData,
-          lnglat: { lat, lng },
-        } = markerData;
-        const lngLatStr = `${lng}/${lat}`;
-        const data = lngLatMap[lngLatStr];
-        if (data) {
-          const state = getState(data);
-          let nowTitleBg, nowTitleColor;
-          if (state) {
-            nowTitleBg = normalTitleBg;
-            nowTitleColor = "#FFDB82";
-          } else {
-            nowTitleBg = faultTitleBg;
-            nowTitleColor = "#FF7575";
-          }
-          const item = data[0];
-          const { stakeMark } = item.extData;
-          const titleTemplate = window.showStakeText
-            ? `<p style="background-image: url('${nowTitleBg}');background-size: 100% 100%;background-repeat: no-repeat;padding: 5px;
-        font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 14px; line-height: 16px; color: ${nowTitleColor};
-        "> ${stakeMark} </p>`
-            : "";
-
-          context.marker.setAnchor("bottom-center");
-
-          context.marker.setLabel({
-            direction: "bottom",
-            // offset: new AMap.Pixel(10, 0), //设置文本标注偏移量
-            content: titleTemplate, //设置文本标注内容
-          });
-
-          context.marker.setContent(getContent(data));
-          // if (window.showStakeText) context.marker.setAnchor("center");
-          // else context.marker.setAnchor("bottom-center");
-
-          const offset = new AMap.Pixel(0, 0);
-          context.marker.setOffset(offset);
-
-          context.marker.setExtData(extData);
-
-          context.marker.on("click", (e) => {
-            hasClick = true;
-
-            const data = lngLatMap[lngLatStr];
-            if (data.length > 1) {
-              this.showInfoWindow(data);
-              return;
-            }
-
-            console.log(
-              "%c [ 点击地图坐标 ]-302-「map.js」",
-              "font-size:15px; background:#8f8c0b; color:#d3d04f;",
-              data[0]
-            );
-
-            data[0].config.markerClick?.(data[0].extData, data[0].config?.item);
-          });
-        }
-      },
-    });
-
-    markerCluster.on("click", (e) => {
-      if (hasClick) return (hasClick = false);
-
-      map.setCenter(e.lnglat);
-      map.setZoom(map.getZoom() + 3);
-    });
-
-    this.markerCluster = markerCluster;
-  }
-
-  removeData(data) {
-    data.forEach((item, index) => {
-      const findIndex = this.data.findIndex(
-        (removeData) => removeData === item
-      );
-      let { stakeMark, direction } = item.extData;
-      stakeMark = upperFirst(stakeMark); //统一格式 大写K
-      const id = `${stakeMark}_${direction || ""}`;
-      const existNode = graphInstance.getCellById(id);
-      const lnglat = item.lnglat;
-      if (lnglat) {
-        const { lat, lng } = getLatAndLng(lnglat);
-        const lngLatStr = `${lng}/${lat}`;
-        const lngLatArr = lngLatMap[lngLatStr]; //已是移除后的数据集
-        if (existNode) {
-          if (lngLatArr) {
-            if (lngLatArr.length === 0)
-              window.graphInstance.removeNode(existNode.id);
-            else {
-              //更新节点
-              const updateNode = graphInstance.getCellById(id);
-              updateNode.updateData(getDataConf(lngLatArr, item.extData));
-            }
-          } else window.graphInstance.removeNode(id);
-        }
-      }
-      if (findIndex > -1) this.data.splice(findIndex, 1);
-    });
-
-    this.markerCluster.setData(this.data);
-  }
-
-  setData() {
-    this.markerCluster.setData(this.data);
-  }
-  clear() {
-    this.data = [];
-  }
-}
-
-export function getContent(data) {
-  // const faultBg = require(`@screen/images/mapBg/fault.svg`);
-  // const normalBg = require(`@screen/images/mapBg/active.svg`);
-  const state = getState(data);
-  let nowBg, nowTitleBg, nowTitleColor;
-  if (state) {
-    nowBg = normalBg;
-    nowTitleBg = normalTitleBg;
-    nowTitleColor = "#FFDB82";
-  } else {
-    nowBg = faultBg;
-    nowTitleBg = faultTitleBg;
-    nowTitleColor = "#FF7575";
-  }
-
-  const item = data[0];
-  const { stakeMark } = item.extData;
-  if (data.length === 1) {
-    return `
-      <div style="
-        background-image: url(${nowBg});
-        background-size: 100% 100%;
-        background-repeat: no-repeat;
-        width: 51px;
-        height: 51px;
-        display: flex;
-        align-self: center;
-        justify-content: center;
-      ">
-        <img style="
-            min-width: 24px;
-            min-height: 24px;
-            width: 24px;
-            height: 24px;
-            margin-top: 8.1px;
-          " src='${getIcon(item)}'
-        >
-      </div>
-  `;
-  } else {
-    const width = `${36 + `${data.length}`.length * 15}px`;
-
-    return `
-    <div style="
-      background-image: url(${nowBg});
-      background-size: 100% 100%;
-      background-repeat: no-repeat;
-      width: ${width};
-      height: ${width};
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      padding-bottom: 9px;
-      align-self: center;
-    " onmouseover="this.parentNode.style.zIndex=13;" onmouseout="this.parentNode.style.zIndex=12;">
-      ${data.length}
-    </div>
-`;
-  }
-}
-
-function getIcon({ config, extData }) {
-  const normal = require(`@screen/images/layer${config.item.id.replace(
-    /^\.|[^/]+(?=.svg$)/g,
-    (str) => (str === "." ? "" : `${str}_active`)
-  )}`);
-
-  const fault = require(`@screen/images/layer${config.item.id.replace(
-    /^\.|[^/]+(?=.svg$)/g,
-    (str) => (str === "." ? `` : `${str}_fault`)
-  )}`);
-
-  const currentState = getState({ config, extData });
-
-  const deviceIcon =
-    typeof config.iconCallback === "function" &&
-    config.iconCallback(currentState, extData, config.item);
-
-  return deviceIcon ? deviceIcon : currentState ? normal : fault;
-}
-
-function getState(data) {
-  if (Array.isArray(data)) {
-    return data.every((item) => getStateSingle(item));
-  } else return getStateSingle(data);
-}
-
-function getStateSingle({ config, extData }) {
-  return typeof config?.stateCallback === "function"
-    ? config.stateCallback?.()
-    : extData.deviceState == 1;
-}
-
-export function marksAddInGraph(data) {
-  for (let markerData of data || []) {
-    const lnglat = markerData.lnglat;
-    if (lnglat) {
-      const { lat, lng } = getLatAndLng(lnglat);
-      const lngLatStr = `${lng}/${lat}`;
-      const data = lngLatMap[lngLatStr];
-      addInGraphHandle(data);
-    }
-  }
-}
-
-export function addInGraphHandle(data) {
-  const graphInstance = window.graphInstance;
-  const extData = data[0].extData;
-  const { item: eventItem } = data[0].config;
-  if (eventItem.id.match(eventRegex)) {
-    let { stakeMark, lang, direction } = extData;
-    stakeMark = upperFirst(stakeMark); //统一格式 大写K
-    const distance =
-      (Number(
-        stakeMark.replace(/\.\d+/, "").replace("+", ".").replace(/[Kk]/, "")
-      ) -
-        54.394) *
-        window.canvasRatio +
-      window.canvasWidth * window.offsetRatio; //K54+394 开始到K208+979计算的比例尺
-
-    const node = { shape: "custom-html", effect: ["data"] };
-    node.data = getDataConf(data, extData);
-    const id = `${stakeMark}_${direction || ""}`;
-    const existNode = graphInstance.getCellById(id);
-    if (existNode) {
-      existNode.updateData(node.data);
-    } else {
-      // setTimeout(() => {
-      graphInstance.addNode({
-        x: distance,
-        y: 60,
-        width: 20,
-        height: 20,
-        ...node,
-        zIndex: 1,
-        id: id,
-      });
-      // }, 0);
-    }
-  }
-}
-
-function getDataConf(data, extData) {
-  data = data.filter((item) => item.config.item.id.match(eventRegex));
-  let dataConf;
-  const nowBg = getState(data) ? normalBg : faultBg;
-  if (data.length === 1) {
-    dataConf = {
-      shape: "singleNode-html",
-      nowBg,
-      src: `${getIcon(data[0])}`,
-      extData,
-    };
-  } else {
-    dataConf = {
-      shape: "multiNode-html",
-      nowBg,
-      // width: `${36 + `${data.length}`.length * 15}px`,
-      length: data.length,
-      extData,
-    };
-  }
-  return dataConf;
-}
-
-export function getLatAndLng(lnglat) {
-  if (Array.isArray(lnglat)) return { lng: lnglat[0], lat: lnglat[1] };
-  else return lnglat;
-}
-
-export const markerClusterIns = new MarkerCluster();
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
index b91a768d..4bbfe96a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
@@ -9,6 +9,8 @@ import { Graph, Shape } from '@antv/x6'
 import { debounce } from "lodash";
 import { actualLocationList, canvasList } from "./data.js";
 
+const faultBg = require(`@screen/images/mapBg/fault.svg`);
+const normalBg = require(`@screen/images/mapBg/active.svg`);
 
 const mouseenterDebounceFunc = debounce(({ node }) => {
   if (["custom-html"].indexOf(node.shape) >= 0) {
@@ -22,15 +24,12 @@ const mouseleaveDebounceFunc = debounce(({ node }) => {
   }
 }, 0);
 
-
 const clickDebounceFunc = debounce(({ node }) => {
-  const mapIns = Vue.prototype.mapIns;
   if (["custom-html"].indexOf(node.shape) >= 0) {
     const extData = node.getData()?.extData;
     if (extData) {
-      mapIns.setZoomAndCenter(18, [extData.longitude, extData.latitude]);
+      this.setMapZoomAndCenter(18, [extData.longitude, extData.latitude])
     }
-
   }
 }, 0);
 
@@ -60,13 +59,19 @@ export default {
   name: "Thumbnail",
   data() {
     return {
-      list: canvasList, //计算真实距离与画布距离的比例  *节点真实距离作为canvasItem.distance的值
+      list: [], //计算真实距离与画布距离的比例  *节点真实距离作为canvasItem.distance的值
       translateX: 0,
       translateY: 50,
       allInstance: 0
     };
   },
-
+  props: {
+    map: {
+      type: String,
+      default: "B",
+    }
+  },
+  inject: ['setMapZoomAndCenter'],
   mounted() {
     this.mapInit();
     // onceObserver.call(this, this.$refs.ThumbnailRef, () => {
@@ -76,9 +81,87 @@ export default {
     //     this.allInstance = 0
     //   this.mapInit();
     // });
+    window.addEventListener("resize", () => {
+      if (this.timeout) clearTimeout(this.timeout);
+      this.timeout = setTimeout(() => {
+        this.debug();
+      }, 200);
+    });
   },
   methods: {
+
+    getIcon({ config, extData }, type = '') {
+      const normal = require(`@screen/images/layer${type}${config.item.id.replace(
+        /^\.|[^/]+(?=.svg$)/g,
+        (str) => (str === "." ? "" : `${str}_active`)
+      )}`);
+
+      const fault = require(`@screen/images/layer${type}${config.item.id.replace(
+        /^\.|[^/]+(?=.svg$)/g,
+        (str) => (str === "." ? `` : `${str}_fault`)
+      )}`);
+
+      const currentState = this.getState({ config, extData });
+
+      const deviceIcon =
+        typeof config.iconCallback === "function" &&
+        config.iconCallback(currentState, extData, config.item);
+
+      return deviceIcon ? deviceIcon : currentState ? normal : fault;
+    },
+
+    getState(data) {
+      if (Array.isArray(data)) {
+        return data.every((item) => this.getStateSingle(item));
+      } else return this.getStateSingle(data);
+    },
+
+    getStateSingle({ config, extData }) {
+      return typeof config?.stateCallback === "function"
+        ? config.stateCallback?.()
+        : extData.deviceState == 1;
+    },
+    debug() {
+      const nodes = _.cloneDeep(this._graph.getNodes()).filter(x => x.id.length < 11);
+      this._graph.dispose();
+      // 
+      setTimeout(() => {
+        this.mapInit();
+
+        for (let n of nodes) {
+
+          const aryId = n.id.split('_')
+          const distance = (Number(aryId[0].replace(/\.\d+/, "").replace("+", ".").replace(/[Kk]/, "")) - 54.394) * window.canvasRatio + window.canvasWidth * window.offsetRatio; //K54+394 开始到K208+979计算的比例尺
+          if (n.data.nowBg) {
+            n.data.nowBg = this.getState(n.data.extNode) ? normalBg : faultBg;
+          }
+          if (n.data.src) {
+            n.data.src = `${this.getIcon(n.data.extNode)}`
+          }
+
+          const node = {
+            shape: "custom-html",
+            effect: ["data"],
+            data: n.data
+          };
+          this._graph.addNode({
+            x: distance,
+            y: 60,
+            width: 25,
+            height: 25,
+            ...node,
+            zIndex: 1,
+            id: n.id,
+          });
+        }
+
+      }, 100);
+    },
     async mapInit() {
+      this.list = _.cloneDeep(canvasList)
+      this.translateX = 0;
+      this.translateY = 50;
+      this.allInstance = 0;
       const content = this.$refs.ThumbnailRef;
       width = content.clientWidth;
       height = content.clientHeight;
@@ -174,6 +257,7 @@ export default {
         container: content,
         width,
         height,
+
         background: {
           image: require("./images/bg.png"),
           size: "100% 100%"
@@ -183,9 +267,18 @@ export default {
           // return true;
         },
       });
+      this._graph = graph;
       graph.on('node:mouseenter', mouseenterDebounceFunc);
       graph.on('node:mouseleave', mouseleaveDebounceFunc);
-      graph.on('node:click', clickDebounceFunc);
+      graph.on('node:click', debounce(({ node }) => {
+        if (["custom-html"].indexOf(node.shape) >= 0) {
+          const extData = node.getData()?.extData;
+          if (extData) {
+            this.setMapZoomAndCenter(18, [extData.longitude, extData.latitude])
+          }
+
+        }
+      }, 0));
 
       Shape.HTML.register({
         shape: 'custom-html',
@@ -224,6 +317,8 @@ export default {
               display: flex;
               justify-content: center;
               align-items: center;
+              width: ${width * 1.2}px;
+              height: ${height * 1.2}px;
               padding-bottom: ${height * 0.1}px;
             ">
               ${length}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
index e022aa80..81006e1d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
@@ -1,40 +1,42 @@
 <template>
-  <div class="Home">
-    <!-- <AMapContainer ref="AMapContainerRef" @update:isGisCompleted="(data) => {this.isGisCompleted = data;}" /> -->
-    <BMapContainer ref="BMapContainerRef" @update:isGisCompleted="(data) => {this.isGisCompleted = data;}" />
-    <section class="content">
-      <!-- 左侧 -->
-      <div class="content-l">
-        <!-- 上 -->
-        <FocusedMonitoring class="card-menu" />
-
-        <!-- 下 -->
-        <RoadAndEvents ref="RoadAndEventsRef" :isGisCompleted="isGisCompleted" class="content-l-b card-menu" />
-      </div>
-
-      <!-- 右侧 -->
-      <div class="content-r">
-        <div class="home-icons">
+  <div style="width: 100%;height: 100%;">
+      <component :is="mapContainer" ref="MapContainerRef" @update:isGisCompleted="(data) => { this.isGisCompleted = data; }"  />
+    <div class="Home">
+      <section class="content">
+        <!-- 左侧 -->
+        <div class="content-l">
+          <!-- 上 -->
+          <FocusedMonitoring class="card-menu" style="height: 15vw;" />
+          <!-- 下 -->
+          <RoadAndEvents ref="RoadAndEventsRef" :isGisCompleted="isGisCompleted" :mapContainer="mapContainer" style="flex:1" class="card-menu" />
+        </div>
+        <div class="content-m">
+        </div>
+
+        <div class="home-icons" >
           <HomeFilter class="item" />
           <HomeFrame class="item" />
           <HomeVector class="item" />
           <HomeWord class="item" />
-          <!-- <HomeVectorControl class="item" /> -->
           <HomeFrameControl class="item" />
+          <HomeWeather class="item" />
+          <HomeWeatherLayer class="item" />
+          <HomeTraffic class="item" />
+        </div>
+        <div class="content-r">
+          <ConditionStatistics class="right card-menu" style="height: 100%;" />
+        </div>
+      </section>
+      <footer class="footer card-menu">
+        <div class="footer-title">
+          <span>济菏高速缩略图</span>
+          <i class="el-icon-s-fold" style="color: #2ad9fd; transform: rotate(-90deg)" @click.stop="handleShrink" />
         </div>
-        <ConditionStatistics class="right card-menu" />
-      </div>
-    </section>
-
-    <footer class="footer card-menu">
-      <div class="footer-title">
-        <span>济菏高速缩略图</span>
-        <i class="el-icon-s-fold" style="color: #2ad9fd; transform: rotate(-90deg)" @click.stop="handleShrink" />
-      </div>
-      <div class="footer-content">
-        <Thumbnail />
-      </div>
-    </footer>
+        <div class="footer-content">
+          <Thumbnail ref="Thumbnail" />
+        </div>
+      </footer>
+    </div>
   </div>
 </template>
 
@@ -50,13 +52,14 @@ import HomeVector from "./components/HomeVector/index.vue";
 import HomeWord from "./components/HomeWord/index.vue";
 import HomeFrameControl from "./components/HomeFrameControl/index.vue";
 import HomeVectorControl from "./components/HomeVectorControl/index.vue";
+import HomeWeather from "./components/HomeWeather/index.vue";
+import HomeWeatherLayer from "./components/HomeWeatherLayer/index.vue";
+import HomeTraffic from "./components/HomeTraffic/index.vue";
 
+import RoadAndEvents from "./components/RoadAndEvents/index.vue";
 import Button from "@screen/components/Buttons/Button.vue";
 import Vue from "vue";
-
-import RoadAndEvents from "./components/RoadAndEvents2/index.vue";
 import BMapContainer from "./components/BMapContainer/index.vue";
-// import InfoBoard from "./components/InfoBoard"
 
 export default {
   name: "Home",
@@ -74,23 +77,33 @@ export default {
     HomeFrameControl,
     HomeVectorControl,
     HomeWord,
-    // InfoBoard
+    HomeWeather,
+    HomeWeatherLayer,
+    HomeTraffic
   },
   data() {
     return {
-      isShowInfoBoard: false,
       selectedDevice: null,
       isGisCompleted: false,
+      mapContainer:'BMapContainer'
     };
   },
   provide() {
     return {
       // 2024-06-04更新地图==========================================
-      // getMap: () => this.$refs.AMapContainerRef.getMapInstance(),
+      getMap: () => {
+        return this.$refs.MapContainerRef.getMapInstance();
+      },
+      setMapZoomAndCenter: (zoom,lnglat) => {
+        this.$refs.MapContainerRef.setMapZoomAndCenter(zoom,lnglat);
+      },
       activeDeviceTypes: Vue.observable([]),
     };
   },
   methods: {
+    debug(){
+      this.$refs.Thumbnail.debug()
+    },
     handleShrink(e) {
       const translateXElement = e.target.parentElement.parentElement;
 
@@ -119,68 +132,60 @@ export default {
   height: 100%;
   // height: 100%;
   // z-index: 6;
-  // display: flex;
-  // flex-direction: column;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
   // gap: 30px;
   padding: 19px 31px 0 25px;
   // justify-content: center;
 
+
+
   .card-menu {
     transition: all 0.24s linear;
   }
 
   .content {
     width: 100%;
-    // margin: auto;
     display: flex;
     justify-content: space-between;
-    // flex: 1;
-    height: min-content;
-    pointer-events: none;
-
-    >div {
-      pointer-events: auto;
-    }
+    height: 62vh;
 
     .content-l {
-      width: 461px;
+      width: 25vw;
       overflow: hidden;
-      pointer-events: none;
       display: flex;
       flex-direction: column;
-      gap: 24px;
       overflow: hidden;
       height: 100%;
-
-      >div {
-        pointer-events: all;
-        flex: 1;
-      }
-
-      .content-l-b {
-        height: 332px;
-        max-height: 332px;
-        flex: 0.81;
-      }
+      gap: .5vw;
     }
 
-    .content-r {
+    .content-m {
       display: flex;
       gap: 9px;
+      flex: 1;
+    }
 
-      .home-icons {
-        display: flex;
-        gap: 0px;
-        flex-direction: column;
-
-        .item {
-          padding-top: 15px;
-        }
+    .home-icons {
+      display: flex;
+      gap: 0px;
+      flex-direction: column;
+      z-index: 0;
+      margin-right: 10px;
+      .item {
+        padding-top: 15px;
       }
+    }
 
-      .right {
-        width: 459px;
-      }
+    .content-r {
+      width: 25vw;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+      overflow: hidden;
+      height: 100%;
     }
   }
 
@@ -192,6 +197,7 @@ export default {
     height: min-content;
     will-change: height;
     bottom: 0;
+    z-index: 0;
 
     >div {
       pointer-events: all;
@@ -237,7 +243,7 @@ export default {
 
     .footer-content {
       width: 100%;
-      height: 224px;
+      height: 200px;
       background: #005570;
       border-top: 1px solid #003354;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue
new file mode 100644
index 00000000..ddf014da
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue
@@ -0,0 +1,279 @@
+<template>
+  <div class='board_record'>
+    <!-- 搜索栏 -->
+    <div class="filter">
+      <div>
+        <ButtonGradient @click="onRefreshForm" class="refresh-btn">
+        <template #prefix>
+          <img src="@screen/images/refresh.svg" />
+        </template>
+        刷新
+      </ButtonGradient>
+      </div>
+      
+      <InputSearch ref="searchComp" style="width: 400px" :formList="searchFormList"  @handleSearch="handleSearch" />
+
+    </div>
+    <!-- 内容-->
+    <div class="body"> 
+      <Table :data="tableData" height="75vh" >
+        <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
+          header-align="center" />
+          <ElTableColumn label="管控时间" prop="operTime" width="200" />
+            <ElTableColumn label="管控方式" prop="operType" width="200" />
+            <ElTableColumn label="操作人" prop="operName" width="200" />
+            <ElTableColumn label="设备类型"  width="200">
+              <template slot-scope="scope">
+                <div>
+                  <p v-for="item in scope.row.arydcDeviceType">{{ item }}</p>
+                </div>
+              </template>
+            </ElTableColumn>
+            <ElTableColumn label="设备名称" prop="arydcDeviceName"  width="300">
+              <template slot-scope="scope">
+                <div>
+                  <p v-for="item in scope.row.arydcDeviceName">{{ item }}</p>
+                </div>
+              </template>
+            </ElTableColumn>
+            <ElTableColumn label="执行内容" prop="remark" >
+              <template slot-scope="scope">
+                <div>
+                  <p v-for="item in scope.row.aryRemark">{{ item }}</p>
+                </div>
+              </template>
+            </ElTableColumn>
+            <ElTableColumn label="执行结果" prop="status" width="100" align="center" header-align="center">
+              <template slot-scope="scope">
+                <div>
+                  <p v-for="item in scope.row.aryState">
+                    <i class="el-icon-success" style="font-size: 20px; color:#0c0;" v-if="item === 200"></i>
+                    <i class="el-icon-error" style="font-size: 20px; color:#BBB;" v-else></i> 
+                  </p>
+                </div>
+              </template>
+            </ElTableColumn>
+      </Table>
+    </div>
+
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
+      </Pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import Table from '@screen/components/Table.vue';
+import request from '@/utils/request'
+import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import { searchFormList } from "./data";
+import { getToken } from "@/utils/auth";
+import { delay, exportFile, confirm } from "@screen/utils/common";
+import { Message } from "element-ui";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import Dialog from "@screen/components/Dialog/index.vue";
+
+export default {
+  name: 'boardRecord',
+  components: {
+    ButtonGradient,
+    Pagination,
+    Table,
+    Button,
+    Form,
+    Dialog,
+    BoardRecordPreview,
+    InputSearch
+  },
+  data() {
+    return {
+      tableData: [],
+      searchFormList,
+      total: 20,
+      searchData: {
+        pageSize: 20,
+        pageNum: 1
+      },
+      rowsMult:[],
+      spanLength:0,
+      Enum_ControlType: [
+        { key: "0", label: "手动控制" },
+        { key: "1", label: "定时控制" },
+        { key: "2", label: "批量控制" },
+        { key: "3", label: "预案控制" }
+      ],
+    }
+  },
+  created() {
+    this.initData();
+  },
+  mounted(){
+  },
+  methods: {
+    onRefreshForm(){
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    handleSearch(data) {
+      console.log(data)
+      const _search = {}
+      if(data.operTime && data.operTime.length === 2){
+        _search.startTime = data.operTime[0]+' 00:00:00'
+        _search.endTime = data.operTime[1]+' 23:59:59'
+      }
+      if(data.operType){
+        _search.operType = data.operType
+      }
+      if(data.dcDeviceType){
+        _search.dcDeviceType = data.dcDeviceType
+      }
+      this.searchData = {
+        pageSize: this.searchData.pageSize,
+        pageNum: this.searchData.pageNum,
+        ..._search
+      };
+      this.initData();
+    },
+    indexMethod(index) {
+        return  this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
+    },
+    initData() {
+       request({
+        url: `/business/dcOperLog/list`,
+        method: "get",
+        params: {
+          ...this.searchData
+        }
+      })
+        .then((result) => {
+          const enum_deviceType = {
+            2: "可变信息标志",
+            5: "语音广播",
+            10: "疲劳唤醒",
+            12: "行车诱导",
+            13: "设备箱",
+            16: "远端机"
+          }
+          if (result.code != 200) return;
+       
+          result.rows.forEach(e => {
+            const resJson = JSON.parse(e.jsonResult)
+            const resParam = JSON.parse(e.operParam)[0].devices
+            const aryRemark = [];
+            e.remark.split(',').filter(x=>{
+              x.split('、').filter(y=>{
+                aryRemark.push(y)
+              })
+            })
+            e.operTime= moment(e.operTime).format('YYYY-MM-DD HH:mm:ss')
+            e.operType= _.find(this.Enum_ControlType, { key: e.operType }).label
+            e.arydcDeviceName = e.dcDeviceName.replace(/[\[\]]/g,'').split(',');
+            e.aryRemark = aryRemark;
+            e.aryState = resJson.map(x=>x.result.code)
+            e.arydcDeviceType = resParam.map(x=>enum_deviceType[x.deviceType])
+        })
+
+          this.tableData = result.rows;
+          this.total = result.total;
+        })
+        .finally(() => {
+        });
+    },
+    onSizeChange(pageSize) {
+      this.tableData = [];
+      this.searchData.pageSize = pageSize;
+      this.searchData.pageNum = 1;
+      this.initData();
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      let rowIdx = _.find(this.rowsMult,{rowIndex})
+      if (columnIndex<4){
+        if (rowIdx) {
+            return {
+              rowspan: rowIdx.rowSpan,
+              colspan: 1
+            };
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            };
+          }
+      }
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+
+::v-deep .el-table .cell {
+    text-overflow: clip !important;
+    -webkit-line-clamp: 100;
+  }
+
+.board_record {
+  padding: 0 14px 14px;
+  width:100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .filter {
+    height: 60px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    >div {
+      display: flex;
+      gap: 6px;
+    }
+  }
+
+  .body {
+    flex: 1;
+    height: 0;
+  }
+
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .board_shower{
+    margin: 4px;
+  }
+  ::v-deep .el-carousel__indicators--horizontal{
+    line-height: 0; height: 16px;
+    .el-carousel__indicator--horizontal{
+      padding: 7px 4px;
+    }
+  }
+  ::v-deep .el-table__cell div.cell {
+    padding: 0 10px !important;
+  }
+}
+.upload-file{
+  width: 100%;
+  margin: 20px 0px;
+  background-color: #104c66 !important;
+  border: 1px solid #359cbc !important;
+  border-radius: 5px;
+  text-align: center;
+  padding: 5px 0px;
+  font-size: 14px;
+  cursor: pointer;
+}
+</style>
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 51de787c..1b4bee7c 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
@@ -3,48 +3,57 @@
     v-model="modelVisible"
     top="10%"
     :title="propData.id ? '修改' : '新增'"
-    width="1400px"
+    width="1000px"
   >
     <div class="AddNEditDialog">
       <!-- <Form :value="propData" class="form" ref="basicInfoForm" :formList="formList" column="1" labelWidth="80px" /> -->
       <el-form
         ref="basicInfoForm"
         :model="editData"
-        label-width="80px"
+        label-width="60px"
+        :inline="true" 
         :rules="groupBasicRules"
       >
+      <el-row :gutter="5" >
+        <el-col :span="10">
         <el-form-item label="名称" prop="groupName">
           <el-input
             v-model="editData.groupName"
-            placeholder="任务组名称"
+            placeholder="任务组名称"  style="width: 320px;"
           ></el-input>
         </el-form-item>
+        </el-col>
+        <el-col :span="10">
         <el-form-item label="描述" prop="remark">
           <el-input
             v-model="editData.remark"
-            placeholder="任务组描述"
+            placeholder="任务组描述" style="width: 320px"
           ></el-input>
         </el-form-item>
+      
+      </el-col>
+        <el-col :span="4">
         <!-- <el-form-item label="状态" prop="status">
           <el-switch v-model="editData.status" active-value="1" inactive-value="0"></el-switch>
         </el-form-item> -->
-        <div style="display: flex; justify-content: flex-end">
-          <el-button
-            @click="(modelVisible = false), (submitting = false)"
-            type="info"
+        <div style="display: flex; justify-content: center;padding-top: 5px;">
+          <Button
+            @click.native="(modelVisible = false), (submitting = false)"
+            type="info" style="background-color: #3d697f;margin-right:  20px;"
           >
             取消
-          </el-button>
-          <el-button
+          </Button>
+          <Button
             type="primary"
-            @click="onSaveTaskGroup('basicInfoForm')"
+            @click.native="onSaveTaskGroup('basicInfoForm')"
             :loading="submitting"
           >
-            提交
-          </el-button>
-        </div>
+            保存
+          </Button>
+        </div></el-col>
+      </el-row>
       </el-form>
-      <div class="line"></div>
+      <div class="line" v-if="editData.id"></div>
       <template v-if="editData.id">
         <!-- 如果是新增的、还没有保存的任务组，不能添加任务 -->
         <div class="fl-around task_op">
@@ -273,7 +282,16 @@ export default {
     onSubmitTime(time) {
       this.isShowTimeEdit = false;
       if (Object.keys(this.selectedTaskGroup).length > 0) {
-        this.selectedTaskGroup.time = time;
+        let aryTime = time.split(':')
+          if(aryTime.length === 3){
+            if(aryTime[1].length === 1){
+              aryTime[1] = '0'+aryTime[1]
+            }
+            if(aryTime[2].length === 1){
+              aryTime[2] = '0'+aryTime[1]
+            }
+          }
+        this.selectedTaskGroup.time = aryTime.join(':');
         this.selectedTaskGroup = {};
       } else {
         this.taskGroupsEditing.push({ time, tasks: [] });
@@ -281,6 +299,7 @@ export default {
 
       let detailedConfiguration = [];
       this.taskGroupsEditing.forEach((item) => {
+       
         detailedConfiguration.push({
           time: item.time,
           tasks: _.map(item.tasksEdit, "jobId"),
@@ -295,7 +314,7 @@ export default {
         },
       }).then((result) => {
         if (result.code != 200) return;
-        Message.success(`提交成功!`);
+        Message.success(`保存成功`);
       });
     },
     onAddTaskItem(taskG) {
@@ -318,82 +337,73 @@ export default {
           groupName: "",
           // status: "1",
           remark: "",
-          detailedConfiguration: "",
+          detailedConfiguration: '[]',
         };
       }
     },
     getTaskList() {
-      this.taskGroupsEditing = JSON.parse(this.editData.detailedConfiguration);
-      // this.taskGroupsEditing = [{time:"08:00:00",tasks:[1],tasksEdit:[]}];
-
-      // 测试代码开始
-      // let rstData = [
-      //   {
-      //     id: 1,
-      //     callParameter: '{"deviceType":"2","direction":"1","devices":[{"id":904,"iotDeviceId":"81221 - 65535","deviceType":"2","direction":"1"},{"id":2116,"iotDeviceId":"26113 - 65535","deviceType":"2","direction":"1"}],"functions":[{"functionId":"11","params":{"size":"65535","fileName":"play012.lst"}},{"functionId":"13","params":{"STAY":90,"ACTION":"1","SPEED":"0","COLOR":"ffff00","FONT":"3","FONT_SIZE":"24","CONTENT":"长清收费站\\\\n出入口封闭","width":"160","height":"80","formatStyle":"2"}},{"functionId":"1B","params":{"fileId":"12"}}]}',
-      //     jobGroup: 1
-      //   }
-      // ]
-      // this.taskGroupsEditing.forEach(item => {
-      //   let arr = _.filter(rstData, itm => { return item.tasks.includes(itm.id) });
-      //   item.tasksEdit = arr;
-      // });
-      // return
-      // 测试代码结束
-
-      request({
-        url: `/business/dcBatchFunctionsJob/query`,
-        method: "GET",
-        params: {
-          jobGroup: this.propData.id,
-        },
-      }).then((result) => {
-        if (result.code != 200) return;
-        console.log("当前任务组下的任务", result.data);
-        // result.data = [
-        //   {
-        //     id:1,
-        //     callParameter: '{"deviceType":"2","devices":[{"id":904,"iotDeviceId":"81221 - 65535","deviceType":"2","direction":"1"},{"id":2116,"iotDeviceId":"26113 - 65535","deviceType":"2","direction":"1"}],"functions":[{"functionId":"11","params":{"size":"65535","fileName":"play012.lst"}},{"functionId":"13","params":{"STAY":90,"ACTION":"1","SPEED":"0","COLOR":"ffff00","FONT":"3","FONT_SIZE":"24","CONTENT":"长清收费站\\\\n出入口封闭","width":"160","height":"80","formatStyle":"2"}},{"functionId":"1B","params":{"fileId":"12"}}]}',
-        //     jobGroup:1
-        //   }
-        // ]
-        this.taskGroupsEditing.forEach((item) => {
-          let arr = _.filter(result.data, (itm) => {
-            return item.tasks.includes(itm.jobId);
+      if(this.editData.detailedConfiguration === ''){
+        this.taskGroupsEditing = [{time:"08:00:00",tasks:[1],tasksEdit:[]}];
+      } else {
+        this.taskGroupsEditing = JSON.parse(this.editData.detailedConfiguration);
+        request({
+            url: `/business/dcBatchFunctionsJob/query`,
+            method: "GET",
+            params: {
+              jobGroup: this.propData.id,
+            },
+          }).then((result) => {
+            if (result.code != 200) return;
+            this.taskGroupsEditing.forEach((item) => {
+              let aryTime = item.time.split(':')
+              if(aryTime.length === 3){
+                if(aryTime[1].length === 1){
+                  aryTime[1] = '0'+aryTime[1]
+                }
+                if(aryTime[2].length === 1){
+                  aryTime[2] = '0'+aryTime[1]
+                }
+              }
+              item.time = aryTime.join(':')
+              let arr = _.filter(result.data, (itm) => {
+                return item.tasks.includes(itm.jobId);
+              });
+              this.$set(item, "tasksEdit", arr);
+              // item.tasksEdit = arr;
+            });
           });
-          this.$set(item, "tasksEdit", arr);
-          // item.tasksEdit = arr;
-        });
-      });
+      }
     },
     onSaveTaskGroup(formName) {
       this.$refs[formName].validate((valid) => {
         if (!valid) {
           return;
         }
-        this.editData.groupName = this.editData.groupName.trim();
-        this.editData.remark = this.editData.remark.trim();
-
+        let submitForm = {
+          groupName: this.editData.groupName.trim(),
+          remark: this.editData.remark.trim()
+        }
+        if(this.mode === 'add'){
+          submitForm.detailedConfiguration =  '[]';
+        } else {
+          submitForm.id = this.editData.id
+        }
         this.submitting = true;
 
-        //测试数据开始
-        // this.$set(this.editData, "id", 11);
-        // this.submitting = false;
-        // return
-        //测试数据结束
-
         request({
           url: `/business/dcBatchFunctionsJobGroup`,
           method: this.mode == "edit" ? "PUT" : "POST",
-          data: this.editData,
+          data: submitForm,
         })
           .then((result) => {
             if (result.code != 200) return;
 
-            Message.success(`提交成功!`);
+            Message.success(`保存成功`);
             this.$emit("onSuccess");
-            this.editData = { ...result.data };
-            this.mode = "edit";
+            if(this.mode === 'add'){
+              this.editData = { ...result.data };
+              this.mode = "edit";
+            }
           })
           .catch((err) => {
             console.log(
@@ -401,7 +411,7 @@ export default {
               "font-size:15px; background:#547bf2; color:#98bfff;",
               err
             );
-            // Message.error(`提交失败!`);
+            // Message.error(`保存失败`);
           })
           .finally(() => {
             this.submitting = false;
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 ef3be0b5..2ae50344 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
@@ -2,39 +2,46 @@
   <div class="task_editor_box" v-if="isCompReady">
     <div class="flex main_ctt">
       <div class="device_type">
-        <span v-if="editData.deviceType">【{{ deviceTypeDic[editData.deviceType].label }}】</span>
+        <span v-if="editData.deviceType">{{ deviceTypeDic[editData.deviceType].label }}</span>
       </div>
       <div class="devices">
         <template v-if="editData.devices">
-          <span v-for="item,index in editData.devices" v-if="index<1" class="title">
+          <span v-for="item, index in editData.devices" v-if="index < 1" class="title">
             {{ deviceDic[item.id].deviceName }}
           </span>
-          <span v-if="editData.devices.length > 1" class="other">+{{ editData.devices.length-1 }}</span>
+          <span v-if="editData.devices.length > 1" class="other">+{{ editData.devices.length - 1 }}</span>
         </template>
       </div>
       <div class="content">
-        <template v-if="editData.deviceType=='2'">
+        <template v-if="editData.deviceType == '2'">
           <BoardRecordPreview :tpl="editData.params" class="board">
           </BoardRecordPreview>
         </template>
         <template v-if="editData.deviceType == '5'">
-          <p class="text">内容：{{ editData.params.text }}</p>
+          <div class="textArea">{{ editData.params.text }}</div>
         </template>
         <template v-if="editData.deviceType == '10' || editData.deviceType == '13'">
           <div class="center mode10">
-            <div class="mode10_m"
-            ><div :class="awakerWorkModeDic[editData.params.SETMD] !=='常亮模式'?'mode10_mc mode10_mc2':'mode10_mc mode10_mc1'"></div>{{ awakerWorkModeDic[editData.params.SETMD] }}</div>
+            <div class="mode10_m">
+              <div
+                :class="awakerWorkModeDic[editData.params.SETMD] !== '常亮模式' ? 'mode10_mc mode10_mc2' : 'mode10_mc mode10_mc1'">
+              </div>{{ awakerWorkModeDic[editData.params.SETMD] }}
+            </div>
             <div>时长：<span style="color:#15a5c0">{{ editData.params.SETTM }}分钟</span></div>
           </div>
         </template>
 
         <template v-if="editData.deviceType == '12'">
           <div class="center mode10">
-            <div class="mode10_m"><div :class="inducerModeDic[editData.params.mode] !=='常亮模式'?'mode10_mc mode10_mc2':'mode10_mc mode10_mc1'"></div>{{ inducerModeDic[editData.params.mode] }}</div>
+            <div class="mode10_m">
+              <div
+                :class="inducerModeDic[editData.params.mode] !== '常亮模式' ? 'mode10_mc mode10_mc2' : 'mode10_mc mode10_mc1'">
+              </div>{{ inducerModeDic[editData.params.mode] }}
+            </div>
             <div>
               <p>上行：{{ inducerWorkType[editData.params.onWorkStatus] }}</p>
-              <p>下行：{{inducerWorkType[editData.params.inWorkStatus] }}</p>
-          </div>
+              <p>下行：{{ inducerWorkType[editData.params.inWorkStatus] }}</p>
+            </div>
           </div>
         </template>
 
@@ -65,29 +72,29 @@ export default {
     taskEditDialog, BoardRecordPreview
   },
   props: {
-    groupId:Number,
-    time:String,
-    propData:Object
+    groupId: Number,
+    time: String,
+    propData: Object
   },
   data() {
     return {
-      isCompReady:false,
-      editData:{},
+      isCompReady: false,
+      editData: {},
       isEditingTask: false,
-      selectedType:"",
-      deviceTypeDic:"",
-      awakerWorkModeDic:"",
-      inducerModeDic:"",
-      inducerWorkType:"",
-      deviceDic:{},
-      deviceList:[]
+      selectedType: "",
+      deviceTypeDic: "",
+      awakerWorkModeDic: "",
+      inducerModeDic: "",
+      inducerWorkType: "",
+      deviceDic: {},
+      deviceList: []
     };
   },
   computed: {
-   
+
   },
   watch: {
-   
+
   },
   mounted() {
     this.deviceTypeDic = deviceTypeDic;
@@ -95,17 +102,16 @@ export default {
     this.inducerModeDic = inducerModeDic;
     this.inducerWorkType = inducerWorkTypeDic;
     this.isCompReady = true;
-    console.log(JSON.parse(this.propData.callParameter || '[{}]')[0], "++++=====######");
-    this.initBasicData().then(res=>{
-      
+
+    this.initBasicData().then(res => {
       let temp = JSON.parse(this.propData.callParameter || '[{}]')[0]; //callParameter是个字符串
       //转成BoardRecordPreview组件需要的格式，用来预览
-      if(temp.functions){
+      if (temp.functions) {
         // temp.functions[1].params.CONTENT = temp.functions[1].params.CONTENT.replaceAll(/\\n/g, '\\\\n').replaceAll(/=/g, '\\=').replaceAll(/,/g, '\\,').replaceAll(/&nbsp/g, ' ');
         let params = {};
-        if (temp.deviceType == '2'){
+        if (temp.deviceType == '2') {
           params = temp.functions[1].params.parameters[0]
-        } else if (temp.deviceType == '5'){
+        } else if (temp.deviceType == '5') {
           params = temp.functions[0].params
         } else if (temp.deviceType == '10') {
           params = {
@@ -128,26 +134,25 @@ export default {
           params,
           screenSize: temp.screenSize
         };
-      }else{
+      } else {
         this.editData = {};
       }
       this.isCompReady = true;
     })
   },
   methods: {
-    onModify(){
+    onModify() {
       this.isEditingTask = true;
     },
-    onSubmit(para){
+    onSubmit(para) {
       this.$emit("onSubmit");
       this.isEditingTask = false;
       // let devices = _.filter(this.deviceOptions, item=>{
       //   this.editData.devices.includes(item.id);
       // })
-      // console.log(devices, "选中的设备")
       // this.$emit("onModify", {devices});
     },
-    onDelete(){
+    onDelete() {
       this.$confirm("确定要删除任务？", "操作确认", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -169,16 +174,14 @@ export default {
 
       });
     },
-    initBasicData(){
-      
+    initBasicData() {
       this.deviceDic = {};
-      return getDeviceList({ deviceType: JSON.parse(this.propData.callParameter || '[{}]')[0].deviceType }).then(res=>{
+      return getDeviceList({ deviceType: JSON.parse(this.propData.callParameter || '[{}]')[0].deviceType }).then(res => {
         this.deviceList = res.data;
-         res.data.forEach(item=>{
-          // this.deviceOptions.push({
-            item.screenSize = JSON.parse(item.otherConfig||'{}').screenSize;
-           this.$set(this.deviceDic, item.id, item);
-         })
+        res.data.forEach(item => {
+          item.screenSize = JSON.parse(item.otherConfig || '{}').screenSize;
+          this.$set(this.deviceDic, item.id, item);
+        })
       })
     }
   },
@@ -186,48 +189,110 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.task_editor_box{
-  .main_ctt{ align-items: stretch; border-top:1px dashed #0AC; padding: 6px 8px; max-height: 80px;
-    .device_type{ width: 200px; display: flex; flex-direction: row; align-items: center; }
-    .devices{ flex: 1; display: flex; flex-wrap: wrap; align-items: center;
-      span{ font-size:14px;  margin:0 4px 3px 0; border-radius: 3px; white-space: nowrap; word-break: break-all; float: left;}
-      .title{border: 1px solid #0AC; padding: 2px 8px;}
-      .other{
+.task_editor_box {
+  .main_ctt {
+    align-items: stretch;
+    border-top: 1px dashed #0AC;
+    padding: 6px 8px;
+    max-height: 80px;
+
+    .device_type {
+      width: 200px;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+
+    .devices {
+      flex: 1;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+
+      span {
+        font-size: 14px;
+        margin: 0 4px 3px 0;
+        border-radius: 3px;
+        white-space: nowrap;
+        word-break: break-all;
+        float: left;
+      }
+
+      .title {
+        border: 1px solid #0AC;
+        padding: 2px 8px;
+      }
+
+      .other {
         padding: 3px 5px;
         border: 1px solid #00b3cc;
-        color:#00b3cc;
+        color: #00b3cc;
         border-radius: 3px;
       }
     }
-    .content{ width: 300px; display: flex; align-items: stretch;
-      .board{ flex: 1; }
-      .text{ flex: 1; display: flex; align-items: center; justify-content: center; word-break: break-all;}
-      .center{ flex: 1; display: flex; flex-direction: column; justify-content: center; align-items: center;}
+
+    .content {
+      width: 300px;
+      display: flex;
+      align-items: stretch;
+
+      .board {
+        flex: 1;
+      }
+
+      .textArea {
+        flex: 1;
+        display: flex;
+        overflow-y: auto;
+        overflow-x: hidden;
+        background-color: #000;
+        color: yellow;
+      }
+
+      .center {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+
+    .button {
+      width: 120px;
+      margin-left: 10px;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
     }
-    .button{ width:120px; margin-left: 10px; display: flex; align-items: center; justify-content: flex-end;}
   }
 }
-.mode10{
+
+.mode10 {
   display: flex;
   flex-direction: row !important;
   justify-content: flex-start !important;
-  .mode10_m{
+
+  .mode10_m {
     margin-right: 30px;
     display: flex;
     align-items: center;
-    
-    .mode10_mc{
+
+    .mode10_mc {
       width: 10px;
       height: 10px;
       border-radius: 50%;
       margin-right: 10px;
     }
-    .mode10_mc1{ 
-      background-color: #15a5c0; 
+
+    .mode10_mc1 {
+      background-color: #15a5c0;
     }
-    .mode10_mc2{ width: 10px;
+
+    .mode10_mc2 {
+      width: 10px;
       background-color: #eef54e;
-      
+
     }
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
index 39254f5b..cb18387d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
@@ -63,7 +63,7 @@
       <template v-else-if="searchData.deviceType == '5'">
         <!-- 语音广播 -->
         <el-form-item label="广播内容">
-          <el-input type="textarea" v-model="editData.type5.text"></el-input>
+          <el-input type="textarea" :maxlength="150" v-model="editData.type5.text"></el-input>
         </el-form-item>
       </template>
 
@@ -307,8 +307,44 @@ export default {
         }
       });
 
+      if(this.searchData.deviceType === ''){
+        this.$message.error('请选择设备类型')
+        return;
+      }
+
+      if(devices.length === 0){
+        this.$message.error('请选择设备')
+        return;
+      }
       let params = this.processParams();
-  
+      // 语音广播
+      if(this.searchData.deviceType == "5" && (!params.text || params.text === '')){
+        this.$message.error('请输入广播内容')
+        return;
+      }
+      // 激光疲劳
+      if(this.searchData.deviceType == "10"){
+        if(!params.SETMD){
+          this.$message.error('请选择工作模式')
+          return;
+        }
+        if(!params.SETTM){
+          this.$message.error('请输入工作时长')
+          return;
+        }
+      }
+      // 行车诱导
+      if(this.searchData.deviceType == "12"){
+        if(!params.inWorkStatus){
+          this.$message.error('请选择上行工作模式')
+          return;
+        }
+        if(!params.onWorkStatus){
+          this.$message.error('请选择下行工作模式')
+          return;
+        }
+      }
+
       submitTaskRequest(this.propData.id, this.groupId, this.time, devices, params, { direction: this.searchData.direction, deviceType: this.searchData.deviceType, screenSize: this.filterData.screenSize }).then(res=>{
         this.$emit("onSubmit")
       });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/timeEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/timeEditDialog.vue
index b98dadb2..c5c7a93c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/timeEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/timeEditDialog.vue
@@ -2,10 +2,14 @@
   <Dialog v-model="modelVisible" title="触发时间设置" width="400px" label-width="120px">
     <el-form>
       <el-form-item label="时(支持cron表达式)">
-        <el-input v-model="editData.hour"></el-input>
+        <el-input-number :min="0" :max="24" v-model="editData.hour"></el-input-number>
       </el-form-item>
       <el-form-item label="分(支持cron表达式)">
-        <el-input v-model="editData.minute"></el-input>
+        <el-input-number  :min="0" :max="60"  v-model="editData.minute"></el-input-number>
+      </el-form-item>
+
+      <el-form-item label="秒(固定值 0)">
+        <el-input-number value="0" :disabled="true"></el-input-number>
       </el-form-item>
       <el-form-item>
         <el-button size="mini" type="primary" @click="onSubmit">保存</el-button>
@@ -60,7 +64,7 @@ export default {
   },
   methods: {
     onSubmit(){
-      let time = [this.editData.hour.trim(), this.editData.minute.trim(), "00"].join(":");
+      let time = [this.editData.hour, this.editData.minute, "00"].join(":");
       this.$emit("onSubmit", time)
     },
     transformData(){
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue
index eafe75ef..0af72999 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue
@@ -1,4 +1,6 @@
 <template>
+
+  <!-- 路网管控 - 设备管控 - 管控策略 -->
   <div class="sensitiveWord" v-loading="isLoading" element-loading-text="数据加载中"
     element-loading-background="rgba(0, 0, 0, 0.3)">
     <div class="filter">
@@ -28,8 +30,10 @@
     </div>
 
     <div class="body">
+      <div class="content">
+        
       <Empty v-if="!data.length && !isFirst" class="no-data" style="position: absolute">暂无数据</Empty>
-      <template v-else>
+      <div class="scrollPanel" v-else>
         <div class="cardBox" v-for="(item, index) in data" :key="index">
           <Card :buttonIcon="null" :keyMap="keyMap" :cardData="item" class="card" buttonText="详情">
             <template #form-remark="{ data }">
@@ -52,7 +56,8 @@
             </template>
           </Card>
         </div>
-      </template>
+      </div>
+    </div>
     </div>
 
     <!-- 分页 -->
@@ -147,7 +152,7 @@ export default {
         .then((result) => {
           item.status = result.data.status;
           if (result.code != 200) return;
-          Message.success(`操作成功!`);
+          Message.success(`操作成功`);
         })
     },
     getSearchData() {
@@ -226,6 +231,7 @@ export default {
           this.searchText = this.searchData?.word || "请输入关键词，回车搜索";
           if (result.code != 200) return;
           this.data = result.rows;
+          
           // this.data.map(item=>{
           //   item.remark = "每天早7点关闭激光唤醒设备，晚7点打开激光唤醒设备。每天早7点关闭激光唤醒设备，晚7点打开激光唤醒设备。"
           // });
@@ -258,6 +264,7 @@ export default {
   padding: 20px;
   display: flex;
   flex-direction: column;
+
   .filter {
     height: 60px;
     display: flex;
@@ -271,24 +278,40 @@ export default {
   }
 
   .body {
-    height: 0;
     flex: 1;
     overflow: hidden;
-    display: flex;
-    flex-wrap: wrap;
-    align-content: flex-start;
-    .cardBox {
-      flex-basis: percentage(1/5);
-      width: 0;
-      padding-right: 10px;
-      padding-bottom: 10px;
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(6, 1fr);
+        grid-gap: 15px;
+        grid-auto-rows: minmax(140px, max-content);
+        position: relative;
+        flex: 1;
+        overflow: auto;
+      }
+    }
+  }
+
+  .cardBox {
+      // flex-basis: percentage(1/5);
+      // width: 0;
+      // padding-right: 10px;
+      // padding-bottom: 10px;
     }
    .remark {
       font-size: 14px; line-height: 20px; height: 40px; overflow: hidden;
       color: #00b3cc;
     }
-  }
-
   .footer {
     margin-top: 15px;
     height: 36px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue
index f3408bcd..8676c3b1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/SpecialTable.vue
@@ -88,12 +88,12 @@ export default {
     position: relative;
     padding: 15px 18px;
     // padding-top: 12px;
-    font-size: 20px;
+    font-size: 16px;
     font-family: PingFang SC, PingFang SC;
     font-weight: 500;
-    line-height: 23px;
+    line-height: 16px;
     letter-spacing: 1px;
-    gap: 24px;
+    gap: 0px;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -130,11 +130,12 @@ export default {
   }
 
   .operation {
-    padding: 24px 18px;
+    padding: 20px 18px;
 
     .content {
       width: 100%;
       gap: 9px;
+      margin-top: 10px;
     }
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/OperateRecord.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/OperateRecord.vue
index 8185bba1..d56e0141 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/OperateRecord.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/OperateRecord.vue
@@ -49,7 +49,7 @@ export default {
   data() {
     return {
       // timeLine2List: Array.from({ length: 6 }).map(() => ({
-      //   // title: "接警记录",
+      //   title: "接警记录",
       //   time: "2023-12-21 16:35:44",
       //   name: "甘易玫",
       //   desc: "描述性文字文字文字文字文字文字文字文字描述性文字文字文字文字文字文字文字文字",
@@ -86,6 +86,9 @@ export default {
             name: item.nickName,
             desc: item.modifyContent,
             posts: "操作员",
+            type:'text',
+            source: 1,
+            onlyright: true
           }));
         })
         .catch(() => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
index ec8a4b5a..c83fdc78 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
@@ -266,7 +266,7 @@ export default {
     handleExportTemplate() {
       exportFile({
         url: "/business/shifts/exportModel",
-        filename: "机构值班表面板",
+        filename: "机构值班表模板",
         data: {
           ...this.searchData,
           ...this.getPagination(),
@@ -379,7 +379,7 @@ export default {
 
   .operate-button {
     width: 105px;
-    height: 41px;
+    height: 30px;
     border-radius: 5px;
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
index c33cbfa9..55f4dd9b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
@@ -98,6 +98,9 @@ export default {
           label: "机构名称:",
           key: "organizationName",
           required: true,
+          options: {
+            maxlength: 12
+          }
         },
         {
           label: "方向:",
@@ -111,6 +114,9 @@ export default {
         {
           label: "地址:",
           key: "organizationAddress",
+          options: {
+            maxlength: 50
+          }
         },
         merge(cloneDeep(PresetFormItems.station), {
           required: false,
@@ -232,9 +238,9 @@ export default {
           data,
         })
           .then((result) => {
-            if (result.code != 200) return Message.error(`提交失败!`);
+            if (result.code != 200) return Message.error(`提交失败`);
 
-            Message.success(`提交成功!`);
+            Message.success(`提交成功`);
 
             this.modelVisible = false;
 
@@ -246,7 +252,7 @@ export default {
               "font-size:15px; background:#547bf2; color:#98bfff;",
               err
             );
-            Message.error(`提交失败!`);
+            Message.error(`提交失败`);
           })
           .finally(() => {
             this.submitting = false;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue
index 881fe241..39232697 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue
@@ -151,15 +151,15 @@ export default {
   methods: {
     onRefreshForm(){
       this.$refs.searchComp.handleResetForm();
-      this.setCurrentPage(1);
+      // this.setCurrentPage(1);
     },
     getVehicleTypeList() {
       if (this.vehicleTypeList.length) return;
 
       request({
-        url: `/system/dict/data/type/sys_vehicle_type`,
+        url: `/system/dict/data/type/vehicle_type`,
         method: "GET",
-        params: {},
+        params: {type:'car'},
       })
         .then(({ data, code }) => {
           if (code != 200) return; //Message.error("详情获取失败");
@@ -176,12 +176,12 @@ export default {
         data: {},
       })
         .then((result) => {
-          if (result.code != 200) return Message.error(`删除失败!`);
+          if (result.code != 200) return Message.error(`删除失败`);
           this.setCurrentPage(1);
-          Message.success(`删除成功!`);
+          Message.success(`删除成功`);
         })
         .catch((err) => {
-          Message.error(`删除失败!`);
+          Message.error(`删除失败`);
         });
     },
 
@@ -222,25 +222,37 @@ export default {
           if (result.code != 200) return;
 
           this.dataList = result.rows;
-          let data = [];
-          this.vehicleTypeList.forEach((items) => {
-            this.dataList.forEach((item) => {
-              if (item.car.length > 0) {
-                for (var i = 0; i < item.car.length; i++) {
-                  if (item.car[i].vehicleType == items.dictValue) {
-                    data.push(items.dictLabel + "*" + item.car[i].carNum);
-                    // item.cars = items.dictLabel + "*" + item.car[i].carNum;
-                  }
-                }
+          
+          this.dataList.forEach((item) => {
+            item.cars = [];
+            item.car.forEach(c => {
+              const tmpCar= _.find(this.vehicleTypeList,{dictValue:c.vehicleType.toString()});
+              if(tmpCar){
+                item.cars.push(`${tmpCar.dictLabel}×${c.carNum}`)
               }
             });
+            item.cars = item.cars.join('、')
           });
 
-          this.dataList.forEach((item) => {
-            if (item.car.length > 0) {
-              item.cars = data.join("、");
-            }
-          });
+          // this.vehicleTypeList.forEach((items) => {
+            
+          //   this.dataList.forEach((item) => {
+          //     if (item.car.length > 0) {
+          //       for (var i = 0; i < item.car.length; i++) {
+          //         if (item.car[i].vehicleType == items.dictValue) {
+          //           data.push(items.dictLabel + "*" + item.car[i].carNum);
+          //           // item.cars = items.dictLabel + "*" + item.car[i].carNum;
+          //         }
+          //       }
+          //     }
+          //   });
+          // });
+
+          // this.dataList.forEach((item) => {
+          //   if (item.car.length > 0) {
+          //     item.cars = data.join("、");
+          //   }
+          // });
           this.setTotal(result.total);
         })
         .finally(() => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue
index 4b7a0691..520da937 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue
@@ -57,6 +57,9 @@ export default {
           label: "人员名称:",
           key: "name",
           required: true,
+          options: {
+            maxlength: 6
+          }
         },
         {
           label: "手机号码:",
@@ -67,6 +70,9 @@ export default {
               type: "phone",
             },
           ],
+          options: {
+            maxlength: 11
+          }
         },
         {
           label: "岗位:",
@@ -153,9 +159,9 @@ export default {
           data,
         })
           .then((result) => {
-            if (result.code != 200) return Message.error(`提交失败!`);
+            if (result.code != 200) return Message.error(`提交失败`);
 
-            Message.success(`提交成功!`);
+            Message.success(`提交成功`);
 
             this.modelVisible = false;
 
@@ -167,7 +173,7 @@ export default {
               "font-size:15px; background:#547bf2; color:#98bfff;",
               err
             );
-            Message.error(`提交失败!`);
+            Message.error(`提交失败`);
           })
           .finally(() => {
             this.submitting = false;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
index 922d668e..3befa822 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
@@ -111,12 +111,12 @@ export default {
         data: {},
       })
         .then((result) => {
-          if (result.code != 200) return Message.error(`删除失败!`);
+          if (result.code != 200) return Message.error(`删除失败`);
           this.setCurrentPage(1);
-          Message.success(`删除成功!`);
+          Message.success(`删除成功`);
         })
         .catch((err) => {
-          Message.error(`删除失败!`);
+          Message.error(`删除失败`);
         });
     },
     handleOpenDialogAddEdit(data) {
@@ -205,6 +205,7 @@ export default {
     justify-content: space-between;
     grid-auto-rows: minmax(280px, max-content);
     position: relative;
+    overflow: none;
   }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddNEditDialog.vue
index 21497dc9..bfeb0bc6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddNEditDialog.vue
@@ -109,6 +109,7 @@ export default {
               departmentData.value.data,
               this.data.deptId
             );
+            console.log(this.data?.deptId,this.formData.deptId ,3333)
 
           this.$refs.FormConfigRef.reset(true);
         }
@@ -136,9 +137,9 @@ export default {
           data,
         })
           .then((result) => {
-            if (result.code != 200) return Message.error(`提交失败!`);
+            if (result.code != 200) return Message.error(`提交失败`);
 
-            Message.success(`提交成功!`);
+            Message.success(`提交成功`);
 
             this.modelVisible = false;
 
@@ -150,7 +151,7 @@ export default {
               "font-size:15px; background:#547bf2; color:#98bfff;",
               err
             );
-            Message.error(`提交失败!`);
+            Message.error(`提交失败`);
           })
           .finally(() => {
             this.submitting = false;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/data.js
index e5916cde..79653d8b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/data.js
@@ -43,6 +43,9 @@ export const addEditFormList = [
     label: "辖区路段名称:",
     key: "sectionName",
     required: true,
+    options: {
+      maxlength: 50
+    }
   },
 
   merge(cloneDeep(PresetFormItems.startStation), {
@@ -95,6 +98,9 @@ export const addEditFormList = [
   {
     label: "辖区路段编号:",
     key: "roadCode",
+    options: {
+      maxlength: 50
+    }
   },
   {
     label: "里程:",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/components/AddNEditDialog.vue
index 8d55ab40..ee83b427 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/components/AddNEditDialog.vue
@@ -57,11 +57,17 @@ export default {
           label: "姓名:",
           key: "name",
           required: true,
+          options: {
+            maxlength: 10
+          }
         },
         {
           label: "手机号码:",
           key: "phone",
           required: true,
+          options: {
+            maxlength: 11
+          },
           rules: [
             {
               type: "phone",
@@ -70,11 +76,17 @@ export default {
         },
         {
           label: "开始桩号:",
-          key: "stakeMake"
+          key: "stakeMake",
+          options: {
+            maxlength: 10
+          }
         },
         {
           label: "结束桩号:",
-          key: "endMake"
+          key: "endMake",
+          options: {
+            maxlength: 10
+          }
         },
       ],
     };
@@ -116,9 +128,9 @@ export default {
           data,
         })
           .then((result) => {
-            if (result.code != 200) return Message.error(`提交失败!`);
+            if (result.code != 200) return Message.error(`提交失败`);
 
-            Message.success(`提交成功!`);
+            Message.success(`提交成功`);
 
             this.modelVisible = false;
 
@@ -130,7 +142,7 @@ export default {
               "font-size:15px; background:#547bf2; color:#98bfff;",
               err
             );
-            Message.error(`提交失败!`);
+            Message.error(`提交失败`);
           })
           .finally(() => {
             this.submitting = false;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/index.vue
index f98dc7f0..c5e11833 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/index.vue
@@ -110,12 +110,12 @@ export default {
         data: {},
       })
         .then((result) => {
-          if (result.code != 200) return Message.error(`删除失败!`);
+          if (result.code != 200) return Message.error(`删除失败`);
           this.setCurrentPage(1);
-          Message.success(`删除成功!`);
+          Message.success(`删除成功`);
         })
         .catch((err) => {
-          Message.error(`删除失败!`);
+          Message.error(`删除失败`);
         });
     },
     handleOpenDialogAddEdit(data) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/components/AddNEditDialog.vue
index e535c09b..08c535d5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/components/AddNEditDialog.vue
@@ -49,7 +49,8 @@ export default {
   props: {
     visible: Boolean,
     data: Object,
-    vehicleTypeList:Array
+    vehicleTypeList:Array,
+    orgList:Array
   },
   inject: ["setCurrentPage"],
   data() {
@@ -99,6 +100,9 @@ export default {
           label: "车牌号:",
           key: "vehiclePlate",
           required: true,
+          options: {
+            maxlength: 10
+          }
         },
         {
           label: "车辆类型:",
@@ -158,9 +162,12 @@ export default {
   watch: {
     modelVisible: {
       immediate: true,
-      handler(bool) {
+      async handler(bool) {
         if (!bool) return;
 
+        this.formList[0].options.options = this.orgList;
+        this.formList[0].default = this.orgList[0].key;
+
         this.formList.filter((item) => item.key == "vehicleType")[0].options.options = this.vehicleTypeList.map((item) => ({
           key: item.dictValue,
           label: item.dictLabel,
@@ -172,7 +179,6 @@ export default {
         }else{
           this.formData = null;
         }
-
         this.$forceUpdate();
       },
     },
@@ -181,10 +187,10 @@ export default {
     async getOptions() {
 
 
-      const result = await getSelectOptionsStation();
+      // const result = await getSelectOptionsStation();
 
-      this.formList[0].options.options = result;
-      this.formList[0].default = result[0].key;
+      // this.formList[0].options.options = result;
+      // this.formList[0].default = result[0].key;
     },
     handleSubmit() {
       this.$refs.FormConfigRef.validate().then((data) => {
@@ -199,9 +205,9 @@ export default {
           data,
         })
           .then((result) => {
-            if (result.code != 200) return Message.error(`提交失败!`);
+            if (result.code != 200) return Message.error(`提交失败`);
 
-            Message.success(`提交成功!`);
+            Message.success(`提交成功`);
 
             this.modelVisible = false;
 
@@ -213,7 +219,7 @@ export default {
               "font-size:15px; background:#547bf2; color:#98bfff;",
               err
             );
-            Message.error(`提交失败!`);
+            Message.error(`提交失败`);
           })
           .finally(() => {
             this.submitting = false;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/data.js
index 907c7fc4..a3b523f9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/data.js
@@ -2,6 +2,14 @@
 
 export const searchFormList = [
   {
+    label: "机构:",
+    key: "organizationId",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [],
+    },
+  },{
     label: "车辆类型:",
     key: "vehicleType",
     type: "select",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/index.vue
index d01e108c..bfefcf73 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/index.vue
@@ -63,7 +63,7 @@
       </template>
     </div>
 
-    <AddNEditDialog v-model="addNEditDialogVisible" :data="dialogData" :vehicleTypeList="vehicleTypeList" />
+    <AddNEditDialog v-model="addNEditDialogVisible" :data="dialogData" :orgList="orgList" :vehicleTypeList="vehicleTypeList" />
   </div>
 </template>
 
@@ -73,6 +73,7 @@ import InputSearch from "@screen/components/InputSearch/index.vue";
 import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import Button from "@screen/components/Buttons/Button.vue";
 import AddNEditDialog from "./components/AddNEditDialog.vue";
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
 
 import { searchFormList } from "./data";
 import request from "@/utils/request";
@@ -95,6 +96,7 @@ export default {
   },
   data() {
     return {
+      orgList:[],
       searchFormList,
       addNEditDialogVisible: false,
       dialogData: null,
@@ -136,7 +138,7 @@ export default {
       this.$refs.searchComp.handleResetForm();
       this.setCurrentPage(1);
     },
-    getVehicleTypeList() {
+    async getVehicleTypeList() {
       if (this.vehicleTypeList.length) return;
 
       request({
@@ -153,6 +155,9 @@ export default {
           }));
         })
         .catch((err) => {});
+        const result = await getSelectOptionsStation();
+        this.orgList = result;
+        this.searchFormList[0].options.options = result;
     },
     async handleDelete(data) {
       await confirm({ message: "是否要删除该车辆?" });
@@ -163,12 +168,12 @@ export default {
         data: {},
       })
         .then((result) => {
-          if (result.code != 200) return Message.error(`删除失败!`);
+          if (result.code != 200) return Message.error(`删除失败`);
           this.setCurrentPage(1);
-          Message.success(`删除成功!`);
+          Message.success(`删除成功`);
         })
         .catch((err) => {
-          Message.error(`删除失败!`);
+          Message.error(`删除失败`);
         });
     },
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/charts.js
index f42320f6..ed6dd1fa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/CrowdnessIndicatorRankings/charts.js
@@ -1,21 +1,12 @@
 import * as echarts from "echarts";
 
-export const StatChartOption = {
-  width: "100%",
-  height: "100%",
+export const lineChartOption = {
   color: ["#2AD9FD"],
   xAxis: {
-    name: "日",
     type: "category",
     // boundaryGap: ["15%", "15%"],
-    nameTextStyle: {
-      color: "#2AD9FD",
-      align: "right",
-      fontSize: 15,
-      padding: [0, -15, 0, 0],
-    },
     boundaryGap: false,
-    data: ["1", "5", "10", "15", "20", "25", "30"],
+    data: ["00", "01", "02", "03", "04","05","06","07","08","09","10","11","12","13", "14","15","16","17","18","19","20","21","22","23","24"],
     axisTick: {
       show: false,
     },
@@ -30,35 +21,62 @@ export const StatChartOption = {
     },
   },
   grid: {
-    left: 50,
-    top: 10,
-    // bottom: 30,
-    // right: 30,
+    // left: 0,
+    top: 36,
+    bottom: 24,
+    right: 10,
   },
   tooltip: {
     trigger: "axis",
-    valueFormatter: (value) => {
-      return value + "%";
+    backgroundColor: "rgba(0,0,0,0.36)",
+    borderWidth: 0,
+    textStyle: {
+      color: "#fff",
     },
+    formatter: "{b}：{c}(辆)",
+    // formatter: function([axisData]) {
+    //   console.log(axisData)
+    //     let str = axisData.name + ' ' + axisData.data + '辆</br>';
+    //     // params.forEach(item => {
+    //     //     if (item.seriesName === '供温' || item.seriesName === '回温') {
+    //     //         str += item.marker + item.seriesName + ' : ' + item.data.value + ' ℃' + '</br>';
+    //     //     } else if (item.seriesName === '压力值(Mpa)') {
+    //     //         // 柱状图渐变时设置marker
+    //     //         item.marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#6C50F3;"></span>';
+    //     //         str += item.marker + item.seriesName + ' : ' + item.data.value + ' m';
+    //     //     }
+    //     // });
+    //     return str;
+    // }
   },
   yAxis: {
-    max: 100,
+    name: "辆",
     type: "value",
+    // nameGap: 24,
+    nameTextStyle: {
+      color: "#2AD9FD",
+      width: 200,
+      align: "right",
+      fontSize: 12,
+      padding: [0, 12, 0, 0],
+    },
     splitLine: {
       lineStyle: {
         type: [6, 9],
         color: "rgba(255,255,255, .3)",
+        // dashOffset: [10, 10],
+        // cap: 21,
+        // width: 2
       },
     },
     axisLabel: {
       color: "#fff",
       fontSize: 12,
-      formatter: "{value} %",
     },
   },
   series: [
     {
-      data: [0, 90, 65, 90, 45, 36, 27],
+      data: [820, 932, 901, 934, 1290, 1330, 1320],
       type: "line",
       showSymbol: false,
       smooth: true,
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 5c22a8ff..51f49879 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,10 +1,8 @@
 <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" />
+      <component :is="mapContainer" v-if="delayLoad" ref="MapContainerRef" height="300px"
+        @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"
@@ -18,7 +16,7 @@
         </el-tooltip>
 
         <ElPopover v-else trigger="manual" :value="isActive(item)" placement="left" :popper-class="`popover-0`"
-          :popper-style="{ zIndex: 999 }">
+          :popper-style="{ zIndex: 99 }">
           <div v-if="item.key === 'weather'" class="weather">
             <span>天气：{{ weatherData.text }}</span>
             <span>能见度：{{ weatherData.vis }}公里</span>
@@ -28,7 +26,7 @@
           <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,
+        zIndex: 99,
         backgroundImage: `url(${require(`./images/${item.key}${isActive(item) ? '-active' : ''
           }.svg`)})`,
       }"></div>
@@ -46,13 +44,15 @@ import Card from "@screen/components/Card2/Card.vue";
 import DialogBoard from "./components/DialogBoard.vue";
 import DialogCamera from "./components/DialogCamera.vue";
 import AMapContainer from "@screen/pages/Home/components/AMapContainer/index.vue";
+import BMapContainer from "@screen/pages/Home/components/BMapContainer/index.vue";
 import { provideMixin } from "./../../mixin";
 import { getWeatherForecast } from "@/api/commandDispatch";
 import * as echarts from "echarts";
-import { StatChartOption } from "./charts";
+import { lineChartOption } from "./charts";
 import request from "@/utils/request";
+import Vue from "vue";
 
-import { getWeatherFormat }from '../../../../../perception/meteorologyCheck/data.js'
+import { getWeatherFormat } from '../../../../../perception/meteorologyCheck/data.js'
 export default {
   name: "CrowdnessIndicatorRankings",
   components: {
@@ -60,6 +60,7 @@ export default {
     DialogBoard,
     DialogCamera,
     AMapContainer,
+    BMapContainer,
   },
   mixins: [provideMixin],
   inject: ["provideData"],
@@ -96,6 +97,8 @@ export default {
       markerCamera: [],
       dialogVisibleCamera: false,
       dialogDataCamera: null,
+
+      mapContainer: 'BMapContainer'
     };
   },
   computed: {
@@ -131,13 +134,44 @@ export default {
         this.getWeather();
       } else if (item.key === "pie") {
         this.$nextTick(() => {
-          const statChart = echarts.init(
-            document.getElementById("statChartRef")
-          );
-          statChart.setOption(StatChartOption);
+          const statChart = echarts.init(document.getElementById("statChartRef"));
+          // statChart.setOption(lineChartOption);
+          request({
+            url: 'business/traffic-statistics/history/queryTheGantryDataByPileNumber',
+            method: 'get',
+            params:{
+              startDate: moment().format('YYYY-MM-DD'),
+              stakeMark: this.detailData.stakeMark
+            }
+          }).then(res=>{
+            const options = _.cloneDeep(lineChartOption);
+            options.series[0].data = res.data.map(x=>x.totalFlow);
+            options.tooltip.formatter = "{b}时：{c}(辆)";
+            statChart.setOption(lineChartOption);
+          })
         });
       } else if (item.key === "bar") {
-        this.$refs.AMapContainerRef.showRoadConditions(findIndex === -1);
+        if(findIndex === -1){
+          request({ url: '/business/traffic-statistics/current/getTheCurrentCongestedSection', method: 'get'}).then(res=>{
+
+            let aryLine = [];
+              res.data.forEach(e => {
+                const lines = e.link_lng_lats.split(';').map(x=>x.split(','))
+                aryLine.push({
+                  width: 3,            // 线宽度
+                    color: '#FF0000', // 线颜色
+                    xyArr: lines
+                })
+              });
+              Vue.prototype.mapIns.addLineByArr(
+                aryLine
+              );
+          });
+        } else {
+          Vue.prototype.mapIns.removeLayerByName('lineLayer');  
+        }
+        //
+        // this.$refs.MapContainerRef.showRoadConditions(findIndex === -1);
       } else if (item.key === "level") {
         this.getBoard(findIndex === -1);
       } else if (item.key === "camera") {
@@ -156,37 +190,78 @@ export default {
           },
         }).then((result) => {
           if (result.code != 200)
-            return Message.error(`查询失败!${result.msg}`);
+            return Message.error(`查询失败${result.msg}`);
           const list = [...result.data.downCamera, ...result.data.upCamera];
-
-          const icon = require(`@screen/images/layer/路测设备/摄像机_active.svg`);
-          const icon_f = require(`@screen/images/layer/路测设备/摄像机_fault.svg`);
-          list.forEach((e) => {
-            const p = new AMap.LngLat(
-              parseFloat(e.longitude),
-              parseFloat(e.latitude)
-            );
-            const m = this.addMarker(
-              p,
-              e.useState ? icon : icon_f,
-              e.useState,
-              function () {
-                if (e.useState === 1) {
-                  self.dialogDataCamera = e;
-                  self.dialogVisibleCamera = true;
-                } else {
-                  self.$message.warning("设备未接入！！");
-                }
-              }
-            );
-            this.markerCamera.push(m);
-          });
+          if (this.mapContainer === 'BMapContainer') {
+            const map2d = this.$refs.MapContainerRef.getMapInstance();
+            const icon = require(`@screen/images/layerb/路测设备/摄像机_active.svg`);
+            const icon_f = require(`@screen/images/layerb/路测设备/摄像机_fault.svg`);
+            const points = [];
+            list.forEach((e) => {
+                points.push({
+                  type: 'event',
+                  longitude: parseFloat(e.longitude),
+                  latitude: parseFloat(e.latitude), 
+                  iconUrl: e.useState ? icon : icon_f,
+                  otherInfo: {
+                    ext: null,
+                    config:{
+                      item: e,
+                      markerClick:function(ext,e){
+                        if (e.useState === 1) {
+                          self.dialogDataCamera = e;
+                          self.dialogVisibleCamera = true;
+                        } else {
+                          self.$message.warning("设备未接入！！");
+                        }
+                      }
+                    }
+                  }
+                })
+            })
+            if(points.length > 0){
+              map2d.addPointByArr(
+                {pointList: points},
+                'jhlayers_camera',
+                false
+              );
+            }
+          } else {
+              const icon = require(`@screen/images/layer/路测设备/摄像机_active.svg`);
+              const icon_f = require(`@screen/images/layer/路测设备/摄像机_fault.svg`);
+              list.forEach((e) => {
+                const p = new AMap.LngLat(
+                  parseFloat(e.longitude),
+                  parseFloat(e.latitude)
+                );
+                const m = this.addMarker(
+                  p,
+                  e.useState ? icon : icon_f,
+                  e.useState,
+                  function () {
+                    if (e.useState === 1) {
+                      self.dialogDataCamera = e;
+                      self.dialogVisibleCamera = true;
+                    } else {
+                      self.$message.warning("设备未接入！！");
+                    }
+                  }
+                );
+                this.markerCamera.push(m);
+              });
+          }
         });
       } else {
-        this.markerCamera.forEach((e) => {
+        if (this.mapContainer === 'BMapContainer') {
+          const map2d = this.$refs.MapContainerRef.getMapInstance();
+          map2d.removeLayerByName('jhlayers_camera')
+        }else{
+          this.markerCamera.forEach((e) => {
           e.setMap(null);
           e = null;
         });
+        }
+        
       }
     },
     handledDialogCamera(bool) {
@@ -207,51 +282,92 @@ export default {
           method: "post",
           data: fileData,
         }).then((result) => {
-          if (result.code != 200)
-            return Message.error(`查询失败!${result.msg}`);
-          const icon = require(`@screen/images/layer/路测设备/情报板_active.svg`);
-          const icon_f = require(`@screen/images/layer/路测设备/情报板_fault.svg`);
-          result.data.forEach((e) => {
-            const p = new AMap.LngLat(
-              parseFloat(e.longitude),
-              parseFloat(e.latitude)
-            );
-            const m = this.addMarker(
-              p,
-              e.useState ? icon : icon_f,
-              e.useState,
-              function () {
-                if (e.useState === 1) {
-                  self.dialogData = e;
-                  self.dialogVisible = true;
-                } else {
-                  self.$message.warning("设备未接入！");
+          if (result.code != 200) return Message.error(`查询失败${result.msg}`);
+          if (this.mapContainer === 'BMapContainer') {
+            const map2d = this.$refs.MapContainerRef.getMapInstance();
+            const icon = require(`@screen/images/layerb/路测设备/情报板_active.svg`);
+            const icon_f = require(`@screen/images/layerb/路测设备/情报板_fault.svg`);
+            const points = [];
+            result.data.forEach((e) => {
+                points.push({
+                  type: 'event',
+                  longitude: parseFloat(e.longitude),
+                  latitude: parseFloat(e.latitude), 
+                  iconUrl: e.useState ? icon : icon_f,
+                  otherInfo: {
+                    ext: null,
+                    config:{
+                      item: e,
+                      markerClick:function(ext,e){
+                        if (e.useState === 1) {
+                          self.dialogData = e;
+                          self.dialogVisible = true;
+                        } else {
+                          self.$message.warning("设备未接入！！");
+                        }
+                      }
+                    }
+                  }
+                })
+            })
+            if(points.length > 0){
+              map2d.addPointByArr(
+                {pointList: points},
+                'jhlayers_board',
+                false
+              );
+            }
+          } else {
+            const icon = require(`@screen/images/layer/路测设备/情报板_active.svg`);
+            const icon_f = require(`@screen/images/layer/路测设备/情报板_fault.svg`);
+            result.data.forEach((e) => {
+              const p = new AMap.LngLat(
+                parseFloat(e.longitude),
+                parseFloat(e.latitude)
+              );
+              const m = this.addMarker(
+                p,
+                e.useState ? icon : icon_f,
+                e.useState,
+                function () {
+                  if (e.useState === 1) {
+                    self.dialogData = e;
+                    self.dialogVisible = true;
+                  } else {
+                    self.$message.warning("设备未接入！");
+                  }
                 }
-              }
-            );
-            this.markerBoard.push(m);
-          });
+              );
+              this.markerBoard.push(m);
+            });
+          }
         });
       } else {
-        this.markerBoard.forEach((e) => {
-          e.setMap(null);
-          e = null;
-        });
+        if (this.mapContainer === 'BMapContainer') {
+          const map2d = this.$refs.MapContainerRef.getMapInstance();
+          map2d.removeLayerByName('jhlayers_board')
+        } else {
+          this.markerBoard.forEach((e) => {
+            e.setMap(null);
+            e = null;
+          });
+        }
       }
     },
     handledDialogBoard(bool) {
       this.dialogVisible = bool;
     },
     getWeather() {
-      request({url: '/weatherForecast/currentWeatherAndForecastInformation',
+      request({
+        url: '/weatherForecast/currentWeatherAndForecastInformation',
         method: 'post',
         data: {
-          "roadId":"G003537",
-          "stakeNum":this.detailData.stakeMark,
-          "forecastHour":"0",
-          "managerId":"YG10201"
+          "roadId": "G003537",
+          "stakeNum": this.detailData.stakeMark,
+          "forecastHour": "0",
+          "managerId": "YG10201"
         }
-      }).then(res=>{
+      }).then(res => {
         this.weatherData = getWeatherFormat(res.data[0]);
       })
       // getWeatherForecast(
@@ -270,19 +386,45 @@ export default {
       const self = this;
       setTimeout(() => {
         // 获取map接口
-        const { AMap, mapIns } = self.$refs.AMapContainerRef.getMapInstance();
         const { longitude, dimension, eventName } = self.detailData;
-        const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`);
-        const center = new AMap.LngLat(
-          parseFloat(longitude),
-          parseFloat(dimension)
-        );
-        self.addMarker(center, icon, 1);
-        mapIns.setZoomAndCenter(12, center);
+        const mapInfo = self.$refs.MapContainerRef.getMapInstance();
+        if (this.mapContainer === 'BMapContainer') {
+          const icon = require(`@screen/images/layerb/事件专题/${eventName}_active.svg`);
+          const center = [parseFloat(longitude), parseFloat(dimension)]
+          
+          mapInfo.addPointByArr(
+            {
+              pointList: [
+                {
+                  type: 'event', //类型。例如：交通事件、故障停车、摄像机等 【必传字段】
+                  longitude: center[0], //点坐标经度    【必传字段】
+                  latitude: center[1],  //点坐标纬度    【必传字段】
+                  iconUrl: icon,     // 图标  【必传字段】
+                  otherInfo: {
+                    name: '123'
+                  }
+                }
+              ]
+            },          //  点位数据数组（按以下规范组装）
+            'jhlayers_event',  //  当前添加的数据 唯一标识（删除该图层时也会用到）//./事件专题/交通事故.svg
+            false    //  当前新加图层是否启用聚合效果
+          );
+          mapInfo.zoomInBylatlon(center,12);
+        } else {
+
+          const icon = require(`@screen/images/layer/事件专题/${eventName}_active.svg`);
+          const { AMap, mapIns } = mapInfo;
+          const center = new AMap.LngLat(
+            parseFloat(longitude),
+            parseFloat(dimension)
+          );
+          self.addMarker(center, icon, 1);
+          mapIns.setZoomAndCenter(12, center);
+        }
       }, 500);
     },
     addMarker(position, icon, state, fn = null) {
-      const { AMap, mapIns } = this.$refs.AMapContainerRef.getMapInstance();
+      const { AMap, mapIns } = this.$refs.MapContainerRef.getMapInstance();
       const nowBg = require(`@screen/images/mapBg/active.svg`);
       const nowBg_f = require(`@screen/images/mapBg/fault.svg`);
       var marker = new AMap.Marker({
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
index 7ecfe402..53ba4b75 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
@@ -3,17 +3,15 @@
         <el-row>
             <el-col :span="7">
                 <!-- 设备类型 -->
-                <el-select v-model="tableInfo.deviceType" placeholder="" transfer="true"
-                    style="width: 120px;">
+                <el-select v-model="tableInfo.deviceType" @change="onDeviceTypeChange" placeholder="" transfer="true"
+                    style="width: 130px;">
                     <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
             </el-col>
-            <el-col :span="1">
-            </el-col>
             <el-col :span="7">
                 <!-- 规则条件 -->
-                <el-select v-model="tableInfo.searchRule" placeholder="" style="width: 120px;">
+                <el-select v-model="tableInfo.searchRule"  placeholder="" style="width: 140px;margin-left: 10px;">
                     <el-option v-for="item in zyOptions" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select>
@@ -68,7 +66,7 @@
         <el-row v-if="tableInfo.searchRule == 1">
             <!-- 设备列表 -->
             <el-select v-model="tableInfo.devList" placeholder="请选择设备" multiple collapse-tags>
-                <el-option v-for="item in sbOptions" :key="item.id" :label="item.label" :value="item.value">
+                <el-option v-for="item in tableInfo.sbOptions" :disabled="item.deviceState != 1" :key="item.id" :label="item.label" :value="item.value">
                 </el-option>
             </el-select>
         </el-row>
@@ -91,12 +89,12 @@
                         :value="item.value"></el-option>
                 </el-select>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 10" :span="6">
+            <el-col v-if="tableInfo.deviceType == 10" :span="6" style="margin-left: 10px;">
                 <el-input-number placeholder="" v-model="tableInfo.zx_operationDuration" :min="0"
                     :max="999"></el-input-number>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 10" :span="6">
-                <span>时长(分钟)</span>
+            <el-col v-if="tableInfo.deviceType == 10" :span="6" style="margin-left: 5px;">
+                <span >时长(分钟)</span>
             </el-col>
             <!-- 行车诱导 -->
             <el-col v-if="tableInfo.deviceType == 12" :span="6">
@@ -107,12 +105,12 @@
                     <el-option label="万年历" value="02"></el-option>
                 </el-select>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 12 && tableInfo.zx_controlModel == '01'" :span="8">
-                <el-time-picker v-model="tableInfo.zx_time" is-range style="" range-separator="-" placeholder="选择时间"
+            <el-col v-if="tableInfo.deviceType == 12 && tableInfo.zx_controlModel == '01'" :span="8" style="margin-left: 5px">
+                <el-time-picker v-model="tableInfo.zx_time" is-range  range-separator="-" placeholder="选择时间"
                     value-format="HH:mm" format="HH:mm">
                 </el-time-picker>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 12" :span="4">
+            <el-col v-if="tableInfo.deviceType == 12" :span="6" style="margin-left: 5px;">
                 <el-select v-model="tableInfo.zx_state" placeholder="工作状态">
                     <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
                         :value="item.value"></el-option>
@@ -133,7 +131,7 @@
 
         <el-row v-if="(tableInfo.deviceType == 2 || tableInfo.deviceType == 5) && tableInfo.executeConfig && tableInfo.executeConfig.contentList && tableInfo.executeConfig.contentList.length > 0">
             <el-col :span="24">
-               <div class="keep-ratio" origin="top" v-for="(itm,idx) of tableInfo.executeConfig.contentList">
+               <div v-for="(itm,idx) of tableInfo.executeConfig.contentList">
                 <div class="contentLabel" >{{ itm.deviceName }}</div>
                 <div class="contentValue" v-if="itm.isEditor === undefined">
                     <div class="contentBoard" >{{ itm.content }}</div>
@@ -172,11 +170,11 @@
                         :value="item.value"></el-option>
                 </el-select>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 10" :span="6">
+            <el-col v-if="tableInfo.deviceType == 10" :span="6"  style="margin-left: 10px;">
                 <el-input-number placeholder="" v-model="tableInfo.hf_operationDuration" :min="0"
                     :max="999"></el-input-number>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 10" :span="6">
+            <el-col v-if="tableInfo.deviceType == 10" :span="6" style="margin-left: 5px;">
                 <span>时长(分钟)</span>
             </el-col>
             <!-- 行车诱导 -->
@@ -188,13 +186,13 @@
                     <el-option label="万年历" value="02"></el-option>
                 </el-select>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 12 && tableInfo.hf_controlModel == '01'" :span="8">
-                <el-time-picker v-model="tableInfo.hf_time" is-range style="" range-separator="-" placeholder="选择时间"
+            <el-col v-if="tableInfo.deviceType == 12 && tableInfo.hf_controlModel == '01'" :span="8" style="margin-left: 5px;">
+                <el-time-picker v-model="tableInfo.hf_time" is-range  range-separator="-" placeholder="选择时间" 
                     value-format="HH:mm" format="HH:mm">
                 </el-time-picker>
             </el-col>
-            <el-col v-if="tableInfo.deviceType == 12" :span="4">
-                <el-select v-model="tableInfo.hf_state" placeholder="工作状态">
+            <el-col v-if="tableInfo.deviceType == 12" :span="6" style="margin-left: 5px;">
+                <el-select v-model="tableInfo.hf_state" placeholder="工作状态" >
                     <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
                         :value="item.value"></el-option>
                 </el-select>
@@ -344,7 +342,6 @@ export default {
             ],
             deviceData: [],
             qbbData: {},
-            sbOptions: [],
             deviceType: 1,
             clickQbbName: 1
         }
@@ -352,13 +349,60 @@ export default {
     watch: {
         'tableInfo.deviceType': {
             async handler(newValue,oldValue) {
-               if(oldValue !== undefined){
+                // console.log(newValue,oldValue)
+            //     // console.log(this.tableInfo, newValue,oldValue)
+            //     // if(this.tableInfo.isUnReset){
+            //     //     this.tableInfo.isUnReset = false
+            //     //     return;
+            //     // }
+            //    if(oldValue !== undefined){ //更新信息后
+            //     this.tableInfo.devList = []
+            //     this.tableInfo.searchRule = 1;
+            //     this.sbOptions = []
+            //     delete this.tableInfo.zx_operationType
+            //     delete this.tableInfo.hf_operationType
+            //     if(this.tableInfo.executeConfig && this.tableInfo.executeConfig.contentList){
+            //         this.tableInfo.executeConfig.contentList = []
+            //     }
+            //     if(this.tableInfo.recoverConfig && this.tableInfo.recoverConfig.contentList){
+            //         this.tableInfo.recoverConfig.contentList = []
+            //     }
+            //     if(this.tableInfo.deviceType === 2){
+            //         this.tableInfo.zx_operationType = 2;
+            //         this.tableInfo.hf_operationType = 2;
+            //         this.tableInfo.executeConfig = {operationType:2}
+            //         this.tableInfo.recoverConfig = {operationType:2}
+            //     }
+            //     if(this.tableInfo.deviceType === 5){
+            //         this.tableInfo.zx_operationType = 2;
+            //         this.tableInfo.executeConfig = {operationType:2}
+            //     }
+            //     // this.tableInfo = _.cloneDeep(this.tableInfo)
+            //    }
+            //    await this.loadData(newValue);
+            //    this.$emit('check');
+                
+            },
+            immediate: true,
+        }
+    },
+    async mounted() {
+        this.onDeviceTypeChange(this.tableInfo.deviceType,false)
+    },
+    methods: {
+        initData() { },
+        async onDeviceTypeChange(v,isInit=true){
+            await this.loadData(v);
+            if(isInit){
                 this.tableInfo.devList = []
+                this.tableInfo.searchRule = 1;
                 this.sbOptions = []
-                if(this.tableInfo.executeConfig.contentList){
+                delete this.tableInfo.zx_operationType
+                delete this.tableInfo.hf_operationType
+                if(this.tableInfo.executeConfig && this.tableInfo.executeConfig.contentList){
                     this.tableInfo.executeConfig.contentList = []
                 }
-                if(this.tableInfo.recoverConfig.contentList){
+                if(this.tableInfo.recoverConfig && this.tableInfo.recoverConfig.contentList){
                     this.tableInfo.recoverConfig.contentList = []
                 }
                 if(this.tableInfo.deviceType === 2){
@@ -371,32 +415,26 @@ export default {
                     this.tableInfo.zx_operationType = 2;
                     this.tableInfo.executeConfig = {operationType:2}
                 }
-               }
-                await this.loadData(newValue);
-            },
-            immediate: true,
-        }
-    },
-    async mounted() {
-    },
-    methods: {
-        initData() { },
+            }
+            this.$emit('check');
+        },
         async loadData(deviceType = 1) {
-            this.sbOptions = [];
             let result = await request({
                 url: `business/device/query?deviceType=${deviceType}`,
                 method: "get",
             });
             if (result.code != 200) return Message.error(result?.msg);
+            const _sbOptions = [];
             if (deviceType == 1) {
                 result.data.filter((it) => it.iotDeviceId && it.childType !== "1-1").forEach(it => {
-                    this.sbOptions.push({ value: it.iotDeviceId, label: it.deviceName })
+                    _sbOptions.push({ value: it.iotDeviceId, label: it.deviceName,deviceState:it.deviceState })
                 });
             } else {
                 result.data.filter((it) => it.iotDeviceId).forEach(it => {
-                    this.sbOptions.push({ value: it.iotDeviceId, label: it.deviceName })
+                    _sbOptions.push({ value: it.iotDeviceId, label: it.deviceName,deviceState:it.deviceState })
                 });
             }
+            this.tableInfo.sbOptions = _sbOptions;
         },
         async changeDeviceType(value) {
             const defaultFields = ['deviceType','searchRule','number','deviceList']
@@ -494,10 +532,11 @@ export default {
 }
 .contentBoard{
     flex:1;
-    background-color: #000;  
-    color:yellow;
+    background-color: #19425c;  
+    color:#dfdfdf;
     padding: 9px 0px;
     text-align: center;
+    font-weight: bold;
 }
 .btn{
     height:40px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/qbbDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/qbbDialog.vue
index e170f34b..718340bc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/qbbDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/qbbDialog.vue
@@ -20,7 +20,7 @@
       </div>
   
       <template #footer>
-        <Button style="background: #c9c9c9; padding: 0 24px"
+        <Button style="background: #0e708b; padding: 0 24px"
           @click.native="(modelVisible = false), (submitting = false)">取消</Button>
         <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">确认</Button>
       </template>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js
index 85813ee2..e54bd61e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/data.js
@@ -7,4 +7,5 @@ export const defaultTableInfo = {
   isDefault: true,
   zx_operationType: 2,
   hf_operationType: 2,
+  sbOptions: [],
 };
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 f9eaf863..82837c70 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
@@ -5,6 +5,7 @@
         <ScopeTable
           :tableInfo="item"
           :index="index"
+          @check="checkTable"
           @onAdd="onAdd"
           @onDel="onDel"
           @onConfirm="onConfirm"
@@ -22,7 +23,7 @@
         一键控制
       </ButtonGradient>
       <ButtonGradient
-        v-if="detailData.eventState != 2"
+        v-if="detailData.eventState != 2 && !isAll5"
         class="special-button"
         style="background: rgb(250, 152, 56)"
         @click.native="handleSubmit(2)"
@@ -60,7 +61,8 @@ export default {
       planId: "",
       tableData: [],
       subclass:"",
-      eventId: ""
+      eventId: "",
+      isAll5: false,//如果全都是语音广播的话则隐藏
     };
   },
   watch: {
@@ -73,11 +75,16 @@ export default {
         this.eventId = newValue.id;
         this.initData(newValue)
       }
-      
     },
+   
   },
   mounted() {},
   methods: {
+    checkTable(){
+      const unDevice5 = this.tableData.filter(x=>x.deviceType !== 5)
+      this.isAll5 = (unDevice5.length === 0);
+      this.tableData = _.cloneDeep(this.tableData)
+    },
     // detailChange(eventId) {
     //   if(this.tableData.length === 0){
     //     this.initData(this.detailData);
@@ -94,6 +101,7 @@ export default {
           let data = result.data;
           if (data.length == 0) {
             this.tableData = [{ ...defaultTableInfo }];
+            
             return Message.warning("该事件暂无处置预案");
           }
           let dcExecuteAction = data[0].dcExecuteAction || [];
@@ -147,7 +155,10 @@ export default {
       if (this.tableData.length <= 1) {
         return Message.warning("最后一项不可删除！");
       }
-      this.tableData.splice(index, 1);
+      let _tbData = _.cloneDeep(this.tableData)
+      _tbData.splice(index, 1);
+      this.tableData = _tbData;
+      this.checkTable();
     },
     onConfirm(index){
         const param = {
@@ -216,72 +227,78 @@ export default {
       return data;
     },
     handleSubmit(value = 1) {
-      let dcArr = [];
-      this.tableData.forEach((item) => {
-        let dcData = {
-          deviceType: item.deviceType,
-          searchRule: item.searchRule,
-          number: item.number,
-        };
-        if (item.devList && item.devList.length > 0) {
-          dcData.deviceList = item.devList.join(",");
-        }
-        if(item.deviceType === 2 || item.deviceType === 5){//情报板和语音广播
-          dcData.executeConfig = JSON.stringify(item.executeConfig);
-          dcData.recoverConfig = JSON.stringify(item.recoverConfig);
-        } else {
-            let zxData = {},
-            hfData = {};
-            Object.keys(item).forEach((key) => {
-              if (/^zx_/.test(key)) {
-                let keyName = key.substring(3);
-                zxData[keyName] = item[key];
-              }
-              if (/^hf_/.test(key)) {
-                let keyName = key.substring(3);
-                hfData[keyName] = item[key];
-              }
-            });
-            if (item.deviceType == 12) {
-              zxData = this.formatData(zxData);
-              hfData = this.formatData(hfData);
+      const self = this;
+      this.$modal
+        .confirm(`是否确认${value===1?'一键控制操作':'一键恢复操作'}？`)
+        .then(function () {
+          let dcArr = [];
+          self.tableData.forEach((item) => {
+            let dcData = {
+              deviceType: item.deviceType,
+              searchRule: item.searchRule,
+              number: item.number,
+            };
+            if (item.devList && item.devList.length > 0) {
+              dcData.deviceList = item.devList.join(",");
+            }
+            if(item.deviceType === 2 || item.deviceType === 5){//情报板和语音广播
+              dcData.executeConfig = JSON.stringify(item.executeConfig);
+              dcData.recoverConfig = JSON.stringify(item.recoverConfig);
+            } else {
+                let zxData = {},
+                hfData = {};
+                Object.keys(item).forEach((key) => {
+                  if (/^zx_/.test(key)) {
+                    let keyName = key.substring(3);
+                    zxData[keyName] = item[key];
+                  }
+                  if (/^hf_/.test(key)) {
+                    let keyName = key.substring(3);
+                    hfData[keyName] = item[key];
+                  }
+                });
+                if (item.deviceType == 12) {
+                  zxData = self.formatData(zxData);
+                  hfData = self.formatData(hfData);
+                }
+                
+                dcData.executeConfig = JSON.stringify(zxData);
+                dcData.recoverConfig = JSON.stringify(hfData);
             }
             
-            dcData.executeConfig = JSON.stringify(zxData);
-            dcData.recoverConfig = JSON.stringify(hfData);
-        }
-        
-        dcArr.push(dcData);
-      });
-      let reqData = {
-        operationType: value, //1-执行操作 2-恢复操作
-        dcEmergencyPlans: {
-          id: this.planId,
-          dcExecuteAction: dcArr,
-        },
-        dcEvent: {
-          id: this.detailData.id,
-          eventType: this.detailData.eventType,
-          stakeMark: this.detailData.stakeMark,
-          subclass: this.detailData.subclass,
-          direction: this.detailData.direction == "菏泽方向" ? "1" : "3",
-        },
-      };
-      //
-      request({
-        url: "/business/plans/event/confirm",
-        method: "post",
-        data: reqData,
-      })
-        .then((result) => {
-          if (result.code != 200) return Message.error(result?.msg);
-          Message.success("提交成功");
-          this.reload();
-        })
-        .catch(() => {
-          Message.error("提交失败");
-          this.reload();
-        });
+            dcArr.push(dcData);
+          });
+          let reqData = {
+            operationType: value, //1-执行操作 2-恢复操作
+            dcEmergencyPlans: {
+              id: self.planId,
+              dcExecuteAction: dcArr,
+            },
+            dcEvent: {
+              id: self.detailData.id,
+              eventType: self.detailData.eventType,
+              stakeMark: self.detailData.stakeMark,
+              subclass: self.detailData.subclass,
+              direction: self.detailData.direction == "菏泽方向" ? "1" : "3",
+            },
+          };
+          //
+          request({
+            url: "/business/plans/event/confirm",
+            method: "post",
+            data: reqData,
+          })
+            .then((result) => {
+              if (result.code != 200) return Message.error(result?.msg);
+              Message.success("提交成功");
+              self.reload();
+            })
+            .catch(() => {
+              Message.error("提交失败");
+              self.reload();
+            });
+        }).catch((_) => {});
+
     },
   },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
index 08de0efe..3173e163 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
@@ -22,6 +22,7 @@
           </el-table-column>
           <el-table-column label="人员" align="center">
             <template slot-scope="scope">
+              <div style="max-height: 100px;overflow-y: auto;">
               <el-checkbox-group v-model="form.employees">
                 <el-checkbox
                   v-for="item in scope.row.employeesMap"
@@ -30,10 +31,12 @@
                   >{{ item.name }}</el-checkbox
                 >
               </el-checkbox-group>
+            </div>
             </template>
           </el-table-column>
           <el-table-column label="车辆" align="center" width="240">
             <template slot-scope="scope">
+              <div style="max-height: 100px;overflow-y: auto;">
               <el-checkbox-group v-model="form.vehicle">
                 <el-checkbox
                   v-for="item in scope.row.vehiclesMap"
@@ -42,6 +45,7 @@
                   >{{ item.vehiclePlate + item.vehicleText }}</el-checkbox
                 >
               </el-checkbox-group>
+            </div>
               <!-- <span v-for="item in scope.row.vehiclesMap">
                 {{ item.vehiclePlate }}</span
               > -->
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
index 1da48867..8ccb3e30 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/index.vue
@@ -141,7 +141,7 @@ export default {
   methods: {
     handleClick() {
       this.modelSmartVisible = false;
-      this.$parent.$refs['CrowdnessIndicatorRankings'][0].active = []
+      this.$parent.$refs['CrowdnessIndicatorRankings'].active = []
       this.statsDialogVisible = true;
     },
     handleClose() {
@@ -171,7 +171,6 @@ export default {
         stakeMark: this.provideDetail.stakeMark,
         id: this.provideDetail.id,
       }).then(async (res) => {
-        console.log(res,'$$$$$$$$$$$$$$$')
         this.statsDialogAction = res.data.existence;
         if(res.data.existence === 0){
           const result = await request({
@@ -292,7 +291,7 @@ export default {
       display: flex;
       width: 100%;
       align-items: flex-start;
-      margin: 15px 0;
+      margin-bottom: 10px;
 
       .label {
         font-size: 13px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/data.js
index a799defb..13a1c2cf 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/data.js
@@ -287,25 +287,6 @@ export const formList = [
       placeholder: "",
     },
   },
-  // {
-  //   label: "完结时间:",
-  //   key: "endTime",
-  //   type: "input",
-  //   options: {
-  //     disabled: true,
-  //     placeholder: ''
-  //   }
-  // },
-  // {
-  //   label: "事件描述:",
-  //   key: "direction",
-  //   type: "input",
-  //   gridColumn: 3,
-  //   options: {
-  //     disabled: true,
-  //     placeholder: "",
-  //   },
-  // },
 ];
 
 export const reportList = [
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/index.vue
index f13d3a00..445710f0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogProcess/index.vue
@@ -7,13 +7,13 @@
           <Form class="form" ref="FormConfigRef" :formList="formConfigList" v-model="fData" labelWidth="120px" />
 
           <span class="title">上报侧重要素</span>
-          <Form ref="FormReportRef" :formList="reportList" v-model="reportData" label-width="150px" />
+          <Form ref="FormReportRef" :formList="formReportList" v-model="rData" label-width="150px" />
         </div>
         <div class="linespace"></div>
         <div class="footer">
           <Button @click.native="onSubmit">保存</Button>
           <!-- :loading="submitting" -->
-          <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
+          <Button style="background: #0e708b" @click.native="modelVisible = false">关闭</Button>
         </div>
       </el-tab-pane>
       <el-tab-pane label="初报" name="second">
@@ -63,7 +63,7 @@
           <Button style="background: #3de8ff" @click.native="handlePreview">预览</Button>
           <Button v-if="type == 0" style="background: #ffdb82" @click.native="onFileSubmit">保存</Button>
           <Button v-if="type == 0" :loading="submitting" @click.native="onSubmitUpload">保存并上报</Button>
-          <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
+          <Button style="background: #0e708b" @click.native="modelVisible = false">关闭</Button>
         </div>
       </el-tab-pane>
       <el-tab-pane label="续报" name="third" :disabled="type == 0">
@@ -125,7 +125,7 @@
           <Button v-if="(type == 1 && formFileData.status == 0) ||
     (newType == 1 && formFileData.status == 0)
     " @click.native="onSubmitUpload" :loading="submitting">保存并上报</Button>
-          <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
+          <Button style="background: #0e708b" @click.native="modelVisible = false">关闭</Button>
         </div>
       </el-tab-pane>
       <el-tab-pane label="终报" name="fourth" :disabled="type == 0">
@@ -175,11 +175,11 @@
           <Button style="background: #3de8ff" @click.native="handlePreview">预览</Button>
           <Button v-if="type != 3" style="background: #ffdb82" @click.native="onFileSubmit">保存</Button>
           <Button v-if="type != 3" @click.native="onSubmitUpload" :loading="submitting">保存并上报</Button>
-          <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
+          <Button style="background: #0e708b" @click.native="modelVisible = false">关闭</Button>
         </div>
       </el-tab-pane>
-      <Dialog style="" v-model="showDocx" width="1085px" top="60px">
-        <div class="docx-wrapper">
+      <Dialog style="" v-model="showDocx" width="1085px" top="20px">
+        <div class="docx-wrapper" style="height:800px;overflow-y: auto;overflow-x: hidden;">
           <section ref="initFile" class="docx" style="
               padding: 72pt 90.15pt;
               width: 595.3pt;
@@ -358,7 +358,7 @@ import {
   importantFileStatus,
 } from "@/api/commandDispatch";
 import { Message } from "element-ui";
-import { delay, exportFile, confirm } from "@screen/utils/common";
+import { delay, exportFile2, confirm } from "@screen/utils/common";
 var moment = require("moment");
 export default {
   name: "DialogProcessVisible",
@@ -390,20 +390,9 @@ export default {
       submitting: false,
       fData: {},
       formConfigList: [],
-      reportList,
+      formReportList:[],
       activeName: "first",
-      reportData: {
-        plateNumber: "",
-        diversionPoint: "",
-        currentProgress: "",
-        takeSteps: "",
-        planStatus: "",
-        trafficPoliceStatus: "",
-        medicalStatus: "",
-        boardStatus: "",
-        chemicalsStatus: "",
-        fireStatus: "",
-      },
+      rData: {},
       formFileData: {
         fromDept: "齐鲁高速股份有限公司",
         createTime: "2024年04月24日17时22分",
@@ -420,7 +409,6 @@ export default {
       pageNum: 1,
       renewedList: [],
       // submitting: false
-      thirdNum:0
     };
   },
   watch: {
@@ -430,7 +418,7 @@ export default {
         this.eventId = this.provideDetail.id;
         this.activeName = 'first'
         await this.initData();
-        this.getReportData();
+        await this.getReportData();  
         this.getImportantFileStatus();
       }
     }
@@ -463,11 +451,29 @@ export default {
         info.lang = info.lang.split(",")
       }
       if (typeof info.stakeMark == "string") {
-        let numbers = info.stakeMark.match(/\d+/g).map(Number);
+        let numbers = info.stakeMark.match(/\d+/g).map(String);
         info.stakeMark = numbers;
       }
 
 
+      if(info.eventType === 10){
+        // 起止桩号
+        if(info.dcEventAbnormalWeather.endStakeMark && typeof info.dcEventAbnormalWeather.endStakeMark == "string"){
+            let numbers = info.dcEventAbnormalWeather.endStakeMark.match(/\d+/g).map(String);
+            info.endStakeMark = numbers;
+        }
+      }
+      
+      if(info.eventType === 7){
+        // 起止桩号
+        if(info.dcEventConstruction.endStakeMark && typeof info.dcEventConstruction.endStakeMark == "string"){
+            let numbers = info.dcEventConstruction.endStakeMark.match(/\d+/g).map(String);
+            info.endStakeMark = numbers;
+        }
+      }
+      
+
+
       let _confirgList = _.cloneDeep(configList[info.eventName]);
 
       const facilityResult = await request({ url: `/business/facility/query`, method: "get" })
@@ -515,14 +521,13 @@ export default {
       this.formConfigList = _confirgList;
       this.fData = info;
     },
-    getReportData() {
-      getEventImportant(this.eventId).then((res) => {
-        this.reportData = { ...res.data };
-      });
+    async getReportData() {
+      let res = await getEventImportant(this.eventId)
+      this.formReportList = _.cloneDeep(reportList)
+      this.rData = res.data;
     },
     handleClick(tab, event) {
       this.activeName = tab.name;
-      this.thirdNum = 0;
       this.pageNum = 1;
       if (this.activeName == "second") {
         this.getEventImportantFileList(1);
@@ -622,8 +627,8 @@ export default {
     getEventImportantFileList(type) {
       deventImportantFileList(this.eventId, type).then((res) => {
         if (res.length > 0) {
-          console.log(this.thirdNum ,'--------------------')
-          this.formFileData = res[this.thirdNum];
+          this.pageNum = res.length;
+          this.formFileData = res[res.length -1];
           if (type == "1" || type == "2") {
             this.renewedList = res;
           }
@@ -643,14 +648,11 @@ export default {
           this.newType = 1;
           this.renewedList.push(res.data);
           this.pageNum = this.renewedList.length;
-          this.thirdNum = this.pageNum - 1;
-          console.log("this.renewedList", this.renewedList);
         }
       });
     },
     // 切换分页
     onCurrentChange(val) {
-      this.thirdNum = val;
       this.renewedList.forEach((item, index) => {
         if (val == index + 1) {
           this.formFileData = item;
@@ -666,7 +668,7 @@ export default {
     },
     // 下载
     handleDownload() {
-      exportFile({
+      exportFile2({
         url: "/business/eventImportantFile/download",
         filename: this.type == 0 ? "初报" : this.type == 1 ? "续报" : "终报",
         data: this.formFileData,
@@ -684,7 +686,7 @@ export default {
       } else {
         await addEventImportantFile(data).then((res) => { });
       }
-
+      this.$message.success('保存完成')
       if (this.activeName == "second") {
         this.getEventImportantFileList(1);
       } else if (this.activeName == "third") {
@@ -931,7 +933,7 @@ export default {
     // width: 120px;
     // height: 30px;
     // line-height: 30px;
-    margin-left: 20px;
+    margin-left: 10px;
   }
 }
 
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 3ac64c31..37303cda 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
@@ -1,12 +1,16 @@
 <template>
-  <div>
+  <div class="flexParent">
     <Card class="DisposalProcess" title="处置过程">
       <template #title-prefix>
+        <div class="ButtonList" v-horizontal-scroll>
+          <div class="ButtonScoll" :style="'width:'+linkEvent.length * 90+'px'">
         <ButtonGradient v-for="(item,index) of linkEvent" @click.native="eventLink(index)"
           class="title-button" :style="`margin-left: ${index===0?20:10}px;padding:0px 10px;border-radius: 5px;${index===linkEventIndex?'background:#fb781b;':''}`"
         >
           {{item.eventNature===1?'首因事件':'关联事件'}}{{ index===0?'':(index) }}
         </ButtonGradient>
+      </div>
+      </div>
       </template>
       <template #title-suffix>
         <ButtonGradient
@@ -59,8 +63,9 @@
         </ButtonGradient>
       </template>
 
-      <TimeLine1 :data="timeLine1List" :filterDistance="filterDistance" />
-      <TimeLine2 :data="timeLine2List" style="flex: 1" />
+      <TimeLine1 v-if="timeLine1List.length > 0" :data="timeLine1List" :filterDistance="filterDistance" />
+      <div v-else style="height:62px"></div>
+      <TimeLine2 :data="timeLine2List" style="flex:1;" />
       <div v-if="!timeLine2List.length" class="no-data">暂无数据</div>
       <div class="bottom">
         <ElSelect
@@ -109,7 +114,7 @@
           <div class="input" style="width:300px;text-align: left;">{{ imageName }}</div>
         </el-upload>
         <ElSelect
-          :disabled="detailData.eventState == 2"
+          :disabled="detailData.eventState == 2 || testRadio == 'upload' "
           v-model="text"
           clearable
           placeholder="请选择常用语"
@@ -119,6 +124,7 @@
             :key="item"
             :label="item"
             :value="item"
+            class="option-with-wrap"
           >
           </ElOption>
         </ElSelect>
@@ -146,7 +152,7 @@
 </template>
 
 <script>
-import Card from "@screen/components/Card2/Card.vue";
+import Card from "@screen/components/Card3/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";
@@ -154,6 +160,9 @@ import { getToken } from "@/utils/auth";
 import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index";
 import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index";
 import DialogProcess from "./DialogProcess/index.vue";
+import {
+  eventDetails,
+} from "@/api/commandDispatch";
 import {
   getProcessNode,
   getProcessList,
@@ -172,8 +181,7 @@ import { result } from "lodash";
 export default {
   name: "DisposalProcess",
   mixins: [provideMixin],
-  inject: ["adpScale", "provideData","reload"],
-  // mixins: [provideMixin],
+  inject: ["provideData","reload"],
   components: {
     Card,
     ButtonGradient,
@@ -219,6 +227,17 @@ export default {
       linkEventIndex:0
     };
   },
+
+  directives: {
+    'horizontal-scroll': {
+        bind: function (el) {
+            el.addEventListener('wheel', function (event) {
+                event.preventDefault();
+                el.scrollLeft += event.deltaY;
+            });
+        }
+    }
+  },
   watch: {
     processId(newVlaue, oldValue) {
       if(newVlaue === ''){
@@ -232,7 +251,6 @@ export default {
               element?.commonPhrases.length > 0
                 ? element?.commonPhrases.split(",")
                 : [];
-            console.log("this.phrasesOptions", this.phrasesOptions);
             this.processName = element.processNode;
             this.processType = 1;
           }
@@ -259,13 +277,11 @@ export default {
   },
   methods: {
     filterDistance(distance) {
-      return (1 / this.adpScale.scaleX) * distance;
+      return  distance;
     },
     handleFullHeight() {
-      this.$parent.$refs['CrowdnessIndicatorRankings'][0].active = []
       this.isFullHeight = !this.isFullHeight;
-
-      this.$emit("fullHeight", "CrowdnessIndicatorRankings");
+      this.$emit("fullHeight", this.isFullHeight);
     },
 
     // 获取重要事件状态
@@ -309,13 +325,36 @@ export default {
     //处置过程记录
     async disposalRecords(id) {
       let processIdMap = {};
-      getProcessList(id).then((result) => {
-        this.timeLine2List = result.map((item) => {
+      getProcessList(id).then(async (result) => {
+        const _resList = [];
+        for(let i = 0; i < result.length; i++){
+          let item = result[i]
           processIdMap[item.processId] = new Date(
             item.operationTime
           ).toLocaleTimeString();
+          if(item.processType === 3){
+            const resDetail =  await eventDetails(item.processId)
+            let _result = [];
+            if (resDetail.data?.controlResult) {
+              _result =  JSON.parse(resDetail.data.controlResult);
+              _result.forEach(ed => {
+                if(ed.result){
+                  if(ed.result.retCode !== undefined && ed.result.retCode === "0"){
+                    ed.result.code = 200;
+                    ed.result.msg = '操作成功';
+                  }
+                } else {
+                  ed.result = {
+                    code: 500,
+                    msg: '操作失败'
+                  }
+                }
+              });
+            }
+            item.controlResult = _result
+          }
 
-          return {
+          _resList.push({
             // title: "接警记录",
             id: item.processId,
             time: item.operationTime
@@ -328,16 +367,18 @@ export default {
             processName: item.processName,
             type: item.type,
             processType: item.processType,
+            controlResult: item.controlResult
             // posts: '淄博发展公司管理员'
-          };
-        });
+          })
+        }
+        this.timeLine2List = _resList;
       });
     },
     beforeUpload(file) {
       const isLt2M = file.size / 1024 / 1024 < 20;
 
       if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 20MB');
+        this.$message.error('上传图片或视频大小不能超过 20MB');
       }
       return isLt2M;
     },
@@ -390,7 +431,7 @@ export default {
           this.imageName = "点击上传";
           this.text = "";
           this.$message.success("发送成功");
-
+          this.timeLine1List = [];
           this.reload();
         });
       } else {
@@ -463,18 +504,29 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.option-with-wrap {
+  max-width: 250px;
+  height: auto;
+  white-space: normal; /* 保证文本不会在边界处截断 */
+  overflow-wrap: break-word; /* 允许在边界处或者任何点换行 */
+}
+.flexParent{
+  display: flex;
+  width:100%;
+  flex-direction: column;
+}
 .DisposalProcess {
   ::v-deep {
     .content {
       display: flex;
       flex-direction: column;
       gap: 12px;
+      flex:1;
     }
   }
 
   .special-button {
     .icon {
-      
       background-repeat: no-repeat;
       background-size: 100% 100%;
       width: 20px;
@@ -482,7 +534,6 @@ export default {
       transition: all 0.3s linear;
     }
   }
-
   .bottom {
     display: grid;
     grid-template-columns: 0.5fr auto 1fr 130px 90px;
@@ -504,4 +555,14 @@ export default {
     white-space:nowrap;
   }
 }
+.ButtonList{
+  border-radius: 5px;
+  .ButtonScoll{
+    display: flex;
+  }
+  width: 24vw;
+  overflow-x: auto;
+  overflow-y: hidden;
+  // scrollbar-width: none;
+}
 </style>
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 8ac3d942..2e9b243c 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
@@ -5,7 +5,7 @@
 
       <div class="footer">
         <Button @click.native="onSubmit" :loading="submitting">保存</Button>
-        <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
+        <Button style="background: #0e708b" @click.native="modelVisible = false">关闭</Button>
       </div>
     </div>
   </Dialog>
@@ -72,6 +72,8 @@ export default {
         method: "GET",
       })
       let info = result.data;
+      this.stakeMark = info.stakeMark;
+      
       if (typeof info.stakeMark == "string") {
         let numbers = info.stakeMark.match(/\d+/g).map(String);
         info.stakeMark = numbers;
@@ -80,30 +82,45 @@ export default {
         info.lang = info.lang.split(",")
       }
 
-      if(info.eventSubclass && info.eventSubclass === '3-2' && info.dcEventTrafficControl && info.dcEventTrafficControl.facilityId ){
-        info.dcEventTrafficControl.facilityId  = [info.dcEventTrafficControl.facilityId]
+      if(info.eventType === 10){
+        // 起止桩号
+        if(info.dcEventAbnormalWeather.endStakeMark && typeof info.dcEventAbnormalWeather.endStakeMark == "string"){
+            let numbers = info.dcEventAbnormalWeather.endStakeMark.match(/\d+/g).map(String);
+            info.endStakeMark = numbers;
+        }
       }
-      for(let i in info){
-        if(typeof info[i] === 'object' && info[i]){
-          for(let j in info[i]){
-            if(j === 'rampId'){
-              if(info[i][j] !== null && info[i][j] !== '' && info[i][j] !== 'NaN'){
-                let aryZd = info[i][j].split(',');
-                let numZd = []
-                aryZd.forEach(e => {
-                  numZd.push(parseInt(e))
-                });
-                info[i][j] = numZd
-              } else {
-                info[i][j] = ''
-              }
-              
-            }
-          }
+      
+      if(info.eventType === 7){
+        // 起止桩号
+        if(info.dcEventConstruction.endStakeMark && typeof info.dcEventConstruction.endStakeMark == "string"){
+            let numbers = info.dcEventConstruction.endStakeMark.match(/\d+/g).map(String);
+            info.endStakeMark = numbers;
         }
       }
-
-      //修改事件信息===============开始
+      
+      
+      // 交通管制
+      if(info.eventSubclass && info.eventSubclass === '3-2' && info.dcEventTrafficControl){
+        if(info.dcEventTrafficControl.facilityId ){
+          info.dcEventTrafficControl.facilityId  = [info.dcEventTrafficControl.facilityId]
+        }
+      }
+      if(info.eventSubclass && info.eventSubclass === '3-3' && info.dcEventTrafficControl){
+        let zd = info.dcEventTrafficControl.rampId
+        if(zd !== null && zd !== '' && zd !== 'NaN'){
+          let aryZd = zd.toString().split(',');
+            let numZd = []
+            aryZd.forEach(e => {
+              numZd.push(parseInt(e))
+            });
+            
+            info.dcEventTrafficControl.rampId = numZd
+        } else {
+          info.dcEventTrafficControl.rampId = ''
+        }
+      }
+      
+      //修改事件信息 参数===============开始
       let _confirgList = _.cloneDeep(configList[info.eventName]);
 
       if(info.eventType === 3){
@@ -122,8 +139,9 @@ export default {
           type: it.facilityType,
         })
       );
-      
-      _confirgList.forEach(async (it) => {
+      // 绑定所有的服务区/立交桥/收费站等
+      for(let i = 0; i < _confirgList.length; i++) {
+        const it = _confirgList[i];
         if (it.label==='服务区:' && it.type==='select' ) { //服务区
           it.options.options = this.lwss.filter((x) => x.type == 6);
         }
@@ -132,11 +150,9 @@ export default {
           let aryKey = it.key.split('.')
           const v = info[aryKey[0]][aryKey[1]]
           if(v){
-
             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 = [];
+            let zd = [];//匝道
             zdResult.rows.forEach((it) =>
               zd.push({ key: it.id, label: it.rampName })
             );
@@ -154,9 +170,224 @@ export default {
         if (it.label==='停车区:' && it.type==='select' ) { //停车区
           it.options.options = this.lwss.filter((x) => x.type == 7);
         }
-      });
+      }
+      // 异常天气
+      if(info.eventType === 10){
+        if(info.eventSubclass === '10-2'){
+          _confirgList[1].options.options = [
+              {
+                key: "2-1",
+                label: "小雪",
+              },
+              {
+                key: "2-2",
+                label: "中雪",
+              },
+              {
+                key: "2-3",
+                label: "大雪",
+              },
+              {
+                key: "2-4",
+                label: "暴雪",
+              },
+              {
+                key: "2-5",
+                label: "大暴雪",
+              },
+              {
+                key: "2-6",
+                label: "特大暴雪",
+              },
+          ];
+        } else if(info.eventSubclass === '10-3'){
+          _confirgList[1].options.options =[
+              {
+                key: "3-1",
+                label: "轻雾",
+              },
+              {
+                key: "3-2",
+                label: "大雾",
+              },
+              {
+                key: "3-3",
+                label: "浓雾",
+              },
+              {
+                key: "3-4",
+                label: "强浓雾",
+              },
+              {
+                key: "3-5",
+                label: "团雾",
+              },
+            ];
+        }
+      }
+       //交通拥堵
+      if (info.eventType === 4){
+        if(info.dcEventTrafficCongestion.congestionCause === 1){
+          _confirgList[2].options.options =[
+          {
+            key: 1,
+            label: "主线车流量大",
+          },
+          {
+            key: 2,
+            label: "收费站出口车流量大导致主线压车",
+          },
+          ]
+        } else {
+          _confirgList[2].options.options =[{
+            key: 1,
+            label: "收费站广场拥堵导致出口压车",
+          },
+          {
+            key: 2,
+            label: "收费站设备故障",
+          },
+          {
+            key: 3,
+            label: "地方道路原因",
+          },
+          {
+            key: 4,
+            label: "省内非集团所辖高速原因",
+          },
+          {
+            key: 5,
+            label: "集团所辖道路拥堵",
+          },
+          {
+            key: 6,
+            label: "集团所辖枢纽立交异常导致主线压车",
+          },
+          {
+            key: 7,
+            label: "路侧起火",
+          },
+          {
+            key: 8,
+            label: "备注项添加",
+          }]
+        }
+      }
+      // 施工建设
+      if(info.eventType===7){
+        if(['7-6','7-7','7-8','7-9','7-10'].includes(info.eventSubclass)){
+          info.key0123 = 2;
+          _confirgList[1].options.options =[
+                  {
+                    key: "7-6",
+                    label: "道路建设施工",
+                  },
+                  {
+                    key: "7-7",
+                    label: "收费站建设施工",
+                  },
+                  {
+                    key: "7-8",
+                    label: "服务区建设施工",
+                  },
+                  {
+                    key: "7-9",
+                    label: "枢纽立交匝道建设施工",
+                  },
+                  {
+                    key: "7-10",
+                    label: "地方道路建设施工",
+                  },
+                ]
+        }
+      }
+      // 交通管制
+      if(info.eventType === 3){
+       
+        let ss = {
+            "3-1": [{label: "主线关闭",key:1}],
+            "3-2": [{label: "收费站关闭",key:6}],
+            "3-3": [{label: "立交匝道关闭",key:10}],
+            "3-4": [{label: "服务区关闭",key:14}],
+          };
+        let classi = {
+          "3-1": [
+            {label: "主线限行",key:2},
+            {label: "主线间隔放行",key:3},
+            {label: "主线并道",key:4},
+            {label: "主线限速",key:5}
+          ],
+          "3-2": [
+            {label: "收费站限行",key:7},
+            {label: "收费站分流",key:8},
+            {label: "收费站间隔放行",key:9},
+          ],
+          "3-3": [
+            {label: "立交限行",key:11},
+            {label: "立交匝道限行",key:12},
+            {label: "立交分流",key:13},
+          ],
+          "3-4": [{label: "服务区关闭",key:14}],
+        }
+        let ad = {
+          1: ss[info.eventSubclass],
+          2: classi[info.eventSubclass]||[],
+        };
+        _confirgList[2].options.options = ad[info.dcEventTrafficControl.controlType];
+
+
+        if(info.dcEventTrafficControl.controlCause === 3){
+          _confirgList[5].options.options = [
+              {
+                value: "3-1",
+                label: "雨",
+              },
+              {
+                value: "3-2",
+                label: "雪",
+              },
+              {
+                value: "3-3",
+                label: "雾",
+              },
+              {
+                value: "3-4",
+                label: "道路积水",
+              },
+              {
+                value: "3-5",
+                label: "道路湿滑",
+              },
+              {
+                value: "3-6",
+                label: "道路结冰",
+              },
+              {
+                value: "3-7",
+                label: "沙尘暴",
+              },
+          ];
+        }
+        if(info.dcEventTrafficControl.controlCause === 4){
+
+          _confirgList[5].options.options = [
+              {
+                value: "4-1",
+                label: "专项工程施工",
+              },
+              {
+                value: "4-2",
+                label: "改扩建工程施工",
+              },
+              {
+                value: "4-3",
+                label: "其他施工",
+              },
+            ]
+        }
+      }
+
       this.formConfigList = _confirgList;
-      console.log(_confirgList)
       this.fData = info;
       
       
@@ -164,13 +395,14 @@ export default {
     },
     onSubmit() {
       this.$refs.FormConfigRef.validate().then((formData) => {
-
         this.submitting = true;
         let eventType = this.infoData.eventType;
         formData.eventType = eventType;
 
         let f = formatEvent(formData, eventType);
-        
+        if(eventType === 8){
+          f.stakeMark = this.stakeMark;
+        }
         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 47809633..a647c421 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
@@ -1,9 +1,6 @@
 <template>
   <Card class="EventInformation" title="事件信息">
     <template #title-suffix>
-      <!-- <ButtonGradient class="title-button" v-if="detailData.eventState != 2">
-        查看 //根据用户权限授权
-      </ButtonGradient> -->
       <ButtonGradient
         v-if="detailData.eventState != 2"
         class="title-button"
@@ -12,24 +9,16 @@
         编写
       </ButtonGradient>
     </template>
-
     <Descriptions :list="list" :data="detailData" style="gap: 15px" />
 
     <div class="road-lane">
-      <div v-for="i in 11">
-        <!-- <img v-if="i != 6" :src="'./images/'+(detailData.lang.indexOf((i+1).toString())===-1?'normal.svg':'congestion.svg')"> -->
-        <img
-          v-if="
-            i != 6 &&
-            (!detailData.lang || !detailData.lang.includes((i-1).toString()))
-          "
-          src="./images/normal.svg"
+      <div v-for="i in 5">
+        <img :src=" detailData.direction === '菏泽方向' && detailData.lang && detailData.lang.includes(enum_lang[(i-1).toString()])?require('./images/congestion.svg'):require('./images/normal.svg')"
         />
-        <img
-          v-if="
-            i != 6 && detailData.lang && detailData.lang.includes((i-1).toString())
-          "
-          src="./images/congestion.svg"
+      </div>
+      <div></div>
+      <div v-for="i in 5">
+        <img :src=" detailData.direction === '济南方向' && detailData.lang && detailData.lang.includes(enum_lang_jn[(i-1).toString()])?require('./images/congestion.svg'):require('./images/normal.svg')"
         />
       </div>
     </div>
@@ -72,37 +61,45 @@ export default {
   },
   data() {
     return {
+      enum_lang:{
+        0:0, //应急车道
+        1:4, //最内侧车道
+        2:3, 
+        3:2,
+        4:1, //最外侧车道
+      },
+      enum_lang_jn:{
+        0:1, 
+        1:2,
+        2:3,
+        3:4,
+        4:0,
+      },
       list: [
         {
           label: "情报时间",
-          // text: '2024-01-03 14:00:21',
           key: "occurrenceTime",
           gridColumn: 2,
         },
         {
           label: "情报来源",
-          // text: '96659',
           key: "stringEventSource",
           gridColumn: 2,
         },
         {
           label: "事件类型",
-          // text: '交通事故',
           key: "eventName",
         },
         {
           label: "所属路线",
-          // text: 'G34济菏高速',
           key: "roadName",
         },
         {
           label: "道路方向",
-          // text: '菏泽方向',
           key: "direction",
         },
         {
           label: "桩号",
-          // text: "K266+001",
           key: "stakeMark",
         },
       ],
@@ -111,7 +108,7 @@ export default {
   },
   methods: {
     onEdit(){
-      this.$parent.$refs['CrowdnessIndicatorRankings'][0].active = []
+      this.$parent.$refs['CrowdnessIndicatorRankings'].active = []
       this.editEventInformationDialogVisible = true
     },    
     closeDialog() {
@@ -135,7 +132,7 @@ export default {
 
   .road-lane {
     background-image: url(./images/lane.jpg);
-    flex: 1;
+    height: 90px;
     background-repeat: no-repeat;
     background-size: 100% 100%;
     // background-size: auto auto;
@@ -153,7 +150,6 @@ export default {
   .bottom-info {
     display: flex;
     gap: 9px;
-
     .tag {
       padding: 3px 6px;
       height: 24px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/8.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/8.svg
new file mode 100644
index 00000000..f92d9aa2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/ReleaseInformation/images/8.svg
@@ -0,0 +1,17 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315142">
+<g id="Group 1142815888">
+<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="#0082EF"/>
+</g>
+</g>
+<g id="Frame" clip-path="url(#clip0_1406_428)">
+<path id="Vector" d="M13.3344 10.7874C13.1101 10.8321 12.8962 10.9187 12.704 11.0426C12.5156 11.2403 12.2777 11.384 12.015 11.4588C12.05 11.2237 12.1666 11.009 12.3427 10.8504C12.4902 10.6253 12.5964 10.3758 12.6564 10.1135C12.6561 9.97991 12.6954 9.84928 12.7694 9.73806C12.8433 9.62684 12.9485 9.54004 13.0718 9.48862C13.195 9.43719 13.3308 9.42346 13.4618 9.44915C13.5929 9.47484 13.7134 9.5388 13.8081 9.63295C13.9028 9.7271 13.9675 9.84722 13.9939 9.97812C14.0204 10.109 14.0075 10.2448 13.9568 10.3684C13.9061 10.4919 13.8199 10.5977 13.7091 10.6723C13.5983 10.7468 13.4679 10.7869 13.3344 10.7874H13.3344ZM12.0986 9.16984C11.8745 9.02132 11.6258 8.91391 11.3641 8.85263C11.2305 8.85263 11.0999 8.81302 10.9889 8.7388C10.8778 8.66458 10.7912 8.55909 10.7401 8.43567C10.689 8.31225 10.6756 8.17644 10.7016 8.04542C10.7277 7.9144 10.792 7.79405 10.8865 7.69959C10.981 7.60513 11.1013 7.5408 11.2323 7.51473C11.3634 7.48867 11.4992 7.50205 11.6226 7.55317C11.746 7.60429 11.8515 7.69087 11.9257 7.80194C11.9999 7.91302 12.0395 8.04361 12.0395 8.17719C12.0836 8.40184 12.1691 8.61631 12.2917 8.80961C12.4882 8.99953 12.6305 9.23838 12.704 9.50156C12.4705 9.4643 12.2572 9.34704 12.1006 9.16985H12.0981L12.0986 9.16984ZM10.9859 6.78929C10.7822 5.08368 9.01608 3.74731 6.87919 3.74731C4.6027 3.74731 2.7505 5.2623 2.7505 7.12551C2.76845 7.64076 2.91226 8.14378 3.16936 8.59066C3.42646 9.03754 3.78905 9.41469 4.22546 9.68918C4.36922 9.79512 4.51962 9.89171 4.67576 9.97837L4.49264 10.7093C4.55868 10.7404 4.62272 10.7734 4.69026 10.8019L5.61487 10.3396C5.74995 10.3746 5.89205 10.3971 6.03313 10.4212C6.12319 10.4372 6.21326 10.4537 6.30582 10.4647C6.88241 10.5374 7.46745 10.5038 8.03194 10.3656C8.04941 10.6158 8.09506 10.8632 8.16802 11.1031C7.74553 11.2021 7.31312 11.2527 6.87918 11.2537C6.48988 11.2515 6.10187 11.2087 5.72144 11.1261L4.04382 11.9637C3.97998 11.9963 3.90802 12.0097 3.8367 12.0023C3.76538 11.9948 3.69776 11.9668 3.64205 11.9217C3.5861 11.8768 3.54415 11.8169 3.52119 11.749C3.49823 11.6811 3.4952 11.608 3.51247 11.5384L3.81266 10.3296C3.27096 9.98512 2.82229 9.51269 2.50619 8.95394C2.19008 8.39519 2.01625 7.76727 2 7.12551C2 4.84503 4.18441 2.99683 6.87918 2.99683C9.43784 2.99683 11.5332 4.66491 11.7373 6.7853C11.6198 6.76721 11.5014 6.75552 11.3826 6.75027C11.25 6.75528 11.1174 6.76778 10.9858 6.78879L10.9859 6.78929ZM9.42734 9.45253C9.652 9.40749 9.86564 9.32144 10.0578 9.19737C10.2464 8.99993 10.4845 8.85655 10.7472 8.78209C10.7114 9.01644 10.5954 9.23111 10.419 9.38949C10.2714 9.61463 10.1653 9.8648 10.1053 10.127C10.1055 10.2605 10.0661 10.3911 9.99212 10.5022C9.91813 10.6134 9.81286 10.7001 9.6896 10.7515C9.56635 10.8028 9.43064 10.8165 9.29962 10.7907C9.1686 10.765 9.04815 10.701 8.95349 10.6068C8.85883 10.5126 8.7942 10.3925 8.76778 10.2616C8.74135 10.1308 8.75431 9.99497 8.80502 9.87145C8.85573 9.74793 8.94191 9.64221 9.05267 9.56765C9.16344 9.49308 9.29382 9.45302 9.42734 9.45253ZM10.6441 11.0776C10.8673 11.2272 11.1154 11.3353 11.3766 11.3978C11.5102 11.3978 11.6408 11.4374 11.7519 11.5116C11.8629 11.5858 11.9495 11.6913 12.0006 11.8148C12.0518 11.9382 12.0651 12.074 12.0391 12.205C12.013 12.336 11.9487 12.4564 11.8542 12.5508C11.7598 12.6453 11.6394 12.7096 11.5084 12.7357C11.3774 12.7618 11.2416 12.7484 11.1181 12.6973C10.9947 12.6461 10.8892 12.5596 10.815 12.4485C10.7408 12.3374 10.7012 12.2068 10.7012 12.0732C10.6581 11.8483 10.5733 11.6335 10.451 11.4398C10.2553 11.249 10.114 11.0095 10.0417 10.7459C10.2755 10.7843 10.4885 10.903 10.6441 11.0816V11.0776Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1406_428">
+<rect width="12" height="12" fill="white" transform="translate(2 2)"/>
+</clipPath>
+</defs>
+</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 ab7a2795..a71633cc 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,16 +2,21 @@
   <Card class="ReleaseInformation" title="信息发布">
     <Form :formList="formList" column="1" ref="FormMsgRef">
       <template #type="{ formData, data }">
-        <CheckboxGroup :options="checkboxList" v-model="checkboxValues">
+        <!-- <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`)" />
               {{ data.label }}
             </div>
           </template>
-        </CheckboxGroup>
+        </CheckboxGroup> -->
       </template>
     </Form>
+    <div class="checkbox-content" v-for="item in checkboxList">
+      <div style="color:#3de8ff">发布平台：</div>
+      <img :src="require(`./images/${item.key}.svg`)" />
+      {{ item.label }}
+    </div>
     <!-- <div class="line"></div>
 
     <Descriptions :list="list" style="flex: 1;" column="1" titleStyle="align-self: flex-start;">
@@ -24,14 +29,14 @@
     </Descriptions> -->
 
     <div class="bottom">
-      <ButtonGradient
+      <Button
         v-if="detailData.eventState != 2"
         @click.native="handleSubmit"
         :loading="submitting"
         class="title-button special-button"
       >
         一键发布
-      </ButtonGradient>
+      </Button>
       <!-- <ButtonGradient class="title-button special-button">
         发布预案
       </ButtonGradient> -->
@@ -42,6 +47,7 @@
 <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 Form from "@screen/components/FormConfig";
 import CheckboxGroup from "@screen/components/FormConfig/components/ElCheckboxGroup.vue";
 import Descriptions from "@screen/components/Descriptions.vue";
@@ -56,6 +62,7 @@ export default {
     ButtonGradient,
     CheckboxGroup,
     Form,
+    Button,
     Descriptions,
   },
   inject: ["provideData","reload"],
@@ -82,10 +89,11 @@ export default {
       checkboxValues: [],
       formData:{},
       checkboxList: [
-        { key: "2", label: "微信" },
-        { key: "1", label: "短信" },
-        { key: "5", label: "网站" },
-        { key: "3", label: "新浪" },
+        { key: "8", label: "企业微信" },
+        // { key: "2", label: "微信" },
+        // { key: "1", label: "短信" },
+        // { key: "5", label: "网站" },
+        // { key: "3", label: "新浪" },
       ],
       submitting: false,
       formList: [
@@ -96,16 +104,17 @@ export default {
           options: {
             type: "textarea",
             autosize: true,
-            autosize: { minRows: 4, maxRows: 4 },
-            showWordLimit: true,
+            maxlength:"200",
+            autosize: { minRows: 3, maxRows: 3 },
+            // showWordLimit: true,
           },
         },
-        {
-          label: "发布平台:",
-          key: "type",
-          type: "input",
-          default: [],
-        },
+        // {
+        //   label: "发布平台:",
+        //   key: "type",
+        //   type: "input",
+        //   default: [],
+        // },
       ],
     };
   },
@@ -134,7 +143,7 @@ export default {
       await this.$refs.FormMsgRef.validate()
         .then(async (res) => {
           let data = _.cloneDeep(res);
-          data.type = this.checkboxValues;
+          data.type = ['8'];//this.checkboxValues;
 
           if (data.content === null) {
             this.$message.warning(`未输入发布内容`);
@@ -181,7 +190,7 @@ export default {
       display: flex;
       flex-direction: column;
       justify-content: space-between;
-      gap: 18px;
+
     }
   }
 
@@ -190,15 +199,12 @@ export default {
     height: 100%;
     display: flex;
     align-items: start;
-    gap: 6px;
-
     > div {
       flex: 1;
       font-size: 16px;
       font-family: PingFang SC, PingFang SC;
       font-weight: 400;
       color: rgba(255, 255, 255, 0.6);
-      line-height: 19px;
       letter-spacing: 1px;
     }
 
@@ -228,7 +234,6 @@ export default {
 
   .bottom {
     display: flex;
-    gap: 9px;
     justify-content: end;
 
     .special-button {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue
index 8273974d..5640a420 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/components/AddControlEventInfoDialog/index.vue
@@ -2,9 +2,9 @@
     <Dialog v-model="modelVisible" title="新增交通管制事件" width="1100px" top="10%">
         <div class="AddControlEventInfoDialog">
             <Form class="form" ref="FormConfigRef" :formList="formConfigList" v-model="fData" labelWidth="120px" />
-
+           
             <div class="footer">
-                <Button style="background: #c9c9c9" @click.native="modelVisible = false">关闭</Button>
+                <Button style="background: #0e708b" @click.native="modelVisible = false">关闭</Button>
                 <Button :loading="submitting" @click.native="onSubmit">保存</Button>
             </div>
         </div>
@@ -18,7 +18,6 @@ import Button from "@screen/components/Buttons/Button.vue";
 import request from "@/utils/request";
 import { Message } from 'element-ui'
 
-
 import { formatEvent, configList, getFacilities } from "@screen/utils/enum_event/data.js";
 
 
@@ -83,6 +82,43 @@ export default {
             if (value && value != "3-1") {
                 getFacilities(facilityType, config)
             }
+            config[1].default = this.controlType;
+
+
+
+
+            let ss = {
+                "3-1": [{label: "主线关闭",key:1}],
+                "3-2": [{label: "收费站关闭",key:6}],
+                "3-3": [{label: "立交匝道关闭",key:10}],
+                "3-4": [{label: "服务区关闭",key:14}],
+            };
+            let classi = {
+            "3-1": [
+                {label: "主线限行",key:2},
+                {label: "主线间隔放行",key:3},
+                {label: "主线并道",key:4},
+                {label: "主线限速",key:5}
+            ],
+            "3-2": [
+                {label: "收费站限行",key:7},
+                {label: "收费站分流",key:8},
+                {label: "收费站间隔放行",key:9},
+            ],
+            "3-3": [
+                {label: "立交限行",key:11},
+                {label: "立交匝道限行",key:12},
+                {label: "立交分流",key:13},
+            ],
+            "3-4": [{label: "服务区关闭",key:14}],
+            }
+            let ad = {
+                1: ss[value],
+                2: classi[value],
+            };
+            config[2].options.options = ad[this.controlType];
+            config[2].default = ad[this.controlType][0].key
+
             this.formConfigList = config;
         },
         onSubmit() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/index.vue
index 1336f09c..94e68af2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/TrafficControl/index.vue
@@ -12,7 +12,7 @@
         封闭
       </ButtonGradient>
       <ButtonGradient
-        v-if="detailData.eventState != 2"
+        v-if="detailData.eventState != 2 && eventSubclass !=='3-4' "
         class="title-button special-button"
         @click.native="onSubmit(2)"
         style="background: linear-gradient(82deg, #ffcd48 0%, #fe861e 100%)"
@@ -64,7 +64,7 @@ export default {
   },
   methods: {
     onSubmit(value) {
-      this.$parent.$refs['CrowdnessIndicatorRankings'][0].active = []
+      this.$parent.$refs['CrowdnessIndicatorRankings'].active = []
       this.controlType = value;
       this.addControlEventInfoDialogVisible = true;
       
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
index 9fe5e5c7..57789260 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
@@ -1,64 +1,75 @@
 <template>
-  <div class="CommandDispatch" :style="{ '--row': row, height: '100%' }">
-    <component
-      :is="key"
-      v-for="(_, key) in gridAreaMap"
-      :key="key"
-      :ref="key"
-      :style="{ gridArea: gridAreaMap[key] }"
-      @fullHeight="(opacityKey) => handleFullHeight(key, opacityKey)"
-    />
+  <div class="CommandDispatch" :style="menu.isRecentOpen?'height:calc(100vh - 90px)':'height:calc(100vh - 60px)'">
+    <div class="cbeside">
+      <div style="height: 300px;"><EventInformation ref="EventInformation" /></div>
+      <div style="flex:1;"><DispatchLiaison ref="DispatchLiaison" /></div>
+      <div style="height: 200px;" v-if="flexB"><ReleaseInformation ref="ReleaseInformation" /></div>
+      <div style="height: 140px;" v-if="flexA"><TrafficControl ref="TrafficControl" /></div>
+    </div>
+    <div class="ccenter" >
+      <div v-if="isFullHeight" style="height: 300px"><CrowdnessIndicatorRankings ref="CrowdnessIndicatorRankings" /></div>
+      <div style="display: flex; width:100%;flex:1; min-height: 0px;">
+        <DisposalProcess ref="DisposalProcess" @fullHeight="(key) =>isFullHeight = !key" />
+      </div>
+    </div>
+    <div class="cbeside">
+      <div style="height: 300px;"><RealTimeVideo ref="RealTimeVideo" /></div>
+      <div style="flex:1;height:0"><DeviceControl ref="DeviceControl" /></div>
+    </div>
   </div>
 </template>
 
 <script>
 import request from "@/utils/request";
+import {  mapState } from "vuex";
 
-const files = require.context("./Cards", true, /[^/]+\/index\.vue$/);
 
-const components = files.keys().reduce((components, key) => {
-  components[key.match(/[^/]+/g)[1]] = files(key).default;
+import EventInformation from "./Cards/EventInformation/index.vue";
+import DispatchLiaison from "./Cards/DispatchLiaison/index.vue";
+import ReleaseInformation from "./Cards/ReleaseInformation/index.vue";
+import TrafficControl from "./Cards/TrafficControl/index.vue";
 
-  return components;
-}, {});
+import CrowdnessIndicatorRankings from "./Cards/CrowdnessIndicatorRankings/index.vue";
+import DisposalProcess from "./Cards/DisposalProcess/index.vue";
+
+import RealTimeVideo from "./Cards/RealTimeVideo/index.vue";
+import DeviceControl from "./Cards/DeviceControl/index.vue";
 
-const originGridArea = {
-  EventInformation: "1 / 1 / span 11 / 1", // 事件信息（左1）
-  DispatchLiaison: "12 / 1 / span 7 / 2", // 调度联络（左2）13 / 1 / span 11 / 2
-  ReleaseInformation: "19 / 1/ span 9 / 2", //信息发布（左3）
-  TrafficControl: "29 / 1 / span 5 / 2", //交通管制（左4）24 / 1 / span 10 / 2
-  CrowdnessIndicatorRankings: "1 / 2 / span 12 / 2", //地图 / 拥挤指数排名情况（中1）
-  DisposalProcess: "13 / 2 / span 21 / 2", //处置过程（中2）
-  RealTimeVideo: "1 / 3 / span 9 / 3", //实时视频（右1）
-  DeviceControl: "10 / 3 / span 24 / 3", //设备管控（右3）
-  // DisposalPlan: "17 / 1 / span 9 / 2", //处置预案（作废）
-};
 
 export default {
   name: "CommandDispatch",
   components: {
-    ...components,
+    EventInformation,
+    DispatchLiaison,
+    ReleaseInformation,
+    TrafficControl,
+    CrowdnessIndicatorRankings,
+    DisposalProcess,
+    RealTimeVideo,
+    DeviceControl
   },
   props: {
 
+  },
+  computed: {
+    ...mapState(["menu"]),
   },
   provide() {
     return {
       provideData: this.provideData,
-      reload:this.getDetail, 
+      reload:this.getDetail
     };
   },
   data() {
     return {
-      gridAreaMap: {
-        ...originGridArea,
-      },
-      row: 24,
       provideData: {
         detail: null,
       },
       detailId: "",
-      linkId: ""
+      linkId: "", 
+      isFullHeight: true,
+      flexA: true,
+      flexB: true,
     };
   },
   created() {
@@ -95,55 +106,26 @@ export default {
           if (result.code != 200) return; 
           this.provideData.detail = result.data;
           console.log("#############", this.provideData.detail);
+          if(result.data.direction){
+            result.data.direction = (result.data.direction==='1'?'菏泽方向':'济南方向')
+          }
           if (
             ["设备设施隐患", "非法上路", "施工建设", "服务区异常"].includes(
               result.data.eventName
             )
           ) {
-            const gridArea = { ...originGridArea };
             // 第一列变化
-            gridArea["DispatchLiaison"] = "12 / 1 / span 13 / 2";
-            gridArea["ReleaseInformation"] = "25 / 1 / span 9 / 2";
-            delete gridArea.TrafficControl; //交通管制（左4）24
-
+            this.flexA = false;
             if (["设备设施隐患", "非法上路"].includes(result.data.eventName)) {
               // 第三列变化
-              gridArea["DispatchLiaison"] = "12 / 1 / span 22 / 2";
-              delete gridArea.ReleaseInformation;
+              this.flexB = false
             }
-
-            this.gridAreaMap = gridArea;
           }
         })
         .catch((err) => {});
     },
-    handleFullHeight(key, opacityKey) {
-      // 还原图标
-      if (this.gridAreaMap[key] !== originGridArea[key]) {
-        this.gridAreaMap[key] = originGridArea[key];
-        if (this.$refs[opacityKey]?.[0]) {
-          this.$refs[opacityKey][0].$el.style.opacity = 1;
-          this.$refs[opacityKey][0].$el.style.pointerEvents = "auto";
-        }
-      } else {
-        let index = 0;
-        if (this.$refs[opacityKey]?.[0]) {
-          this.$refs[opacityKey][0].$el.style.opacity = 0;
-          this.$refs[opacityKey][0].$el.style.pointerEvents = "none";
-        }
-        this.gridAreaMap[key] = originGridArea[key].replace(
-          /[0-9]+/g,
-          (num) => {
-            try {
-              return { 0: "1", 2: this.row + 1 }[index] || num;
-            } catch (error) {
-            } finally {
-              index++;
-            }
-          }
-        );
-        this.gridAreaMap["DisposalProcess"] = "1 / 2 / span 33 / 2";
-      }
+    handleFullHeight(key) {
+     this.isFullHeight = key
     },
   },
 };
@@ -151,12 +133,10 @@ export default {
 
 <style lang="scss" scoped>
 .CommandDispatch {
-  padding: 24px 12px 21px 12px;
-  display: grid;
-  grid-template-columns: 1fr 2fr 1fr;
-  grid-template-rows: repeat(var(--row), 1fr);
-  gap: 18px;
-
+  padding: 5px 12px 21px 12px;
+  display: flex;
+  flex-direction: row;
+  gap: 12px;
   > div {
     transition: all 0.18s linear;
   }
@@ -174,4 +154,19 @@ export default {
     }
   }
 }
+.cbeside{
+  width: 25vw;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  gap: 10px;
+}
+.ccenter{
+  width: 50vw;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  flex-wrap: nowrap;
+}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index2.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index2.vue
new file mode 100644
index 00000000..d7347b39
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index2.vue
@@ -0,0 +1,178 @@
+<template>
+  <div class="CommandDispatch" :style="menu.isRecentOpen?'row:24;height:calc(100vh - 90px)':'row:24;height:calc(100vh - 60px)'">
+    <component
+      :is="key"
+      v-for="(_, key) in gridAreaMap"
+      :key="key"
+      :ref="key"
+      :style="{ gridArea: gridAreaMap[key] }"
+      @fullHeight="(opacityKey) => handleFullHeight(key, opacityKey)"
+    />
+  </div>
+</template>
+
+<script>
+import request from "@/utils/request";
+import {  mapState } from "vuex";
+const files = require.context("./Cards", true, /[^/]+\/index\.vue$/);
+const components = files.keys().reduce((components, key) => {
+  components[key.match(/[^/]+/g)[1]] = files(key).default;
+
+  return components;
+}, {});
+
+const originGridArea = {
+  EventInformation: "1 / 1 /  5 / 1", // 事件信息（左1）
+  DispatchLiaison: "5 / 1 / 12 / 1", // 调度联络（左2）13 / 1 / span 11 / 2
+  ReleaseInformation: "12 / 1 /18 / 1", //信息发布（左3）
+  TrafficControl: "18 / 1 / 24 / 1", //交通管制（左4）24 / 1 / span 10 / 2
+  CrowdnessIndicatorRankings: "1 / 2 / 5 / 2", //地图 / 拥挤指数排名情况（中1）
+  DisposalProcess: "5 / 2 / 24 / 2", //处置过程（中2）
+  // RealTimeVideo: "1 / 3 / span 4 / 3", //实时视频（右1）
+  // DeviceControl: "10 / 3 / span 24 / 3", //设备管控（右3）
+  // DisposalPlan: "17 / 1 / span 9 / 2", //处置预案（作废）
+};
+
+export default {
+  name: "CommandDispatch",
+  components: {
+    ...components,
+  },
+  props: {
+
+  },
+  computed: {
+    ...mapState(["menu"]),
+  },
+  provide() {
+    return {
+      provideData: this.provideData,
+      reload:this.getDetail, 
+    };
+  },
+  data() {
+    return {
+      gridAreaMap: {
+        ...originGridArea,
+      },
+      row: 24,
+      provideData: {
+        detail: null,
+      },
+      detailId: "",
+      linkId: ""
+    };
+  },
+  created() {
+    let h = window.location.href.split("=");
+    if (h.length === 2) {
+      this.detailId = window.location.href.split("=")[1];
+      localStorage.setItem('commandDispatch',this.detailId)
+    } else {
+      let id = localStorage.getItem('commandDispatch')
+      if(id && id !== ''){
+        this.detailId = id;
+      } else {
+        this.detailId = "b825c7bbf4de43cdb8f689e270adf7a1";
+      }
+    }
+    this.getDetail();
+  },
+  methods: {
+    getDetail(eventId) {
+      let _id = this.detailId
+      if(eventId && eventId !== ''){
+        _id = eventId;
+        this.linkId = eventId;
+      } else if(this.linkId !== ''){
+        _id = this.linkId;
+      }
+    
+      // 指挥调度 - 只有交通事件没有感知事件，感知事件完成后自动转为交通事件
+      request({
+        url: `/dc/system/event/eventSubclass/${_id}`,
+        method: "GET",
+      })
+        .then((result) => {
+          if (result.code != 200) return; 
+          this.provideData.detail = result.data;
+          console.log("#############", this.provideData.detail);
+          if (
+            ["设备设施隐患", "非法上路", "施工建设", "服务区异常"].includes(
+              result.data.eventName
+            )
+          ) {
+            const gridArea = { ...originGridArea };
+            // 第一列变化
+            gridArea["DispatchLiaison"] = "12 / 1 / span 13 / 2";
+            gridArea["ReleaseInformation"] = "25 / 1 / span 9 / 2";
+            delete gridArea.TrafficControl; //交通管制（左4）24
+
+            if (["设备设施隐患", "非法上路"].includes(result.data.eventName)) {
+              // 第三列变化
+              gridArea["DispatchLiaison"] = "12 / 1 / span 22 / 2";
+              delete gridArea.ReleaseInformation;
+            }
+
+            this.gridAreaMap = gridArea;
+          }
+        })
+        .catch((err) => {});
+    },
+    handleFullHeight(key, opacityKey) {
+      // 还原图标
+      if (this.gridAreaMap[key] !== originGridArea[key]) {
+        this.gridAreaMap[key] = originGridArea[key];
+        if (this.$refs[opacityKey]?.[0]) {
+          this.$refs[opacityKey][0].$el.style.opacity = 1;
+          this.$refs[opacityKey][0].$el.style.pointerEvents = "auto";
+        }
+      } else {
+        let index = 0;
+        if (this.$refs[opacityKey]?.[0]) {
+          this.$refs[opacityKey][0].$el.style.opacity = 0;
+          this.$refs[opacityKey][0].$el.style.pointerEvents = "none";
+        }
+        this.gridAreaMap[key] = originGridArea[key].replace(
+          /[0-9]+/g,
+          (num) => {
+            try {
+              return { 0: "1", 2: this.row + 1 }[index] || num;
+            } catch (error) {
+            } finally {
+              index++;
+            }
+          }
+        );
+        this.gridAreaMap["DisposalProcess"] = "1 / 2 / span 33 / 2";
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.CommandDispatch {
+  padding: 5px 12px 21px 12px;
+  display: grid;
+  grid-template-columns: 1fr 2fr 1fr;
+  grid-template-rows: repeat(var(--row), 1fr);
+  gap: 12px;
+  > div {
+    transition: all 0.18s linear;
+  }
+
+  ::v-deep {
+    .title-button {
+      border-radius: 65px;
+      font-size: 12px;
+    }
+
+    .special-button {
+      border-radius: 3px !important;
+      padding: 3px;
+      height: 26px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/components/Card/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/components/Card/index.vue
index db99fb63..b168d4cf 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/components/Card/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/components/Card/index.vue
@@ -86,6 +86,7 @@ export default {
   .left {
     img {
       width: 240px;
+      height: 170px;
     }
   }
 
@@ -111,7 +112,6 @@ export default {
         display: flex;
         align-items: center;
         position: relative;
-
         >span {
           position: absolute;
           // right: 0px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue
index 2e3daa5f..8adc394e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 路网管控 - 事件管控 - 协调调度记录 -->
   <div class='CoordinateSchedulingRecords'>
     <!-- 搜索栏 -->
     <div class="filter">
@@ -9,17 +10,22 @@
         刷新
       </ButtonGradient>
 
-      <InputSearch style="width: 402px;" :formConfigOptions="{ labelWidth: '82px' }" :formList="searchFormList" @handleSearch="handleSearch" />
+      <InputSearch style="width: 402px;" :formConfigOptions="{ labelWidth: '82px' }" :formList="searchFormList"
+        @handleSearch="handleSearch" />
     </div>
 
     <!-- 内容 -->
     <div class="body">
-      <Card v-for="item in 8" :key="item" />
+        <div class="content">
+          <div class="scrollPanel">
+            <Card v-for="item in 12" :key="item" />
+          </div>
+        </div>
     </div>
 
     <!-- 分页 -->
     <div class="footer">
-      <Pagination :total="90"  layout="total, sizes, prev, pager, next"/>
+      <Pagination :total="90" layout="total, sizes, prev, pager, next" />
     </div>
   </div>
 </template>
@@ -58,6 +64,16 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity .24s;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+
 .CoordinateSchedulingRecords {
   padding: 21px;
 
@@ -68,7 +84,7 @@ export default {
   width: 100%;
 
   .filter {
-    height: 60px;
+    height: 50px;
     display: flex;
     justify-content: space-between;
   }
@@ -76,12 +92,26 @@ export default {
   .body {
     flex: 1;
     overflow: hidden;
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    grid-gap: 24px;
-    // grid-row-gap: 9px;
-    // grid-column-gap: 9px;
-    grid-auto-rows: min-content;
+    position: relative;
+    overflow: hidden;
+
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        grid-gap: 24px;
+        grid-auto-rows: minmax(220px, max-content);
+        position: relative;
+        flex: 1;
+        overflow: auto;
+      }
+    }
   }
 
   .footer {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
index 89ccd222..e03d2454 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/data.js
@@ -30,7 +30,6 @@ export const searchFormList = [
     label: "方向:",
     key: "direction",
     type: "RadioGroup",
-    default: "1",
     options: {
       options: [
         {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
index 2519e40d..ca058190 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index.vue
@@ -20,13 +20,18 @@
 
     <!-- 内容 -->
     <div class="body">
-      <RoadStateCard
-        v-for="(item, index) in data"
-        :key="index"
-        :cardData="item"
-        :isShowLeft="false"
-        @firstBtnClick="firstBtnClick"
-      />
+      <div class="content">
+        <div class="scrollPanel">
+          <RoadStateCard
+              v-for="(item, index) in data"
+              :key="index"
+              :cardData="item"
+              :isShowLeft="false"
+              @firstBtnClick="firstBtnClick"
+            />
+        </div>
+      </div>
+      
     </div>
 
     <!-- 分页 -->
@@ -151,7 +156,6 @@ export default {
       this.eventId = id;
     },
     handleSearch(data) {
-      console.log("data", data);
       let daterange = data.daterange;
 
       let dStakeMark = data.stakeMark;
@@ -172,7 +176,6 @@ export default {
         stakeMark: stakeMark,
         endStakeMark: endStakeMark,
       };
-      console.log(this.searchData,'$$$$')
       this.initData();
     },
     handleClose() {
@@ -200,18 +203,42 @@ export default {
     .refresh-btn {
     }
   }
-
   .body {
     flex: 1;
-    overflow: auto;
-    display: grid;
-    grid-template-columns: repeat(4, 1fr);
-    grid-gap: 20px;
-    // grid-row-gap: 9px;
-    // grid-column-gap: 9px;
-    grid-auto-rows: min-content;
+    overflow: hidden;
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(5, 1fr);
+        grid-gap: 20px;
+        grid-auto-rows: min-content;
+        position: relative;
+        flex: 1;
+        overflow: auto;
+      }
+    }
   }
 
+  // .body {
+  //   flex: 1;
+  //   overflow: auto;
+  //   display: grid;
+  //   grid-template-columns: repeat(4, 1fr);
+  //   grid-gap: 20px;
+  //   // grid-row-gap: 9px;
+  //   // grid-column-gap: 9px;
+  //   grid-auto-rows: min-content;
+  // }
+
   .footer {
     margin-top: 15px;
     height: 36px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index_back.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index_back.vue
index 00528a6a..ca22737a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index_back.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/index_back.vue
@@ -159,7 +159,6 @@ export default {
       this.eventId = id;
     },
     handleSearch(data) {
-      console.log("data", data);
       let daterange = data.daterange;
 
       let dStakeMark = data.stakeMark;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
index 20e94a80..0d9dd3e0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
@@ -25,7 +25,7 @@
       <TimeLine1 :data="process" @update:tableData="updateTableData" />
     </div>
     <div class="EventDetail">
-      <Table :data="getTableData()" :show-header="false">
+      <Table :data="getTableData()" height="100%" :show-header="false">
         <ElTableColumn label="步骤" width="110" align="center">
           <template slot-scope="scope">
             {{ `${scope.$index + 1}` }}
@@ -39,7 +39,6 @@
               v-model="scope.row.phrases"
               :autosize="{ minRows: 2, maxRows: 2 }"
               :maxlength="150"
-              showWordLimit
               placeholder="请输入常用语内容"
             />
           </template>
@@ -66,7 +65,7 @@
     </div>
     <template #footer>
       <Button
-        :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
+        :style="{ backgroundColor: '#0e708b', padding: '0 24px' }"
         @click.native="modelVisible = false"
       >
         取消</Button
@@ -269,8 +268,9 @@ export default {
   display: flex;
   gap: 9px;
   width: 836px;
+  height: 500px;
+  overflow: auto;
   // height: 768px;
-  min-height: 500px;
   margin-top: 20px;
   flex-direction: column;
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue
index 6178555f..ae6d55b5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue
@@ -76,7 +76,7 @@
     </div>
     <template #footer>
       <Button
-        :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
+        :style="{ backgroundColor: '#0e708b', padding: '0 24px' }"
         @click.native="modelVisible = false"
       >
         取消</Button
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/index.vue
index 4f127a6c..df0ada75 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/index.vue
@@ -83,7 +83,7 @@ import request from "@/utils/request";
 import { Message } from "element-ui";
 
 export default {
-  name: "emergencyProcessManagement",
+  name: "EmergencyProcessManagement",
   components: {
     ButtonGradient,
     Pagination,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
index 7a032641..03503b2e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
@@ -1,23 +1,18 @@
 <template>
   <div class="Carousel">
-    <img src="./images/arrow.svg" @click="prevSlide" class="arrow" />
-
-    <VueSlickCarousel v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
-      <div v-for="(item, index) in pictures" :key="index" class="item">
-        <!-- <img :src="require(`@screen/images/${item}`)" style="height: 100%"> -->
-        <!-- <img :src="item" style="height: 100%"> -->
-        <el-image style="height: 100%" :src="item" :preview-src-list="pictures">
-        </el-image>
-      </div>
-    </VueSlickCarousel>
-
-    <VueSlickCarousel v-if="videos.length > 0" v-bind="videoSettings" ref="CarouselRef" class="vueSlickCarousel">
-      <div v-for="(item, index) in  videos " :key="index" class="item">
-        <Video style="height: 100%;" :showHeader="false" :url="item || ''" videoType="mp4" />
+    <VueSlickCarousel v-if="list.length > 0"  v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
+      <div v-for="(item, index) in  list " :key="index" class="item">
+        <el-image v-if="type==='picture'"  fit="fill" :src="item" :preview-src-list="list"></el-image>
+        <Video v-else style="height: 100%;width:100%;" :showHeader="false" :url="item || ''" videoType="mp4" />
       </div>
     </VueSlickCarousel>
-
-    <img src="./images/arrow.svg" @click="nextSlide" class="arrow" />
+    <div class="pagep" v-if="total>1">
+      <Pagination @current-change="onChange" width="'100%'"
+         :current-page.sync="pageNum" :page-size="1"
+        layout="prev, pager, next" :total="total">
+      </Pagination>
+    </div>
+    <div class="nodata" v-if="list.length === 0">暂无媒体数据</div>
   </div>
 </template>
 
@@ -28,53 +23,58 @@ import 'vue-slick-carousel/dist/vue-slick-carousel.css'
 // optional style for arrows & dots
 import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css'
 import Video from "@screen/components/Video";
+import Pagination from "@screen/components/Pagination.vue";
 
 export default {
   name: "Carousel",
-  components: { VueSlickCarousel, Video },
+  components: { 
+    VueSlickCarousel, 
+    Video,
+    Pagination,
+  },
   props: {
-    pictures: {
-      type: Array,
-      default: () => [
-        // "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        // "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
-        // "require('@screen/images/shareWith/message-active.svg')",
-        // "require('@screen/images/shareWith/message.svg')",
-        // "require('@screen/images/shareWith/website-active.svg')",
-        // "require('@screen/images/shareWith/website.svg')",
-        // "require('@screen/images/shareWith/weChat-active.svg')",
-        // "require('@screen/images/shareWith/weChat-active.svg')"
-      ]
-    },
-    videos: {
+    list: {
       type: Array,
       default: () => []
     },
+    listPage:[],
+    type: {
+      type: String,
+      default: ''
+    },
+  },
+  watch:{
+    list:{
+      handler(newVal, oldVal) {
+        this.total = newVal.length;
+        this.pageNum = 1
+      },
+      immediate:true
+    }
+    
   },
   data() {
     return {
+      total: 0,
+      pageNum: 1,
+      
       carouselItems: [],
       settings: {
         infinite: true,
         arrows: false,
         speed: 600,
-        slidesToShow: 1,
-        slidesToScroll: 1,
-        autoplay: true,
-        autoplaySpeed: 1800,
-      },
-      videoSettings: {
-        infinite: true,
-        arrows: false,
-        speed: 600,
+        dots: false,//启用点指示器      
         slidesToShow: 1,
         slidesToScroll: 1,
         autoplay: false,
         autoplaySpeed: 1800,
-      }
+      },
     }
   },
   methods: {
+    onChange(e){
+      this.$refs.CarouselRef.goTo(e-1)
+    },
     prevSlide() {
       this.$refs.CarouselRef.prev()
     },
@@ -85,24 +85,44 @@ export default {
   },
 }
 </script>
-
 <style lang="scss" scoped>
+::v-deep .el-image-viewer__wrapper{
+  z-index: 9999 !important;
+}
+</style>
+<style lang="scss" scoped>
+
 .Carousel {
   width: 100%;
   overflow: hidden;
   display: flex;
   gap: 9px;
-
+  position: relative;
+  .pagep{
+    display: flex;
+    position: absolute;
+    bottom: 5px;
+    width: 100%;
+    justify-content: center;
+    color: #fff;
+    font-size: 12px;
+   
+  }
   .vueSlickCarousel {
     flex: 1;
     overflow: hidden;
 
     ::v-deep {
+      .slick-dots{ 
+        
+      }
       .slick-list {
         height: 100%;
+        width: 100%;
 
         div {
           height: 100%;
+          width: 100%;
         }
       }
     }
@@ -110,10 +130,17 @@ export default {
     .item {
       img {
         height: 100%;
+        width: 100%;
       }
     }
   }
-
+  .nodata{
+    background-color: #1a434bbb;
+    width: 100%;
+    text-align: center;
+    line-height: 100px;
+    color: #ccccccbb;
+  }
   .arrow {
     cursor: pointer;
     width: 15px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index_v1.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index_v1.vue
new file mode 100644
index 00000000..735d5742
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index_v1.vue
@@ -0,0 +1,168 @@
+<template>
+  <div class="Carousel">
+    <img src="./images/arrow.svg" @click="prevSlide" class="arrow" v-if="pictures.length > 1 || videos.length > 1" />
+    
+    <VueSlickCarousel v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
+      <div v-for="(item, index) in pictures" :key="index" class="item" >
+        <el-image   fit="fill" :src="item" :preview-src-list="pictures">
+        </el-image>
+      </div>
+    </VueSlickCarousel>
+    
+
+    <VueSlickCarousel v-if="videos.length > 0"  v-bind="videoSettings" ref="CarouselRef" class="vueSlickCarousel">
+      <div v-for="(item, index) in  videos " :key="index" class="item">
+        <Video style="height: 100%;width:100%;" :showHeader="false" :url="item || ''" videoType="mp4" />
+      </div>
+    </VueSlickCarousel>
+
+    <div class="nodata" v-if="pictures.length === 0 && videos.length === 0">暂无媒体数据</div>
+    <img src="./images/arrow.svg" @click="nextSlide" class="arrow" v-if="pictures.length > 1 || videos.length > 1" />
+  </div>
+</template>
+
+<script>
+
+import VueSlickCarousel from 'vue-slick-carousel'
+import 'vue-slick-carousel/dist/vue-slick-carousel.css'
+// optional style for arrows & dots
+import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css'
+import Video from "@screen/components/Video";
+
+export default {
+  name: "Carousel",
+  components: { VueSlickCarousel, Video },
+  props: {
+    pictures: {
+      type: Array,
+      default: () => [
+        // "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
+        // "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
+        // "require('@screen/images/shareWith/message-active.svg')",
+        // "require('@screen/images/shareWith/message.svg')",
+        // "require('@screen/images/shareWith/website-active.svg')",
+        // "require('@screen/images/shareWith/website.svg')",
+        // "require('@screen/images/shareWith/weChat-active.svg')",
+        // "require('@screen/images/shareWith/weChat-active.svg')"
+      ]
+    },
+    videos: {
+      type: Array,
+      default: () => []
+    },
+  },
+  data() {
+    return {
+      carouselItems: [],
+      settings: {
+        infinite: true,
+        arrows: false,
+        speed: 600,
+        dots: true,//启用点指示器      
+        slidesToShow: 1,
+        slidesToScroll: 1,
+        autoplay: false,
+        autoplaySpeed: 1800,
+      },
+      videoSettings: {
+        infinite: true,
+        arrows: false,
+        speed: 600,
+        dots: true,//启用点指示器     
+        slidesToShow: 1,
+        slidesToScroll: 1,
+        autoplay: false,
+        autoplaySpeed: 1800,
+      }
+    }
+  },
+  methods: {
+    prevSlide() {
+      this.$refs.CarouselRef.prev()
+    },
+    nextSlide() {
+      // console.log('pics',this.pictures)
+      this.$refs.CarouselRef.next()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-image-viewer__wrapper{
+  z-index: 9999 !important;
+}
+</style>
+<style lang="scss" scoped>
+.Carousel {
+  width: 100%;
+  overflow: hidden;
+  display: flex;
+  gap: 9px;
+
+  .vueSlickCarousel {
+    flex: 1;
+    overflow: hidden;
+
+    ::v-deep {
+      
+      .slick-dots{ 
+        // background-color: #ff0000;
+        bottom: 0px;
+        li.slick-active{
+          button{
+            color: #fff;
+            font-size: 10px;
+            background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+          }
+        }
+        li{
+          button{
+            color: #fff;
+            font-size: 10px;
+            background: linear-gradient(180deg, #004960 0%, #004b62 100%);
+          }
+          
+          button::before{
+            content: '';
+            background-color: transparent;
+            
+          }
+        }
+        
+        
+      }
+      .slick-list {
+        height: 100%;
+        width: 100%;
+
+        div {
+          height: 100%;
+          width: 100%;
+        }
+      }
+    }
+
+    .item {
+      img {
+        height: 100%;
+        width: 100%;
+      }
+    }
+  }
+  .nodata{
+    background-color: #1a434bbb;
+    width: 100%;
+    text-align: center;
+    line-height: 100px;
+    color: #ccccccbb;
+  }
+  .arrow {
+    cursor: pointer;
+    width: 15px;
+
+    &:first-child {
+      transform: rotate(-180deg)
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
index acb1a41c..4d951f89 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
@@ -1,3 +1,7 @@
+import {
+  WarningSubclassOptions,
+  LaneOccupancyList,
+} from "@screen/utils/enum.js";
 export const _formList = [
   {
     label: "事件源:",
@@ -39,6 +43,7 @@ export const _formList = [
     label: "高速名称:",
     key: "roadName",
     type: "input",
+    default:'济菏高速',
     options: {
       disabled: true,
       placeholder: "",
@@ -62,7 +67,7 @@ export const _formList = [
       placeholder: "",
     },
     visible: (data) => {
-      return (data.actionSource !== '-1');
+      return (data.activeName !== '-1');
     },
   },
   {
@@ -91,7 +96,7 @@ export const _formList = [
       placeholder: "",
     },
     visible: (data) => {
-      return (data.actionSource !== '-1');
+      return (data.activeName !== '-1');
     },
   },
   {
@@ -149,9 +154,249 @@ export const _formList = [
       disabled: true,
       placeholder: "",
     },
+    visible: (data) => {
+      if (data?.description) {
+        return true;
+      }
+      return false;
+    },
+  },
+];
+export const _formListGz_v1 = [
+  {
+    label: "事件源:",
+    key: "stringEventSource",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "桩号:",
+    key: "stakeMark",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "行驶方向:",
+    key: "direction",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "事件类型:",
+    key: "stringEventType",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "高速名称:",
+    key: "roadName",
+    type: "input",
+    default:'济菏高速',
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "事件状态:",
+    key: "stringEventState",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "事件类型:",
+    key: "actionSource",
+    type: "input",
+    visible: (data) => {
+      return false;
+    },
+  },
+  {
+    label: "发生时间:",
+    key: "startTime",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "水膜厚度(mm):",
+    key: "waterFilmThickness",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.waterFilmThickness) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "风速:",
+    key: "windSpeed",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.windSpeed) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "能见度(m):",
+    key: "visibility",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.visibility) {
+        return true;
+      }
+      return false;
+    },
+  },
+  {
+    label: "事件描述:",
+    key: "description",
+    type: "input",
+    isAlone: true,
+    gridColumn: 3,
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+    visible: (data) => {
+      if (data?.description) {
+        return true;
+      }
+      return false;
+    },
   },
 ];
 
+export const _formListGz = [
+  {
+    label: "事件源:",
+    key: "warningSource",
+    type: "text",
+    enum: "InfoWarningSource",
+  },
+  {
+    label: "桩号:",
+    key: "stakeMark",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "行驶方向:",
+    key: "direction",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
+  {
+    label: "事件类型:",
+    key: "warningType",
+    type: "select",
+    options: {
+      disabled: true,
+      options: [
+        {value:1,label: "交通拥堵"},
+        {value:2,label: "行人"},
+        {value:3,label: "非机动车"},
+        {value:4,label: "停车"},
+        {value:5,label: "违规驾驶"},
+        {value:6,label: "路障"},
+        {value:7,label: "道路施工"},
+        {value:8,label: "异常天气"},
+        {value:9,label: "护栏碰撞"},
+        {value:10,label: "交通事故"},
+        {value:11,label: "车辆故障"},
+        {value:99,label: "其他事件"},
+      ],
+    },
+    ons: {
+      change: (value, { data }) => {
+        this.formList[4].options.options =
+        WarningSubclassOptions[value] || [];
+        data.warningSubclass = null;
+      },
+    },
+  },
+  {
+    label: "细分类型:",
+    key: "warningSubclass",
+    type: "select",
+    options: {
+      options: [],
+    },
+  },
+  {
+    label: "高速名称:",
+    key: "roadName",
+    type: "text",
+  },
+  {
+    label: "发生时间:",
+    key: "warningTime",
+    type: "text",
+  },
+  {
+    label: "持续时长:",
+    key: "duration",
+    type: "text",
+  },
+  {
+    label: "事件描述:",
+    key: "remark",
+    isAlone: true,
+    options: {
+      type: "textarea",
+      maxlength: 100,
+      autosize: { minRows: 1, maxRows: 1 },
+    },
+  },
+  {
+    label: "影响车道:",
+    key: "lane",
+    type: "CheckboxGroup",
+    isAlone: true,
+    options: {
+      options: LaneOccupancyList,
+      gap: "12px",
+    },
+  },
+]
 export const timeLine1List = [
   {
     time: "16.36",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue
index de0532c9..b582f99d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue
@@ -57,7 +57,7 @@
         >确认</Button
       >
       <Button
-        style="background: #c9c9c9; padding: 0 24px"
+        style="background: #0e708b; padding: 0 24px"
         @click.native="(modelVisible = false), (submitting = false)"
         >取消</Button
       >
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 ef4e0f74..4f6b28f1 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,32 +1,54 @@
 <template>
-  <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
-    <div class="EventDetail" :style="{
-    height: activeName == '-1' || activeName == '0' ? '480px' : '598px',
-  }">
-      <Form ref="FormConfigRef" :formList="formList" :dFormData="formData" label-width="100px" />
-
-      <div class="video-pic" v-if="formData.videoList && formData.videoList.length > 0" :style="{height: formData.component === 'VideoMulti' ? '242px' : undefined,}">
-        <component :is="formData.component" 
-          v-if="activeName != '-1'" style="height: 100%; width: 380px"
-          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0 ? formData.videoList[0] : ''" 
-          :camId="formData.upCamId" :pileNum="formData.stakeMark" rangeIndex="upCamera" :videoType="formData.videoType" />
-
-        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
-          :showHeader="false" 
-          :url="formData.videoList && formData.videoList.length > 0? formData.videoList[1]: ''
-        " :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
-          :videoType="formData.videoType" />
-
-        <Carousel v-if="activeName == '-1' && formData.videoList && formData.videoList.length > 0" style="flex: 1" :videos="formData.videoList" :pictures="[]" />
-        <Carousel v-if="activeName == '-1' && formData.pictures && formData.pictures.length > 0" style="flex: 1" :pictures="formData.pictures" :videos="[]" />
+  <!-- 事件弹窗 - 通用 -->
+  <Dialog v-model="modelVisible" style="z-index: 2050;"  title="事件详情" width="950px" top="4%">
+    <div class="EventDetail" >
+    <!-- :style="{height: activeName == '-1' || activeName == '0' ? '480px' : '598px',}" -->
+      <Form ref="FormConfigRef" :formList="formList" v-model="data" label-width="110px" />
+
+      <div class="video-pic" v-if="activeName == '-1' && [1,2,5].indexOf(data.warningSource) !== -1">
+        <div style="flex: 1; height: 100%;position: relative;">
+        <div class="radio">
+          <span @click="videoClick('downCamera')" :class="{ active: realVideo === 'downCamera' }">菏泽</span>
+          <span @click="videoClick('upCamera') " :class="{ active: realVideo === 'upCamera' }">济南</span>
+        </div>
+        <Video v-if="realVideo"
+            class="item-video"
+            :pileNum="data.stakeMark"
+            :rangeIndex="realVideo"
+            :showHeader="false"
+          />
+      </div>
+      <div style="flex: 1; height: 100%;width:0px;position: relative;">
+        <div class="radio">
+          <span @click="realType = 'video'" :class="{ active: realType === 'video' }">视频</span>
+          <span @click="realType = 'picture'" :class="{ active: realType === 'picture' }">图像</span>
+        </div>
+        <Carousel style="height: 100%;" :list="realType === 'video'?(data.videoList || []):data.pictures || []"  :type="realType" />
+      </div>
       </div>
-      <!-- <div>{{ formData.videoList[0] }}</div> -->
-      <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
-      <TimeLine2 v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" style="flex: 1" />
+      <div  v-if="(activeName == '-1' && [1,2,5].indexOf(data.warningSource) === -1) || activeName !== '-1'" class="video-stream">
+        <div class="item"> <Video
+            class="item-video"
+            :pileNum="data.stakeMark"
+            rangeIndex="upCamera"
+            :showHeader="false"
+          />
+      <span>济南方向</span></div>
+      <div class="item"> 
+          <Video
+            class="item-video"
+            :pileNum="data.stakeMark"
+             rangeIndex="downCamera"
+            :showHeader="false"
+          />
+          <span>菏泽方向</span></div>
+      </div>
+      <TimeLine1 style="width: 100%;" v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
+      <TimeLine2 style="width: 100%;height:160px;" v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" />
     </div>
 
     <!-- 确认弹窗 -->
-    <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="formData" :activeName="activeName"
+    <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="data" :activeName="activeName"
       @reInitData="() => {
     this.$emit('update:value', false);
     this.$emit('queryData', true);
@@ -34,12 +56,16 @@
     " @close="onCloseAddNew" />
 
     <template #footer>
-      <Button v-if="activeName == '-1' || activeName == '0'" style="margin-top: 30px;padding: 0 24px"
-        @click.native="onDelete">误报</Button>
-      <Button :style="{ marginTop: '30px', backgroundColor: '#C9C9C9', padding: '0 24px' }"
+      <Button :loading="submitLoading"  v-if="activeName == '-1' || activeName == '0'" style="margin-top: 30px;padding: 0 24px"
+        @click.native="onDelete">解除</Button>
+      <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"
         @click.native="modelVisible = false">取消</Button>
-      <Button v-if="activeName == '-1' || activeName == '0'" style="margin-top: 30px;padding: 0 24px"
-        @click.native="onSubmit">确认</Button>
+      <Button :loading="submitLoading" v-if="!isError && (activeName == '-1')" style="margin-top: 30px;padding: 0 24px"
+        @click.native="updateEvent">处置</Button>
+      <Button :loading="submitLoading" v-if="!isError && ( activeName == '0')" style="margin-top: 30px;padding: 0 24px"
+        @click.native="onSubmit">处置</Button>
+      <Button :loading="submitLoading"  v-if="!isError && activeName == '1'" style="margin-top: 30px;padding: 0 24px"
+        @click.native="goDispatch">处置</Button>
     </template>
   </Dialog>
 </template>
@@ -49,9 +75,9 @@ import Dialog from "@screen/components/Dialog/index";
 import TimeLine1 from "@screen/components/TimeLine/TimeLine1/index";
 import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index";
 import Form from "@screen/components/FormConfig";
-import { _formList } from "./data";
-import Video from "@screen/components/Video";
-import VideoMulti from "@screen/components/VideoMulti";
+import { _formList,_formListGz } from "./data";
+// import Video from "@screen/components/Video";
+import Video from "@screen/components/VideoMulti";
 import Carousel from "./Carousel/index.vue";
 import EventPlanDialog from "./eventPlanDialog/index.vue";
 import Button from "@screen/components/Buttons/Button.vue";
@@ -59,13 +85,34 @@ import request from "@/utils/request";
 import { Message } from "element-ui";
 var moment = require("moment");
 import {
-  getProcessNode,
+  eventDetails,
   getProcessList,
-  postProcess,
-  postCompleteEvent,
-  postNoSkipClear,
 } from "@/api/commandDispatch";
+import {
+  DirectionTypes,
+  WarningSubclassOptions,
+} from "@screen/utils/enum.js";
 
+function getDuration(warningTime) {
+  const currentTime = moment();
+  const specifiedTime = moment(warningTime);
+
+  const duration = moment.duration(currentTime.diff(specifiedTime));
+
+  const hours = Math.floor(duration.asHours());
+  const minutes = Math.floor(duration.asMinutes()) % 60;
+  const seconds = Math.floor(duration.asSeconds()) % 60;
+
+  return `${padZero(hours)}:${padZero(minutes)}:${padZero(seconds)}`;
+}
+
+function padZero(num) {
+  num = num.toString();
+  while (num.length < 2) {
+    num = "0" + num;
+  }
+  return num;
+}
 export default {
   name: "EventDetail",
   components: {
@@ -74,7 +121,6 @@ export default {
     TimeLine1,
     TimeLine2,
     Video,
-    VideoMulti,
     Carousel,
     Button,
     EventPlanDialog,
@@ -91,9 +137,11 @@ export default {
       default: () => { },
     },
   },
+ 
   data() {
     return {
-      formList: [..._formList],
+      data: {},
+      formList: [],
       isShowDialog: false,
       info: [],
       timeLine1List: [
@@ -112,23 +160,61 @@ export default {
           direction: "left",
         },
       ],
+      isError:false, //是否误报
+      submitLoading: false,
+
+      realType: 'video',
+      realVideo: 'downCamera',
     };
   },
   computed: {
     modelVisible: {
       get() {
         if (this.visible) {
+          this.isError = false
           this.getProcess();
+          if(this.activeName === '-1'){
+            _formListGz[4].options.options = WarningSubclassOptions[this.formData.warningType];
+         
+            this.formList = [..._formListGz]
+            let _data = _.cloneDeep(this.formData)
+            _data.direction=DirectionTypes[_data.direction]
+            _data.roadName = '济菏高速'
+            _data.duration = getDuration(_data.warningTime);
+            if(_data.lane){
+              _data.lane = _data.lane.toString().split(",") || []
+            }
+            this.data = _data;
+          } else {
+            this.formList = [..._formList]
+            let _data = _.cloneDeep(this.formData)
+
+             
+            _data.direction=DirectionTypes[_data.direction]
+
+            this.data = _data;
+          }
         }
         return this.visible;
       },
       set(val) {
-        this.formList = [..._formList]
+        // this.formList = [..._formList]
         this.$emit("update:value", val);
       },
     },
   },
   methods: {
+
+    videoClick(type){
+      this.realVideo = '';
+      setTimeout(() => {
+        this.realVideo = type
+      }, 300);
+    },
+    goDispatch() {
+      this.$router.push(`/control/event/commandDispatch?id=${this.formData.id}`);
+      this.modelVisible = false
+    },
     getProcess() {
       if (this.activeName == "-1" || this.activeName == "0") {
         this.timeLine1List = [];
@@ -137,31 +223,53 @@ export default {
       }
 
       let directionFlg = true;
-      getProcessList(this.formData.id).then((rows) => {
+      getProcessList(this.formData.id).then(async (rows) => {
         this.timeLine1List = [];
         this.timeLine2List = [];
 
-        this.formData?.processConfigList.forEach((it) => {
-          const process = rows.find((row) => it.nodeNode == row.processId && row.processType === 1);
+        if(this.data.processConfigList){
 
-          if (process) {
-            this.timeLine1List.push({
-              time: moment(process.operationTime || new Date()).format("HH:mm"),
-              label: it.processNode,
-              isActive: true,
-            });
-            directionFlg = !directionFlg;
-          } else {
-            this.timeLine1List.push({
-              time: "",
-              label: it.processNode,
-              isActive: false,
-            });
-          }
-        });
+            this.data.processConfigList.forEach((it) => {
+            const process = rows.find((row) => it.nodeNode == row.processId && row.processType === 1);
 
-        rows.forEach(item => {
-          this.timeLine2List.push({
+            if (process) {
+              this.timeLine1List.push({
+                time: moment(process.operationTime || new Date()).format("HH:mm"),
+                label: it.processNode,
+                isActive: true,
+              });
+              directionFlg = !directionFlg;
+            } else {
+              this.timeLine1List.push({
+                time: "",
+                label: it.processNode,
+                isActive: false,
+              });
+            }
+          });
+        }
+
+        const _resList = [];
+
+        for(let i = 0; i < rows.length; i++){
+          let item = rows[i]
+
+          if(item.processType === 3){
+            const resDetail =  await eventDetails(item.processId)
+            let _result = [];
+            if (resDetail.data?.controlResult) {
+              _result =  JSON.parse(resDetail.data.controlResult);
+              _result.forEach(ed => {
+                if(ed.result.retCode !== undefined && ed.result.retCode === "0"){
+                  ed.result.code = 200;
+                  ed.result.msg = '操作成功';
+                }
+              });
+            }
+            item.controlResult = _result
+          }
+          
+          _resList.push({
             id: item.processId,
             time: item.operationTime
               ? new Date(item.operationTime).toLocaleString()
@@ -173,17 +281,10 @@ export default {
             processName: item.processName,
             type: item.type,
             processType: item.processType,
-            /*time: moment(item.operationTime || new Date()).format(
-              "yyyy-MM-DD HH:mm:ss"
-            ),
-            name: item.operatorName,
-            desc: item.context,
-            source: item.source,
-            posts: "",
-            direction: item.source == 1 ? "right" : "left",*/
+            controlResult: item.controlResult
           });
-        })
-
+        }
+        this.timeLine2List = _resList;
       });
     },
     getProcessNode() {
@@ -214,6 +315,7 @@ export default {
     onDelete() {
       if (this.formData.id) {
         if (this.activeName == "-1") {
+          this.isError = true;
           if (this.formList[this.formList.length - 1].key !== 'relieveReason') {
             this.formList.push({
               label: "解除类型:",
@@ -259,6 +361,7 @@ export default {
           } else {
             this.$refs.FormConfigRef.validate()
               .then((result) => {
+                this.submitLoading = true;
                 request({
                   url: `/business/warning/falseAlarm`,
                   method: "post",
@@ -268,7 +371,7 @@ export default {
                     relieveReason: result.relieveReason
                   },
                 }).then((result) => {
-                  if (result.code == 200) Message.success("成功！");
+                  if (result.code == 200) Message.success("成功");
                   else Message.error(result?.msg);
                   this.modelVisible = false;
                   this.$emit("queryData", true);
@@ -276,6 +379,7 @@ export default {
                   this.$root.$emit('refresh-event');
                   //触发全局监听事件
                   this.$root.$emit('delete-event');
+                  this.submitLoading = false;
                 });
               })
               .catch((err) => {
@@ -292,70 +396,36 @@ export default {
               url: `dc/system/event/${this.formData.id}`,
               method: "delete",
             }).then((result) => {
-              if (result.code == 200) Message.success("成功！");
+              if (result.code == 200) Message.success("成功");
               else Message.error(result?.msg);
               this.modelVisible = false;
               this.$emit("queryData", true);
               //触发全局监听事件
+
+              this.$root.$emit('refresh-event');  
               this.$root.$emit('delete-event');
             });
           })
         }
       }
-
-      // 2024-05-18 修改为二次确认，增加误报类型和误报原因
-      // if (this.formData.id) {
-      //   this.$confirm("确定误报吗？", "提示", {
-      //     confirmButtonText: "确定",
-      //     cancelButtonText: "取消",
-      //     type: "warning",
-      //   }).then(() => {
-      //     if (this.activeName == "-1") {
-      //       request({
-      //         url: `/business/warning/delete`,
-      //         method: "post",
-      //         data: { id: this.formData.id },
-      //       }).then((result) => {
-      //         if (result.code == 200) Message.success("成功！");
-      //         else Message.error(result?.msg);
-      //         this.modelVisible = false;
-      //         this.$emit("queryData", true);
-      //         //触发全局监听事件
-      //         this.$root.$emit('delete-event');
-      //       });
-      //     } else {
-      //       request({
-      //         url: `dc/system/event/${this.formData.id}`,
-      //         method: "delete",
-      //       }).then((result) => {
-      //         if (result.code == 200) Message.success("成功！");
-      //         else Message.error(result?.msg);
-      //         this.modelVisible = false;
-      //         this.$emit("queryData", true);
-      //         //触发全局监听事件
-      //         this.$root.$emit('delete-event');
-      //       });
-      //     }
-      //   });
-      // }
     },
     onSubmit() {
-     
       let reData = {
         id: this.formData.id,
-        stakeMark: this.formData.stakeMark,
-        direction: this.formData.direction == '济南方向' ? 3 : 1,
-        warningType: this.formData.warningType,
-        warningSource: this.formData.warningSource,
+        stakeMark: this.data.stakeMark,
+        direction: this.data.direction == '济南方向' ? 3 : 1,
+        warningType: this.data.warningType,
+        warningSource: this.data.warningSource,
         deptId: this.formData.deptId,
-        warningTime: this.formData.warningTime,
+        warningTime: this.data.warningTime,
         warningLevel: this.formData.warningLevel,
-        warningSubclass: this.formData.warningSubclass,
+        warningSubclass: this.data.warningSubclass,
         warningTitle: this.formData.warningTitle,
-        lane: this.formData.lane,
-        remark: this.formData.remark,
+        lane: this.data.lane.join(","),
+        remark: this.data.remark,
       }
       if (this.activeName == '-1') {
+        this.submitLoading = true
         request({
           url: '/business/warning/updateWarningConvert',
           method: "post",
@@ -371,9 +441,11 @@ export default {
           setTimeout(() => {
             self.$router.push(`/control/event/commandDispatch?eventId=${self.formData.id}`);  
           }, 300);
+          this.submitLoading = false
           
         });
       } else if (this.activeName == '0') {
+        this.submitLoading = true
         request({
           url: `/dc/system/event/dcEventState/${this.formData.id}/1`,
           method: "put",
@@ -389,6 +461,7 @@ export default {
           setTimeout(() => {
             self.$router.push(`/control/event/commandDispatch?eventId=${self.formData.id}`);  
           }, 300);
+          this.submitLoading = false
         });
       } else {
         let eventId = this.formData.id;
@@ -397,7 +470,7 @@ export default {
           this.$router.push(`/control/event/commandDispatch?eventId=${eventId}`);
           // this.$router.push(`/control/event/commandDispatch`);
         })
-
+        
       }
 
     },
@@ -406,6 +479,33 @@ export default {
       this.$emit("update:value", false);
       this.$emit("queryData", true);
     },
+
+
+    updateEvent() {
+      this.submitLoading = true;
+      const self = this;
+      request({
+        url: `/perceivedEvents/warning/updateWarning`,
+        method: "post",
+        data: {
+          id: this.formData.id,
+          warningType: this.data.warningType,
+          warningSubclass: this.data.warningSubclass,
+          remark: this.data.remark,
+          lane: this.data.lane.join(","),
+        },
+      })
+        .then((result) => {
+            if (result.code != 200) return Message.error(result?.msg);
+            self.onSubmit();
+        })
+        .catch(() => {
+          // Message.error("提交失败");
+        })
+        .finally(() => {
+          this.submitLoading = false;
+        });
+    },
   },
 };
 </script>
@@ -414,15 +514,80 @@ export default {
 .EventDetail {
   display: flex;
   gap: 9px;
-  width: 836px;
+  width: 905px;
   // height: 768px;
   flex-direction: column;
-
+  justify-content: center;
+  align-items: center;
   .video-pic {
     display: flex;
-    height: 190px;
+    height: 270px;
     gap: 15px;
+    flex-direction: row;
+    width: 98%;
     justify-content: space-around;
   }
 }
+.video-stream{
+  margin-top: 10px;
+  width: 100%;
+  display: flex;
+  gap: 15px;
+  justify-content: space-around;
+
+  .item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    height: 300px;
+    align-items: center;
+    gap: 6px;
+
+    span {
+      font-size: 12px;
+    }
+
+    .item-video {
+      width: 100%;
+      flex: 1;
+      height: 100%;
+    }
+  }
+}
+.radio {
+      position: absolute;
+      right: 10px;
+      top: 30px;
+      z-index: 999;
+      background: #265A70;
+      border-radius: 41px 41px 41px 41px;
+      overflow: hidden;
+      opacity: 1;
+      border: 1px solid #3DE8FF;
+      font-size: 12px;
+      // font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      color: #FFFFFF;
+      line-height: 14px;
+      height: fit-content;
+
+      // -webkit-background-clip: text;
+      // -webkit-text-fill-color: transparent;
+
+      .active {
+        background-color: rgba(61, 232, 255, 1);
+      }
+
+      span {
+        background-color: rgba(38, 90, 112, 1);
+        padding: 4px 9px;
+        display: inline-block;
+        cursor: pointer;
+
+        &:hover {
+          background-color: rgba(61, 232, 255, 1);
+        }
+      }
+    }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue
index 33333f72..d1a5d886 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue
@@ -56,7 +56,7 @@
 
             </div>
             <template #footer v-if="type == 1">
-                <Button style="background: #C9C9C9;padding:0 24px;"
+                <Button style="background: #0e708b;padding:0 24px;"
                     @click.native="modelVisible = false, submitting = false">取消</Button>
                 <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">确认</Button>
             </template>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
index 78cfca49..037d637a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
@@ -273,7 +273,7 @@ export const eventSources = {
       },
       {
         key: "2",
-        label: "交通转接",
+        label: "交警转接",
       },
       {
         key: "3",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
index d5bbea78..db7121c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
@@ -13,7 +13,7 @@
     </div>
 
     <template #footer>
-      <Button style="background: #c9c9c9; padding: 0 24px;margin-top: 24px;"
+      <Button style="background: #0e708b; padding: 0 24px;margin-top: 24px;"
         @click.native="(modelVisible = false), (submitting = false)">取消</Button>
       <Button style="padding: 0 24px;margin-top: 24px;" @click.native="handleSubmit" :loading="submitting">保存</Button>
     </template>
@@ -166,6 +166,7 @@ export default {
           .then((result) => {
             if (result.code != 200) return Message.error(result?.msg);
             Message.success("提交成功");
+            this.$emit("queryData", true);
             this.modelVisible = false;
           })
           .catch(() => {
@@ -173,7 +174,6 @@ export default {
           })
           .finally(() => {
             this.submitting = false;
-            this.$emit("queryData", true);
           });
       });
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
index 5f52ea9f..2b11f145 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
@@ -54,7 +54,7 @@ export const tabMap = {
 };
 export const gjSearchFormList = [
   {
-    label: "事件来源:",
+    label: "事件源:",
     key: "warningSource",
     type: "select",
     options: {
@@ -86,24 +86,7 @@ export const gjSearchFormList = [
         // },
         {
           key: "7",
-          label: "气象监测器",
-        },
-      ],
-    },
-  },
-  {
-    label: "方向:",
-    key: "direction",
-    type: "RadioGroup",
-    options: {
-      options: [
-        {
-          key: "1",
-          label: "菏泽方向",
-        },
-        {
-          key: "3",
-          label: "济南方向",
+          label: "气象检测器",
         },
       ],
     },
@@ -166,6 +149,23 @@ export const gjSearchFormList = [
       ],
     },
   },
+  {
+    label: "方向:",
+    key: "direction",
+    type: "RadioGroup",
+    options: {
+      options: [
+        {
+          key: "1",
+          label: "菏泽方向",
+        },
+        {
+          key: "3",
+          label: "济南方向",
+        },
+      ],
+    },
+  },
   {
     label: "时间范围:",
     key: "daterange",
@@ -173,26 +173,149 @@ export const gjSearchFormList = [
     type: "datePicker",
     options: {
       style: "width: auto",
-      type: "datetimerange",
-      format: "yyyy-MM-dd HH:mm:ss",
-      valueFormat: "yyyy-MM-dd HH:mm:ss",
+      type: "daterange",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
     },
   },
   {
     ...station,
-    label: "桩号:",
+    label: "开始桩号:",
     required: false,
   },
+  merge(cloneDeep(station), {
+    options: {
+      options: [
+        {
+          key: "endStakeMark[0]",
+        },
+        {
+          key: "endStakeMark[1]",
+        },
+      ],
+    },
+    label: "结束桩号:",
+    required: false,
+  }),
 ];
 
 export const gzSearchFormList = [
-  PresetFormItems.eventSources,
-  merge(PresetFormItems.eventType, {
+  {
+    label: "事件源:",
+    key: "eventSource",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+        {
+          key: "1",
+          label: "96659",
+        },
+        {
+          key: "2",
+          label: "交警转接",
+        },
+        {
+          key: "3",
+          label: "道路巡查",
+        },
+        {
+          key: "4",
+          label: "视频巡查",
+        },
+        {
+          key: "5",
+          label: "视频AI",
+        },
+        {
+          key: "6",
+          label: "一键救援",
+        },
+        {
+          key: "7",
+          label: "其他",
+        },
+        {
+          key: "8",
+          label: "雷达识别",
+        },
+        {
+          key: "9",
+          label: "锥桶",
+        },
+        {
+          key: "10",
+          label: "护栏碰撞",
+        },
+        {
+          key: "11",
+          label: "扫码报警",
+        },
+        {
+          key: "12",
+          label: "非机预警",
+        },
+        {
+          key: "13",
+          label: "气象检测器",
+        },
+      ],
+    },
+  },
+  {
+    label: "事件类型:",
+    key: "eventType",
+    type: "select",
     options: {
+      options: [
+        {
+          key: "1",
+          label: "交通事故",
+        },
+        {
+          key: "2",
+          label: "车辆故障",
+        },
+        {
+          key: "3",
+          label: "交通管制",
+        },
+        {
+          key: "4",
+          label: "交通拥堵",
+        },
+        {
+          key: "5",
+          label: "非法上路",
+        },
+        {
+          key: "6",
+          label: "路障清除",
+        },
+        {
+          key: "7",
+          label: "施工建设",
+        },
+        {
+          key: "8",
+          label: "服务区异常",
+        },
+        {
+          key: "9",
+          label: "设施设备隐患",
+        },
+        {
+          key: "10",
+          label: "异常天气",
+        },
+        {
+          key: "11",
+          label: "其他事件",
+        },
+      ],
       clearable: true,
     },
-  }),
-  // PresetFormItems.eventType,
+  },
   {
     label: "方向:",
     key: "direction",
@@ -221,8 +344,8 @@ export const gzSearchFormList = [
     type: "datePicker",
     options: {
       type: "daterange",
-      format: "yyyy-MM-dd HH:mm:ss",
-      valueFormat: "yyyy-MM-dd HH:mm:ss",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
     },
   },
   {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index 37fe9242..f16e98cd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@@ -30,16 +30,21 @@
       <InputSearch ref="searchComp" style="width: 402px" :formList="searchFormList" @handleSearch="handleSearch" />
     </div>
 
-    <!-- 内容 -->
-    <div class="body" v-loading>
+    <div class="body">
+        <div class="content">
+              <!-- 内容 -->
+    <div class="scrollPanel" v-loading :style="activeName === '-1' ? 'grid-template-columns: repeat(4, 1fr);' : 'grid-template-columns: repeat(5, 1fr);'">
       <RoadStateCard v-for="(item, index) in data" :key="index" v-bind="getStateCardBind(item)"
         @firstBtnClick="firstBtnClick" @lastBtnClick="onLastBtnClick" />
-    </div>
+</div>
+      </div>
+      </div>
+  
 
     <!-- 分页 -->
     <div class="footer">
       <Pagination @current-change="getData" @size-change="onSizeChange" width="'100%'"
-        :page-sizes="[12, 16, 20, 30, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        :page-sizes="activeName === '-1' ?[12, 16, 20, 32, 48]:[15, 20, 25, 30, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
         layout="total, sizes, prev, pager, next" :total="total">
       </Pagination>
     </div>
@@ -48,7 +53,7 @@
     <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName"
       @update:value="handleClose" @queryData="queryData" />
     <!-- "新增"弹出框 -->
-    <FormEvent :visible="isShowAddNew" @close="onCloseAddNew" @queryData="queryData" />
+    <FormEvent v-if="isShowAddNew" :visible="isShowAddNew" @close="onCloseAddNew" @queryData="queryData" />
   </div>
 </template>
 
@@ -58,7 +63,6 @@ import Tabs from "@screen/components/Tabs/index.vue";
 import RoadStateCard from "@screen/components/RoadStateCard/index.vue";
 import Pagination from "@screen/components/Pagination.vue";
 import InputSearch from "@screen/components/InputSearch/index.vue";
-import EventDetailDialog from "./EventDetailDialog/index";
 import FormEvent from "./FormEvent/index";
 import { tabMap, gjSearchFormList, gzSearchFormList } from "./data";
 import request from "@/utils/request";
@@ -66,6 +70,7 @@ import { Message } from "element-ui";
 import { Loading } from 'element-ui';
 import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping, DirectionTypes as gzDirectionMapping, warningSourceMapping, warningStateMapping } from "@screen/utils/enum.js"
 import { getNearCameraNew } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import { padStart } from "lodash";
 
 // const warningSourceMapping = {
 //   1: '视频AI',
@@ -74,7 +79,7 @@ import { getNearCameraNew } from "@screen/pages/Home/components/RoadAndEvents/ut
 //   4: '护栏碰撞',
 //   5: '扫码报警',
 //   6: '非机预警',
-//   // 7: '气象监测器'
+//   // 7: '气象检测器'
 // }
 // const gzDirectionMapping = {
 //   '1': '菏泽方向',
@@ -96,7 +101,6 @@ export default {
     Pagination,
     RoadStateCard,
     InputSearch,
-    EventDetailDialog,
     FormEvent,
   },
   data() {
@@ -136,7 +140,7 @@ export default {
   created() {
     //添加全局事件监听
     this.$root.$on('refresh-event-list', this.getData);
-    this.searchFormList = gzSearchFormList;
+    this.searchFormList = gjSearchFormList;
     this.getData();
   },
   beforeDestroy() {
@@ -146,10 +150,10 @@ export default {
   methods: {
     handleSelect(activeName) {
       this.activeName = activeName;
-
       this.searchData.eventState = activeName == "-1" ? null : activeName;
-      // this.searchFormList = activeName == "-1" ? gjSearchFormList : gzSearchFormList;
-
+      this.searchData.pageSize = activeName==='-1'?12:15;
+      this.searchFormList = activeName == "-1" ? gjSearchFormList : gzSearchFormList ;;
+      this.data = [];
       this.getData(activeName);
     },
     getStateCardBind(item) {
@@ -191,9 +195,8 @@ export default {
             }
 
           })
-          // console.log('result.rows',result.rows[0])
+          // console.log('result.rows',result.rows)
           this.data = result.rows;
-
           this.total = result.total;
         });
       } else {
@@ -203,7 +206,7 @@ export default {
           params: this.searchData,
         }).then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
-
+          
           result.rows.forEach(it => {
             it.stringDirection = gzDirectionMapping[it.direction] || it.direction;
             it.stringEventType = it.stringEventType + (it.eventSubclass ? `(${it.eventSubclassName})` : '');
@@ -263,7 +266,8 @@ export default {
           let link = document.createElement("a");
           link.style.display = "none";
           link.href = url;
-          link.setAttribute("download", "事件信息列表.xlsx");
+          let name = _.find(this.panels,{key:this.activeName})
+          link.setAttribute("download", `${name.label}.xlsx`);
           document.body.appendChild(link);
           link.click();
           URL.revokeObjectURL(link.href); // 释放URL 对象
@@ -291,7 +295,7 @@ export default {
 
           data.stringEventSource = data?.warningSource ? warningSourceMapping[data.warningSource] : '';
           data.nickName = data.userName;
-          data.direction = gzDirectionMapping[data.direction] || data.direction;
+          // data.direction = gzDirectionMapping[data.direction] || data.direction;
           data.startTime = data.warningTime;
           data.stringEventState = warningStateMapping[data.warningState];
           data.stringEventType = warningTypeMapping[data.warningType];
@@ -311,7 +315,9 @@ export default {
           }
 
           data.actionSource = this.activeName
-
+          data.description = data.remark;
+          
+          
           data.videoType = "mp4";
           data.component = "Video";
           this.detailDialogFormData = data;
@@ -350,16 +356,15 @@ export default {
       this.eventDetailDialogVisible = false;
     },
     handleSearch(data) {
-      console.log("data", data);
       let daterange = data.daterange;
 
       let dStakeMark = data.stakeMark;
       let dendStakeMark = data.endStakeMark;
 
-      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : '';
+      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0].padStart(3,'0')}+${dStakeMark[1].padStart(3,'0')}` : '';
       let endStakeMark = '';
       if (dendStakeMark) {
-        endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : '';
+        endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0].padStart(3,'0')}+${dendStakeMark[1].padStart(3,'0')}` : '';
       }
 
       this.searchData = {
@@ -369,12 +374,17 @@ export default {
         eventSource: data.eventSource,
         warningSource: data?.warningSource || '',
         direction: data.direction,
-        startTime: daterange && daterange.length > 0 ? daterange[0] : "",
-        endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
-        completeTime: this.activeName == "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
-        stakeMark: stakeMark,
+        startTime: daterange && daterange.length > 0 ? (daterange[0]+' 00:00:00') : "",
+        endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? (daterange[1]+' 23:59:59') : "",
+        completeTime: this.activeName == "-1" && daterange && daterange.length > 0 ? (daterange[1]+' 23:59:59') : "",
+        
         endStakeMark: endStakeMark,
       };
+      if(this.activeName === "-1" ){
+        this.searchData.startStakeMark= stakeMark
+      } else {
+        this.searchData.stakeMark= stakeMark
+      }
       this.getData();
     },
     resultMapping(type, value) {
@@ -418,15 +428,42 @@ export default {
     }
   }
 
+  // .body {
+  //   flex: 1;
+  //   overflow: hidden;
+  //   display: grid;
+  //   height: 0px;
+  //   min-height: 0px;
+  //   grid-gap: 24px;
+  //   // grid-row-gap: 9px;
+  //   // grid-column-gap: 9px;
+  //   grid-auto-rows: min-content;
+  // }
+
   .body {
     flex: 1;
-    overflow: auto;
-    display: grid;
-    grid-template-columns: repeat(4, 1fr);
-    grid-gap: 24px;
-    // grid-row-gap: 9px;
-    // grid-column-gap: 9px;
-    grid-auto-rows: min-content;
+    overflow: hidden;
+    position: relative;
+    overflow: hidden;
+
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        grid-gap: 24px;
+        grid-auto-rows: minmax(220px, max-content);
+        position: relative;
+        flex: 1;
+        overflow-y: auto;
+        overflow-x: hidden;
+      }
+    }
   }
 
   .footer {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/StatsDialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/StatsDialogVisible/index.vue
new file mode 100644
index 00000000..3bf7c19f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/StatsDialogVisible/index.vue
@@ -0,0 +1,573 @@
+<template>
+  <Dialog v-model="modelVisible" title="收费站管制统计" style="width: 100%;z-index: 3000;">
+    <div class="search">
+      <InputSearch
+        :formList="searchFormList"
+        @handleSearch="handleSearch"
+        style="width: 502px"
+      />
+    </div>
+
+    <div class="StatsDetail">
+      <el-table
+        key="table1"
+        v-if="searchType == 2 && controlType == 1"
+        :data="tableData"
+        style="width: 100%"
+        :span-method="arraySpanMethod"
+      >
+        <el-table-column
+          prop="controlCauseName"
+          label="封闭原因"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="causeTypeName" label="" align="center">
+        </el-table-column>
+        <el-table-column label="封闭站次" align="center">
+          <el-table-column label="目标时段" width="120" align="center">
+            <el-table-column prop="num" label="站次" width="120" align="center">
+            </el-table-column>
+            <el-table-column
+              prop="numRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="去年同期时间段" align="center">
+            <el-table-column
+              prop="lastYearNum"
+              label="站次"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="lastYearNumRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="yearNumRatio"
+            label="同比（%）"
+            align="center"
+          ></el-table-column>
+        </el-table-column>
+        <el-table-column label="封闭时长" align="center">
+          <el-table-column label="目标时段" width="120" align="center">
+            <el-table-column
+              prop="minuteTime"
+              label="时长（分钟）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="timeRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="去年同期时间段" align="center">
+            <el-table-column
+              prop="lastYearTime"
+              label="时长（分钟）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="lastYearTimeRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="yearTimeRatio"
+            label="同比（%）"
+            align="center"
+          ></el-table-column>
+        </el-table-column>
+      </el-table>
+      <el-table
+        key="table2"
+        v-else-if="searchType == 2 && controlType == 2"
+        :data="tableData"
+        style="width: 100%"
+        :span-method="arraySpanMethod"
+      >
+        <el-table-column
+          prop="controlCauseName"
+          label="限行原因"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="causeTypeName" label="" align="center">
+        </el-table-column>
+        <el-table-column label="限行站次" align="center">
+          <el-table-column label="目标时段" width="120" align="center">
+            <el-table-column prop="num" label="站次" width="120" align="center">
+            </el-table-column>
+            <el-table-column
+              prop="numRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="去年同期时间段" align="center">
+            <el-table-column
+              prop="lastYearNum"
+              label="站次"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="lastYearNumRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="yearNumRatio"
+            label="同比（%）"
+            align="center"
+          ></el-table-column>
+        </el-table-column>
+        <el-table-column label="限行时长" align="center">
+          <el-table-column label="目标时段" width="120" align="center">
+            <el-table-column
+              prop="minuteTime"
+              label="时长（分钟）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="timeRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="去年同期时间段" align="center">
+            <el-table-column
+              prop="lastYearTime"
+              label="时长（分钟）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="lastYearTimeRatio"
+              label="占比（%）"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="yearTimeRatio"
+            label="同比（%）"
+            align="center"
+          ></el-table-column>
+        </el-table-column>
+      </el-table>
+      <el-table
+        key="table3"
+        v-else
+        show-summary
+        :data="facilityTableData"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="facilityName"
+          label=""
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="facilityClose" label="封闭" align="center">
+        </el-table-column>
+        <el-table-column prop="facilityRestriction" label="限行" align="center">
+        </el-table-column>
+        <!-- <el-table-column
+          prop="facilityInterval"
+          label="间隔放行"
+          align="center"
+        >
+        </el-table-column> -->
+        <el-table-column prop="total" label="合计" align="center">
+        </el-table-column>
+      </el-table>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index";
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import Table from "@screen/components/Table.vue";
+import { selectTollStation } from "@/api/event/governanceAnalysis";
+import options from "../assets/charts";
+import request from "@/utils/request";
+export default {
+  name: "StatsDetail",
+  components: {
+    Dialog,
+    InputSearch,
+    Table,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  props: {
+    visible: Boolean,
+  },
+  data() {
+    return {
+      num: 0,
+      tableData: [],
+      weatherNum: [],
+      startTime: "",
+      endTime: "",
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+      searchType: 1,
+      controlType: 1,
+      facilityIds: [],
+      facilityTableData: [],
+      searchFormList: [
+        {
+          label: "查询条件:",
+          key: "searchType",
+          required: true,
+          isAlone: true,
+          type: "RadioGroup",
+          default: 1,
+          options: {
+            type: "circle",
+            options: [
+              {
+                key: 1,
+                label: "站点",
+              },
+              {
+                key: 2,
+                label: "原因",
+              },
+            ],
+          },
+        },
+        {
+          label: "事件类型:",
+          key: "controlType",
+          required: true,
+          isAlone: true,
+          type: "RadioGroup",
+          visible: (data) => {
+            if (data.searchType == 2) {
+              return true;
+            }
+          },
+          default: 1,
+          options: {
+            type: "circle",
+            options: [
+              {
+                key: 1,
+                label: "收费站封闭",
+              },
+              {
+                key: 2,
+                label: "收费站限行",
+              },
+            ],
+          },
+        },
+        {
+          label: "选择站点:",
+          key: "facilityId",
+          required: true,
+          type: "Select",
+          options: {
+            multiple: true,
+            options: [],
+          },
+          default: [],
+          visible: (data) => {
+            if (data.searchType == 1) {
+              return true;
+            }
+          },
+        },
+        {
+          label: "日期:",
+          key: "date",
+          required: true,
+          type: "datePicker",
+          default: "",
+          options: {
+            pickerOptions: {
+              disabledDate(time) {
+                return time.getTime() > Date.now();
+              },
+            },
+            valueFormat: "yyyy-MM-dd",
+            type: "daterange",
+          },
+        },
+      ],
+      queryParams: {},
+    };
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      },
+    },
+  },
+
+  methods: {
+    getFacilityList() {
+      Promise.allSettled([
+        // 查询收费站
+        request({
+          url: `/business/facility/query`,
+          method: "get",
+        }),
+      ]).then((res) => {
+        if (res[0].status === "fulfilled" && res[0].value.code == 200) {
+          // this.searchFormList[2].options.options = res[0].value.data.map(
+          //   (item) => ({
+          //     key: item.id,
+          //     label: item.facilityName,
+          //   })
+          // );
+          let dataList = [];
+          res[0].value.data.forEach((item) => {
+            if (item.facilityType == 1) {
+              dataList.push({
+                key: item.id,
+                label: item.facilityName,
+              });
+            }
+          });
+          this.searchFormList[2].options.options = dataList;
+          this.facilityIds = res[0].value.data.map((item) => item.id);
+          this.searchFormList[2].default = dataList.map((item) => item.key);
+          
+          let currentMonth = moment().format("YYYY-MM");
+          let currentDate = moment().format("YYYY-MM-DD");
+          this.queryParams = {
+            searchType: 1,
+            facilityId: this.facilityIds,
+            date: [currentMonth + "-01", currentDate],
+          };
+          this.searchFormList[3].default = [currentMonth + "-01", currentDate];
+          this.getSelectTollStation(this.queryParams);
+        }
+      });
+    },
+    // handleResetForm(data) {
+    //   this.getSelectTollStation(data);
+    // },
+    handleSearch(data, value) {
+      if (value == "reset") {
+        data = this.queryParams;
+      }
+      this.getSelectTollStation(data);
+    },
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (this.searchType == 2) {
+        if (!row.causeTypeName) {
+          if (columnIndex === 0) {
+            return [1, 2];
+          } else if (columnIndex === 1) {
+            return [0, 0];
+          }
+        }
+        if (row.controlCauseName === "恶劣天气") {
+          if (columnIndex === 0) {
+            console.log(this.weatherNum.length);
+            if (rowIndex === 0) {
+              return [this.weatherNum.length, 1];
+            } else if (rowIndex <= this.weatherNum.length) {
+              return [0, 0];
+            }
+            // if (rowIndex === 2) {
+            //     return [7, 1];
+            // }
+            // else if (rowIndex === 3) {
+            //     return [0, 0];
+            // } else if (rowIndex === 4) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 5) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 6) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 7) {
+            //     return [0, 0];
+            // }
+            // else if (rowIndex === 8) {
+            //     return [0, 0];
+            // }
+          }
+          // this.weatherNum = 0
+        }
+      }
+    },
+    getSelectTollStation(data) {
+      let startTime = "";
+      let endTime = "";
+      if (data) {
+        startTime = data.date[0] + " 00:00:00";
+        endTime = data.date[1] + " 23:59:59";
+      } else {
+        startTime = new Date("2024-01-01 11:12:21");
+        startTime = new Date("2024-01-26 11:12:36");
+      }
+
+      var formData = new FormData();
+      this.searchType = data.searchType;
+      this.controlType = data.controlType;
+      if (data.searchType == 1) {
+        formData.append("facilityId", data.facilityId);
+      } else {
+        formData.append("controlType", data.controlType);
+      }
+      formData.append("searchType", data.searchType);
+      formData.append("startTime", startTime);
+      formData.append("endTime", endTime);
+      let weatherData = [];
+      let otherData = [];
+      selectTollStation(formData).then((res) => {
+        if (data.searchType == 2) {
+          this.weatherNum = [];
+          res.data.forEach((item) => {
+            if (item.causeTypeName) {
+              this.weatherNum.push(item.causeTypeName);
+              weatherData.push(item);
+            } else {
+              otherData.push(item);
+            }
+          });
+          this.tableData = weatherData.concat(otherData);
+        } else {
+          res.data.forEach((item) => {
+            item.total =
+              item.facilityClose +
+              item.facilityRestriction;
+              // item.facilityInterval;
+          });
+          this.facilityTableData = res.data;
+        }
+      });
+    },
+  },
+  mounted() {
+    this.getFacilityList();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  min-height: 800px;
+}
+
+.search {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+::v-deep .is-scrolling-none {
+  background: #0b6581;
+}
+
+::v-deep .el-table__empty-text {
+  color: #3ae0f8;
+}
+
+.StatsDetail {
+  // height: 770px;
+  margin: 20px 0;
+  width: 100%;
+  display: flex;
+  gap: 5px;
+}
+
+.el-table {
+  border: 1px solid #07aec6;
+  background: #0b6581;
+}
+
+::v-deep .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  background: #0b6581;
+  border: 1px solid #07aec6;
+}
+
+::v-deep .el-table th.el-table__cell > .cell {
+  color: #3de8ff;
+}
+
+::v-deep .el-table thead.is-group th.el-table__cell {
+  background: #0b6581;
+  border: 1px solid #07aec6;
+}
+
+// ::v-deep .el-table th.el-table__cell.is-leaf,
+::v-deep .el-table td.el-table__cell {
+  border: 1px solid #07aec6;
+  background: #1b586d;
+  color: #fff;
+}
+
+::v-deep .el-table tr {
+  border: 1px solid #07aec6;
+  background-color: #0b6581;
+}
+
+::v-deep
+  .el-table--enable-row-hover
+  .el-table__body
+  tr:hover
+  > td.el-table__cell {
+  background: #1b586d;
+  border: 1px solid #07aec6;
+}
+
+::v-deep .el-table::before,
+.el-table--group::after,
+.el-table--border::after {
+  background: none;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/assets/charts.js
new file mode 100644
index 00000000..73caa0a0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/assets/charts.js
@@ -0,0 +1,223 @@
+import * as echarts from "echarts";
+import icon from "./icon.svg";
+var options = {
+  tooltip: {
+    showContent: false,
+    trigger: "axis",
+    backgroundColor: "rgba(8,36,68,.7)",
+    color: "#fff",
+    textStyle: {
+      color: "#fff",
+    },
+  },
+  legend: {
+    top: "2%",
+    right: "10",
+    icon: "circle",
+    itemWidth: 8,
+    itemHeight: 8,
+    color: ["#5FD7FE", "#FC6A67"],
+    textStyle: {
+      color: "#fff",
+      fontSize: 12,
+    },
+    data: [
+      {
+        name: "收费站限行（次）",
+        itemStyle: {
+          color: "#5FD7FE",
+        },
+      },
+      {
+        name: "收费站封闭（次）",
+        itemStyle: {
+          color: "#FC6A67",
+        },
+      },
+    ],
+  },
+  grid: {
+    left: "30%",
+    right: "20%",
+    top: "10%",
+    bottom: "10%",
+    // width: "100px",
+    // overflow: "hidden",
+    containLabel: true,
+    // // scrollX: true,
+    // scrollY: true,
+    // // xAxisIndex: [0],
+    // start: 50, // 起始位置（百分比）
+    // end: 90,
+  },
+  xAxis: [
+    {
+      splitLine: {
+        show: false,
+      },
+      type: "value",
+      show: false,
+    },
+  ],
+  yAxis: [
+    {
+      splitLine: {
+        show: false,
+      },
+      axisLine: {
+        //y轴
+        show: false,
+      },
+      type: "category",
+      axisTick: {
+        show: false,
+      },
+      inverse: true,
+      data: [
+        "测试",
+        "测试1",
+        "测试2",
+        "测试3",
+        "测试4",
+        "测试5",
+        "测试6",
+        "测试7",
+        "测试8",
+        "测试9",
+      ],
+      axisLabel: {
+        color: "#fff",
+        fontSize: 14,
+        margin: 10,
+        formatter: function (value) {
+          return value + "  {flag|}";
+        },
+        rich: {
+          value: {
+            width: 20,
+            height: 20,
+            fontSize: 14,
+            padding: 10,
+            marginRight: 10,
+          },
+          flag: {
+            width: 11,
+            height: 30,
+            align: "right",
+            backgroundColor: {
+              image: icon,
+            },
+          },
+        },
+      },
+    },
+    {
+      type: "category",
+      inverse: true,
+      axisTick: "none",
+      axisLine: "none",
+      show: true,
+      axisLabel: {
+        textStyle: {
+          color: "#A7D6F4",
+          fontSize: "14",
+        },
+      },
+      // data: value,
+      //   data: [900, 380, 360, 340, 320],
+    },
+  ],
+  series: [
+    {
+      name: "收费站限行（次）",
+      type: "bar",
+      barGap: "120%",
+      barWidth: 10, // 柱子宽度
+      showBackground: true,
+      MaxSize: 0,
+      backgroundStyle: {
+        color: "#0BA7DA32",
+      },
+      label: {
+        show: true,
+        color: "#D8DCDE",
+        fontSize: 13,
+        // distance: 35, // 距离
+        formatter: "{c}次", // 这里是数据展示的时候显示的数据
+        align: "center",
+        position: [280, 0],
+      }, // 柱子上方的数值
+      itemStyle: {
+        barBorderRadius: [0, 4, 4, 0], // 圆角（左上、右上、右下、左下）
+        color: new echarts.graphic.LinearGradient(
+          1,
+          0,
+          0,
+          0,
+          [
+            {
+              offset: 0,
+              color: "#48d0ca",
+            },
+            {
+              offset: 0.5,
+              color: "#61D8FF",
+            },
+            {
+              offset: 1,
+              color: "#61D8FF00",
+            },
+          ],
+          false
+        ), // 渐变
+      },
+      data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+    },
+    {
+      name: "收费站封闭（次）",
+      type: "bar",
+      barWidth: 10, // 柱子宽度
+      showBackground: true,
+      MaxSize: 0,
+      backgroundStyle: {
+        color: "#0BA7DA32",
+      },
+      label: {
+        show: true,
+        color: "#D8DCDE",
+        fontSize: 13,
+        distance: 5, // 距离
+        formatter: "{c}次", // 这里是数据展示的时候显示的数据
+        align: "center",
+        position: [280, 0],
+      }, // 柱子上方的数值
+      itemStyle: {
+        barBorderRadius: [0, 4, 4, 0], // 圆角（左上、右上、右下、左下）
+        color: new echarts.graphic.LinearGradient(
+          1,
+          0,
+          0,
+          0,
+          [
+            {
+              offset: 0,
+              color: "#FF6969",
+            },
+            {
+              offset: 0.5,
+              color: "#FF696955",
+            },
+            {
+              offset: 1,
+              color: "#FFB90410",
+            },
+          ],
+          false
+        ), // 渐变
+      },
+      data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/assets/icon.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/assets/icon.svg
new file mode 100644
index 00000000..71fda111
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/assets/icon.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 13.91 27"><defs><style>.cls-1{fill:url(#未命名的渐变_20);}</style><linearGradient id="未命名的渐变_20" y1="13.5" x2="13.91" y2="13.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#61d8ff"/><stop offset="1" stop-color="#0ba7da" stop-opacity="0"/></linearGradient></defs><path class="cls-1" d="M5.87,27h6.65a1.39,1.39,0,0,0,1.39-1.39V1.39A1.39,1.39,0,0,0,12.52,0H5.87a1.38,1.38,0,0,0-1.3.91L.09,13a1.32,1.32,0,0,0,0,1L4.57,26.09A1.38,1.38,0,0,0,5.87,27Z"/></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/index.vue
new file mode 100644
index 00000000..e5ec64fe
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/audit/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="congestion">
+      <div class="title-top">
+        <div class="close" style="margin-right: 20px;">收费站封闭（次）</div>
+        <div class="traffic">收费站限行（次）</div>
+        <ButtonGradient class="title-button" @click.native="handleStats">
+           统计
+        </ButtonGradient>
+      </div>
+      
+
+    <div class="box" :style="menu.isRecentOpen?'height:calc(100vh - 700px)':'height:calc(100vh - 740px)'"> 
+      <div class="content">
+        <div
+          class="content-item"
+          v-for="item in tollBoothsData"
+          :key="item.facilityName"
+        >
+          <div class="content-item-left">
+            <span class="name">{{ item.facilityName }}</span>
+            <img class="icon" src="./assets/icon.svg" />
+          </div>
+          <div class="content-item-right">
+            <div
+              class="box-item"
+              :style="{
+                '--width':
+                  (item.trafficRestriction / maxRestrictionNum) * 100 + '%',
+              }"
+            >
+              <span class="num">{{ item.trafficRestriction }}次</span>
+            </div>
+            <div
+              class="box-item"
+              :style="{
+                '--width': (item.trafficClose / maxCloseNum) * 100 + '%',
+              }"
+            >
+              <span class="num">{{ item.trafficClose }}次</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <StatsDialogVisible
+      :visible="statsDialogVisible"
+      @update:value="handleClose"
+    />
+  </div>
+</template>
+
+<script>
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
+
+import {  mapState } from "vuex";
+import { tollStationAnalysis } from "@/api/event/governanceAnalysis";
+import StatsDialogVisible from "./StatsDialogVisible/index.vue";
+import icon from "./assets/icon.svg";
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: "RailWayDay",
+  components: {
+    ButtonGradient,
+    StatsDialogVisible,
+  },
+  computed: {
+    ...mapState(["menu"]),
+  },
+  data() {
+    return {
+      statsDialogVisible: false,
+      tollBoothsData: [],
+      maxRestrictionNum: null,
+      maxCloseNum: null,
+    };
+  },
+
+  created() {},
+  methods: {
+    handleStats() {
+      this.statsDialogVisible = true;
+    },
+    handleClose() {
+      this.statsDialogVisible = false;
+    },
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/trafficIncidents/exportGetTollStationAnalysis",
+        filename: name,
+      });
+    },
+    getTollStationAnalysis() {
+      return tollStationAnalysis().then((response) => {
+        this.tollBoothsData = response.data;
+        console.log(response.data)
+        this.maxRestrictionNum = Math.max.apply(
+          Math,
+          this.tollBoothsData.map((item) => {
+            return item.trafficRestriction;
+          })
+        );
+        this.maxCloseNum = Math.max.apply(
+          Math,
+          this.tollBoothsData.map((item) => {
+            return item.trafficClose;
+          })
+        );
+      });
+    },
+  },
+  async mounted() {
+    await this.getTollStationAnalysis();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.congestion {
+  width: 100%;
+  overflow: hidden;
+
+
+  .title-button {
+    width: 50px;
+   
+    border-radius: 65px;
+    font-size: 12px;
+  }
+}
+
+.charts {
+  height: 326px;
+  width: 100%;
+}
+  .title-top {
+    width: 100%;
+    font-size: 12px;
+    color: #fff;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin-bottom: 15px;
+    .traffic:before {
+      content: "";
+      display: block;
+      position: relative;
+      top: 13px;
+      left: -15px;
+      width: 8px;
+      height: 8px;
+      background: #5fd7fe;
+      border-radius: 50%;
+      opacity: 1;
+    }
+
+    .close:before {
+      content: "";
+      display: block;
+      position: relative;
+      top: 13px;
+      left: -15px;
+      width: 8px;
+      height: 8px;
+      background: #fc6a67;
+      border-radius: 50%;
+      opacity: 1;
+    }
+  }
+.box {
+  width: 100%;
+  padding: 0px 20px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  opacity: 1;
+
+  .content {
+    .content-item {
+      margin: 15px 0px;
+      display: flex;
+
+      .content-item-left {
+        display: flex;
+
+        .name {
+          width: 50px;
+          color: #fff;
+          font-size: 14px;
+          margin-right: 10px;
+          display: flex;
+          justify-content: end;
+          align-items: center;
+        }
+
+        .icon {
+          width: 12px;
+          height: 27px;
+          margin-right: 5px;
+        }
+      }
+
+      .content-item-right {
+      }
+    }
+
+    .box-item {
+      position: relative;
+
+      height: 8px;
+      width: 289px;
+      background: linear-gradient(
+        180deg,
+        rgba(11, 167, 218, 0.1) 0%,
+        rgba(79, 211, 255, 0.1) 100%
+      );
+      border-radius: 2px 2px 2px 2px;
+    }
+
+    .box-item:nth-child(1) {
+      margin-bottom: 10px;
+    }
+
+    .box-item:nth-child(1)::before {
+      content: "";
+      position: absolute;
+      top: 0;
+      height: 8px;
+      width: var(--width);
+      background: linear-gradient(
+        90deg,
+        rgba(97, 216, 255, 0) 0%,
+        #60d7ff 100%
+      );
+      border-radius: 2px 2px 2px 2px;
+      opacity: 1;
+      overflow: hidden;
+    }
+
+    .box-item:nth-child(2)::before {
+      content: "";
+      position: absolute;
+      top: 0;
+      height: 8px;
+      width: var(--width);
+      background: linear-gradient(
+        90deg,
+        rgba(255, 185, 4, 0) 0%,
+        rgba(255, 105, 105, 1) 100%
+      );
+      border-radius: 2px 2px 2px 2px;
+      opacity: 1;
+      overflow: hidden;
+    }
+
+    .num {
+      width: 50px;
+      position: absolute;
+      left: 100%;
+      top: -5px;
+      margin-left: 10px;
+      font-size: 12px;
+      color: #fff;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/cmodel/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/cmodel/charts.js
new file mode 100644
index 00000000..606fec26
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/cmodel/charts.js
@@ -0,0 +1,177 @@
+const sxnja = [400, 400, 400];
+const sxnja2 = [700, 700, 700];
+
+// const minNumber = 90;
+// const minArray = [];
+// sxnja.map((value) => {
+//   minArray.push(parseFloat((value - minNumber).toFixed(2)));
+// });
+// console.log(minArray);
+let xaxisData = ["客车", "货车", "专项车"];
+
+var options = {
+  title: {
+    // text: "单位/%",
+    top: "4%",
+    left: "3%",
+    textStyle: {
+      fontSize: "10px",
+      fontWeight: 300,
+      color: "#B5C5D4",
+      opacity: 0.8,
+    },
+  },
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    formatter: function (params) {
+      let mark = ''
+      params.forEach(e => {
+        mark += e.marker + e.seriesName + '：'+e.value+'<br />'
+      });
+      return `<div>${params[0].name}</div>${mark}`;
+    },
+  },
+  legend: {
+    // orient: 'vertical',
+    icon: "circle",
+    itemHeight: 8,
+    itemWidth: 8,
+    top: "0%",
+
+    right: "0%",
+    textStyle: {
+      // fontSize: 12,
+      color: "#fff",
+    },
+  },
+  grid: {
+    left: "1%",
+    right: "2%",
+    top: "60px",
+    bottom: "0%",
+    containLabel: true,
+  },
+  xAxis: {
+    type: "category",
+    data: [],
+    axisLine: {
+      show: true,
+      lineStyle: {
+        width: 1,
+        color: "#2A6278",
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: "#E5E7E8",
+      fontSize: "10px",
+      interval: 0,
+    },
+  },
+  yAxis: [
+    {
+      type: "value",
+      name: "（起）",
+
+      nameTextStyle: {
+        color: "#E5E7E8",
+        fomtSize: 10,
+      },
+      axisLine: {
+        show: false,
+        lineStyle: {
+          width: 1,
+          color: "#545454",
+        },
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: "#B2C2D3",
+          opacity: 0.3,
+          type: "dotted",
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        color: "#E5E7E8",
+        fontSize: "10px",
+        formatter: (value) => {
+          return value;
+          //  + minNumber;
+        },
+      },
+      // minInterval: 1,
+    },
+    {
+      type: "value",
+      name: "(分钟)",
+
+      nameTextStyle: {
+        color: "#E5E7E8",
+        fomtSize: 10,
+      },
+      axisLine: {
+        show: false,
+      },
+      splitLine: {
+        show: false,
+        lineStyle: {
+          color: "#2A6278",
+          opacity: 0.3,
+          type: "dotted",
+        },
+      },
+      // minInterval: 1,
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        color: "#E5E7E8",
+        fontSize: "10px",
+        formatter: (value) => {
+          return value;
+          //  + minNumber;
+        },
+      },
+    },
+  ],
+  series: [
+    {
+      name: "事件数量",
+      data: sxnja2,
+      type: "pictorialBar",
+      symbol: "roundRect",
+      symbolRepeat: true,
+      symbolSize: [12, 5],
+      // symbolOffset: symbolOffset,
+      // barWidth:'40%',
+      itemStyle: {
+        color: "#51BFA4",
+        align: "right",
+      },
+    },
+    {
+      barGap: "10%",
+      name: "平均处置时长",
+      yAxisIndex: 1,
+      data: sxnja,
+      type: "pictorialBar",
+      symbol: "roundRect",
+      symbolRepeat: true,
+      symbolSize: [12, 5],
+      // symbolOffset: symbolOffset,
+      // barWidth:'40%',
+      itemStyle: {
+        color: "#08BAF4",
+      },
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/cmodel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/cmodel/index.vue
new file mode 100644
index 00000000..af10a129
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/cmodel/index.vue
@@ -0,0 +1,68 @@
+<template>
+ <div class="chartsCModel "id="chartsCModel"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsOptions from "./charts";
+import {
+  selectAccidentVehicle,
+} from "@/api/event/governanceAnalysis";
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: "ChartsCModel",
+  data() {
+    return {
+      dataList: [],
+    };
+  },
+  created() {},
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/trafficIncidents/exportSelectAccidentVehicleAnalysis",
+        filename: name,
+        data: this.data
+      });
+    },
+    bind(formData){
+      if(formData){
+        this.data = {}
+        formData.keys().forEach(x=>{
+          this.data[x] = formData.get(x)
+        })
+        if(!this.myChart){
+          this.myChart = echarts.init(document.getElementById("chartsCModel"));
+        }
+            selectAccidentVehicle(formData).then((res) => {
+            // console.log("______", res.data)
+              let typeNameData = [];
+              let numData = [];
+              let avgTimeData = [];
+              res.data.forEach((item) => {
+                typeNameData.push(item.typeName);
+                numData.push(item.num);
+                avgTimeData.push(item.avgTime);
+              });
+              chartsOptions.series[0].data = numData; //事件数量（起）
+              chartsOptions.series[1].data = avgTimeData; //平均处置时长（分钟）
+              chartsOptions.xAxis.data = typeNameData;
+              
+              this.myChart.setOption(chartsOptions);
+          })
+      }
+    }
+  },
+  mounted() {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chartsCModel {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue
index 332c406b..dd41b700 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue
@@ -133,7 +133,10 @@ export default {
     },
   },
   async mounted() {
-    await this.getTollStationAnalysis();
+    this.$nextTick(()=>{
+      this.getTollStationAnalysis();
+    })
+    
     // const myChart = echarts.init(document.getElementById('auditAnalytics'));
     // myChart.setOption(chartsStatistics);
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/topComponent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/topComponent/index.vue
index d330a05a..e8d5433a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/topComponent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/topComponent/index.vue
@@ -1,15 +1,16 @@
 <template>
-  <div class="TrafficFlow">
+  <div class="TrafficFlow2">
     <section class="foot">
-      <div class="item keep-ratio" v-for="(item, index) in topDatas">
-        <div class="line"></div>
-        <div class="item-title">
-          <span>
-            {{ item.eventName }} <span class="num">{{ item.total }}</span
-            >起</span
-          >
-        </div>
-        <div class="item-body">
+      <template  v-for="(item, index) in topDatas">
+        <div class="line" v-if="index !== 0"></div>
+        <div class="item">
+          <div class="item-title">
+            <span>
+              {{ item.eventName }} <span class="num">{{ item.total }}</span
+              >起</span
+            >
+          </div>
+          <div class="item-body">
           <div
             class="left"
             :style="{
@@ -20,17 +21,18 @@
 
           <div class="text-right">
             <div class="text">
-              已处理 <span class="num">{{ item.finished }}</span> 起
+              已处理 <span class="num" :style="item.finished==='0'?'opacity: .3;':''">{{ item.finished }}</span> 起
             </div>
             <div class="text">
-              处理中 <span class="num">{{ item.processing }}</span> 起
+              处理中 <span class="num" :style="item.processing==='0'?'opacity: .3;':''">{{ item.processing }}</span> 起
             </div>
             <div class="text">
-              待处理 <span class="num">{{ item.unconfirmed }}</span> 起
+              待处理 <span class="num" :style="item.unconfirmed==='0'?'opacity: .3;':''">{{ item.unconfirmed }}</span> 起
             </div>
           </div>
         </div>
       </div>
+      </template>
     </section>
   </div>
 </template>
@@ -154,7 +156,7 @@ export default {
   width: 99%;
 }
 
-.TrafficFlow {
+.TrafficFlow2 {
   width: 100%;
   height: 182px;
   display: inline-flex;
@@ -163,7 +165,7 @@ export default {
   color: white;
   background: linear-gradient(180deg, rgba(6, 66, 88, 0) 0%, #06425804 93%);
   border-radius: 0px 0px 0px 0px;
-
+  
   .item:nth-child(11) .line {
     display: none;
   }
@@ -171,9 +173,11 @@ export default {
   .foot {
     display: inline-flex;
     flex-direction: row;
+    align-items: center;
     width: 100%;
     height: 100%;
-    background: linear-gradient(180deg, rgba(6, 66, 88, 0) 40%, #064258 93%);
+    background-color: #132d38;
+    // background: linear-gradient(180deg, rgba(6, 66, 88, 0) 40%, #064258 93%);
 
     .item {
       position: relative;
@@ -192,11 +196,12 @@ export default {
         flex-direction: row;
         justify-content: center;
         align-items: center;
-        background: linear-gradient(
-          180deg,
-          rgba(3, 60, 82, 0) 0%,
-          #033c52 100%
-        );
+        // background: linear-gradient(
+        //   180deg,
+        //   rgba(3, 60, 82, 0) 0%,
+        //   #033c52 100%
+        // );
+        background-color: #033c52;
         border-radius: 4px 4px 4px 4px;
         font-size: 16px;
         font-family: PingFang SC, PingFang SC;
@@ -246,18 +251,10 @@ export default {
           background-position: center;
           transition: all 0.18s linear;
 
-          &::before {
-            content: "";
-            position: absolute;
-            width: 45px;
-            height: 45px;
-            border: 1px solid rgba(0, 209, 255, 0.5);
-            background-color: var(--bgColor);
-            border-radius: 50%;
-            z-index: -1;
-          }
+          border-radius: 50%;
+          background-color: var(--bgColor);
+          border: 1px solid rgba(0, 209, 255, 0.5);
         }
-
         .text-right {
           display: inline-flex;
           flex-direction: column;
@@ -280,11 +277,8 @@ export default {
     }
 
     .line {
-      position: absolute;
       width: 2px;
       height: 120px;
-      top: 25px;
-      left: 180px;
       background: url("~@screen/images/divide.svg");
       background-repeat: no-repeat;
       background-size: 100% 100%;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/ctimer/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/ctimer/charts.js
new file mode 100644
index 00000000..6e8d4bb8
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/ctimer/charts.js
@@ -0,0 +1,354 @@
+import * as echarts from "echarts";
+
+// let xData = [
+//   "大学城-长清",
+//   "长清-孝里",
+//   "孝里-平阴北",
+//   "平阴北-平阴",
+//   "平阴-平阴南",
+//   "平阴南-东平",
+//   "东平-梁山东",
+//   "梁山东-梁山",
+//   "梁山-嘉祥西",
+//   "梁山东-梁山",
+// ];
+let data1 = [200, 530, 920, 400, 600, 700, 300, 800];
+let data2 = [120, 340, 750, 600, 400, 700, 900, 200];
+let data3 = [200, 530, 920, 400, 600, 700, 300, 800];
+let options = {
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    formatter: function (params) {
+      let mark = ''
+      params.forEach((e,index) => {
+        mark += e.marker + e.seriesName + '：'+e.value+(params.length-1 === index?'公里':'起')+'<br />'
+      });
+      return `<div>${params[0].name}</div>${mark}`;
+    },
+  },
+  grid: {
+    left: "10px",
+    right: "10px",
+    top: "70px",
+    bottom: "0px",
+    containLabel: true,
+  },
+  xAxis: {
+    data: [],
+    show: true,
+    axisTick: {
+      show: false,
+      lineStyle: {
+        color: "#fff",
+      },
+    },
+    axisLine: {
+      lineStyle: {
+        color: "#2A6278",
+      },
+    },
+    axisLabel: {
+      interval: 1,
+      align: "center",
+      rotate: "1",
+      margin: 30,
+      textStyle: {
+        fontSize: 10,
+        color: "#E5E7E8",
+      },
+      formatter: (value) => {
+        return value.split("-").join("\n\n");
+      },
+    },
+  },
+  yAxis: [
+    {
+      name: "(起)",
+      nameTextStyle: {
+        color: "#E5E7E8",
+        fomtSize: 10,
+      },
+      axisLine: {
+        lineStyle: {
+          color: "#1C82C5",
+        },
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: "#2A6278",
+          type: "solid",
+        },
+      },
+      axisLabel: {
+        show: true,
+        color: "#E5E7E8",
+        textStyle: {
+          fontSize: 10,
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+    },
+    {
+      name: "  (公里)",
+      nameTextStyle: {
+        color: "#E5E7E8",
+        fomtSize: 10,
+      },
+      axisLine: {
+        lineStyle: {
+          color: "#1C82C5",
+        },
+      },
+      splitLine: {
+        show: false,
+        lineStyle: {
+          color: "#2A6278",
+          type: "solid",
+        },
+      },
+      axisLabel: {
+        color: "#E5E7E8",
+        textStyle: {
+          fontSize: 10,
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+    },
+  ],
+  legend: {
+    // orient: 'vertical',
+    // icon: "circle",
+    itemHeight: 8,
+    itemWidth: 8,
+    top: "0",
+    right: "2%",
+    textStyle: {
+      color: "#fff",
+    },
+
+    data: [
+      {
+        name: "事故总量",
+        icon: "circle",
+        itemStyle: {
+          color: "#02A0F8",
+        },
+      },
+      {
+        name: "百公里事故总量",
+        icon: "circle",
+        itemStyle: {
+          color: "#01CFEB",
+        },
+      },
+      {
+        name: "去年事故总量",
+        icon: "circle",
+        itemStyle: {
+          color: "#33C691",
+        },
+      },
+      {
+        name: "路段里程数",
+        itemStyle: {
+          color: "#E2BA74",
+        },
+      },
+    ],
+  },
+  series: [
+    {
+      name: "事故总量",
+      type: "bar",
+      barWidth: "10px",
+      selectedMode: false,
+      select: {
+        itemStyle: {
+          opacity: 1,
+          color: function (params) {
+            var a = params;
+
+            return new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: "#1AC5FD", // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: "#003B4E", // 100% 处的颜色
+                },
+              ],
+              false
+            );
+          },
+        },
+      },
+      itemStyle: {
+        barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+        // lenged文本
+        opacity: 1,
+        color: function (params) {
+          var a = params.name;
+          // console.log("==========a=============", a);
+          return new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: "#00A3FF", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "#00A3FF00", // 100% 处的颜色
+              },
+            ],
+            false
+          );
+        },
+      },
+      data: data1,
+    },
+    // 下半截柱状图linear-gradient(180deg, #61D8FF 0%, #003B4E 100%); linear-gradient(180deg, #06D7B1 0%, #003B4E 100%)
+    {
+      name: "百公里事故总量",
+      type: "bar",
+      barWidth: "10px",
+      barGap: "120%",
+      selectedMode: false,
+      select: {
+        itemStyle: {
+          opacity: 1,
+          color: function (params) {
+            var a = params;
+
+            return new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: "#E4BB53", // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: "#01D2EE", // 100% 处的颜色
+                },
+              ],
+              false
+            );
+          },
+        },
+      },
+      itemStyle: {
+        // lenged文本
+        barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+        opacity: 1,
+        color: function (params) {
+          var a = params.name;
+          return new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: "#01D2EE", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "#01D2EE00", // 100% 处的颜色
+              },
+            ],
+            false
+          );
+        },
+      },
+      data: data2,
+    },
+    {
+      name: "去年事故总量",
+      type: "bar",
+      barWidth: "10px",
+      selectedMode: false,
+      select: {
+        itemStyle: {
+          opacity: 1,
+          color: function (params) {
+            var a = params;
+
+            return new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: "#1AC5FD", // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: "#003B4E", // 100% 处的颜色
+                },
+              ],
+              false
+            );
+          },
+        },
+      },
+      itemStyle: {
+        barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+        // lenged文本
+        opacity: 1,
+        color: function (params) {
+          var a = params.name;
+          return new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: "#32BB8A", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "#32BB8A00", // 100% 处的颜色
+              },
+            ],
+            false
+          );
+        },
+      },
+      data: data3,
+    },
+    {
+      name: "路段里程数",
+      stack: "我不叠加", //添加stack属性，相同的stack值的数据类型将会叠加不并列，值为自定义值
+      type: "line", //换为line 实现折线与柱状图
+      data: data1,
+      yAxisIndex: 1,
+      color: "#E2BA74",
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/ctimer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/ctimer/index.vue
new file mode 100644
index 00000000..7eb1d3a9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/ctimer/index.vue
@@ -0,0 +1,74 @@
+<template>
+ <div class="chartsTimer "id="chartsTimer"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsOptions from "./charts";
+import { exportFile } from "@screen/utils/common";
+
+import {
+  selectRoadSection,
+} from "@/api/event/governanceAnalysis";
+export default {
+  name: "ChartsTimer",
+  data() {
+    return {
+      dataList: [],
+    };
+  },
+
+  created() {},
+  methods: {
+
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/trafficIncidents/exportSelectRoadSectionAnalysis",
+        filename: name,
+        data: this.data
+      });
+    },
+    bind(formData){
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("chartsTimer"));
+      }
+      this.data = {}
+      if(formData){
+        formData.keys().forEach(x=>{
+          this.data[x] = formData.get(x)
+        })
+        selectRoadSection(formData).then((res) => {
+            let sectionNameData = [];
+            let avgNumData = [];
+            let lastNumData = [];
+            let numData = [];
+            let mileageData = [];
+            res.data.forEach((item) => {
+              avgNumData.push(item.avgNum);
+              lastNumData.push(item.lastNum);
+              numData.push(item.num);
+              mileageData.push(item.mileage);
+              sectionNameData.push(item.section_name);
+            });
+            chartsOptions.series[0].data = numData; //事故总量
+            chartsOptions.series[1].data = avgNumData; //百公里事故总量
+            chartsOptions.series[2].data = lastNumData; //去年事故总量
+            chartsOptions.series[3].data = mileageData; //路段里程数
+            chartsOptions.xAxis.data = sectionNameData;
+            this.myChart.setOption(chartsOptions);
+          })
+      }
+    }
+  },
+  mounted() {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chartsTimer {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/days/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/days/charts.js
new file mode 100644
index 00000000..f23ac14f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/days/charts.js
@@ -0,0 +1,149 @@
+/* 数据 */
+var options = {
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
+  },
+  legend: {
+    icon: "circle",
+    itemHeight: 8,
+    itemWidth: 8,
+    fontSize: 12,
+    top: "5%",
+    x: "right",
+    textStyle: {
+      color: "#E5E7E8",
+    },
+    color: ["#51BFA4", "#E2BA74"],
+  },
+  grid: {
+    top: "60px", //上边距
+    right: "0", //右边距
+    left: "10px", //左边距
+    bottom: "10px", //下边距
+    containLabel: true,
+  },
+  xAxis: {
+    type: "category",
+    data: [],
+    axisTick: {
+      show: false, //隐藏X轴刻度
+    },
+    axisLine: {
+      lineStyle: {
+        color: "#2A6278",
+      },
+    },
+    axisLabel: {
+      show: true,
+      color: "#E5E7E8",
+      fontSize: 10,
+      fontFamily: "Source Han Sans CN-Regular",
+    },
+  },
+  yAxis: [
+    {
+      type: "value",
+      name: "（起）",
+      nameTextStyle: {
+        color: "#E5E7E8",
+        fomtSize: 10,
+      },
+      // splitNumber: 5,
+      // nameTextStyle: {
+      //   color: "#BDC4C7",
+      //   fontSize: 10,
+      //   fontFamily: "Source Han Sans CN-Regular",
+      //   align: "left",
+      //   verticalAlign: "center",
+      // },
+      axisLabel: {
+        fontSize: 10,
+        color: "#E5E7E8",
+        fontFamily: "HarmonyOS Sans-Regular",
+      },
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        lineStyle: {
+          color: "#2A6278",
+        },
+      },
+    },
+  ],
+  series: [
+    {
+      name: "感知事件",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#32BB8A99" },
+            { offset: 1, color: "#32BB8A00" },
+          ],
+          global: false,
+        },
+      },
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#51BFA4",
+      },
+      lineStyle: {
+        width: 2,
+      },
+
+      data: [5, 20, 40, 15, 20], // 折线图的数据
+    },
+    {
+      name: "交通事件",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#E2BA74",
+      },
+      lineStyle: {
+        width: 2,
+      },
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#E2BA7490" },
+            { offset: 1, color: "#E2BA7400" },
+          ],
+          global: false,
+        },
+      },
+      data: [5, 20, 30, 15, 20], // 折线图的数据
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/days/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/days/index.vue
new file mode 100644
index 00000000..06d8c6df
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/days/index.vue
@@ -0,0 +1,73 @@
+<template>
+ <div class="chartsDays" id="chartsDays"></div>
+</template>
+  
+<script>
+import * as echarts from "echarts";
+import chartsStatistics from "./charts";
+import { eventTrend } from "@/api/event/governanceAnalysis"
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: 'chartsDays',
+  components: {
+    
+  },
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/trafficIncidents/exportGetEventTrend",
+        filename: name,
+        data: {},
+      });
+    },
+    getEventTrend() {
+      if(!this.myChart){
+          this.myChart = echarts.init(document.getElementById("chartsDays"));
+        }
+      return eventTrend().then((response) => {
+        let time = response.data.traffic.map((item) => {
+          if (item.hours.toString().length > 1) {
+            item.hours = item.hours + ":00"
+          } else {
+            item.hours = "0" + item.hours + ":00"
+          }
+          return item.hours
+        })
+        let traffic = response.data.traffic.map((item) => {
+          return item.num
+        })
+        let perception = response.data.perception.map((item) => {
+          return item.num
+        })
+        chartsStatistics.xAxis.data = time;
+        chartsStatistics.series[0].data = perception;
+        chartsStatistics.series[1].data = traffic;
+        this.myChart.setOption(chartsStatistics);
+      })
+    }
+  },
+  async mounted() {
+    this.$nextTick(()=>{
+     this.getEventTrend();
+    })
+    
+  },
+}
+</script>
+  
+<style lang='scss' scoped>
+
+
+.chartsDays {
+  height: 100%;
+  width: 100%;
+}
+</style>
+  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/etype/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/etype/charts.js
new file mode 100644
index 00000000..41170bca
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/etype/charts.js
@@ -0,0 +1,265 @@
+let zData = ["侧翻", "撞障碍物", "自燃", "追尾", "撞护栏", "货物洒落"];
+let lc = [450, 500, 250, 340, 450, 500];
+let lc2 = [400, 550, 200, 140, 400, 550];
+let options = {
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    formatter: function (params) {
+      let mark = ''
+      params.forEach((e,index) => {
+        mark += e.marker + e.seriesName + '：'+e.value+(index<2?'起':'分钟')+'<br />'
+      });
+      return `<div>${params[0].name}</div>${mark}`;
+    },
+  },
+  grid: {
+    right: "4%",
+    top: "60px",
+    left: "30px",
+    bottom: "0%",
+    containLabel: true,
+  },
+  xAxis: {
+    type: "category",
+    boundaryGap: true,
+    data: zData,
+    axisLabel: {
+      interval: 0,
+      textStyle: {
+        color: "#E5E7E8",
+        fontSize: 10,
+      },
+    },
+    axisTick: {
+      //坐标轴刻度相关设置。
+      show: false,
+    },
+    axisLine: {
+      //坐标轴轴线相关设置
+      lineStyle: {
+        color: "#2A6278",
+      },
+    },
+    splitLine: {
+      //坐标轴在 grid 区域中的分隔线。
+      show: false,
+    },
+  },
+  yAxis: [
+    {
+      type: "value",
+      name: "（起）",
+      nameTextStyle: {
+        color: "#E5E7E8",
+        fomtSize: 10,
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          color: "#E5E7E8",
+          fontSize: 10,
+        },
+      },
+      // minInterval: 1,
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: "#2A6278",
+        },
+      },
+    },
+    {
+      type: "value",
+      name: "(分钟)",
+      nameTextStyle: {
+        color: "#E5E7E8",
+        fomtSize: 10,
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          color: "#fff",
+          fontSize: 10,
+          // formatter: "{value} °C",
+        },
+      },
+      // minInterval: 1,
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        show: false,
+        lineStyle: {
+          color: "#2A6278",
+        },
+      },
+    },
+  ],
+  legend: {
+    // orient: 'vertical',
+    // icon: "circle",
+    itemHeight: 8,
+    itemWidth: 8,
+    top: "0%",
+    right: "10%",
+    textStyle: {
+      color: "#fff",
+    },
+    data: [
+      {
+        name: "事件数量",
+        icon: "circle",
+        itemStyle: {
+          color: "#02A0F8",
+        },
+      },
+      {
+        name: "去年同期数量",
+        icon: "circle",
+        itemStyle: {
+          color: "#01CFEB",
+        },
+      },
+      {
+        name: "平均处置时长",
+        itemStyle: {
+          color: "#E2BA74",
+        },
+      },
+      {
+        name: "去年同期平均处置时长",
+        itemStyle: {
+          color: "#FB6D07",
+        },
+      },
+    ],
+  },
+  series: [
+    {
+      name: "事件数量",
+      type: "pictorialBar",
+      stack: "数量",
+      // label: {
+      //   normal: {
+      //     show: false,
+      //     position: "top",
+      //     textStyle: {
+      //       color: "#FFFFFF",
+      //       fontSize: 16,
+      //     },
+      //   },
+      // },
+      itemStyle: {
+        normal: {
+          color: {
+            type: "linear",
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [
+              {
+                offset: 0,
+                color: "#0085FF", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "#0085FF00", // 100% 处的颜色
+              },
+            ],
+            globalCoord: false, // 缺省为 false
+          },
+        },
+      },
+      symbol:
+        "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
+      data: lc,
+    },
+    {
+      name: "去年同期数量",
+      type: "pictorialBar",
+      stack: "else",
+      barGap: "10%",
+      boundaryGap: "100%",
+      // label: {
+      //   normal: {
+      //     show: false,
+      //     position: "top",
+      //     textStyle: {
+      //       color: "#FFFFFF",
+      //       fontSize: 16,
+      //     },
+      //   },
+      // },
+      itemStyle: {
+        normal: {
+          color: {
+            type: "linear",
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [
+              {
+                offset: 0,
+                color: "#01D2EE", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "rgba(0, 194, 255,0)", // 100% 处的颜色
+              },
+            ],
+            globalCoord: false, // 缺省为 false
+          },
+        },
+      },
+      symbol:
+        "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
+      data: lc2,
+    },
+    {
+      name: "平均处置时长",
+      yAxisIndex: 1,
+      data: lc2,
+      type: "line",
+      // symbol: "none",
+      symbolSize: 5,
+      smooth: true,
+      color: "#E2BA74",
+      lineStyle: {
+        color: "#E2BA74",
+        width: 1,
+        // type: "dashed",
+        // dashOffset:50
+      },
+    },
+    {
+      name: "去年同期平均处置时长",
+      yAxisIndex: 1,
+      data: lc,
+      type: "line",
+      // symbol: "none",
+      symbolSize: 5,
+      smooth: true,
+      color: "#FB6D07",
+      lineStyle: {
+        color: "#FB6D07",
+        width: 1,
+        // type: "dashed",
+        // dashOffset:50
+      },
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/etype/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/etype/index.vue
new file mode 100644
index 00000000..eb729817
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/etype/index.vue
@@ -0,0 +1,74 @@
+<template>
+ <div class="chartsEType "id="chartsEType"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsOptions from "./charts";
+import {
+  selectEventType,
+} from "@/api/event/governanceAnalysis";
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: "ChartsEType",
+  data() {
+    return {
+      dataList: [],
+    };
+  },
+
+  created() {},
+  methods: {
+
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/trafficIncidents/exportSelectEventTypeAnalysis",
+        filename: name,
+        data: this.data
+      });
+    },
+    bind(formData){
+      this.data = {}
+      if(formData){
+        formData.keys().forEach(x=>{
+          this.data[x] = formData.get(x)
+        })
+        if(!this.myChart){
+          this.myChart = echarts.init(document.getElementById("chartsEType"));
+        }
+        selectEventType(formData).then((res) => {
+          let lastAvgTimeData = [];
+          let avgTimeData = [];
+          let numData = [];
+          let lastNumData = [];
+          let eventSubclassData = [];
+          res.data.forEach((item) => {
+            lastAvgTimeData.push(item.lastAvgTime);
+            numData.push(item.num);
+            avgTimeData.push(item.avgTime);
+            lastNumData.push(item.lastNum);
+            eventSubclassData.push(item.eventSubclassName);
+            chartsOptions.series[0].data = numData; //事件数量
+            chartsOptions.series[1].data = lastNumData; //去年同期数量
+            chartsOptions.series[2].data = avgTimeData; //平均处置时长
+            chartsOptions.series[3].data = lastAvgTimeData; //去年同期平均处置时长
+            chartsOptions.xAxis.data = eventSubclassData;
+          })
+          this.myChart.setOption(chartsOptions);
+        })
+      }
+    }
+  },
+  mounted() {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chartsEType {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index.vue
index 4034f117..3ae416eb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index.vue
@@ -1,48 +1,114 @@
 <template>
   <div class='TrafficFlow'>
-    <section class="foot">
-      <div class="header-shot">
+    <div class="header-shot">
         <TopComponent />
       </div>
       <div class="content">
-        <ChannelAnalytics class="content-l" />
-        <EventTypeAnalysis class="content-l" />
-        <PostTrendsDay class="content-r mar-r" />
-        <AuditAnalytics class="content-r" />
+        <section class="chartPanel" style="height: 100%;">
+            <section class="cleft">
+              <div class="title">
+                <div class="icon"></div>今日事件趋势
+                <ChartExport @export="$refs.refDays.export('今日事件趋势')" />
+              </div>
+              <Days ref="refDays" />
+            </section>
+            <section class="cright">
+              <div class="title">
+                <div class="icon"></div>收费站管制分析
+                <ChartExport @export="$refs.refAudit.export('收费站管制分析')" />
+              </div>
+              <Audit ref="refAudit" />
+            </section>
+            <section class="cright">
+              <div class="title">
+                <div class="icon"></div>事件类型分析
+                <ChartExport @export="$refs.refTAnaly.export('事件类型分析')" />
+              </div>
+              <TAnaly ref="refTAnaly"></TAnaly>
+            </section>
+          </section>
       </div>
+
       <div class="content">
-        <PostTrendsMonth class="content-mi" />
+          <Search></Search>
+          <section class="chartPanel" style="flex:1">
+            <section class="cleft">
+              <div class="title">
+                <div class="icon"></div>事件多发路段
+                <ChartExport @export="$refs.refTimer.export('事件多发路段')" />
+              </div>
+              <CTimer ref="refTimer" />
+            </section>
+            <section class="cright">
+              <div class="title">
+                <div class="icon"></div>事故类型分析
+                <ChartExport @export="$refs.refEType.export('事故类型分析')" />
+              </div>
+              <EType ref="refEType" />
+            </section>
+            <section class="cright">
+              <div class="title">
+                <div class="icon"></div>事故车型分析
+                <ChartExport @export="$refs.refCModel.export('事故车型分析')" />
+              </div>
+              <CModel ref="refCModel" />
+            </section>
+          </section>
       </div>
-    </section>
   </div>
 </template>
   
 <script>
-import TopComponent from './components/topComponent';
-import ChannelAnalytics from './components/channelAnalytics';
-import EventTypeAnalysis from './components/eventTypeAnalysis';
-import AuditAnalytics from './components/auditAnalytics';
-import PostTrendsDay from './components/postTrendsDay';
-import PostTrendsMonth from './components/postTrendsMonth';
-import NucleusThrough from './components/nucleusThrough';
+import TopComponent from './components/topComponent/index.vue'
+import Search from './search/index.vue'
+import CTimer from './ctimer/index.vue';
+import EType from './etype/index.vue';
+import CModel from './cmodel/index.vue';
+
+import Days from './days/index.vue';
+import Audit from './audit/index.vue';
+import TAnaly from './tanaly/index.vue';
+import ChartExport from "@screen/components/ChartExport/index.vue"
 
 export default {
-  name: 'publicService',
+  name: 'GovernanceAnalysis',
   components: {
     TopComponent,
-    ChannelAnalytics,
-    EventTypeAnalysis,
-    AuditAnalytics,
-    PostTrendsDay,
-    PostTrendsMonth,
-    NucleusThrough
+    Search,
+    CTimer,
+    EType,
+    CModel,
+    Days,
+    Audit,
+    TAnaly,
+    ChartExport
   },
   data() {
     return {
       activeName: "first"
     }
   },
+
+  mounted() {
+    window.addEventListener("resize", () => {
+        this.$refs.refTimer.myChart.resize();
+        this.$refs.refEType.myChart.resize();
+        // this.$refs.refTAnaly.myChart.resize();
+        this.$refs.refCModel.myChart.resize();
+        this.$refs.refDays.myChart.resize();
+        
+    });
+  },
   methods: {
+    bindCharts(search){
+      var formData = new FormData();
+      formData.append("direction", search.direction);
+      formData.append("type", search.type);
+      formData.append("startTime", search.startTime);
+      this.$refs.refTimer.bind(formData)
+      this.$refs.refEType.bind(formData)
+      this.$refs.refCModel.bind(formData)
+    },
     changeTabs() {
 
     }
@@ -82,98 +148,56 @@ export default {
 .TrafficFlow {
   width: 100%;
   height: 100%;
-  position: relative;
   z-index: 6;
   color: white;
-
+  padding: 0px 10px 10px 10px;
+  display: flex;
+  flex-direction: column;
   .header-shot {
     width: 100%;
-    margin: auto;
-    margin-top: 15px;
-    height: 160px;
-
   }
 
   .content {
     width: 100%;
-    margin: auto;
     display: flex;
     flex: 1;
-    pointer-events: none;
-    margin-top: 19px;
-    --keep-ratio: scaleX(1);
-
+    margin-top: 15px;
+    background-color: #132d38;
+    padding: 10px;
+    flex-direction: column;
     >div {
       pointer-events: auto;
     }
 
-    .content-l {
-      width: calc(20%);
-
-      margin-right: 20px;
 
+    .chartPanel {
+    display: flex;
+    flex-direction: row;
+    
+    width: 100%;
+      gap:10px;
     }
 
-    .content-mi {
-      width: calc(100%);
-
-      // margin-right: 20px;
+    .cleft {
+      width: 50vw;
     }
-
-
-    .content-m {
-      display: inline-flex;
-      flex-direction: column;
-      width: calc(100% / 4);
-      margin-right: 20px;
-
-      .content-m-t {
-        width: 100%;
-        height: 240px;
-        margin-bottom: 20px;
-      }
+    .cright {
+      flex: 1;
     }
 
-    .content-r {
-      width: 29%;
-
-    }
-
-    .mar-r {
-      margin-right: 20px;
-    }
   }
 
-  .foot {
-    width: 98%;
-    margin: auto;
+  .title {
     display: flex;
-    flex-direction: column;
-
-    justify-content: space-between;
-    flex: 1;
-    pointer-events: none;
-    margin-top: 8px;
-
-    >div {
-      pointer-events: auto;
-    }
-
-    .foot-w {
-      width: 100%;
-
-    }
-
-    .foot-l {
-      width: 726px;
-    }
-
-    .foot-m {
-      width: 613px;
-    }
-
-    .foot-r {
-      width: 493px;
+    position: absolute;
+    align-items: center;
+
+    .icon {
+      width: 5px;
+      height: 16px;
+      background-color: #3DE8FF;
+      margin-right: 10px;
+      border-radius: 2px;
     }
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index2.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index2.vue
new file mode 100644
index 00000000..4034f117
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index2.vue
@@ -0,0 +1,181 @@
+<template>
+  <div class='TrafficFlow'>
+    <section class="foot">
+      <div class="header-shot">
+        <TopComponent />
+      </div>
+      <div class="content">
+        <ChannelAnalytics class="content-l" />
+        <EventTypeAnalysis class="content-l" />
+        <PostTrendsDay class="content-r mar-r" />
+        <AuditAnalytics class="content-r" />
+      </div>
+      <div class="content">
+        <PostTrendsMonth class="content-mi" />
+      </div>
+    </section>
+  </div>
+</template>
+  
+<script>
+import TopComponent from './components/topComponent';
+import ChannelAnalytics from './components/channelAnalytics';
+import EventTypeAnalysis from './components/eventTypeAnalysis';
+import AuditAnalytics from './components/auditAnalytics';
+import PostTrendsDay from './components/postTrendsDay';
+import PostTrendsMonth from './components/postTrendsMonth';
+import NucleusThrough from './components/nucleusThrough';
+
+export default {
+  name: 'publicService',
+  components: {
+    TopComponent,
+    ChannelAnalytics,
+    EventTypeAnalysis,
+    AuditAnalytics,
+    PostTrendsDay,
+    PostTrendsMonth,
+    NucleusThrough
+  },
+  data() {
+    return {
+      activeName: "first"
+    }
+  },
+  methods: {
+    changeTabs() {
+
+    }
+  }
+
+}
+</script>
+  
+<style lang='scss' scoped>
+::v-deep .el-tabs__item {
+  display: inline-flex;
+  justify-content: center;
+  font-size: 16px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  min-width: 128px;
+  position: relative;
+  left: 10px;
+}
+
+::v-deep .el-tabs__active-bar {
+  min-width: 128px;
+}
+
+::v-deep .el-tabs__nav-wrap::after {
+  background-color: #133242;
+  opacity: 0.1;
+}
+
+.footTabs {
+  display: inline;
+  width: 100%;
+
+}
+
+.TrafficFlow {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  z-index: 6;
+  color: white;
+
+  .header-shot {
+    width: 100%;
+    margin: auto;
+    margin-top: 15px;
+    height: 160px;
+
+  }
+
+  .content {
+    width: 100%;
+    margin: auto;
+    display: flex;
+    flex: 1;
+    pointer-events: none;
+    margin-top: 19px;
+    --keep-ratio: scaleX(1);
+
+    >div {
+      pointer-events: auto;
+    }
+
+    .content-l {
+      width: calc(20%);
+
+      margin-right: 20px;
+
+    }
+
+    .content-mi {
+      width: calc(100%);
+
+      // margin-right: 20px;
+    }
+
+
+    .content-m {
+      display: inline-flex;
+      flex-direction: column;
+      width: calc(100% / 4);
+      margin-right: 20px;
+
+      .content-m-t {
+        width: 100%;
+        height: 240px;
+        margin-bottom: 20px;
+      }
+    }
+
+    .content-r {
+      width: 29%;
+
+    }
+
+    .mar-r {
+      margin-right: 20px;
+    }
+  }
+
+  .foot {
+    width: 98%;
+    margin: auto;
+    display: flex;
+    flex-direction: column;
+
+    justify-content: space-between;
+    flex: 1;
+    pointer-events: none;
+    margin-top: 8px;
+
+    >div {
+      pointer-events: auto;
+    }
+
+    .foot-w {
+      width: 100%;
+
+    }
+
+    .foot-l {
+      width: 726px;
+    }
+
+    .foot-m {
+      width: 613px;
+    }
+
+    .foot-r {
+      width: 493px;
+    }
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/search/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/search/index.vue
similarity index 80%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/search/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/search/index.vue
index a4151331..df69c7ca 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/search/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/search/index.vue
@@ -30,9 +30,6 @@
 <script>
 import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
 
-import { getRoadSectionList } from "@/api/event/perceiveEvent";
-
-
 export default {
   name: "EventQuery",
   components: {
@@ -97,7 +94,33 @@ export default {
   created() { },
   methods: {
 
-    searchQuery() { },
+    searchQuery() {
+      let startTime = "";
+      if (this.type == 2) {
+        startTime = moment(this.dateTime).format("YYYY-MM-01 00:00:00");
+      } else if (this.type == 3) {
+        let year = moment().year();
+        if (this.quarter == 1) {
+          startTime = `${year}-01-01 00:00:00`;
+        } else if (this.quarter == 2) {
+          startTime = `${year}-04-01 00:00:00`;
+        } else if (this.quarter == 3) {
+          startTime = `${year}-07-01 00:00:00`;
+        } else {
+          startTime = `${year}-10-01 00:00:00`;
+        }
+      } else if (this.type == 4) {
+        startTime = moment(this.dateTime).format("YYYY-01-01 00:00:00");
+      } else {
+        startTime = moment(this.dateTime).format("YYYY-MM-DD HH:mm:ss");
+      }
+
+      this.$parent.bindCharts({
+        type:this.type,
+        direction: this.direction,
+        startTime
+      });
+    },
     onReset() {
       this.selectId = 1;
       this.selectIndex = 1;
@@ -109,7 +132,9 @@ export default {
     },
   },
   mounted() {
-
+    this.$nextTick(()=>{
+      this.searchQuery()
+    })
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/assets/charts.js
new file mode 100644
index 00000000..1f0d9931
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/assets/charts.js
@@ -0,0 +1,206 @@
+let colors = [
+  "#4278F8",
+  "#5372C4",
+  "#0046FF",
+  "#FB9434",
+  "#854101",
+  "#05E599",
+  "#219F73",
+  "#7CEDD5",
+  "#68F4DD",
+  "#1785C0",
+  "#476DBC",
+  "#B55233",
+];
+
+let legendData = [];
+
+var options = {
+  title: [
+    {
+      text: "999",
+      // top: "25%",
+      top: "35%",
+      textAlign: "center",
+      left: "49%",
+      textStyle: {
+        color: "#ffffff",
+        fontSize: 30,
+        fontFamily: "SourceHanSansCN",
+      },
+    },
+    {
+      text: "总数",
+      // top: "38%",
+      top: "59%",
+      textAlign: "center",
+      left: "49%",
+      textStyle: {
+        color: "rgba(242, 252, 253, 0.84)",
+        fontSize: 12,
+        fontFamily: "SourceHanSansCN",
+      },
+    },
+  ],
+  grid: {
+    top: "38%",
+    left: "6%",
+    right: "6%",
+    bottom: "3%",
+    containLabel: true,
+  },
+  tooltip: {
+    show: true,
+    trigger: "item",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
+  },
+  legend: {
+    show: false,
+    pageButtonPosition: "end",
+  },
+  series: [
+    /** 饼图上刻度 */
+    {
+      type: "gauge",
+      // center: ["50%", "35%"],
+      // radius: "46%", // 错位调整此处
+      center: ["50%", "55%"],
+      radius: "88%", // 错位调整此处
+      startAngle: 0,
+      endAngle: 360,
+      splitNumber: 52,
+      axisLine: { show: false },
+      splitLine: {
+        // length: 39,
+        length: "2",
+        lineStyle: {
+          width: 5,
+          color: "#5CC5FF",
+        },
+      },
+      axisTick: { show: false },
+      axisLabel: { show: false },
+    },
+    {
+      name: "中心效果圆",
+      type: "gauge",
+      // radius: "30%",
+      // center: ["50%", "35%"],
+      radius: "55%",
+      center: ["50%", "55%"],
+      startAngle: 0,
+      endAngle: 360,
+      axisLine: {
+        lineStyle: {
+          color: [[1, "#0AFFE950"]],
+          width: 1,
+        },
+      },
+      tooltip: {
+        backgroundColor: "rgba(50,50,50,0)",
+        formatter: " ",
+        borderWidth: 0,
+        textStyle: {
+          textShadowColor: "rgba(50,50,50,0)",
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        show: false,
+      },
+      axisLabel: {
+        show: false,
+      },
+      detail: {
+        show: false,
+      },
+      pointer: {
+        show: false,
+      },
+      progress: {
+        show: true,
+        width: 80,
+        itemStyle: {
+          color: {
+            type: "radial",
+            x: 0.5,
+            y: 0.5,
+            r: 0.5,
+            colorStops: [
+              {
+                offset: 0,
+                color: "rgb(0, 224, 205, 0)",
+              },
+              {
+                offset: 0.7,
+                color: "rgba(0, 224, 205, 0)",
+              },
+              {
+                offset: 1,
+                color: "rgba(10, 255, 233, 0.5)",
+              },
+            ],
+          },
+        },
+      },
+      data: [
+        {
+          value: 100,
+        },
+      ],
+    },
+    {
+      type: "pie",
+      // radius: ["40%", "50%"],
+      // center: ["50%", "35%"],
+      radius: ["70%", "90%"],
+      center: ["50%", "55%"],
+      z: 10,
+      label: {
+        show: false,
+      },
+      data: [],
+      labelLine: {
+        show: false,
+      },
+      itemStyle: {
+        normal: {
+          borderRadius: "5",
+          borderWidth: 2,
+          borderType: "solid",
+          borderCap: "round",
+          borderJoin: "round",
+          borderColor: "#064258",
+          borderMiterLimit: "20",
+          color: function (params) {
+            return {
+              type: "linear",
+              x: 0,
+              y: 0,
+              x2: 1,
+              y2: 1,
+              colorStops: [
+                {
+                  offset: 0,
+                  // color: "transparent", // 0% 处的颜色
+                  color: colors[params.dataIndex],
+                },
+                {
+                  offset: 1,
+                  color: colors[params.dataIndex], // 100% 处的颜色
+                },
+              ],
+              globalCoord: false, // 缺省为 false
+            };
+          },
+        },
+      },
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/index.vue
new file mode 100644
index 00000000..b11becf8
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/tanaly/index.vue
@@ -0,0 +1,282 @@
+<template>
+  <div class="congestionTan">
+      <div class="chartsTan" id="chartsTan"></div>
+      <div class="legend-box">
+        <el-carousel height="150px" direction="vertical">
+          <el-carousel-item
+            v-for="(item, index) in dataList"
+            :key="index"
+            class="legend-item"
+          >
+            <div v-for="(items, index) in item" class="legend-items">
+              <span class="legend-name">{{ items.name }}</span>
+              <span class="legend-num">{{ items.value }} 起</span>
+              <span class="legend-percert">{{ items.percert }}%</span>
+            </div>
+          </el-carousel-item>
+        </el-carousel>
+      </div>
+    </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsStatistics from "./assets/charts";
+import { allEventNum } from "@/api/event/governanceAnalysis";
+import { exportFile } from "@screen/utils/common";
+export default {
+  name: "Tanaly",
+  components: {
+    
+  },
+  data() {
+    return {
+      myChart: null,
+      dataList: [],
+    };
+  },
+
+  created() {},
+  methods: {
+
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/trafficIncidents/exportGetAllEventNum",
+        filename: name,
+      });
+    },
+    getAllEventNum() {
+  
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("chartsTan"));
+      }
+      allEventNum().then((response) => {
+        let data = [];
+        let total = null;
+        let nameData = [];
+        const newObj = { value: 1, name: "" };
+        for (let i = 0; i < response.data.length; i++) {
+          data.push({
+            value: response.data[i].num,
+            name: response.data[i].eventName,
+          });
+          total += response.data[i].num;
+        }
+        for (let i = 0; i < data.length; i++) {
+          if (data[i].name != "") {
+            nameData.push(data[i].name);
+            this.dataList.push({
+              name: data[i].name,
+              value: data[i].value,
+              percert:
+                total == 0 ? 0 : ((data[i].value / total) * 100).toFixed(2),
+            });
+          }
+        }
+        const list = this.dataList.reduce((acc, curr, index) => {
+          if (index % 4 === 0) acc.push([]);
+          acc[Math.floor(index / 4)].push(curr);
+          return acc;
+        }, []);
+        this.dataList = list;
+        /**
+         * echarts 自带翻页 勿删
+         */
+        // chartsStatistics.legend.data = nameData;
+        // chartsStatistics.legend.formatter = function (name) {
+        //   let tarValue = 0;
+        //   for (let i = 0; i < response.data.length; i++) {
+        //     if (response.data[i].eventName === name) {
+        //       tarValue = response.data[i].num;
+        //     }
+        //   }
+        //   var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
+        //   return `{text|${name}} {number|${tarValue} 起  }  {number|${percert}%}`;
+        // };
+        chartsStatistics.title[0].text = total;
+        chartsStatistics.series[2].data = data;
+
+        this.myChart.setOption(chartsStatistics);
+      });
+    },
+  },
+  async mounted() {
+    this.getAllEventNum();
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.congestionTan {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+    .chartsTan {
+      height: 150px;
+      width: 100%;
+      margin-bottom: 10px;
+    }
+    .legend-box {
+      width: 60%;
+      margin: auto;
+      height: 120px;
+      overflow: hidden;
+
+      .legend-item {
+        width: 100%;
+        .legend-items {
+          width: 100%;
+          height: 30px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          &::before {
+            // position: absolute;
+            content: "";
+            width: 8px;
+            height: 8px;
+            left: 0px;
+            border-radius: 50%;
+            background: #37e7ff;
+          }
+        }
+        .legend-name {
+          width: 100px;
+          margin-left: 10px;
+          font-size: 14px;
+        }
+        .legend-num,
+        .legend-percert {
+          width: 50px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          font-size: 14px;
+          color: #37e7ff;
+          font-weight: bold;
+        }
+      }
+      .legend-item:nth-child(1) {
+        .legend-items:nth-child(1) {
+          &::before {
+            background: #4278f8;
+          }
+        }
+        .legend-items:nth-child(2) {
+          &::before {
+            background: #5372c4;
+          }
+        }
+        .legend-items:nth-child(3) {
+          &::before {
+            background: #0046ff;
+          }
+        }
+        .legend-items:nth-child(4) {
+          &::before {
+            background: #fb9434;
+          }
+        }
+      }
+      .legend-item:nth-child(2) {
+        .legend-items:nth-child(1) {
+          &::before {
+            background: #854101;
+          }
+        }
+        .legend-items:nth-child(2) {
+          &::before {
+            background: #05e599;
+          }
+        }
+        .legend-items:nth-child(3) {
+          &::before {
+            background: #219f73;
+          }
+        }
+        .legend-items:nth-child(4) {
+          &::before {
+            background: #7cedd5;
+          }
+        }
+      }
+      .legend-item:nth-child(3) {
+        .legend-items:nth-child(1) {
+          &::before {
+            background: #68f4dd;
+          }
+        }
+        .legend-items:nth-child(2) {
+          &::before {
+            background: #1785c0;
+          }
+        }
+        .legend-items:nth-child(3) {
+          &::before {
+            background: #476dbc;
+          }
+        }
+        .legend-items:nth-child(4) {
+          &::before {
+            background: #b55233;
+          }
+        }
+      }
+      /**
+      单个动画循环样式 勿删
+       */
+      // .legend-item:nth-child(1) {
+      //   &::before {
+      //     background: #68f4dd;
+      //   }
+      // }
+      // .legend-item:nth-child(2) {
+      //   &::before {
+      //     background: #1785c0;
+      //   }
+      // }
+      // .legend-item:nth-child(3) {
+      //   &::before {
+      //     background: #476dbc;
+      //   }
+      // }
+      // .legend-item:nth-child(4) {
+      //   &::before {
+      //     background: #b55233;
+      //   }
+      // }
+      // .legend-item:nth-child(5) {
+      //   &::before {
+      //     background: #b0862c;
+      //   }
+      // }
+      // .legend-item:nth-child(6) {
+      //   &::before {
+      //     background: #35ad6b;
+      //   }
+      // }
+      // .legend-item:nth-child(7) {
+      //   &::before {
+      //     background: #219f73;
+      //   }
+      // }
+      // .legend-item:nth-child(8) {
+      //   &::before {
+      //     background: #7cedd5;
+      //   }
+      // }
+
+      // .legend-item:nth-child(9) {
+      //   &::before {
+      //     background: #68f4dd;
+      //   }
+      // }
+    }
+}
+::v-deep .el-carousel__indicators--vertical {
+  display: none;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
index 6947bc6a..5355aac7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
@@ -307,12 +307,15 @@ export default {
             this.$emit("onchange",this.index)
             this.deviceType = value;
             this.tableInfo.devList = [];
+            delete this.tableInfo.zx_operationType
+            delete this.tableInfo.hf_operationType
         },
 
         // 情报板弹窗
         clickQbb(name) {
             this.clickQbbName = name;
-            // this.qbbData = this.tableData[index].dcInfoBoardTemplate;
+            console.log( this.tableInfo,name)
+            this.qbbData = this.tableInfo[name];
             this.isShowDialog = true;
         },
         onCloseDialog() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
index 7bce3c4e..37ed9bb7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -12,7 +12,7 @@
           />
         </div>
 
-        <div>
+        <div style="padding-bottom: 100px;">
           <div v-for="(item, index) in tableData" :key="item.id" class="rowBlock">
             <div style="flex:1">
               <ScopeTable :tableInfo="item"  @onchange="onChange" :index="index"></ScopeTable>
@@ -23,10 +23,11 @@
             </div>
           </div>
         </div>
+
     </div>
 
     <template #footer>
-      <Button style="background: #c9c9c9; padding: 0 24px"
+      <Button style="background: #0e708b; padding: 0 24px"
         @click.native="(modelVisible = false), (submitting = false)">取消</Button>
       <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">保存</Button>
     </template>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
index e027ec97..45d01e57 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/data.js
@@ -1,16 +1,34 @@
 import { planDeviceOptions } from "@screen/utils/enum.js";
-
+import {
+  eventSubClassMap,
+  trafficKV
+} from "@screen/utils/enum.js";
 export const searchFormList = [
+ 
   {
-    label: "预案名称:",
-    key: "planName",
+    label: "事件类型:",
+    key: "eventType",
+    type: "select",
+    options: {
+      clearable: true,
+      options: trafficKV,
+    },
+    ons: {
+      change(value, ...args) {
+        const { data, formList } = args.slice(-1)[0];
+        
+        formList[2].options.options = eventSubClassMap[1][value];
+        data.triggerMechanism =''
+      },
+    },
   },
   {
-    label: "设备类型:",
-    key: "deviceType",
+    label: "细分类型:",
+    key: "triggerMechanism",
     type: "select",
     options: {
-      options: planDeviceOptions,
+      clearable: true,
+      options: [],
     },
   },
 ];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
index 5fe991db..3b7e0d51 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
@@ -17,13 +17,20 @@
                     刷新
                 </ButtonGradient>
             </div>
-            <InputSearch ref="searchComp" style="width: 402px;" :formList="searchFormList" :formConfigOptions="{}"
+            <InputSearch 
+            params="planName"
+        placeholder="请输入预案名称，回车搜索"
+        type="input" 
+            ref="searchComp" style="width: 402px;" :formList="searchFormList" :formConfigOptions="{}"
                 @handleSearch="handleSearch" />
         </div>
 
         <!-- 内容 -->
         <div class="body">
-            <Table :data="tableData">
+            <Table :data="tableData" height="75vh">
+                <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
+          header-align="center" />
+
                 <!-- <ElTableColumn prop="strEventCategory" label="事件分类" width="100" align="center" /> -->
                 <ElTableColumn prop="planName" label="预案名称" width="180" align="center" />
                 <ElTableColumn prop="strEventType" label="事件类型" width="180" align="center" />
@@ -113,6 +120,10 @@ export default {
             this.searchData.pageSize = pageSize;
             this.initData();
         },
+
+    indexMethod(index) {
+        return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
+      },
         onRefresh() {
             this.searchData.pageNum = 1;
             this.$refs.searchComp.handleResetForm();
@@ -130,6 +141,13 @@ export default {
             this.isShowDialog = true;
         },
         handleSearch(data) {
+            
+            if(data.eventType === ''){
+                data.eventType = null
+            }
+            if(data.triggerMechanism === ''){
+                data.triggerMechanism = null
+            }
             // console.log(data);
             this.searchData = { ...this.searchData, ...data }
             this.initData();
@@ -156,9 +174,7 @@ export default {
 
 <style lang='scss' scoped>
 .emergencyProcessManagement {
-    padding: 21px;
-
-    height: 100%;
+    padding: 20px;
     display: flex;
     flex-direction: column;
     z-index: 6;
@@ -166,7 +182,7 @@ export default {
     height: 100%;
 
     .filter {
-        height: 60px;
+        margin-bottom: 20px;
         display: flex;
         justify-content: space-between;
         align-items: center;
@@ -178,18 +194,9 @@ export default {
     }
 
     .body {
-        flex: 1;
-        position: relative;
-        overflow: hidden;
-
-        .content {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            overflow: auto;
-        }
-    }
-
+    flex: 1;
+    height: 0;
+  }
     .footer {
         margin-top: 15px;
         height: 36px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
index fdefd20b..6f6e81fb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
@@ -11,7 +11,7 @@
             <!-- 操作按钮 -->
             <div class="infoBtnBox infoBtnBoxSm">
               <p class="btn">
-                <el-radio v-model="radio1" :label="itm.id" @input="changeRadio(itm)" />
+                <el-radio v-model="radio1" :label="itm.content" @input="changeRadio(itm)" />
               </p>
             </div>
           </div>
@@ -20,7 +20,7 @@
     </div>
 
     <template #footer>
-      <Button style="background: #c9c9c9; padding: 0 24px"
+      <Button style="background: #0e708b; padding: 0 24px"
         @click.native="(modelVisible = false), (submitting = false)">取消</Button>
       <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">确认</Button>
     </template>
@@ -73,13 +73,15 @@ export default {
     modelVisible: {
       get() {
         if (this.visible) {
-          if (this.info && this.info.id) {
-            this.radio1 = Number(this.info.id);
+          if (this.info && this.info.content) {
+            this.radio1 = this.info.content
+            
           }
         }
         return this.visible;
       },
       set(val) {
+       
         this.$emit("close", 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 e6519c64..5fc2d037 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
@@ -2,29 +2,45 @@ import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/Pr
 import { warningType } from "@screen/utils/enum.js";
 
 export const searchFormList = [
-  PresetFormItems.warningType,
-  // {
-  //   label: "方向:",
-  //   key: "direction",
-  //   type: "RadioGroup",
-  //   default: "1",
-  //   options: {
-  //     options: [
-  //       {
-  //         key: "1",
-  //         label: "菏泽方向",
-  //       },
-  //       {
-  //         key: "2",
-  //         label: "双向",
-  //       },
-  //       {
-  //         key: "3",
-  //         label: "济南方向",
-  //       },
-  //     ],
-  //   },
-  // },
+  
+  {
+    label: "类型:",
+    key: "warningType",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+        {
+          value: 1,
+          label: "交通拥堵",
+        },
+        {
+          value: 2,
+          label: "行人",
+        },
+        {
+          value: 4,
+          label: "停车",
+        },
+        {
+          value: 5,
+          label: "违规驾驶",
+        },
+        {
+          value: 6,
+          label: "路障",
+        },
+        {
+          value: 7,
+          label: "道路施工",
+        },
+        {
+          value: 99,
+          label: "其他",
+        },
+      ],
+    },
+  },
   {
     label: "时间范围:",
     key: "warningTime",
@@ -36,7 +52,17 @@ export const searchFormList = [
       format: "yyyy-MM-dd HH:mm:ss",
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
-  },
+  }, {
+    label: "收费站:",
+    key: "facilityName",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+       
+      ],
+    },
+  }
   // {
   //   ...PresetFormItems.station,
   //   label: "开始桩号:",
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 4096e255..9e41c367 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
@@ -28,12 +28,17 @@
 
     <!-- 内容 -->
     <div class="body">
+        <div class="content">
+              <!-- 内容 -->
+    <div class="scrollPanel">
       <ManualWarningCard
         v-for="(item, index) in data"
         :key="index"
         :cardData="item"
       />
     </div>
+      </div>
+      </div>
 
     <!-- 分页 -->
     <div class="footer">
@@ -61,6 +66,7 @@ import { perceivedEventsList } from "@/api/manualWarning/index.js";
 // import EventDispatchDialog from "./EventDispatchDialog/index";
 import { searchFormList } from "./data";
 import request from "@/utils/request";
+import { exportFile } from "@screen/utils/common";
 import { WarningType, WarningSubclass } from "@screen/utils/enum.js";
 
 const directionMapping = {
@@ -86,21 +92,42 @@ export default {
       total: 0,
       data: [],
       eventId: "0",
-      pageSize: 16,
+      pageSize: 12,
       pageNum: 1,
       searchData: {
         pageNum: 1,
-        warningSource: "6",
+        warningSource:"6"
       },
     };
   },
   created() {
+    this.initSearch();
     this.initData();
   },
   methods: {
+    initSearch(){
+      request({
+        url: `business/facility/query?facilityType=1`,
+        method: "get",
+      }).then(res=>{
+        if (res.code != 200) return Message.error(res?.msg);
+        const options = [];
+        res.data.forEach(e => {
+          options.push({
+            key: e.facilityName,
+            label: e.facilityName,
+          })
+        });
+        this.searchFormList[2].options.options = options
+      })
+    },
     // 导出
     handleExport() {
-      this.$message.warning("待开发");
+      exportFile({
+        url: "/business/warning/export",
+        filename: "事件列表",
+        data: this.searchData
+      });
     },
     // 刷新
     onRefresh() {
@@ -108,6 +135,7 @@ export default {
       this.$refs.searchComp.handleResetForm();
     },
     initData() {
+     
       perceivedEventsList(this.searchData, this.pageNum, this.pageSize).then(
         (res) => {
           if (res.code != 200) return Message.error(res?.msg);
@@ -138,9 +166,14 @@ export default {
 
     firstBtnClick(id) {},
     handleSearch(data) {
-      this.searchData.warningType = data.warningType;
+      this.searchData.facilityName = data.facilityName;
       this.searchData.startTime = data.warningTime && data.warningTime[0];
       this.searchData.completeTime = data.warningTime && data.warningTime[1];
+      if(data.warningType){
+        this.searchData.warningType = data.warningType
+      } else {
+       delete this.searchData.warningType; 
+      }
       this.initData();
     },
   },
@@ -168,17 +201,45 @@ export default {
     }
   }
 
+
   .body {
     flex: 1;
-    overflow: auto;
-    display: grid;
-    grid-template-columns: repeat(4, 1fr);
-    grid-gap: 20px;
-    // grid-row-gap: 9px;
-    // grid-column-gap: 9px;
-    grid-auto-rows: min-content;
+    overflow: hidden;
+    position: relative;
+    overflow: hidden;
+
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        grid-gap: 24px;
+        grid-auto-rows: minmax(220px, max-content);
+        position: relative;
+        flex: 1;
+        overflow-y: auto;
+        overflow-x: hidden;
+      }
+    }
   }
 
+
+  // .body {
+  //   flex: 1;
+  //   overflow: auto;
+  //   display: grid;
+  //   grid-template-columns: repeat(4, 1fr);
+  //   grid-gap: 20px;
+  //   // grid-row-gap: 9px;
+  //   // grid-column-gap: 9px;
+  //   grid-auto-rows: min-content;
+  // }
+
   .footer {
     margin-top: 15px;
     height: 36px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
index 9e44e29f..b8569628 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
@@ -5,6 +5,7 @@
       :formList="searchFormList"
       @handleSearch="handleSearch"
     />
+    <ButtonGradient @click="onExportClick" style="width:50px">导出</ButtonGradient>
     <div class="Eventfiltering-content">
       <div class="Eventfiltering-left" ref="trafficIncidents"></div>
       <div class="Eventfiltering-right" ref="trafficIncidentsPie"></div>
@@ -14,11 +15,15 @@
 
 <script>
 import InputSearch from "@screen/components/InputSearch/index.vue";
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import trafficIncidentsCharts from "./trafficIncidentsCharts.js";
 import trafficIncidentsChartsPie from "./trafficIncidentsChartsPie.js";
 import { nonAutomaticWarningType } from "@/api/manualWarning/index.js";
 import * as echarts from "echarts";
 import moment from "moment";
+
+import { exportFile } from "@screen/utils/common";
+
 const drawRoundRect = (ctx, x, y, width, height, radius, gr) => {
   // ctx, 矩形距离x坐标位置, 矩形距离y坐标的位置, 矩形的宽, 矩形的长,圆角角度
   ctx.beginPath();
@@ -51,6 +56,7 @@ export default {
   name: "Eventfiltering",
   components: {
     InputSearch,
+    ButtonGradient
   },
   data() {
     return {
@@ -62,7 +68,7 @@ export default {
       trafficIncidentsPie: null,
       searchFormList: [
         {
-          label: "事件类型:",
+          label: "时间类型:",
           key: "type",
           type: "select",
           default: "day",
@@ -154,31 +160,30 @@ export default {
         const context = canvas.getContext("2d");
 
         // // 填充渐变颜色
-        let gr = context.createLinearGradient(280, 0, 580, 0);
+        let gr = context.createLinearGradient(200, 0, 300, 0);
         gr.addColorStop(1, "rgba(92,197,255,0)");
         gr.addColorStop(0, "rgba(92,197,255,0.5)");
         context.lineWidth = 1; // 设置线段宽度
-        drawRoundRect(context, 410, 128, 380, 24, 12, gr);
-        drawRoundRect(context, 410, 162, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 196, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 230, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 264, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 298, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 332, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 366, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 400, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 434, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 468, 320, 24, 10, gr);
-        console.log("this.formData", this.formData);
+        for(let i = 0; i < 11; i++){
+          // drawRoundRect(context, 100, (225 + i*34), 200, 24, 10, gr);
+        }
         await this.getNonAutomaticWarningType(this.formData);
         // drawRoundRect(context, 410, 508, 320, 24, 10, gr);
       });
     });
   },
   methods: {
+    onExportClick(){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportNonAutomaticWarningType",
+        filename: '非机预警按事件查询',
+        data: this.data
+      });
+    },
     getNonAutomaticWarningType(data) {
       let that = this;
-      console.log("data", data);
+      this.data = data;
       return nonAutomaticWarningType(data).then((res) => {
         let newData = res.data;
         let seriesData = [];
@@ -241,12 +246,12 @@ export default {
     justify-content: space-between;
 
     .Eventfiltering-left {
-      width: 63%;
+      flex:1;
       height: 100%;
     }
 
     .Eventfiltering-right {
-      width: 34%;
+      width: 20vw;
       height: 100%;
     }
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js
index 28df33e3..df2e1dab 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js
@@ -18,9 +18,9 @@ var options = {
   title: [
     {
       text: "999",
-      top: "36%",
+      top: "14%",
       textAlign: "center",
-      left: "29%",
+      left: "49%",
       textStyle: {
         color: "#ffffff",
         fontSize: 30,
@@ -29,9 +29,9 @@ var options = {
     },
     {
       text: "总数",
-      top: "32%",
+      top: "10%",
       textAlign: "center",
-      left: "29%",
+      left: "48%",
       textStyle: {
         color: "rgba(242, 252, 253, 0.84)",
         fontSize: 16,
@@ -40,7 +40,7 @@ var options = {
     },
   ],
   grid: {
-    top: "38%",
+    top: "10%",
     left: "6%",
     right: "6%",
     bottom: "3%",
@@ -58,8 +58,8 @@ var options = {
     height: "520px",
     orient: "vertical",
     icon: "circle",
-    top: "15%",
-    left: "67%",
+    top: "30%",
+    left: "30%",
     itemWidth: 10,
     itemHeight: 10,
     textStyle: {
@@ -96,7 +96,7 @@ var options = {
     /** 饼图上刻度 */
     {
       type: "gauge",
-      center: ["30%", "35%"],
+      center: ["50%", "15%"],
       radius: "43%", // 错位调整此处
       startAngle: 0,
       endAngle: 360,
@@ -118,7 +118,7 @@ var options = {
       tooltip: false,
       type: "gauge",
       radius: "30%",
-      center: ["30%", "35%"],
+      center: ["50%", "15%"],
       startAngle: 0,
       endAngle: 360,
       axisLine: {
@@ -185,7 +185,7 @@ var options = {
     {
       type: "pie",
       radius: ["40%", "50%"],
-      center: ["30%", "35%"],
+      center: ["50%", "15%"],
       z: 10,
       label: {
         show: false,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
index 1f087745..d925e4b5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
@@ -5,6 +5,7 @@
       :formList="searchFormList"
       @handleSearch="handleSearch"
     />
+    <ButtonGradient @click="onExportClick" style="width:50px">导出</ButtonGradient>
     <div class="Eventfiltering-content">
       <div class="Eventfiltering-left" ref="trafficIncidents"></div>
       <div class="Eventfiltering-right" ref="trafficIncidentsPie"></div>
@@ -15,10 +16,12 @@
 <script>
 import InputSearch from "@screen/components/InputSearch/index.vue";
 import trafficIncidentsCharts1 from "./trafficIncidentsCharts.js";
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import trafficIncidentsChartsPie1 from "./trafficIncidentsChartsPie.js";
 import { nonAutomaticWarningFacility } from "@/api/manualWarning/index.js";
 import * as echarts from "echarts";
 import moment from "moment";
+import { exportFile } from "@screen/utils/common";
 const drawRoundRect = (ctx, x, y, width, height, radius, gr) => {
   // ctx, 矩形距离x坐标位置, 矩形距离y坐标的位置, 矩形的宽, 矩形的长,圆角角度
   ctx.beginPath();
@@ -51,6 +54,7 @@ export default {
   name: "Sitefiltering",
   components: {
     InputSearch,
+    ButtonGradient
   },
   props: {
     name: {
@@ -68,7 +72,7 @@ export default {
       },
       searchFormList: [
         {
-          label: "事件类型:",
+          label: "时间类型:",
           key: "type",
           type: "select",
           default: "day",
@@ -155,6 +159,14 @@ export default {
 
   mounted() {},
   methods: {
+    onExportClick(){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportNonAutomaticWarningFacility",
+        filename: '非机预警按站点查询',
+        data: this.data
+      });
+    },
     getWarningCharts() {
       setTimeout(() => {
         this.$nextTick(async () => {
@@ -177,20 +189,14 @@ export default {
           const context = canvas.getContext("2d");
 
           // // 填充渐变颜色
-          let gr = context.createLinearGradient(280, 0, 580, 0);
+        let gr = context.createLinearGradient(200, 0, 300, 0);
           gr.addColorStop(1, "rgba(92,197,255,0)");
           gr.addColorStop(0, "rgba(92,197,255,0.5)");
           context.lineWidth = 1; // 设置线段宽度
-          drawRoundRect(context, 385, 128, 320, 24, 12, gr);
-          drawRoundRect(context, 385, 162, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 196, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 230, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 264, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 298, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 332, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 366, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 400, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 434, 320, 24, 10, gr);
+          // for(let i = 0; i < 10; i++){
+          //   drawRoundRect(context, 90, (224 + i*34), 270, 24, 10, gr);
+          // }
+
           // drawRoundRect(context, 385, 474, 320, 24, 10, gr);
           // drawRoundRect(context, 385, 510, 320, 24, 10, gr);
           await this.getNonAutomaticWarningFacility(this.formData);
@@ -198,6 +204,7 @@ export default {
       });
     },
     getNonAutomaticWarningFacility(data) {
+      this.data = data;
       return nonAutomaticWarningFacility(data).then((res) => {
         let newData = res.data;
         let seriesData = [];
@@ -261,12 +268,12 @@ export default {
     justify-content: space-between;
 
     .Eventfiltering-left {
-      width: 63%;
+      flex:1;
       height: 100%;
     }
 
     .Eventfiltering-right {
-      width: 34%;
+      width: 20vw;
       height: 100%;
     }
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js
index 0beee08d..082488bd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js
@@ -18,9 +18,9 @@ var options = {
   title: [
     {
       text: "999",
-      top: "36%",
+      top: "14%",
       textAlign: "center",
-      left: "29%",
+      left: "49%",
       textStyle: {
         color: "#ffffff",
         fontSize: 30,
@@ -29,9 +29,9 @@ var options = {
     },
     {
       text: "总数",
-      top: "32%",
+      top: "10%",
       textAlign: "center",
-      left: "29%",
+      left: "48%",
       textStyle: {
         color: "rgba(242, 252, 253, 0.84)",
         fontSize: 16,
@@ -40,7 +40,7 @@ var options = {
     },
   ],
   grid: {
-    top: "38%",
+    top: "10%",
     left: "6%",
     right: "6%",
     bottom: "3%",
@@ -58,8 +58,8 @@ var options = {
     height: "520px",
     orient: "vertical",
     icon: "circle",
-    top: "15%",
-    left: "63%",
+    top: "30%",
+    left: "25%",
     itemWidth: 10,
     itemHeight: 10,
     textStyle: {
@@ -96,7 +96,7 @@ var options = {
     /** 饼图上刻度 */
     {
       type: "gauge",
-      center: ["30%", "35%"],
+      center: ["50%", "15%"],
       radius: "43%", // 错位调整此处
       startAngle: 0,
       endAngle: 360,
@@ -118,7 +118,7 @@ var options = {
       tooltip: false,
       type: "gauge",
       radius: "30%",
-      center: ["30%", "35%"],
+      center: ["50%", "15%"],
       startAngle: 0,
       endAngle: 360,
       axisLine: {
@@ -185,7 +185,7 @@ var options = {
     {
       type: "pie",
       radius: ["40%", "50%"],
-      center: ["30%", "35%"],
+      center: ["50%", "15%"],
       z: 10,
       label: {
         show: false,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
index d984205b..c5a47221 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
@@ -5,6 +5,7 @@
       :formList="searchFormList"
       @handleSearch="handleSearch"
     />
+    <ButtonGradient @click="onExportClick" style="width:50px">导出</ButtonGradient>
     <div class="Eventfiltering-content">
       <div class="Eventfiltering-left" ref="trafficIncidents"></div>
     </div>
@@ -13,15 +14,19 @@
 
 <script>
 import InputSearch from "@screen/components/InputSearch/index.vue";
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import trafficIncidentsCharts2 from "./trafficIncidentsCharts.js";
 import { nonAutomaticWarningTimeType } from "@/api/manualWarning/index.js";
 import * as echarts from "echarts";
 import moment from "moment";
+import request from "@/utils/request";
+import { exportFile } from "@screen/utils/common";
 
 export default {
   name: "Sitefiltering",
   components: {
     InputSearch,
+    ButtonGradient
   },
   props: {
     name: {
@@ -37,7 +42,7 @@ export default {
       },
       searchFormList: [
         {
-          label: "事件类型:",
+          label: "时间类型:",
           key: "type",
           type: "select",
           default: "day",
@@ -105,7 +110,17 @@ export default {
               return true;
             }
           },
-        },
+        }, {
+    label: "收费站:",
+    key: "facilityId",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+       
+      ],
+    },
+  }
       ],
     };
   },
@@ -114,6 +129,7 @@ export default {
       handler(newValue, oldValue) {
         console.log("newValue", newValue);
         if (newValue == "third") {
+          this.initSearch();
           this.getWarningCharts();
         }
       },
@@ -122,6 +138,33 @@ export default {
   },
   mounted() {},
   methods: {
+    onExportClick(){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportNonAutomaticWarningTimeType",
+        filename: '非机预警按日期查询',
+        data: this.data
+      });
+    },
+    initSearch(){
+      if(this.searchFormList[4].options.options.length > 0){
+        return;
+      }
+      request({
+        url: `business/facility/query?facilityType=1`,
+        method: "get",
+      }).then(res=>{
+        if (res.code != 200) return Message.error(res?.msg);
+        const options = [];
+        res.data.forEach(e => {
+          options.push({
+            key: e.id,
+            label: e.facilityName,
+          })
+        });
+        this.searchFormList[4].options.options = options
+      })
+    },
     getWarningCharts() {
       setTimeout(() => {
         this.$nextTick(async () => {
@@ -134,7 +177,8 @@ export default {
       });
     },
     getNonAutomaticWarningTimeType(data) {
-      console.log("data", data);
+
+      this.data = data;
       return nonAutomaticWarningTimeType(data).then((res) => {
         let newData = res.data;
         let seriesData = [];
@@ -172,6 +216,9 @@ export default {
       });
     },
     handleSearch(value) {
+      if(value.facilityId === ''){
+        value.facilityId = null;
+      }
       value.warningTime = value.warningTime + " 00:00:01";
       this.formData = { ...value };
       this.getNonAutomaticWarningTimeType(this.formData);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue
index 371b7c72..6333ed05 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue
@@ -4,7 +4,7 @@
       <el-tab-pane label="按事件分类" name="first">
         <Eventfiltering name="first" />
       </el-tab-pane>
-      <el-tab-pane label="按卡口" name="second">
+      <el-tab-pane label="按站点" name="second">
         <Sitefiltering :name="activeName" />
       </el-tab-pane>
       <el-tab-pane label="按日期" name="third">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalTollStation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalTollStation/index.vue
index 07296810..74974edb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalTollStation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalTollStation/index.vue
@@ -1,14 +1,51 @@
+
 <template>
-    <div>
-        <img class="img" src="@screen/images/digital/digitalTollStation.jpg" />
+    <div class='comp_box'>
+        <iframe class="iframe" :src="url" frameborder="0"></iframe>
     </div>
 </template>
+
 <script>
 
+import { getConfigKey } from "@/api/system/config.js";
+import request from "@/utils/request";
+export default {
+    name: 'InDevelopment',
+    components: {
+    },
+    data(){
+        return {
+            url:""
+        }
+    },
+    props: {
+    },
+    mounted() {
+        getConfigKey("digitalTollStation").then((response) => {
+          this.url = response.msg===''?'https://10.0.86.63:9000/s?loadType=auto&group=15ai1k13748d&runType=box':response.msg;
+        });
+    }
+}
 </script>
+
 <style lang='scss' scoped>
-    .img {
-        height: 1030px;
-        width: 1920px;
+.comp_box {
+    // padding-top:160px;
+    width: 100%;
+    height: 100%;
+    color: #8A9EAA;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+
+    .iframe {
+        z-index: 0;
+        position: absolute;
+        left: 0;
+        top: -70px;
+        width: 100%;
+        height: 110%;
     }
+}
 </style>
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 1e53a741..9012d5e3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/index.vue
@@ -1,4 +1,5 @@
 <template>
+    <!-- 数字路网 -->
     <div class="roadNet">
         <div class="summary">
             <div class="summaryUnit" v-for="item in summary" :style="{ 'flex-basis': item.width + 'px' }">
@@ -40,7 +41,7 @@
                     </li>
                 </ul>
             </div>
-            <div class="part partCalc">
+           <div class="part partCalc">
                 <img class="arrow" src="./img/arrowRight.svg" alt="">
                 <div class="calcUnit small">
                     <h4 class="keep-ratio">实时计算</h4>
@@ -324,7 +325,7 @@ export default {
                 { title: "ETC门架", value: '-' },
                 { title: "雷达", value: '-' },
                 { title: "一类交调站", value: '-' },
-                { title: "气象监测", value: '-' },
+                { title: "气象检测", value: '-' },
                 { title: "事件预警", value: '-' },
                 { title: "基础数据", value: '-' },
                 { title: "摄像机", value: '-' },
@@ -352,7 +353,7 @@ export default {
                 if (res.code != 200) return;
                 this.manage[2].value = res.data;
             });
-            //气象监测
+            //气象检测
             request({ url: 'business/metrics/message-access/count', method: 'get',params:{...param, productId: 'zc-meteorological'}}).then(res=>{
                 if (res.code != 200) return;
                 this.manage[3].value = res.data;
@@ -628,10 +629,10 @@ li {
 
         .manageTotal {
             width: 366px;
-            height: 112px;
+            height: 100px;
             background: url(./img/manageTotal.svg) no-repeat center center;
             text-align: center;
-            margin-top: 30px;
+            margin-top: 20px;
 
             h4 {
                 color: #FFD15C;
@@ -655,7 +656,7 @@ li {
             flex: 1;
             align-content: stretch;
             padding: 0;
-            margin-top: 30px;
+            margin-top: 20px;
 
             li {
                 flex-basis: 50%;
@@ -703,7 +704,7 @@ li {
         flex-direction: column;
         justify-content: space-around;
         align-items: center;
-        padding: 20px 0;
+        padding: 0px 0 10px 0;
 
         .arrow {
             right: -40px;
@@ -742,7 +743,7 @@ li {
 
         .calcUnit.small {
             width: 172px;
-            height: 215px;
+            height: 180px;
 
             h4 {
                 height: 22px;
@@ -760,8 +761,7 @@ li {
 
         .calcUnit.big {
             width: 225px;
-            height: 272px;
-
+            height: 180px;
             .con {
                 height: 250px;
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/charts.js
index cf7e68c1..06ea46a8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/charts.js
@@ -14,6 +14,13 @@ let nameList = [
   "12月",
 ]; // 类别
 var options = {
+  title:{
+    text:'',
+    textStyle: {
+      color: "#fff",
+      fontSize: '14px'
+    },
+  },
   tooltip: {
     show: true,
     trigger: "axis",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
index 0f7cd677..8a246186 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue
@@ -1,14 +1,24 @@
 <template>
-  <div class='content'>
+  <div class='content' :style="menu.isRecentOpen?'height:calc(100vh - 100px)':'height:calc(100vh - 65px)'">
     <div class="left">
-
-      <WgtTitle :title="'设备列表'"></WgtTitle>
+      <!-- <WgtTitle :title="'设备列表'"></WgtTitle> -->
       <el-form :model="form" class="formSearch " size="mini"  @submit.native.prevent>
         <el-form-item>
           <el-col :span="11">
-            <el-input v-model="form.deviceName" @keydown.enter.native="onSearch" size="medium" placeholder="设备名称" class="direction"></el-input>
+            <!-- <el-input v-model="form.deviceName" @keydown.enter.native="onSearch" size="medium" placeholder="设备名称" class="direction"></el-input> -->
+            <el-select
+              v-model="form.deviceType"
+              placeholder="请选择设备类型"
+            >
+              <el-option
+                v-for="item in [{label:'智能设备箱',value:13},{label:'太阳能板',value:15},{label:'远端机',value:16},{label:'气象检测器',value:3}]"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
           </el-col>
-          <el-col :span="10" :offset="1">
+          <el-col :span="12" :offset="1">
             <el-checkbox-group v-model="form.deviceState" style="height:26px">
               <el-checkbox :label="1">在线</el-checkbox>
               <el-checkbox :label="0">异常</el-checkbox>
@@ -22,7 +32,7 @@
       </el-form>
       <div class="body">
         <vuescroll :ops="scrollOptions">
-          <div :class="'device  ' + (listIndex===index?'deviceSel':'')" v-for="(item, index) of list" @click="devClick(item,index)">
+          <div :class="'device  ' + (devItem.deviceName===item.deviceName?'deviceSel':'')" v-for="(item, index) of list" @click="devClick(item, index)">
             <div>{{ item.deviceName }}</div>
             <el-tooltip :content="(item.deviceState == 0 || item.deviceState == null) ? '异常' : '在线'" placement="top">
               <img src="@/assets/jihe/images/offline.svg" class="state"
@@ -36,10 +46,10 @@
         </vuescroll>
       </div>
       <div class="footer">
-        <ElPagination @current-change="bindList" @size-change="onSizeChange" width="'100%'"
+        <Pagination @current-change="bindList" @size-change="onSizeChange" width="'100%'"
           :page-sizes="[10, 20, 30, 40, 50]" :page-size="page.pageSize" :current-page.sync="page.pageNum"
           layout="total, prev, pager, next" :total="total" class="Pagination">
-        </ElPagination>
+        </Pagination>
       </div>
     </div>
     <div class="right">
@@ -50,26 +60,32 @@
             type="date"
             class="selectDate"
             v-model="date"
+            value-format="yyyy-MM-dd"
             style="width: 140px"
             placeholder="请选择"
+            :clearable="false"
           />
-          <el-select v-model="devParam" @change="devChange"
-            class="devparam" placeholder="请选择" >
-              <el-option v-for="item in devOptions" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
+    
           <Button style="margin-left: 25px"  @click.native="bindData()">查询</Button>
         </div>
       </div>
       <div class="right-bottom" >
-        <div id="chart1" class="chart1"></div>
+        <div id="chartList" class="chartList"></div>
         <div class="right-table">
-          <Table :data="tableData" >
-            <ElTableColumn label="名称" prop="name" width="300"  align="center" />
-            <ElTableColumn label="采集时间" prop="timestamp"  align="center" />
-            <ElTableColumn :label="devParamName" prop="result" width="300" align="center" />
+          <Table :data="tableData" style="width: 75vw">
+            <ElTableColumn label="名称" prop="name" width="240"  align="center" />
+            <ElTableColumn label="采集时间" prop="timestamp" width="100"   align="center"  />
+            <ElTableColumn v-for="(item,index) of tableCols" :label="item.label" :prop="item.value" align="center" />
           </Table>
         </div>
+
+        <!-- 分页 -->
+        <div class="footer" style="display: flex;justify-content: center;margin:10px 0px;">
+          <Pagination @current-change="loadTable" @size-change="onSizeTableChange" width="'100%'"
+            :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+            layout="total, sizes, prev, pager, next" :total="totalRecord">
+          </Pagination>
+        </div>
       </div>
     </div>
   </div>
@@ -86,16 +102,24 @@ import { setLoading } from "@screen/utils/index.js";
 import chart1 from "./charts";
 import * as echarts from "echarts";
 import Table from '@screen/components/Table.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import {  mapState } from "vuex";
 export default {
   name: 'smartAnalysis',
   components: {
     vuescroll,
     WgtTitle,
     Button,
-    Table
+    Table,
+    Pagination
+  },
+  computed: {
+    ...mapState(["menu"]),
   },
   data() {
     return {
+      devItem:{},
+      clearable: false,
       listIndex: -1,
       form: {
         deviceName: '',
@@ -105,99 +129,144 @@ export default {
         pageNum: 0,
         pageSize: 20
       },
+      searchData: {
+        pageNum: 0,
+        pageSize: 10
+      },
       total: 0,
+      totalRecord:0,
       list: [],
       scrollOptions,
       date:'',
-      devParam:null,
-      devOptions:[],
-      devParamName:'',
+      tableSource: [],
       tableData:[],
-      init: true
+      tableCols: [],
+      init: true,
+      aryChartList:[]
     }
   },
   created() {
 
   },
   mounted() {
-    this.bindList();
     this.date = moment().format('YYYY-MM-DD')
+    this.bindList();  
   },
   methods: {
     bindData(){
-      if(this.devParam === null){
-        Message.warning('未选择参数')
-        return;
-      }
-      const param = _.find(this.devOptions,{id:this.devParam})
-      this.devParamName = param.name;
+      const item = this.devItem;
       const closeLoading = setLoading();
       request({
-        url: 'business/device/properties/deviceNameData',
+        url: 'business/device/properties/deviceAnalysis',
         method: 'post',
         data:{
-          deviceId: this.list[this.listIndex].deviceId,
-          propertyId: param.propertyId,
-          propertyName: param.propertyName,
-          deviceType: param.deviceType,
-          dateTime: this.date
+          dateTime: this.date,
+          deviceType: item.deviceType,
+          deviceId: item.deviceId
         }
       }).then(result => {
         if (result.code != 200) return Message.error(result?.msg);
-        let name = [];
-        let value = []; 
-        let unit = ''
-        result.data.forEach((e,index) => {
-          e.name = this.list[this.listIndex].deviceName,
-          name.push(e.timestamp.substr(11))
-          const n = e.result.match(/\d+\.*\d*/g);
-          if(n.length > 0){
-            if(unit === ''){
-              unit = e.result.substr(n[0].length)
-            }
-            value.push(parseFloat(n[0]))
-          } else {
-            value.push(0)
+        this.aryChartList = [];
+        let cols = [];
+        let rows = [];
+        result.data.forEach(e => {
+          cols.push({
+            label: e.name,
+            value: e.name
+          })
+
+          if(rows.length === 0){
+            e.results.forEach(el => {
+              rows.push({
+                name:item.deviceName,
+                timestamp: el.timestamp.substr(11)
+              })  
+            });
           }
-        });
-        this.tableData = result.data;
-        chart1.xAxis.data = name;
-        chart1.yAxis[0].name = unit;
-        chart1.series[0].name = param.name;
-        chart1.series[0].data = value;
-        chart1.tooltip['valueFormatter'] = function (value) {
-          return value + " "+unit;
-        }
-        var myChart1 = echarts.init(document.getElementById("chart1"));
-        myChart1.setOption(chart1);
+
+          let xname = e.results.map(x=>x.timestamp.substr(11))
+          let value = [];
+            let unit = ''
+          e.results.forEach((c,idx)=>{
+            rows[idx][e.name] = c.result
+            const n = c.result?.match(/\d+\.*\d*/g);
+              if(n && n.length > 0){
+                if(unit === ''){
+                  unit = c.result.substr(n[0].length)
+                }
+                value.push(parseFloat(n[0]))
+              } else {
+                value.push(0)
+              }
+          })
+          
+          
+          const chartOptions = _.cloneDeep(chart1);
+          chartOptions.title.text = e.name +' / ' + this.date + ' / ' + item.deviceName;
+          chartOptions.xAxis.data = xname;
+          chartOptions.yAxis[0].name = unit;
+          chartOptions.series[0].name = e.name;
+          chartOptions.series[0].data = value;
+          chartOptions.tooltip['valueFormatter'] = function (value) {
+            return value + " "+unit;
+          }
+          
+          this.aryChartList.push({
+            ...item,
+            pname: e.name,
+            options: chartOptions
+          })
+        })
+        this.showCharts();
+        this.tableCols = cols;
+        this.tableSource = rows;
+        this.totalRecord = rows.length;
+        this.searchData= {
+          pageSize: 10,
+          pageNum: 1,
+        },
+        this.loadTable()
       }).finally(()=>{
         closeLoading()
-      })
+      });
     },
-    devChange(e){
-      const dev = _.find(devOptions,{id: e})
-      console.log(dev)
+    onSizeTableChange(pageSize) {
+      this.tableData = [];
+      this.searchData.pageSize = pageSize;
+      this.searchData.pageNum = 1;
+      this.loadTable();
+    },
+    loadTable(e){
+      if(e){
+        this.searchData.pageNum = e;
+      }
+      const nums = (this.searchData.pageNum-1)*(this.searchData.pageSize);
+      const nume = nums + this.searchData.pageSize
+      this.tableData = this.tableSource.slice(nums,nume)
+    },
+    showCharts(){
+       const charts = document.getElementById('chartList')
+       let html = ''
+       this.aryChartList.map(x=>{
+        const id = x.deviceId + x.pname
+        html +=`<div id="${id}" style="width:100%;height:300px">${id}</div>`
+       })
+      charts.innerHTML = html;
+      setTimeout(() => {
+        this.aryChartList.map(x=>{
+          const id = x.deviceId + x.pname
+          const myChart1 = echarts.init(document.getElementById(id));
+          myChart1.setOption(x.options);
+        })  
+      }, 500);
     },
     devClick(item,index){
       this.listIndex = index;
-      request({
-        url: 'business/device/deviceParameter',
-        method: 'get',
-        params:{
-          deviceType:item.deviceType
-        }
-      }).then(result => {
-        if (result.code != 200) return Message.error(result?.msg);
-     
-        this.devOptions = result.rows;
-        if(result.rows.length > 0){
-          this.devParam = result.rows[0].id
-          this.bindData();
-        } else {
-          this.devParam = null; 
-        }
-        
-      })
+      this.devItem =item;
+      this.aryChartList = [];
+      setTimeout(() => {
+        this.bindData();
+      }, 200);
     },
     onSizeChange(pageSize) {
       this.page.pageSize = pageSize;
@@ -226,7 +295,11 @@ export default {
         this.total = result.total;
         if(this.init){
           this.init = false;
-          this.devClick(this.list[0],0)
+          setTimeout(() => {
+            
+            this.devClick( this.list[0],0)  
+          }, 400);
+          
         }
         
       })
@@ -257,8 +330,8 @@ export default {
   padding: 20px;
 
   .left {
-    width: 400px;
-    background-color: #112533;
+    width: 300px;
+    // background-color: #112533;
     height: 100%;
     display: flex;
     flex-direction: column;
@@ -278,38 +351,43 @@ export default {
   }
 
   .right {
+  
+    margin-left: 20px;
     flex: 1;
-    margin-left: 30px;
+    display: flex;
+    flex-direction: column;
     .top{
       .search{
         display: flex;
         justify-content: flex-end;
       }
     }
+    .chartList{
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+    }
     .right-bottom{
       width: 100%;
-      height: 100%;
-      flex:1;
+      flex: 1;
+      height: 0;
+      overflow-y: auto;
       display: flex;
       flex-direction: column;
-      justify-content: flex-start;
-      align-items: flex-start;
     }
     .chart1{
       width: 100%;
-      flex:1;
+      height: 300px;
     }
     .right-table{
       width: 100%;
-      height: 550px;
-      overflow-y: auto;
-      margin-bottom: 30px;
+      margin-top: 20px;
     }
   }
 }
 
 ::v-deep .formSearch {
-  padding: 20px 20px 0;
+  padding: 20px 5px;
 
   .el-form-item__label {
     color: #fff;
@@ -330,9 +408,11 @@ export default {
   cursor: pointer;
   display: flex;
   justify-content: space-between;
+  align-items: center;
 }
 .deviceSel{
-  background-color:#1798a9;
+  // background-color:#1798a9;
+  background: linear-gradient(45deg, #1798a9, #1798a900);
 }
 .device:hover {
   background-color: #1d647f;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index_1.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index_1.vue
new file mode 100644
index 00000000..a7ae6865
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index_1.vue
@@ -0,0 +1,519 @@
+<template>
+  <div class='content' :style="menu.isRecentOpen?'height:calc(100vh - 100px)':'height:calc(100vh - 65px)'">
+    <div class="left">
+      <WgtTitle :title="'设备列表'"></WgtTitle>
+      <el-form :model="form" class="formSearch " size="mini"  @submit.native.prevent>
+        <el-form-item>
+          <el-col :span="11">
+            <el-input v-model="form.deviceName" @keydown.enter.native="onSearch" size="medium" placeholder="设备名称" class="direction"></el-input>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-checkbox-group v-model="form.deviceState" style="height:26px">
+              <el-checkbox :label="1">在线</el-checkbox>
+              <el-checkbox :label="0">异常</el-checkbox>
+            </el-checkbox-group>
+          </el-col>
+        </el-form-item>
+        <el-form-item style="display: flex; justify-content: center;">
+          <el-button class="btnInfoBoard" type="add" @click.native="onSearch()">搜索</el-button>
+          <el-button type="publish" @click.native="onResetSearch()">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="body">
+        <vuescroll :ops="scrollOptions">
+          <div :class="'device  ' + (listIndex===index?'deviceSel':'')" v-for="(item, index) of list" @click="devClick(item,index)">
+            <div>{{ item.deviceName }}</div>
+            <el-tooltip :content="(item.deviceState == 0 || item.deviceState == null) ? '异常' : '在线'" placement="top">
+              <img src="@/assets/jihe/images/offline.svg" class="state"
+                v-if="item.deviceState == '0' || item.deviceState == null">
+              <img src="@/assets/jihe/images/online.svg" class="state" v-else>
+            </el-tooltip>
+          </div>
+          <div v-if="list.length === 0" style="color: #fff; text-align: center; line-height: 60px">
+            暂无数据
+          </div>
+        </vuescroll>
+      </div>
+      <div class="footer">
+        <Pagination @current-change="bindList" @size-change="onSizeChange" width="'100%'"
+          :page-sizes="[10, 20, 30, 40, 50]" :page-size="page.pageSize" :current-page.sync="page.pageNum"
+          layout="total, prev, pager, next" :total="total" class="Pagination">
+        </Pagination>
+      </div>
+    </div>
+    <div class="right">
+      <div class="top">
+        <div class="search">
+          <el-date-picker
+            size="small"
+            type="date"
+            class="selectDate"
+            v-model="date"
+            value-format="yyyy-MM-dd"
+            style="width: 140px"
+            placeholder="请选择"
+            :clearable="false"
+          />
+          <el-select v-model="devParam" @change="devChange"
+            class="devparam" placeholder="请选择" >
+              <el-option v-for="item in devOptions" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+          <Button style="margin-left: 25px;background-color: #0e708b; "  @click.native="clearData()">重置</Button>
+          <Button style="margin-left: 25px"  @click.native="bindData()">查询</Button>
+        </div>
+      </div>
+      <div class="right-bottom" >
+        <div id="chartList" class="chartList"></div>
+        <div class="right-table">
+          <Table :data="tableData" height="430px" style="width: 75vw">
+            <ElTableColumn label="名称" prop="name" width="300"  align="center" />
+            <ElTableColumn label="采集时间" prop="timestamp"  align="center" />
+            <ElTableColumn :label="devParamName" prop="result" width="300" align="center" />
+          </Table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import request from "@/utils/request";
+import vuescroll from "vuescroll";
+import scrollOptions from "@/common/scrollbar.js";
+import { Message } from "element-ui";
+import WgtTitle from "@screen/pages/perception/widgets/title";
+import Button from "@screen/components/Buttons/Button.vue";
+import { setLoading } from "@screen/utils/index.js";
+import chart1 from "./charts";
+import * as echarts from "echarts";
+import Table from '@screen/components/Table.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import {  mapState } from "vuex";
+export default {
+  name: 'smartAnalysis',
+  components: {
+    vuescroll,
+    WgtTitle,
+    Button,
+    Table,
+    Pagination
+  },
+  computed: {
+    ...mapState(["menu"]),
+  },
+  data() {
+    return {
+      clearable: false,
+      listIndex: -1,
+      form: {
+        deviceName: '',
+        deviceState: [1, 0]
+      },
+      page: {
+        pageNum: 0,
+        pageSize: 20
+      },
+      total: 0,
+      list: [],
+      scrollOptions,
+      date:'',
+      devParam:null,
+      devOptions:[],
+      devParamName:'',
+      tableData:[],
+      init: true,
+      aryChartList:[]
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.date = moment().format('YYYY-MM-DD')
+    this.bindList();  
+  },
+  methods: {
+    bindData(){
+      if(this.devParam === null){
+        Message.warning('未选择参数')
+        return;
+      }
+      const param = _.find(this.devOptions,{id:this.devParam})
+      this.devParamName = param.name;
+      if(!_.find(this.aryChartList,{deviceName:this.devParamName,date:this.date})){
+
+        this.aryChartList.push({
+          deviceId:this.list[this.listIndex].deviceId,
+          deviceName: this.devParamName,
+          param,
+          options: null,
+          date:this.date
+        })
+        this.bindCharts();
+      }
+     
+    },
+    bindCharts(){
+      const info = this.aryChartList[this.aryChartList.length -1]
+      const {param} = info;
+
+      const closeLoading = setLoading();
+      request({
+        url: 'business/device/properties/deviceNameData',
+        method: 'post',
+        data:{
+          deviceId: this.list[this.listIndex].deviceId,
+          propertyId: param.propertyId,
+          propertyName: param.propertyName,
+          deviceType: param.deviceType,
+          dateTime: this.date
+        }
+      }).then(result => {
+        if (result.code != 200) return Message.error(result?.msg);
+        let name = [];
+        let value = []; 
+        let unit = ''
+        result.data.forEach((e,index) => {
+          e.name = this.list[this.listIndex].deviceName,
+          name.push(e.timestamp.substr(11))
+          const n = e.result.match(/\d+\.*\d*/g);
+          if(n.length > 0){
+            if(unit === ''){
+              unit = e.result.substr(n[0].length)
+            }
+            value.push(parseFloat(n[0]))
+          } else {
+            value.push(0)
+          }
+        });
+        this.tableData = result.data;
+        const chartOptions = _.cloneDeep(chart1);
+        chartOptions.title.text = this.list[this.listIndex].deviceName +' / ' + info.date + ' / ' + info.deviceName;
+        chartOptions.xAxis.data = name;
+        chartOptions.yAxis[0].name = unit;
+        chartOptions.series[0].name = param.name;
+        chartOptions.series[0].data = value;
+        chartOptions.tooltip['valueFormatter'] = function (value) {
+          return value + " "+unit;
+        }
+        info.options = chartOptions;
+        console.log(info,'------')
+        this.showCharts();
+        // console.log(document.getElementById(id),'3333')
+        // var myChart1 = echarts.init(document.getElementById(id));
+        // myChart1.setOption(chartOptions);
+        // this.aryChartList.push(myChart1)
+        // for(let i = 0; i < this.aryChartList.length -1; i++){
+        //   // this.aryChartList.
+        //   console.log('2222')
+        // }
+      }).finally(()=>{
+        closeLoading()
+      })
+    },
+    clearData(){
+      this.aryChartList = [];
+      this.devParam = this.devOptions[0].id
+      this.aryChartList = []
+      setTimeout(() => {
+        this.bindData();
+      }, 200);
+    },
+    showCharts(){
+       const charts = document.getElementById('chartList')
+       let html = ''
+       this.aryChartList.map(x=>{
+        const id = x.deviceId + x.date + x.deviceName
+        html=`<div id="${id}" style="width:100%;height:300px">${id}</div>`+html
+       })
+      charts.innerHTML = html;
+      this.aryChartList.map(x=>{
+        const id = x.deviceId + x.date + x.deviceName
+        const myChart1 = echarts.init(document.getElementById(id));
+        myChart1.setOption(x.options);
+      })
+      // console.log(charts.innerHTML,'￥￥￥￥')
+      // setTimeout(() => {
+      //   this.bindCharts(id,param)
+      // }, 200);
+    },
+    devChange(e){
+      const dev = _.find(this.devOptions,{id: e})
+    },
+    devClick(item,index){
+      this.listIndex = index;
+      request({
+        url: 'business/device/deviceParameter',
+        method: 'get',
+        params:{
+          deviceType:item.deviceType
+        }
+      }).then(result => {
+        if (result.code != 200) return Message.error(result?.msg);
+     
+        this.devOptions = result.rows;
+        if(result.rows.length > 0){
+          this.clearData();
+        } else {
+          this.devParam = null; 
+        }
+        
+      })
+    },
+    onSizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.bindList();
+    },
+    bindList() {
+      const params = {
+        ...this.form, ...this.page,
+      };
+      if (params.deviceState.length === 2) {
+        delete params.deviceState;
+      } else {
+        params.deviceState = params.deviceState.join('')
+      }
+      if (params.deviceName === '') {
+        delete params.deviceName
+      }
+
+      request({
+        url: 'business/device/selectDeviceNameList',
+        method: 'get',
+        params
+      }).then(result => {
+        if (result.code != 200) return Message.error(result?.msg);
+        this.list = result.rows;
+        this.total = result.total;
+        if(this.init){
+          this.init = false;
+          setTimeout(() => {
+            this.devClick(this.list[0],0)  
+          }, 400);
+          
+        }
+        
+      })
+    },
+    onResetSearch() {
+      this.form = {
+        deviceName: '',
+        deviceState: [1, 0]
+      };
+      this.pageNum = 0;
+      this.bindList();
+    },
+    onSearch() {
+      this.pageNum = 0;
+      this.bindList();
+    },
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.content {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+  background-color: #101d23;
+  padding: 20px;
+
+  .left {
+    flex: 1;
+    background-color: #112533;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+    .body {
+      flex: 1;
+      height: 0;
+      padding: 0 10px 10px;
+    }
+
+    .footer {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 10px;
+    }
+  }
+
+  .right {
+    width: 75vw;
+    margin-left: 30px;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    .top{
+      .search{
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+    .chartList{
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+    }
+    .right-bottom{
+      width: 100%;
+      flex: 1;
+      height: 0;
+      overflow-y: auto;
+      display: flex;
+      flex-direction: column;
+    }
+    .chart1{
+      width: 100%;
+      height: 300px;
+    }
+    .right-table{
+      width: 100%;
+      margin-top: 20px;
+    }
+  }
+}
+
+::v-deep .formSearch {
+  padding: 20px 20px 0;
+
+  .el-form-item__label {
+    color: #fff;
+  }
+}
+
+.direction {
+  ::v-deep .el-input {
+    .el-input__inner {
+      font-size: 14px !important;
+      padding: 8px 5px;
+    }
+  }
+}
+
+.device {
+  padding: 7.5px 15px;
+  cursor: pointer;
+  display: flex;
+  justify-content: space-between;
+}
+.deviceSel{
+  background-color:#1798a9;
+}
+.device:hover {
+  background-color: #1d647f;
+}
+
+.state {
+  width: 18px;
+  height: 18px;
+}
+
+</style>
+
+<style lang="scss" scoped>
+.Pagination {
+ 
+  ::v-deep {
+
+    >button,
+    >ul li {
+      background: #064258;
+      border-radius: 2px 2px 2px 2px;
+      opacity: 1;
+      color: #fff;
+    }
+
+    >button {
+      padding: 0 3px;
+      border: 1px solid #00b3cc;
+    }
+
+    >ul li {
+      background: linear-gradient(180deg, #004960 0%, #004b62 100%);
+      margin: 0 1.5px;
+
+      &.active {
+        background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+      }
+    }
+
+    .el-pagination__total {
+      color: #fff;
+    }
+
+    .el-pagination__sizes {
+      .el-select {
+        .el-input {
+          width: 81px;
+
+          .el-input__inner {
+            font-size: 12px;
+            height: 23px;
+            background-color: #064258 !important;
+          }
+        }
+
+        .el-input__suffix {
+          .el-input__icon {
+            line-height: 23px;
+          }
+        }
+      }
+    }
+
+    .el-pagination__jump {
+      margin-left: 10px;
+      color: #fff;
+      font-size: 12px;
+
+      .el-input {
+        width: 27px;
+        margin: 0 3px;
+
+        .el-input__inner {
+          font-size: 12px;
+          background-color: #064258 !important;
+          border-radius: 2px 2px 2px 2px;
+        }
+      }
+    }
+
+    .btn-next {
+      margin-left: 6px;
+    }
+
+    .btn-prev {
+      margin-right: 6px;
+    }
+  }
+
+  ::v-deep .el-pagination__total {
+    margin-left: 10px;
+  }
+}
+.devparam{
+  width: 200px;
+  margin-left: 20px;
+  
+}
+.selectDate {
+    width: 89px;
+    border: 1px solid #00b3cc;
+    
+    ::v-deep {
+      .el-input__prefix{
+        top:-4px;
+      }
+      .el-input__inner {
+        
+        background-color: #064258 !important;
+        border-width: 0px !important;
+      }
+    }
+  }
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/data.js
index 00caefa4..dfa9e059 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/data.js
@@ -6,23 +6,84 @@ import {directionOptions} from '@screen/utils/enum.js';
 export const searchFormList = [
  
   {
-    label: "设备名称:",
-    key: "deviceName",
-    type: "input",
-    default: ""
-  },
-  {
-    label: "物联编号:",
-    key: "iotDeviceId",
-    type: "input",
-    default: ""
-  },  {
+    label: "设备类型:",
+    key: "deviceType",
+    type: "select",
+    options: {
+      options: [
+        {
+          value: "1",
+          label: "摄像机",
+        },
+        {
+          value: "2",
+          label: "情报板",
+        },
+        {
+          value: "3",
+          label: "气象检测器",
+        },
+        {
+          value: "5",
+          label: "路段语音广播系统",
+        },
+        {
+          value: "6",
+          label: "护栏碰撞预警系统",
+        },
+        {
+          value: "7",
+          label: "毫米波雷达",
+        },
+        {
+          value: "8",
+          label: "合流区预警系统",
+        },
+        {
+          value: "10",
+          label: "激光疲劳唤醒",
+        },
+        {
+          value: "11",
+          label: "一类交通量调查站",
+        },
+        {
+          value: "12",
+          label: "智能行车诱导系统",
+        },
+        {
+          value: "13",
+          label: "智能设备箱",
+        },
+      ],
+    },
+  },{
     label: "设备方向:",
     key: "direction",
     type: "select",
     options: {
       options: directionOptions,
     },
+  },{
+    label: "使用状态:",
+    key: "useState",
+    type: "select",
+    options: {
+      options: [
+        {value:1,label:'在用'},
+        {value:0,label:'停用'}
+      ],
+    },
+  },{
+    label: "设备状态:",
+    key: "deviceState",
+    type: "select",
+    options: {
+      options: [
+        {value:'1',label:'正常'},
+        {value:'0',label:'异常'}
+      ],
+    },
   },
   
 ];
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 d8f46a39..ddd62272 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
@@ -17,13 +17,16 @@
       </ButtonGradient>
       </div>
       
-      <InputSearch ref="searchComp" style="width: 480px" :formList="searchFormList"
+      <InputSearch ref="searchComp" style="width: 480px"
+        params="deviceName"
+        placeholder="请输入设备名称，回车搜索"
+        type="input" :formList="searchFormList"
         :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
 
     </div>
     <!-- 内容 -->
     <div class="body">
-      <Table :data="tableData" height="100%">
+      <Table :data="tableData" height="75vh">
         <el-table-column label="序号" type="index" :index="indexMethod" width="120" align="center"
           header-align="center" />
         <ElTableColumn label="设备名称" prop="deviceName" align="center" header-align="center" />
@@ -136,7 +139,7 @@ import {DirectionTypes,deviceTypeOptions,directionOptions} from '@screen/utils/e
 import InputSearch from "@screen/components/InputSearch/index.vue";
 import { searchFormList } from "./data";
 import { getToken } from "@/utils/auth";
-import { delay, exportFile, confirm } from "@screen/utils/common";
+import { exportFile } from "@screen/utils/common";
 import { Message } from "element-ui";
 import Button from "@screen/components/Buttons/Button.vue";
 import Form from "@screen/components/FormConfig";
@@ -409,16 +412,16 @@ export default {
           data,
         })
           .then((result) => {
-            if (result.code != 200) return Message.error(`提交失败!`);
+            if (result.code != 200) return Message.error(`提交失败`);
 
-            Message.success(`提交成功!`);
+            Message.success(`提交成功`);
 
             this.modelVisible = false;
             this.searchData.pageNum = 1;
             this.initData();
           })
           .catch((err) => {
-            Message.error(`提交失败!`);
+            Message.error(`提交失败`);
           })
           .finally(() => {
             this.submitting = false;
@@ -430,17 +433,9 @@ export default {
       exportFile({
         url: "/business/device/export",
         filename: "设备列表",
-        data: this.getSearchData(),
+        data: this.searchData
       });
     },
-    getSearchData() {
-      let params = {
-        groupName: this.searchData?.word,
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-      };
-      return params;
-    },
     initData() {
       request({
         url: `/business/device/list`,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue
index b8ba818b..5eb4430c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue
@@ -71,6 +71,14 @@
                   src="@screen/images/layer/路测设备/疲劳唤醒.svg"
                   v-if="item.title.includes('疲劳唤醒')"
                 />
+                <img
+                  src="@screen/images/layer/路测设备/太阳能板.svg"
+                  v-if="item.title.includes('太阳能板')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/远端机.svg"
+                  v-if="item.title.includes('远端机')"
+                />
               </div>
               <div class="numUnit">
                 <span class="num">{{ item.total }}</span>
@@ -119,7 +127,7 @@ export default {
   components: { draggable },
   props: {
     dataList: {
-      type: Object,
+      type: Array,
       default: () => [],
     },
   },
@@ -131,7 +139,6 @@ export default {
   created() {},
   methods: {
     ____onDragend() {
-      console.log(789, this.dataList);
       let data = [];
       this.dataList.forEach((item, index) => {
         data.push(item.title);
@@ -153,15 +160,12 @@ export default {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  margin-right: 0px;
-  overflow-y: scroll;
   .draggable {
     width: 100%;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
     margin-right: 0px;
-    overflow-y: scroll;
   }
   .item {
     flex-basis: percentage(1/8);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceUptime/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceUptime/index.vue
index 4041d822..935d7244 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceUptime/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceUptime/index.vue
@@ -1,22 +1,18 @@
 <template>
-  <div class='congestion'>
-    <WgtTitle :title="'设备在线率雷达图'"></WgtTitle>
-    <div class="board">
+  <div class="charts ">
       <Empty v-if="isEmpty" text="暂无数据..."></Empty>
-      <div v-else class="charts keep-ratio " ref="deviceUptime"></div>
-    </div>
-  </div>
+      <div v-else class="charts " ref="deviceUptime"></div>
+  </div>  
 </template>
   
 <script>
-import WgtTitle from "../../../../../../perception/widgets/title";
 import * as echarts from "echarts";
 import chartOptions from "./assets/charts";
+
 let chartsStatistics = chartOptions.options;
 export default {
   name: 'DeviceUptime',
   components: {
-    WgtTitle
   },
   props: {
     dataList: {
@@ -32,7 +28,7 @@ export default {
   watch: {
     dataList: {
       handler(newD, oldD) {
-
+      
         if (!newD || newD.length <= 0) {
           this.isEmpty = true;
           return
@@ -62,8 +58,10 @@ export default {
 
         this.isEmpty = false;
         this.$nextTick(() => {
-          var myChart = echarts.init(this.$refs['deviceUptime']);
-          myChart.setOption(chartsStatistics);
+          if(!this.myChart){
+            this.myChart = echarts.init(this.$refs['deviceUptime']);
+          }
+          this.myChart.setOption(chartsStatistics);
           chartOptions.counterReset();
         });
 
@@ -78,7 +76,7 @@ export default {
 
   },
   methods: {
-
+    
   },
   mounted() {
 
@@ -87,26 +85,7 @@ export default {
 </script>
   
 <style lang='scss' scoped>
-.congestion {
-  width: 100%; height: 100%;
-  display: flex;
-  flex-direction: column;
 
-  .board {
-    flex: 1;
-    width: 100%;
-    padding: 0px 20px;
-    background: linear-gradient(180deg, rgba(6, 66, 88, 0) 0%, rgba(6, 66, 88, 0.4) 100%);
-    // border-radius: 5px 5px 5px 5px;
-    opacity: 1;
-    // border: 1px solid;
-    // border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-direction: column;
-  }
-}
 
 .charts {
   height: 100%;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/monthlyEquipment/index.vue
index 6a683c64..28c4f312 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/monthlyEquipment/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/monthlyEquipment/index.vue
@@ -46,7 +46,7 @@ export default {
   },
   props: {
     dataList: {
-      type: Object,
+      type: Array,
       default: () => []
     }
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/assets/barCharts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/assets/barCharts.js
index 85a7a74c..79e0c0b4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/assets/barCharts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/assets/barCharts.js
@@ -60,7 +60,7 @@ nameList.map((item, index) => {
 
 var options = {
   grid: {
-    top: "15%", //上边距
+    top: "20%", //上边距
     right: "5px", //右边距
     left: "30px", //左边距
     bottom: "2%", //下边距
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/index.vue
index 5d4813ec..6bd89e3e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/onLineBarCharts/index.vue
@@ -1,10 +1,7 @@
 <template>
-  <div class="congestion">
-    <WgtTitle title="设备在线率柱状图"></WgtTitle>
-    <div class="board" ref="box">
-      <Empty v-if="isEmpty" text="暂无数据..."></Empty>
-      <div ref="barCharts" v-else style="width: 100%; height: 100%"></div>
-    </div>
+  <div class="charts">
+    <Empty v-if="isEmpty" text="暂无数据..."></Empty>
+    <div ref="barCharts" v-else class="charts"></div>
   </div>
 </template>
 
@@ -26,7 +23,7 @@ export default {
   props: {
     dataList: {
       type: Object,
-      default: () => [],
+      default: () => null,
     },
   },
   created() {},
@@ -70,9 +67,10 @@ export default {
         chartOptions.xAxis.data = xData;
         chartOptions.series[0].data = valueData;
         this.$nextTick(() => {
-          var myChart = echarts.init(this.$refs["barCharts"]);
-          myChart.setOption(chartOptions);
-          chartOptions.counterReset();
+          if(!this.myChart){
+            this.myChart = echarts.init(this.$refs["barCharts"]);
+          }
+          this.myChart.setOption(chartOptions);
         });
       },
       deep: true,
@@ -84,64 +82,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.congestion {
+.charts{
   width: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .board {
-    position: relative;
-    height: 510px;
-    width: 100%;
-    padding: 0px 20px;
-    background: linear-gradient(
-      180deg,
-      rgba(6, 66, 88, 0) 0%,
-      rgba(6, 66, 88, 0.4) 100%
-    );
-    // border-radius: 5px 5px 5px 5px;
-    opacity: 1;
-    // border: 1px solid;
-    // border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-direction: column;
-
-    .ball {
-      position: absolute;
-    }
-
-    .ballAnimation {
-      transform: translate(0px, -10px);
-      animation: mymove 2s infinite ease-in-out alternate;
-
-      &.level_0 {
-        animation-delay: 0s;
-      }
-
-      &.level_1 {
-        animation-delay: 0.6s;
-      }
-
-      &.level_2 {
-        animation-delay: 1.4s;
-      }
-
-      &.level_3 {
-        animation-delay: 1.8s;
-      }
-    }
-  }
-}
-
-@keyframes mymove {
-  0% {
-    transform: translate(0px, -10px);
-  }
-
-  100% {
-    transform: translate(0px, 10px);
-  }
+  height: 100%;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/index.vue
index 4ea65904..ca0fe087 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/index.vue
@@ -1,12 +1,25 @@
 <template>
   <div class="statisticAna">
+    <div class="top">
     <DeviceSummary
       class="deviceSummary"
       :dataList="equipments"
     ></DeviceSummary>
+  </div>
     <div class="bottomTabs">
-      <DeviceUptime :dataList="equipments" class="tabs-lo" />
-      <OnLineBarCharts :dataList="sectionData" class="tabs-mo" />
+      <section class="cleft">
+          <div class="title">
+            <div class="icon"></div>设备在线率雷达图
+            <!-- <ChartExport @export="chartExport('设备在线率')" /> -->
+          </div>
+            <DeviceUptime v-show="isKeep" ref="refDeviceUptime" :dataList="equipments" />
+        </section>
+        <section class="cright">
+          <div class="title">
+            <div class="icon"></div>设备在线率柱状图
+          </div>
+            <OnLineBarCharts v-show="isKeep" ref="refOnLineBarCharts" :dataList="sectionData" />
+        </section>
     </div>
   </div>
 </template>
@@ -16,6 +29,10 @@
 import DeviceUptime from "./components/deviceUptime";
 import OnLineBarCharts from "./components/onLineBarCharts";
 import DeviceSummary from "./components/deviceSummary";
+import {res_state_type} from './mock.js'
+import { delay } from "@screen/utils/common";
+import ChartExport from "@screen/components/ChartExport/index.vue"
+import { exportFile } from "@screen/utils/common";
 import {
   getSystemStatusType,
   getStatusSection,
@@ -26,6 +43,7 @@ export default {
     DeviceUptime,
     DeviceSummary,
     OnLineBarCharts,
+    ChartExport
   },
   data() {
     return {
@@ -50,7 +68,9 @@ export default {
       equipments: [],
       activeName: "first",
       interval: null,
-      sectionData: [],
+      sectionData: null,
+      isKeep: true
+      
     };
   },
   provide() {
@@ -62,6 +82,13 @@ export default {
     clearInterval(this.interval);
   },
   methods: {
+    chartExport(name){
+      exportFile({
+        method:'get',
+        url: "/system/status/exportType",
+        filename: name
+      });
+    },
     getSection() {
       getStatusSection().then((res) => {
         this.sectionData = res.data;
@@ -78,9 +105,9 @@ export default {
     },
     initDevice() {
       getSystemStatusType().then((res) => {
-          let allList = [];
+        // res = res_state_type;
+        let allList = [];
         if(res.data){
-          
           let sort = res.data["排序规则"].rule.split(",");
           sort.forEach((i) => {
             for (let key in res.data) {
@@ -97,58 +124,84 @@ export default {
                 allList.push(item);
               }
             }
-          });
+          }); 
+          
         }
-
         this.equipments = allList;
       });
     },
+    pageResize(){
+      this.$refs.refDeviceUptime.myChart?.resize();
+      this.$refs.refOnLineBarCharts.myChart?.resize();  
+    }
   },
   async mounted() {
     this.getSection();
     await this.initData();
+
+   
+    window.addEventListener("resize", async () => {
+      this.isKeep = false;
+      await delay(100)
+      this.$refs.refDeviceUptime.myChart.resize();
+      this.$refs.refOnLineBarCharts.myChart.resize();
+      await delay(100)
+      this.isKeep = true;
+      this.$nextTick(()=>{
+        this.$refs.refDeviceUptime.myChart.resize();
+        this.$refs.refOnLineBarCharts.myChart.resize();
+      })
+    });
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.floatEmpty {
-  position: absolute;
-  z-index: 100;
-  // background: rgba($color: #000000, $alpha: 0.2);
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-}
 
+.top{
+  height: 40vh;
+  overflow-y: auto;
+  overflow-x: none;
+  background-color: #132d38;
+}
 .bottomTabs {
-  position: relative;
   display: inline-flex;
   width: 100%;
   flex-direction: row;
   flex: 1;
-  .tabs-lo {
-    display: inline-flex;
-    width: 670px;
+  margin-top: 12px;
+  background-color: #132d38;
+  padding:10px;
+  .cleft {
+    width: 30vw; 
     height: 100%;
-    margin-right: 15px;
   }
-
-  .tabs-mo {
-    display: inline-flex;
+  .cright {
     flex: 1;
   }
 }
 
 .deviceSummary {
-  height: 390px;
+  flex: 1;
   margin-bottom: 6px;
   overflow: hidden;
 }
 
 
 
+.title {
+    display: flex;
+    position: absolute;
+    align-items: center;
+
+    .icon {
+      width: 5px;
+      height: 16px;
+      background-color: #3DE8FF;
+      margin-right: 10px;
+      border-radius: 2px;
+    }
+  }
 .statisticAna {
   width: 100%;
   height: 100%;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/mock.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/mock.js
new file mode 100644
index 00000000..bae27bc9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/mock.js
@@ -0,0 +1,136 @@
+export const res_state_type = 
+{
+    "msg": "操作成功",
+    "code": 200,
+    "data": {
+        "毫米波雷达": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "1",
+            "sum": "209",
+            "lostRate": "0.00%"
+        },
+        "站前悬臂式可变信息标志": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "1",
+            "sum": "8",
+            "lostRate": "0.00%"
+        },
+        "高清网络枪型固定摄像机": {
+            "sucessRate": "71.43%",
+            "failRate": "28.57%",
+            "sumUseState": "35",
+            "sum": "315",
+            "lostRate": "28.57%"
+        },
+        "排序规则": {
+            "rule": "智能设备箱,全部设备,高清网络枪型固定摄像机,高清网络球形摄像机,360°全景摄像机,桥下高清网络球形摄像机,180°全景摄像机,门架式可变信息标志,雨棚可变信息标志,站前悬臂式可变信息标志,气象检测器,路段语音广播系统,护栏碰撞预警系统,毫米波雷达,合流区预警系统,激光疲劳唤醒,一类交通量调查站,智能行车诱导系统"
+        },
+        "智能设备箱": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "12",
+            "sum": "219",
+            "lostRate": "6.25%"
+        },
+        "桥下高清网络球形摄像机": {
+            "sucessRate": "0.00%",
+            "failRate": "0.00%",
+            "sumUseState": "0",
+            "sum": "52",
+            "lostRate": "0.00%"
+        },
+        "智能行车诱导系统": {
+            "sucessRate": "75.00%",
+            "failRate": "25.00%",
+            "sumUseState": "4",
+            "sum": "21",
+            "lostRate": "25.00%"
+        },
+        "雨棚可变信息标志": {
+            "sucessRate": "0.00%",
+            "failRate": "0.00%",
+            "sumUseState": "0",
+            "sum": "6",
+            "lostRate": "0.00%"
+        },
+        "合流区预警系统": {
+            "sucessRate": "0.00%",
+            "failRate": "0.00%",
+            "sumUseState": "0",
+            "sum": "36",
+            "lostRate": "0.00%"
+        },
+        "门架式可变信息标志": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "6",
+            "sum": "31",
+            "lostRate": "0.00%"
+        },
+        "护栏碰撞预警系统": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "1",
+            "sum": "18",
+            "lostRate": "0.00%"
+        },
+        "180°全景摄像机": {
+            "sucessRate": "25.00%",
+            "failRate": "75.00%",
+            "sumUseState": "4",
+            "sum": "10",
+            "lostRate": "75.00%"
+        },
+        "360°全景摄像机": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "2",
+            "sum": "15",
+            "lostRate": "0.00%"
+        },
+        "一类交通量调查站": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "1",
+            "sum": "8",
+            "lostRate": "0.00%"
+        },
+        "气象检测器": {
+            "sucessRate": "0.00%",
+            "failRate": "0.00%",
+            "sumUseState": "0",
+            "sum": "10",
+            "lostRate": "0.00%"
+        },
+        "全部设备": {
+            "sucessRate": "68.67%",
+            "failRate": "31.33%",
+            "sumUseState": "166",
+            "sum": "1374",
+            "lostRate": "32.23%"
+        },
+        "路段语音广播系统": {
+            "sucessRate": "18.52%",
+            "failRate": "81.48%",
+            "sumUseState": "27",
+            "sum": "27",
+            "lostRate": "81.48%"
+        },
+        "激光疲劳唤醒": {
+            "sucessRate": "100.00%",
+            "failRate": "0.00%",
+            "sumUseState": "1",
+            "sum": "6",
+            "lostRate": "0.00%"
+        },
+        "高清网络球形摄像机": {
+            "sucessRate": "71.43%",
+            "failRate": "28.57%",
+            "sumUseState": "56",
+            "sum": "161",
+            "lostRate": "28.57%"
+        }
+    }
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/index.vue
index 1df9b888..2b5d2dd2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/index.vue
@@ -1,13 +1,12 @@
 <template>
   <div class="statisticAnalysis">
-   
     <el-tabs class="full_tab" v-model="activeName"  @tab-click="handleClick">
       <el-tab-pane label="设备分析" name="first" class="tab_con">
-        <StatisticAna />
+        <StatisticAna ref="refStatisticAna" />
       </el-tab-pane>
       <el-tab-pane label="设备查询" name="second" class="tab_con">
         <template v-if="sec !== null">
-          <StatisticQuy />
+          <StatisticQuy ref="refQuy" />
         </template>
       </el-tab-pane>
     </el-tabs>
@@ -37,6 +36,14 @@ export default {
     handleClick(e){
       if(this.activeName === 'second'){
         this.sec='second'
+        setTimeout(() => {
+          this.$refs.refQuy.queryChart?.resize();  
+        }, 100);
+      } else {
+        setTimeout(() => {
+          this.$refs.refStatisticAna?.pageResize();  
+        }, 100);
+        
       }
     }
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
index 662f5920..5ebd3fb9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js
@@ -1,4 +1,5 @@
 import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import moment from "moment";
 
 export const deviceType = [
   {
@@ -115,6 +116,7 @@ export const tabMap = {
 };
 
 export const searchFormList = [
+ 
   {
     label: "时间范围:",
     key: "time",
@@ -127,6 +129,23 @@ export const searchFormList = [
     options: {
       format: "yyyy-MM-dd",
       type: "daterange",
+      pickerOptions:{
+        disabledDate(time) {
+          return time.getTime() > Date.now() || time.getTime()<new Date(moment().subtract(3, "months").format("YYYY-MM-DD"));
+        },
+      }
+    },
+  }, 
+  {
+    label: "方向:",
+    key: "direction",
+    type: "select",
+    options: {
+      options: [
+        { key: "3", label: "济南方向" },
+        { key: "1", label: "菏泽方向" },
+        { key: "2", label: "双向" },
+      ],
     },
   }
 ];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue
index a59746b7..df2200ea 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue
@@ -6,12 +6,17 @@
         <el-button size="mini" icon="el-icon-download" class="btnSearch" @click="SystemStatusExport">导出Excel</el-button>
       </div>
       <div class="right-div">
-        <InputSearch :formList="searchFormList" @handleSearch="handleSearch" :placeholder="searchText"  />
+        <InputSearch 
+        ref="searchComp"
+        params="deviceName"
+        placeholder="请输入设备名称，回车搜索"
+        type="input"
+        :formList="searchFormList" @handleSearch="handleSearch"  />
       </div>
     </div>
-    <div class="anacontent">
+    <div class="anacontent" style="height: calc(100vh - 225px)">
       <div class="cleft">
-        <el-checkbox-group class="device keep-ratio" origin="top" v-model="devices" @change="onDeviceChange">
+        <el-checkbox-group class="device" v-model="devices" @change="onDeviceChange">
           <el-checkbox v-for="(item,index) in deviceTypeList" :label="item.value" >{{ item.label }}</el-checkbox>
         </el-checkbox-group>
       </div>        
@@ -22,25 +27,25 @@
             class="floatEmpty"
             :text="emptyText01"
           ></Empty>
-          <div ref="queryChart" class="keep-ratio"></div>
+          <div ref="queryChart" style="width:100%;height:100%;"></div>
         </div>
         <div class="bodyTable">
-          <Table :data="tableData" @sort-change="onSort" v-loading="loading">
+          <Table :data="tableData" @sort-change="onSort" v-loading="loading" >
             <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
                 header-align="center" />
-            <ElTableColumn prop="deviceName" label="设备名称"></ElTableColumn>
-            <ElTableColumn prop="deviceNo" label="设备桩号">
+            <ElTableColumn prop="deviceName"  label="设备名称"></ElTableColumn>
+            <ElTableColumn prop="deviceNo" width="100"  label="设备桩号">
             </ElTableColumn>
-            <ElTableColumn prop="direction" label="方向" class-name="showClass">
+            <ElTableColumn prop="direction" width="100"  label="方向" class-name="showClass">
               <template slot-scope="scope">
                 <span>{{ scope.row.direction == "1" ? "菏泽" : scope.row.direction == "2" ? "双向": "济南"}}</span>
               </template>
             </ElTableColumn>
-            <ElTableColumn prop="deviceIp" label="设备IP"> </ElTableColumn>
-            <ElTableColumn prop="production" label="厂家"> </ElTableColumn>
-           <ElTableColumn prop="time" label="监测时间"> </ElTableColumn>
-            <ElTableColumn prop="deviceStatus" label="设备状态" sortable>
-              <template slot-scope="scope">
+            <ElTableColumn prop="deviceIp" width="100"  label="设备IP"> </ElTableColumn>
+            <ElTableColumn prop="production" width="100"  label="厂家"> </ElTableColumn>
+           <ElTableColumn prop="time" width="200"  label="监测时间" sortable> </ElTableColumn>
+            <ElTableColumn prop="deviceStatus" width="140"  label="设备状态" sortable>
+              <template slot-scope="scope" >
                 <div v-if="scope.row.deviceStatus == '1'">在线</div>
                 <div v-if="scope.row.deviceStatus == '0'" style="color: #bbb">
                   离线
@@ -49,7 +54,7 @@
             </ElTableColumn>
           </Table>
         </div>
-        <div class="footer">
+        <div class="footer" style="display: flex;justify-content: center;">
           <Pagination @current-change="initQueryTable" @size-change="onSizeChange" width="'100%'"
             :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
             layout="total, sizes, prev, pager, next" :total="total">
@@ -68,6 +73,7 @@ import Table from '@screen/components/Table.vue';
 import Pagination from "@screen/components/Pagination.vue";
 import InputSearch from "@screen/components/InputSearch/index.vue";
 import chartsOption from "./charts";
+import request from "@/utils/request";
 import {
   getSystemStatusList,
   getSystemStatusTabList,
@@ -99,17 +105,15 @@ export default {
       searchFormList,
       startTime: "",
       time: "",
-
-
-      startTime2: "",
-      time2: "",
-
+      deviceName: null,
+      direction: null,
       total:0,
       searchData: {
         pageSize: 10,
         pageNum: 1
       },
-      order:'asc'
+      order:'desc',
+      orderField: 'time'
     };
   },
   destroyed() {
@@ -138,6 +142,11 @@ export default {
       }
     },
     onSort(e){
+      if(e.prop === 'time'){
+        this.orderField ='time'
+      } else {
+        this.orderField = 'device_status'
+      }
       if(e.order === 'ascending'){
         this.order = 'asc'
       } else {
@@ -154,10 +163,21 @@ export default {
         return;
       }
       this.setStatus("01", "doing");
-      getSystemStatusList({
+      const params = {
         startTime: this.startTime,
         time: this.time,
-        type: this.devices.join(','),
+        type: this.devices.join(',')
+      }
+      if(this.deviceName){
+        params.deviceName = this.deviceName
+      }
+      if(this.direction){
+        params.direction = this.direction
+      }
+      request({
+        url: "/system/status/list",
+        method: "get",
+        params
       }).then((res) => {
         if (res.code == 200) {
           const _chartsOption = _.cloneDeep(chartsOption)
@@ -181,7 +201,7 @@ export default {
             }
             serie.push(s);
           }
-          
+          x.sort(function(a,b){return moment(a).diff(moment(b))})
           _chartsOption.xAxis.data = x;
           _chartsOption.series= serie;
           this.queryChart = echarts.init(this.$refs["queryChart"]);
@@ -194,19 +214,31 @@ export default {
     //查询列表
     initQueryTable() {
       this.loading = true;
-      getSystemStatusTabList({
-        startTime: this.startTime2,
-        time: this.time2,
+      const params = {
+        startTime: this.startTime,
+        time: this.time,
         type: this.devices.join(','),
         pageNum: this.searchData.pageNum,
         pageSize: this.searchData.pageSize,
-        orderByField:'device_status',
+        orderByField:this.orderField,
         orderDirection:this.order
+      };
+
+      if(this.deviceName){
+        params.deviceName = this.deviceName
+      }
+      if(this.direction){
+        params.direction = this.direction
+      }
+      request({
+        url: "/system/status/tablist",
+        method: "get",
+        params
       }).then((res) => {
         if (res.code == 200) {
           this.loading = false;
           this.total = res.total;
-          this.tableData = res.rows;
+          this.tableData = res.rows
           
         }
       });
@@ -226,16 +258,24 @@ export default {
     },
 
     onRefreshData() {
-      this.initQueryChart();
       this.searchData.pageNum = 1;
-      this.initQueryTable();
+      this.tableData = [];
+      this.$refs.searchComp.handleResetForm();
+      // this.initQueryChart();
+      // this.initQueryTable();
     },
     handleSearch(data) {
-      this.startTime = moment(data.time[0]).format("YYYY-MM-DD HH:mm:ss");
-      this.time = moment(data.time[1]).format("YYYY-MM-DD HH:mm:ss");
+      this.startTime = moment(data.time[0]).format("YYYY-MM-DD") + ' 00:00:00';
+      this.time = moment(data.time[1]).format("YYYY-MM-DD") + ' 23:59:59';
+
+
       this.searchText = `${moment(this.startTime).format(
         "YYYY年MM月DD日"
       )}-${moment(this.time).format("YYYY年MM月DD日")}`;
+
+      this.deviceName = data.deviceName
+      this.direction = data.direction
+      
       this.initQueryChart();
       this.initQueryTable();
     },
@@ -246,11 +286,18 @@ export default {
         background: "#00000052",
         text: "文件正在下载...",
       });
-      getSystemStatusExport({
-        startTime: this.startTime2,
-        time: this.time2,
-        type: this.devices.join(','),
-      })
+      const params = {
+        startTime: this.startTime,
+        time: this.time,
+        type: this.devices.join(',')
+      }
+      if(this.deviceName){
+        params.deviceName = this.deviceName
+      }
+      if(this.direction){
+        params.direction = this.direction
+      }
+      getSystemStatusExport(params)
         .then((res) => {
           const url = window.URL.createObjectURL(new Blob([res]));
           let link = document.createElement("a");
@@ -275,11 +322,16 @@ export default {
     this.time = moment().format("YYYY-MM-DD HH:mm:ss");
 
 
-    this.startTime2 = moment().subtract(1, "hours").format("YYYY-MM-DD HH:mm:ss");
-    this.time2 = this.time;
-
     this.initQueryChart();
     this.initQueryTable();
+
+
+    window.addEventListener("resize", () => {
+      if(this.queryChart){
+        this.queryChart.resize();
+      }
+    });
+    
   },
 };
 </script>
@@ -307,7 +359,6 @@ export default {
   }
 
   .anacontent {
-    flex: 1;
     display: flex;
     flex-direction: row;
     width: 100%;
@@ -315,6 +366,8 @@ export default {
       background-color: #101e25;
       width: 300px;
       height: 100%;
+      overflow-y: auto;
+      overflow-x: hidden;
       .device{
         padding: 10px 15px;
         display: flex;
@@ -331,24 +384,20 @@ export default {
     }
   }
   .bodyTable{
-    width: 100%;
-    height: 450px;
+    flex: 1;
     overflow-y: auto;
     margin-bottom: 20px;
   }
 
   .queryChart {
-
     position: relative;
     display: inline-flex;
     width: 100%;
-    height: 343px;
     padding: 0 20px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0) 0%, #101e25 100%);
     // background-color: #101e25;
     margin-bottom: 20px;
-    --keep-ratio: scaleX(1);
-
+    height: 300px;
     >div {
       display: inline-flex;
       width: 100%;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue
index 517c0a2f..82d4cd46 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/topology/index.vue
@@ -121,7 +121,7 @@
             <div class="arrow arrowleft"></div>
             <div class="arrow arrowleft"></div>
           </div>
-          <div class="cscorll">
+          <div class="cscorll" v-horizontal-scroll>
             <!-- width:' + item.length * 200 + 'px;' -->
             <!-- <div style="height: 290px"> -->
             <div v-for="(itm, idx) in item" class="switchScro">
@@ -232,6 +232,16 @@ export default {
   mounted() {
     this.bind();
   },
+  directives: {
+    'horizontal-scroll': {
+        bind: function (el) {
+            el.addEventListener('wheel', function (event) {
+                event.preventDefault();
+                el.scrollLeft += event.deltaY;
+            });
+        }
+    }
+  },
   methods: {
     bind() {
       request({
@@ -287,17 +297,17 @@ export default {
           this.topo = topo;
           this.card = cards;
         }, 200);
-        setTimeout(() => {
-          var scrollWrap = document.getElementsByClassName('cscorll');
-          scrollWrap.forEach(scrol => {
-            scrol.addEventListener('wheel', function(event) {
-              event.preventDefault();
-              var delta = event.wheelDelta || -event.detail;
-              scrol.scrollLeft += (delta > 0 ? -30 : 30);
-            });
-          });
+        // setTimeout(() => {
+        //   var scrollWrap = document.getElementsByClassName('cscorll');
+        //   scrollWrap.forEach(scrol => {
+        //     scrol.addEventListener('wheel', function(event) {
+        //       event.preventDefault();
+        //       var delta = event.wheelDelta || -event.detail;
+        //       scrol.scrollLeft += (delta > 0 ? -30 : 30);
+        //     });
+        //   });
           
-        }, 500);
+        // }, 500);
       }
     },
   },
@@ -324,7 +334,7 @@ export default {
   width: 15vw;
   height: 100%;
   color: white;
-  margin: 0px 40px 0px 20px;
+  margin: 0px 20px;
 
   .listItem {
     background-image: url(../topology/img/left-bg.png);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/charts.js
index a37fcda7..16a1b6f9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/charts.js
@@ -19,11 +19,10 @@ var options = {
   grid: {
     left: "1%",
     right: "0",
-    top: "30px",
-    bottom: "20px",
+    top: "60px",
+    bottom: "0px",
     containLabel: true,
   },
-
   legend: {
     top: "0%",
     right: "0",
@@ -62,7 +61,7 @@ var options = {
       let result = '<span style="font-size:14px;font-weight: 600;color: #20253B">'+params[0].axisValue +'</span><br>';
       params.forEach(p => {
         if(p.data > 0){
-          result += '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + p.color + '"></span><span style="color: #20253B">'+ p.seriesName +'</span>'+'：'+(p.value)+ '起<br>'  
+          result += '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + p.color + '"></span><span style="color: #20253B">'+ p.seriesName +'</span>'+'：'+(p.value)+ (p.seriesName==='平均'?'分钟':'起')+'<br>'  
         }
       });
       return result;
@@ -112,8 +111,15 @@ var options = {
     },
     {
       type: "value",
+      name: "分钟",
+      nameTextStyle: {
+        color: "#fff",
+        fontSize: 10,
+        align: "left",
+      },
       axisLabel: {
-        show: false,
+        fontSize: 10,
+        color: "#fff"
       },
       axisLine: {
         show: false,
@@ -130,12 +136,14 @@ var options = {
     {
       name: "上报",
       type: "pictorialBar",
-      symbolRepeat: "fixed",
-      symbolMargin: 2,
+      stack:"总量",
       symbol: "rect",
+      symbolMargin: 2,
+      symbolRepeat: "fixed",
       symbolClip: true,
       symbolSize: [18, 6],
       barWidth: 10,
+      barGap: "40%",
       data: valueList1[0],
     }, {
       name: "已完成",
@@ -143,9 +151,11 @@ var options = {
       symbolRepeat: "fixed",
       symbolMargin: 2,
       symbol: "rect",
+      stack:"总量",
       symbolClip: true,
       symbolSize: [18, 6],
       barWidth: 10,
+      barGap: "40%",
       data: valueList1[1],
     },{
       name: "已终止",
@@ -156,6 +166,7 @@ var options = {
       symbolClip: true,
       symbolSize: [18, 6],
       barWidth: 10,
+      barGap: "40%",
       data: valueList1[2],
     },{
       name: "自动结束",
@@ -166,6 +177,7 @@ var options = {
       symbolClip: true,
       symbolSize: [18, 6],
       barWidth: 10,
+      barGap: "40%",
       data: valueList1[3],
     },
     {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/index.vue
index 03d58ccf..b533e150 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/day/index.vue
@@ -1,14 +1,13 @@
 <template>
-  <div
-        class="chartsDay"
-        id="railwayDay"
-      ></div>
+  <div class="chartsDay" id="railwayDay" ></div>
 </template>
 
 <script>
 import * as echarts from "echarts";
 import chartsStatistics from "./charts";
-import { getSectionPerceivedNumber } from "@/api/event/perceiveEvent";
+import request from '@/utils/request'
+import moment from "moment";
+import { exportFile } from "@screen/utils/common";
 
 export default {
   name: "RailWayDay",
@@ -21,65 +20,130 @@ export default {
   },
 
   created() {},
-  methods: {},
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportSelectStateType",
+        filename: name,
+        data:this.data,
+      });
+    },
+    bind(){
+      this.data = {
+          currently:moment().format('YYYY-MM-DD'),
+          lastYear:moment().subtract(1,'year').format('YYYY-MM-DD')
+        };
+      request({
+        url: '/perceivedEvents/warning/selectStateType',
+        method: 'post',
+        data: this.data
+      }).then(result=>{
+        if (result.code != 200) return this.$message.error(result.msg);
+        const {currentlyMap,lastYearMap,stateDuration} =  result.data;
+        const xListSource = [...currentlyMap,...lastYearMap,...stateDuration]
+        let xList = Array.from(new Set(xListSource.map(x=>x.sectionName)));
+     
+        const value0 = []; //上报 warningState = 1
+        const value1 = []; //已完成 warningState = 2
+        const value2 = []; //已终止 warningState = 3
+        const value3 = []; //自动结束 warningState = 4
+        const value4 = []; //去年同期
+        const value5 = []; //平均
+        xList.forEach((e,index) => {
+          const v0 = _.find(currentlyMap,{sectionName:e,warningState:1})
+          value0.push(v0?v0.num:0)
+          const v1 = _.find(currentlyMap,{sectionName:e,warningState:2})
+          value1.push(v1?v1.num:0)
+          const v2 = _.find(currentlyMap,{sectionName:e,warningState:3})
+          value2.push(v2?v2.num:0)
+          const v3 = _.find(currentlyMap,{sectionName:e,warningState:4})
+          value3.push(v3?v3.num:0)
+
+          const aryV4 = lastYearMap.filter(x=>x.sectionName=e)
+          let v4 = 0;
+          for(let l of aryV4){
+            v4+=l.num;
+          }
+          value4.push(v4)
+          const v5 = _.find(stateDuration,{sectionName:e})
+          value5.push(v5?v5.avg:0)
+        });
+        chartsStatistics.xAxis.data = xList;
+        chartsStatistics.series[0].data = value0;
+        chartsStatistics.series[1].data = value1;
+        chartsStatistics.series[2].data = value2;
+        chartsStatistics.series[3].data = value3;
+        chartsStatistics.series[4].data = value4;
+        chartsStatistics.series[5].data = value5;
+        if(!this.myChart){
+          this.myChart = echarts.init(document.getElementById("railwayDay"));          
+        }
+        this.myChart.setOption(chartsStatistics);
+
+      })
+    }
+  },
   mounted() {
-    var myChart = echarts.init(document.getElementById("railwayDay"));
-    myChart.setOption(chartsStatistics);
-        // getSectionPerceivedNumber().then((res) => {
-        //   if (res.code == 200) {
-        //     this.dataList = res.data;
-        //     let data = res.data;
-        //     if (data.length > 0) {
-        //       let texts = [];
-        //       let datas = [];
-        //       const maxObject = data.reduce((prev, current) =>
-        //         current.number2 > prev.number2 ? current : prev
-        //       );
+      this.$nextTick(()=>{
+        this.bind();
+      })
+  
+      // getSectionPerceivedNumber().then((res) => {
+      //   if (res.code == 200) {
+      //     this.dataList = res.data;
+      //     let data = res.data;
+      //     if (data.length > 0) {
+      //       let texts = [];
+      //       let datas = [];
+      //       const maxObject = data.reduce((prev, current) =>
+      //         current.number2 > prev.number2 ? current : prev
+      //       );
 
-        //       data.forEach((it) => {
-        //         texts.push(it.sectionName);
+      //       data.forEach((it) => {
+      //         texts.push(it.sectionName);
 
-        //         if (it.number2 == maxObject.number2) {
-        //           datas.push({
-        //             value: it.number2,
-        //             itemStyle: {
-        //               color: {
-        //                 type: "linear",
-        //                 x: 0,
-        //                 y: 0,
-        //                 x2: 0,
-        //                 y2: 1,
-        //                 colorStops: [
-        //                   {
-        //                     offset: 0,
-        //                     color: "#0469FF", // 0% 处的颜色
-        //                   },
-        //                   {
-        //                     offset: 1,
-        //                     color: "#699CFF", // 100% 处的颜色
-        //                   },
-        //                 ],
-        //                 global: false, // 缺省为 false
-        //               },
-        //               borderRadius: 6,
-        //             },
-        //           });
-        //         } else {
-        //           datas.push({
-        //             value: it.number2,
-        //             itemStyle: {
-        //               borderRadius: 6,
-        //             },
-        //           });
-        //         }
-        //       });
+      //         if (it.number2 == maxObject.number2) {
+      //           datas.push({
+      //             value: it.number2,
+      //             itemStyle: {
+      //               color: {
+      //                 type: "linear",
+      //                 x: 0,
+      //                 y: 0,
+      //                 x2: 0,
+      //                 y2: 1,
+      //                 colorStops: [
+      //                   {
+      //                     offset: 0,
+      //                     color: "#0469FF", // 0% 处的颜色
+      //                   },
+      //                   {
+      //                     offset: 1,
+      //                     color: "#699CFF", // 100% 处的颜色
+      //                   },
+      //                 ],
+      //                 global: false, // 缺省为 false
+      //               },
+      //               borderRadius: 6,
+      //             },
+      //           });
+      //         } else {
+      //           datas.push({
+      //             value: it.number2,
+      //             itemStyle: {
+      //               borderRadius: 6,
+      //             },
+      //           });
+      //         }
+      //       });
 
-        //       chartsStatistics.xAxis.data = texts;
-        //       chartsStatistics.series[0].data = datas;
-        //     }
-        //     myChart.setOption(chartsStatistics);
-        //   }
-        // });
+      //       chartsStatistics.xAxis.data = texts;
+      //       chartsStatistics.series[0].data = datas;
+      //     }
+      //     myChart.setOption(chartsStatistics);
+      //   }
+      // });
   },
 };
 </script>
@@ -88,6 +152,5 @@ export default {
 .chartsDay {
   height: 100%;
   width: 100%;
-  margin-top: 30px;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/index.vue
index 15598603..7f94ce06 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/index.vue
@@ -1,35 +1,48 @@
 <template>
   <div class="EventDetectionAnalysis">
-    <section class="panel">
-      <Search />
-      <Progress></Progress>
-      <section class="chartPanel" >
-        <section class="cleft">
-            <div class="title"><div class="icon"></div>感知事件多发时段</div>
-            <Muliple></Muliple>
-          </section>
-          <section class="cmiddle">
-            <div class="title"><div class="icon"></div>感知事件类型分析</div>
-            <Type></Type>
-          </section>
-          <section class="cright">
-            <div class="title"><div class="icon"></div>桩号范围内事件分析</div>
-            <Pile></Pile>
-          </section>
+
+    <section class="panel chartPanel" style="flex:1; margin-bottom: 10px;">
+      
+      <section style="flex:1;padding-right: 20px;">
+        <div class="title"><div class="icon"></div>日感知事件路段分析
+        <ChartExport @export="$refs.refRealWayDay.export('日感知事件路段分析')" />
+        </div>
+        <RailWayDay v-show="isKeep" ref="refRealWayDay"></RailWayDay>
       </section>
-  </section>
-  <section class="panel" style="flex:1;margin-top: 20px;">
-    <section class="chartPanel" >
-        <section style="flex:1;padding-right: 30px;">
-            <div class="title"><div class="icon"></div>感知事件路段分析</div>
-            <RailWayDay></RailWayDay>
-          </section>
-          <section class="cright">
-            <div class="title"><div class="icon"></div>感知事件路段排名</div>
-            <RailWay></RailWay>
-          </section>
+      <section class="cright">
+        <div class="title"><div class="icon"></div>日感知事件路段排名
+        <ChartExport @export="$refs.refRealWay.export('日感知事件路段排名')" />
+        </div>
+        <RailWay v-show="isKeep" ref="refRealWay"></RailWay>
+      </section>
+    </section>
+    <section class="panel" style="flex:1;">
+      <Search ref="refSearch" />
+      <Progress ref="refProgress"></Progress>
+      <section class="chartPanel">
+        <section class="cleft">
+          <div class="title">
+            <div class="icon"></div>感知事件多发时段 
+            <ChartExport @export="$refs.refMuliple.export('感知事件多发时段')" />
+          </div>
+          <Muliple v-show="isKeep" ref="refMuliple" :filter="filter"></Muliple>
+        </section>
+        <section class="cmiddle">
+          <div class="title">
+            <div class="icon"></div>感知事件类型分析
+            <ChartExport @export="$refs.refType.export('感知事件类型分析')" />
+          </div>
+          <Type v-show="isKeep" ref="refType" :filter="filter"></Type>
+        </section>
+        <section class="cright">
+          <div class="title">
+            <div class="icon"></div>桩号范围内事件分析
+            <ChartExport @export="$refs.refPile.export('桩号范围内事件分析')" />
+          </div>
+          <Pile v-show="isKeep" ref="refPile" :filter="filter"></Pile>
+        </section>
       </section>
-      </section>  
+    </section>
   </div>
 </template>
 
@@ -42,6 +55,9 @@ import Pile from './pile/index.vue'
 import RailWay from './railway/index.vue'
 import RailWayDay from './day/index.vue'
 
+import { delay } from "@screen/utils/common";
+import ChartExport from "@screen/components/ChartExport/index.vue"
+
 export default {
   name: "EventDetectionAnalysis",
   components: {
@@ -51,8 +67,45 @@ export default {
     Type,
     Pile,
     RailWay,
-    RailWayDay
+    RailWayDay,
+    ChartExport
+  },
+  data() {
+    return {
+      filter: undefined,
+      isKeep: true
+    }
   },
+  mounted() {
+    window.addEventListener("resize", async () => {
+      this.isKeep = false;
+      await delay(100)
+      this.$refs.refMuliple.myChart.resize();
+      this.$refs.refType.myChart.resize();
+      this.$refs.refPile.myChart.resize();
+      this.$refs.refRealWayDay.myChart.resize();
+      this.$refs.refRealWay.myChart.resize();
+      await delay(100)
+      this.isKeep = true;
+      this.$nextTick(()=>{
+        this.$refs.refMuliple.myChart.resize();
+        this.$refs.refType.myChart.resize();
+        this.$refs.refPile.myChart.resize();
+        this.$refs.refRealWayDay.myChart.resize();
+        this.$refs.refRealWay.myChart.resize();
+      })
+    });
+  },
+  methods:{
+    bind(){
+      const _search = this.$refs.refSearch.getQuery();
+      const _progress = this.$refs.refProgress.getQuery();
+      this.filter = {
+        ..._search,
+        ..._progress
+      }
+    }
+  }
 };
 </script>
 
@@ -63,36 +116,43 @@ export default {
   display: flex;
   flex-direction: column;
   align-items: stretch;
-  .panel{
+
+  .panel {
     background-color: #132d38;
-    padding:10px;
+    padding: 10px;
   }
-  .chartPanel{
+
+  .chartPanel {
     display: flex;
     flex-direction: row;
-   
+
   }
-  .cleft{
-      width: 30vw;
-    }
-    .cmiddle{
-      flex:1;
-      margin:0px 30px;
-    }
-    .cright{
-      width: 35vw;
-    }
-    .title{
-      display: flex;
-      position: absolute;
-      align-items: center;
-      .icon {
-        width: 5px;
-        height: 16px;
-        background-color: #3DE8FF;
-        margin-right: 10px;
-        border-radius: 2px;
-      }
+
+  .cleft {
+    width: 30vw;
+  }
+
+  .cmiddle {
+    flex: 1;
+    margin: 0px 30px;
+  }
+
+  .cright {
+    width: 35vw;
+  }
+
+  .title {
+    display: flex;
+    position: absolute;
+    align-items: center;
+
+    .icon {
+      width: 5px;
+      height: 16px;
+      background-color: #3DE8FF;
+      margin-right: 10px;
+      border-radius: 2px;
     }
+  }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/charts.js
index d4f444f8..4e849e2e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/charts.js
@@ -10,7 +10,7 @@ var options = {
   grid: {
     left: "1%",
     right: "0",
-    top: "30px",
+    top: "60px",
     bottom: "20px",
     containLabel: true,
   },
@@ -217,7 +217,7 @@ var options = {
       name: "去年同期", // 图例对应类别
       data: [], // 纵坐标数据
       lineStyle: {
-        color: "#39B1FF",
+        color: "#69FAA1",
       },
       areaStyle: {
         color: {
@@ -229,12 +229,12 @@ var options = {
           colorStops: [
             {
               offset: 0.1,
-              color: "#69FAF1", // 0% 处的颜色
+              color: "#69FAA1", // 0% 处的颜色
             },
             {
               offset: 1,
               opacity: 0.01,
-              color: "#69FAF101", // 100% 处的颜色
+              color: "#69FAA101", // 100% 处的颜色
             },
           ],
         },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/index.vue
index 4dd28b6a..ec4140e7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/muliple/index.vue
@@ -6,21 +6,62 @@
 import * as echarts from "echarts";
 import chartsStatistics from "./charts";
 import { getDailyCumulativeMonth } from "@/api/event/perceiveEvent";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
 
 export default {
   name: "Muliple",
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter' (a, b) {
+      if(a){
+        this.bind(a)
+      }
+    }
+  },
   components: {
   },
   data() {
     return {
-      dataList: [],
     };
   },
 
   created() {},
-  methods: {},
-  mounted() {
-    var myChart = echarts.init(document.getElementById("chartsMuliple"));
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportManyTimesInterval",
+        filename: name,
+        data:this.data,
+      });
+    },
+    bind(data){
+      this.data = data;
+        if(!this.myChart){
+          this.myChart = echarts.init(document.getElementById("chartsMuliple"));
+        }
+      request({
+        url: '/perceivedEvents/warning/manyTimesInterval',
+        method: 'post',
+        data: data
+      }).then(result=>{
+        if (result.code != 200) return this.$message.error(result.msg);
+        if(result.data.currentlyMap){
+          chartsStatistics.series[0].data = result.data.currentlyMap.map(x=>x.number);
+        }
+        if(result.data.lastYearMap){
+          chartsStatistics.series[1].data = result.data.lastYearMap.map(x=>x.number);
+        }
+        this.myChart.setOption(chartsStatistics);
+      })
+      
+    },
+    bindMock(){
         getDailyCumulativeMonth().then((res) => {
           if (res.code == 200) {
             this.dataList = res.data;
@@ -48,6 +89,10 @@ export default {
             myChart.setOption(chartsStatistics);
           }
         });
+    }
+  },
+  mounted() {
+    
   },
 };
 </script>
@@ -57,6 +102,5 @@ export default {
 .chartsM {
   height: 100%;
   width: 100%;
-  margin-top: 30px;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/charts.js
index 6cf70e37..d71391f6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/charts.js
@@ -26,7 +26,7 @@ let options = {
   grid: {
     left: "2%",
     right: "4%",
-    top: "30px",
+    top: "60px",
     bottom: "20px",
     containLabel: true,
   },
@@ -110,102 +110,57 @@ let options = {
       name: "本期事件",
       type: "bar",
       barWidth: "10px",
-      barGap: "-100%",
-      selectedMode: false,
-      select: {
-        itemStyle: {
-          opacity: 1,
-          color: function (params) {
-            var a = params;
-
-            return new echarts.graphic.LinearGradient(
-              0,
-              0,
-              0,
-              1,
-              [
-                {
-                  offset: 0,
-                  color: "#01D5BC", // 0% 处的颜色
-                },
-                {
-                  offset: 1,
-                  color: "#003B4E", // 100% 处的颜色
-                },
-              ],
-              false
-            );
-          },
-        },
-      },
       itemStyle: {
-        // lenged文本
         opacity: 0.6,
         color: function (params) {
-          var a = params.name;
-          if (a == "6月") {
-            return new echarts.graphic.LinearGradient(
-              0,
-              0,
-              0,
-              1,
-              [
-                {
-                  offset: 0,
-                  color: "#01D5BC", // 0% 处的颜色
-                },
-                {
-                  offset: 1,
-                  color: "#003B4E", // 100% 处的颜色
-                },
-              ],
-              false
-            );
-          } else
-            return new echarts.graphic.LinearGradient(
-              0,
-              0,
-              0,
-              1,
-              [
-                {
-                  offset: 0,
-                  color: "#61D8FF", // 0% 处的颜色
-                },
-                {
-                  offset: 1,
-                  color: "#003B4E", // 100% 处的颜色
-                },
-              ],
-              false
-            );
+          return new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: "#61D8FF", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "#003B4E", // 100% 处的颜色
+              },
+            ],
+            false
+          );
         },
       },
       data: [],
     },
     {
       name: "去年同期",
-      type: "scatter",
-      emphasis: {
-        scale: false,
-      },
-      symbol:
-        "image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAACCpJREFUSEuFl+uPXVUZxn/rus9lru200zt2SrEJjQSlDWAipv2AGtQYouGDJhpDofgnmNhTv/pFjAItaGL8QtRojCbEaJXEBKUU4YNtKNCW0tqm6XRmembOZe91M2vP9AKWspJ9zsneZ69nvc9a7/M+r+BjRkpJ3HcYfRHGo2BaSFaX0DJgiAgnqbSkKyLdpmL2vW9zKQEizytE/nnLUT//4EiCBEnA3R3MwnpmnGZrCpj8PwWE/HFthGs3l28k6JM4r5ucu/Qt+jcji5sW8n/AnU6SnQOw5hlmMGyXAusDSMEVZZgLA+baLYbvnaWfgTasRzvPWDKMkdiYJGMikWJkkAQn557gnOgg6JBSyiQss1ADZzqFyN9wEMTTz7JTSrZiQQbmUuTdEcu8n0fE9vI7Nw/ZI7EJdI/Ugwk822NktRBElTiz/yLHOwdI+c1r4CuTLNPbOYj42SbuiYktIhGs4h0rOVtVSOeRl5cQq5ori+0jmARR5jdhboIwnVk/TbJ3EKvIHZXnziTRInJu9iJvpgP1DtZ7fyPig4jJ9dxtJTNJMhAVbyrJUmgi3AIqBmRMyGQRowaxCLTL5UX0JFFOEicrUneRaCYIZpa4MMFIK3FviDR15PT+fRzv1CHWVCfR6SB+PMVmbbmHQBwWvDrm6FUaFTwy9FAtjYoRWShU0ojBCtfCk5pA2SDIAVG3CL1A0J5gNDEa2t6xG4GSieNPXeRMpyNiDTz9I1p+nAcQtIXjrcYU75eXUe0W2vVQzqOjQkWJKgpkf4BsKMQQaGTQSGgZkoyEqsSbSXxvjmA24ovzhDjOljKyQwbcFsFfju3DC1ISU7/gruTYIRVzxSLHygLlNco7dENggkVHgRoBM4zI5FBJIawF54j5EMlEqIE1XoMzFt8f4m0T3zxN6G1kV0pMWsPbF74j3hL5RK97nr0+0haCoxauZoqrq5iGxCwW6DGNjRqtEiYJlHaoSiJwdQ4n4Yle4qXEK4HLwAs9nBrBWYGznlC1GE9DdktBuSVwREwdSusR7EqCpVHNKwOFKq9gQgttI0UwaOOxQWIVmAO72P3QJva1DXdJweii4/W35/njk3/nDwqcB6cNlRvijKMajuJMHz++FXf1v+yuo068IiZfSDtVZAbPycaQ94fjaNdAF32sr7BaY2WiyMAvPsxT2yZ4/FYaeGqB5x/7M8+oSBU0VZCUaoArCyp7BTeyFtd1bDOwDclpsfZwejBE1sjAq0bTHZbopsTMG2yOuGUpgsf+dA+P7lrLgY/S3qxDfzrNkz88xr8GjrLdpPQVZemoTMS11uGG80wowa4AV8Waw+mLMWJl4Ijsk6oxtAdjGxS6qqNuSEPxt6/xwqjlM7cBZtFxbM9v2BcjQ92kXOwxVJYq73kTnLXYJcfnjKQSU4fTV1JETK/ipStDTDVAuxI73qRYcthmpOkNxbHHeP12oPlZSHTv/y2fD31KM8LQl5SFpBzM4+YncVzET2/gC0GSxNRz6csJ5JVVvLRhHj0AUxisU1gdKFyO2NM4+k1ezofpY8DTfS9yX0wMtViOeFxT1fvcxY8W+IU2D6tEuk51FLyc6cjAzdE6cqtKGj5RSCiOfJ2fjxV8+rZUVxzb83ser4ElZRhSWks1LKnm5vCfmkFcGLL3GtUPAeMkXss5XB+ucUw5xPocdaTIEf/gAe5/ZIZDtztcb8xy8Mm/8rsgKL2kdCWl1HiTgT1uqs2E0uxKgVkx/WzaGRQzEU61ljhdp1OJtjmFwFxPp0Tx4pfY/5Hp1OX5R1/iGamp6pQqKUtLpRZxRUF1uYXf6NjiFTtE4JTYcChNVYIHhWD+8kaOTh9HN6cwVyp0obH1yVbYWGGUwj63h69un+SRTHuMLC053vnHBQ5//yivNsCFLB6BSmcF6+GGAVesxl1awK9u8lkhaBM4Jvh1smsW2BsFVgx5bcOQq+cL1JxGjQiMddggMKbA6IjOkpl1m4DIimkUyRuCKAlZMn2gUi1c2cdJg8+SOXsVn2lOkt0kelce50hdJFYf5pNCcJeILLQLjg5mUXU+N9DNCu0HmGjQVi6DpoQka3UFaJLIVyI4h897WvZwExrfN/hcHtst/ELJbi2ZsIqTF74rTtZlkZ9g11j2RoXJZdEqzrlJpJ9HtRpo36/rsra5SkXksAG2QolAwpDKXJ2yGVipUKbE99qErNHmMrHazOYU2aEC/anAP098TywtAydY+0tmYuBuPEFFXsvuI9udXB6DQo0EZDciGxKFRqTqhvcSGTRfitiPBHWTEega2saxW0p0EXlj30XOdzorFqg2eyvWR0pmVGIoh/xbFvSy9bnkkBNdVBxFpuEN63NNTUSDtNQjZv+1oIhrFDG7jwxqHfcKuWx9Lj3Bfz5k9mqvmS2oWHPN7EW8Dbxrm5x9r42YHiKDQ8beitkrVjx7m8QcyDZJzRFVjyTHSLHNHQPYJhNaWM7Nvs+bdERcduw3m70Vv5n919Mb2Slha16OZNnezpbMbfLI2EVcWA8bgAvZV68oirVEzsLSeiZF4M6oWK0FEcOZ/Wc5nunNgB8Avq5GKYk6jg5i/SY2x8j2AK1cRFAsisR5EouqSzfr7rvAJwLNpRbNKFiVPKukYVU29AJcI/H2uX2crluaD7UzHzDn9V5f854J1v2KVnBsUoHNSJoh1hzlKa53JnVLc5OOCoFPklNrRzlz4gSe2shnh5Wbhhu91C16pxudxfJ8y/RMHWKdiqxOijEH41aiM6CI+NwvaZiViUsTk3RPfENUWR9WTsEtG7f/ARqeIzUaHVUWAAAAAElFTkSuQmCC",
-      // symbolSize: [26, 26],
-      symbolSize: [0, 0],
+      type: "bar",
+      barWidth: "10px",
       itemStyle: {
-        shadowColor: "rgba(0, 255, 254, 0.53)",
-        shadowBlur: 5,
-        borderWidth: 1,
-        opacity: 1,
+        opacity: 0.6,
+        color: function (params) {
+          return new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: "#69FAA1", // 0% 处的颜色
+              },
+              {
+                offset: 1,
+                color: "#003B4E", // 100% 处的颜色
+              },
+            ],
+            false
+          );
       },
-      z: 2,
-      zlevel: 10,
-      data: [],
-      animationDelay: 500,
-      tooltip: {
-        show: false,
       },
+      data: [],
     },
   ],
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/index.vue
index 1de5cf37..b8da7a48 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/pile/index.vue
@@ -6,28 +6,83 @@
 import * as echarts from "echarts";
 import chartOption from "./charts";
 import { getSectionMarkNumber } from "@/api/event/perceiveEvent";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
 
 
 export default {
   name: "TypeAnalysis",
   components: {
+  },props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter' (a, b) {
+      if(a){
+        this.bind(a)
+      }
+    }
   },
   data() {
     return { 
-      dataList: [],
-      dateTime: moment().format("YYYY-MM-DD HH:mm:ss"),
-      
-      quarter: "1",
-      direction: "1",
-      selectId: 1,
-      reset: false,
-      type: "day",
     };
   },
   created() {},
-  methods: {},
-  mounted() {
-    getSectionMarkNumber({
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportSelectSection",
+        filename: name,
+        data:this.data,
+      });
+    },
+    bind(data){
+      this.data = data;
+        if(!this.myChart){
+          this.myChart = echarts.init(document.getElementById("chartPile"));
+        }
+      request({
+        url: '/perceivedEvents/warning/selectSection',
+        method: 'post',
+        data: data
+      }).then(result=>{
+        if (result.code != 200) return this.$message.error(result.msg);
+        
+        
+        // if(result.data.currentlyMap){
+        //   chartsStatistics.series[0].data = result.data.currentlyMap.map(x=>x.number);
+        // }
+        // if(result.data.lastYearMap){
+        //   chartsStatistics.series[1].data = result.data.lastYearMap.map(x=>x.number);
+        // }
+        const zhs = []
+        const values1 = [];
+        const values2 = [];
+        for(let i in result.data.currentlyMap){
+          zhs.push(i)
+        }
+        for(let i in result.data.lastYearMap){
+          if(!zhs.includes(i)){
+            zhs.push(i)
+          }
+        }
+        zhs.sort(function(a, b){return parseInt(a.substr(1))- parseInt(b.substr(1))})
+        for(let i of zhs){
+          values1.push(result.data.currentlyMap[i]||0)
+          values2.push(result.data.lastYearMap[i]||0)
+        }
+        chartOption.xAxis.data = zhs;
+        chartOption.series[0].data = values1;
+        chartOption.series[1].data = values2;
+        this.myChart.setOption(chartOption);
+      })
+      
+    },
+    bindMock(){
+      getSectionMarkNumber({
           type: this.type,
           sectionId: this.selectId,
           createTime: this.dateTime,
@@ -97,6 +152,12 @@ export default {
           this.myChart = echarts.init(document.getElementById("chartPile"));
             this.myChart.setOption(chartOption);
         });
+    }
+  },
+  mounted() {
+    // this.$nextTick(()=>{
+    //   this.bindMock();
+    // })
   },
 };
 </script>
@@ -106,6 +167,5 @@ export default {
 .chartsPile {
   height: 100%;
   width: 100%;
-  margin-top:30px;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/index.vue
index b885a158..c4093256 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/index.vue
@@ -4,9 +4,9 @@
       <div class="title">
         <span>{{ item.title }}</span>
         <img @drag="(e) => ondrag(e,tag1)" v-if="tags[0] === index" src="./tag.png"
-          :class="index === tagSelected ? 'tag ' : 'tag'">
+          class="tag">
         <img @drag="(e) => ondrag(e,tag2)" v-if="tags[1] === index" src="./tag.png"
-          :class="index === tagSelected ? 'tag ' : 'tag'">
+        class="tag">
         </img>
       </div>
       <div class="point"></div>
@@ -33,8 +33,7 @@ export default {
     return {
       dataList: [],
       listSource: [],
-      tags: [3, 5],
-      tagSelected: -1,
+      tags: [0, 1],
       tagWidth: 0,
       tag1:'A',
       tag2:'B'
@@ -43,6 +42,12 @@ export default {
 
   created() { },
   methods: {
+    getQuery(){
+      return {
+        startStakeMark: this.listSource[this.tags[0]].startStakeMark,
+        endStakeMark: this.listSource[this.tags[1]].endStakeMark,
+      }
+    },
     selectItem(index, num, item) {
       // this.selectIndex = index;
       this.selectLine = num;
@@ -51,6 +56,9 @@ export default {
     ondrag(e,type) {
       if(e.pageX > 0){
         const step = (Math.ceil((e.pageX-30) / this.tagWidth) - 1)
+        if(step>14 || step < 0){
+          return
+        }
         if(type === 'B'){
           if (step > this.tags[0]) { //大于最小的
             this.tags[1] = step;
@@ -90,6 +98,7 @@ export default {
         this.tag1 = 'A'
         this.tag2 = 'B'  
         //TODO 调用查询
+        this.$parent.bind();
       }
     },
     bind() {
@@ -100,6 +109,8 @@ export default {
           rows.forEach((item, index) => {
             let action = '';
             _list.push({
+              startStakeMark: item.startStakeMark,
+              endStakeMark: item.startStakeMark,
               title: item.sectionName.split("-")[0],
               id: item.id,
             });
@@ -107,6 +118,8 @@ export default {
           //最后一项取结束点
           if (rows.length > 1) {
             _list.push({
+              startStakeMark: rows[rows.length - 1].startStakeMark,
+              endStakeMark: rows[rows.length - 1].endStakeMark,
               title: rows[rows.length - 1].sectionName.split("-")[1],
               id: rows[rows.length - 1].id,
             });
@@ -114,6 +127,7 @@ export default {
           this.listSource = _list;
           this.tagWidth = (window.innerWidth-60) / _list.length;
           this.bindAction();
+          this.$parent.bind();
         }
       });
     },
@@ -266,15 +280,13 @@ export default {
 
 .tag {
   width: 30px;
-  height: 25px;
+  height: 55px;
   position: absolute;
   cursor: pointer;
-  margin-top: 70px;
-  margin-left: 3px;
+  margin-top: 35px;
+  margin-left: 4px;
   user-select: none;
+  z-index: 999999;
 }
 
-.tags {
-  pointer-events: none;
-}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/tag.png b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/tag.png
index ae927fa1..96f01f4c 100644
Binary files a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/tag.png and b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/progress/tag.png differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/charts.js
index ab2b808d..b86b6e0c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/charts.js
@@ -16,7 +16,7 @@ var options = {
     // 边距自行修改
     bottom: "0%",
     left: "10px",
-    top: "2%",
+    top: "50px",
     right: "15%",
   },
   xAxis: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/index.vue
index ca0afb94..6409a655 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/railway/index.vue
@@ -1,14 +1,14 @@
 <template>
-  <div
-        class="chartsway "
-        id="situationEchartBox"
-      ></div>
+  <div class="chartsSE" id="situationEchartBox"></div>
 </template>
 
 <script>
 import * as echarts from "echarts";
 import chartsStatistics from "./charts";
-import { getSectionPerceivedList } from "@/api/event/perceiveEvent";
+import request from "@/utils/request";
+import { exportFile } from "@screen/utils/common";
+
+
 
 export default {
   name: "Situation",
@@ -16,45 +16,59 @@ export default {
   },
   data() {
     return {
+      myChart: null,
       dataList: [],
     };
   },
 
   mounted() {
-    
-    var myChart = echarts.init(
-          document.getElementById("situationEchartBox")
-        );
-
-        getSectionPerceivedList().then((res) => {
-          if (res.code == 200) {
-            this.dataList = res.data;
-            let data = res.data;
-
-            let texts = [];
-            let datas = [];
-            data.forEach((it,index) => {
-              if(index > 9) return;
-              texts.push(it.sectionName);
-              datas.push(it.number2);
-            });
-
-            chartsStatistics.yAxis[0].data = texts;
-            chartsStatistics.series[0].data = datas;
-
-            myChart.setOption(chartsStatistics);
-          }
-        });
+    this.$nextTick(() => {
+      this.bind();
+    })
+  },
+  created() { },
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportSectionPerceivedList",
+        filename: name,
+        data:{},
+      });
+    },
+    bind() {
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("situationEchartBox"));
+      }
+      request({
+        url: "/perceivedEvents/warning/sectionPerceivedList",
+        method: "post"
+      }).then((res) => {
+        if (res.code == 200) {
+          this.dataList = res.data;
+          let data = res.data;
+
+          let texts = [];
+          let datas = [];
+          data.forEach((it, index) => {
+            if (index > 6) return;
+            texts.push(it.sectionName);
+            datas.push(it.number);
+          });
+          chartsStatistics.yAxis[0].data = texts;
+          chartsStatistics.series[0].data = datas;
+
+          this.myChart.setOption(chartsStatistics);
+        }
+      });
+    }
   },
-  created() {},
-  methods: {},
 };
 </script>
 
 <style lang="scss" scoped>
-.chartsway {
-  margin-top: 40px;
-  width: 100%; 
-  height: 350px;
+.chartsSE {
+  width: 100%;
+  height: 100%;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/search/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/search/index.vue
index a4151331..5157bd24 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/search/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/search/index.vue
@@ -14,11 +14,11 @@
     </el-select>
     <!-- 日期选择 -->
     <el-date-picker size="mini" v-if="type != '3'" class="selectRoad" v-model="dateTime" style="width: 140px"
-      :picker-options="pickerOptions" :type="type == 1
+      :picker-options="pickerOptions" :type="type == 'day'
         ? 'date'
-        : type == 2
+        : type == 'month'
           ? 'month'
-          : type == 4
+          : type == 'year'
             ? 'year'
             : ''
       " placeholder="请选择" />
@@ -31,6 +31,7 @@
 import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
 
 import { getRoadSectionList } from "@/api/event/perceiveEvent";
+import moment from "moment";
 
 
 export default {
@@ -44,24 +45,24 @@ export default {
       selectId: 1,
       reset: false,
       direction: "1",
-      type: "1",
+      type: "day",
       typeOptions: [
         {
           label: "年",
-          value: "4",
+          value: "year",
         },
         {
           label: "月",
-          value: "2",
+          value: "month",
         },
         {
           label: "日",
-          value: "1",
-        },
-        {
-          label: "季",
-          value: "3",
+          value: "day",
         },
+        // {
+        //   label: "季",
+        //   value: "3",
+        // },
       ],
       quarter: "1",
       quarterOptions: [
@@ -96,14 +97,31 @@ export default {
 
   created() { },
   methods: {
-
-    searchQuery() { },
+    getQuery(){
+      let _currently = moment(this.dateTime);
+      if(this.type === 'day'){
+        _currently = _currently.format('YYYY-MM-DD')
+      } else if(this.type === 'month'){
+        _currently = _currently.format('YYYY-MM-')+'01'
+      } else if(this.type === 'year'){
+        _currently = _currently.format('YYYY-')+'01-01'
+      }
+      return {
+        type: this.type,
+        direction: this.direction,
+        currently: _currently,
+        lastYear: moment(_currently).subtract(1,'year').format('YYYY-MM-DD')
+      }
+    },
+    searchQuery() {
+      this.$parent.bind();
+    },
     onReset() {
       this.selectId = 1;
       this.selectIndex = 1;
       this.reset = true;
       this.direction = "1";
-      this.type = "1";
+      this.type = "day";
       this.dateTime = moment().format("YYYY-MM-DD HH:mm:ss");
       this.searchQuery();
     },
@@ -166,9 +184,5 @@ export default {
     border-color: transparent;
     color: white;
   }
-
-  .keep-ratio {
-    height: 200px;
-  }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/type/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/type/index.vue
index 0a81673a..698b459d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/type/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis/type/index.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="congestiontType">
     
-      <div class="charts keep-ratio" id="typeAnalysis"></div>
+      <div class="charts" id="ctypeAnalysis"></div>
       <div class="legend-box">
+        <div v-if="dataList.length ===0" style="width:100%;height: 100%;text-align: center;line-height: 100px;">暂无数据</div>
         <el-carousel height="200px" direction="vertical">
           <el-carousel-item
             v-for="(item, index) in dataList"
@@ -25,21 +26,104 @@
 import * as echarts from "echarts";
 import chartsStatistics from "./charts";
 import { getWarningTypeDay } from "@/api/event/perceiveEvent";
-
+import request from '@/utils/request'
+import {WarnintType} from '@screen/utils/enum.js'
+import { exportFile } from "@screen/utils/common";
 
 export default {
   name: "TypeAnalysis",
+  props: {
+    filter: {
+      type: Object
+    }
+  },
   components: {
   },
   data() {
     return { dataList: [] };
   },
+
+  watch: {
+    'filter' (a, b) {
+      if(a){
+        this.bind(a)
+      }
+    }
+  },
   created() {},
-  methods: {},
-  mounted() {
-    setTimeout(() => {
+  methods: {
+
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/perceivedEvents/warning/exportSelectWarningType",
+        filename: name,
+        data:this.data,
+      });
+    },
+    bind(data){
+      this.data = data;
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("ctypeAnalysis"));
+      }
+      request({
+        url: '/perceivedEvents/warning/selectWarningType',
+        method: 'post',
+        data: data
+      }).then(result=>{
+        if (result.code != 200) return this.$message.error(result.msg);
+        let total = 0;
+        result.data.currentlyMap.forEach((item, index) => {
+          total += item.number;
+        });
+        const _dataList = [];
+        if(total > 0){
+          result.data.currentlyMap.forEach((item, index) => {
+            _dataList.push({
+              name: WarnintType[item.warningType],
+              value: item.number,
+              percert:((item.number / total) * 100).toFixed(2)
+            });
+          });
+        }
+        
+        this.dataList = _dataList;
+
+        const list = this.dataList.reduce((acc, curr, index) => {
+              if (index % 6 === 0) acc.push([]);
+              acc[Math.floor(index / 6)].push(curr);
+              return acc;
+            }, []);
+            this.dataList = list;
+            chartsStatistics.legend.data = result.data.currentlyMap?.map((item) => WarnintType[item.warningType]);
+            chartsStatistics.series[0].data = result.data.currentlyMap.map(
+              (item, index) => {
+                return {
+                  name: WarnintType[item.warningType],
+                  value:item.number,
+                  label: {
+                    color: colorList[index],
+                  },
+                };
+              }
+            );
+            chartsStatistics.series[1].data = result.data.currentlyMap.map(
+              (item, index) => {
+                return {
+                  name: WarnintType[item.warningType],
+                  value:item.number,
+                  label: {
+                    color: colorList[index],
+                  },
+                };
+              }
+            );
+          this.myChart.setOption(chartsStatistics);
+      })
+    },
+    bindMock(){
       this.$nextTick(() => {
-        var myChart = echarts.init(document.getElementById("typeAnalysis"));
+        var myChart = echarts.init(document.getElementById("ctypeAnalysis"));
 
         getWarningTypeDay().then((res) => {
           if (res.code == 200) {
@@ -157,7 +241,10 @@ export default {
           myChart.setOption(chartsStatistics);
         });
       });
-    });
+    }
+  },
+  mounted() {
+  //  this.bindMock();
   },
 };
 </script>
@@ -344,6 +431,5 @@ export default {
 .charts {
   height: 180px;
   width: 50%;
-  margin-top: 30px;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventQuery/index copy.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventQuery/index copy.vue
index b4dd0512..68fe2986 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventQuery/index copy.vue	
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventQuery/index copy.vue	
@@ -319,7 +319,6 @@ export default {
             if (params.componentType == 'graphic') {
               return
             }
-            // console.log(params);
             chart2.title.text = `{zb|${Math.round(params.data.value / total * 100)}%}`;
             chart2.title.subtext = params.data.name;
             this.myChart2.setOption(chart2);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventSource/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventSource/index.vue
index beb6961b..6de31aa0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventSource/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/analysis2/components/eventSource/index.vue
@@ -100,7 +100,7 @@ export default {
               // },
               {
                 average: 0,
-                name: "气象监测器",
+                name: "气象检测器",
                 percent: 0.1,
               },
             ];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue
index 275e76c6..52a8c2cd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/index.vue
@@ -36,7 +36,6 @@ export default {
   display: flex;
   flex-direction: column;
   padding: 8px 20px 20px;
-
 }
 .full_tab {
   width: 100%;
@@ -45,6 +44,7 @@ export default {
   flex-direction: column;
   flex: 1;
   ::v-deep .el-tabs__header {
+    margin: 0 0 15px;
   }
   ::v-deep .el-tabs__content {
     flex: 1;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/Carousel/index.vue
index 7a032641..735d5742 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/Carousel/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/Carousel/index.vue
@@ -1,23 +1,23 @@
 <template>
   <div class="Carousel">
-    <img src="./images/arrow.svg" @click="prevSlide" class="arrow" />
-
+    <img src="./images/arrow.svg" @click="prevSlide" class="arrow" v-if="pictures.length > 1 || videos.length > 1" />
+    
     <VueSlickCarousel v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
-      <div v-for="(item, index) in pictures" :key="index" class="item">
-        <!-- <img :src="require(`@screen/images/${item}`)" style="height: 100%"> -->
-        <!-- <img :src="item" style="height: 100%"> -->
-        <el-image style="height: 100%" :src="item" :preview-src-list="pictures">
+      <div v-for="(item, index) in pictures" :key="index" class="item" >
+        <el-image   fit="fill" :src="item" :preview-src-list="pictures">
         </el-image>
       </div>
     </VueSlickCarousel>
+    
 
-    <VueSlickCarousel v-if="videos.length > 0" v-bind="videoSettings" ref="CarouselRef" class="vueSlickCarousel">
+    <VueSlickCarousel v-if="videos.length > 0"  v-bind="videoSettings" ref="CarouselRef" class="vueSlickCarousel">
       <div v-for="(item, index) in  videos " :key="index" class="item">
-        <Video style="height: 100%;" :showHeader="false" :url="item || ''" videoType="mp4" />
+        <Video style="height: 100%;width:100%;" :showHeader="false" :url="item || ''" videoType="mp4" />
       </div>
     </VueSlickCarousel>
 
-    <img src="./images/arrow.svg" @click="nextSlide" class="arrow" />
+    <div class="nodata" v-if="pictures.length === 0 && videos.length === 0">暂无媒体数据</div>
+    <img src="./images/arrow.svg" @click="nextSlide" class="arrow" v-if="pictures.length > 1 || videos.length > 1" />
   </div>
 </template>
 
@@ -58,15 +58,17 @@ export default {
         infinite: true,
         arrows: false,
         speed: 600,
+        dots: true,//启用点指示器      
         slidesToShow: 1,
         slidesToScroll: 1,
-        autoplay: true,
+        autoplay: false,
         autoplaySpeed: 1800,
       },
       videoSettings: {
         infinite: true,
         arrows: false,
         speed: 600,
+        dots: true,//启用点指示器     
         slidesToShow: 1,
         slidesToScroll: 1,
         autoplay: false,
@@ -85,7 +87,11 @@ export default {
   },
 }
 </script>
-
+<style lang="scss" scoped>
+::v-deep .el-image-viewer__wrapper{
+  z-index: 9999 !important;
+}
+</style>
 <style lang="scss" scoped>
 .Carousel {
   width: 100%;
@@ -98,11 +104,40 @@ export default {
     overflow: hidden;
 
     ::v-deep {
+      
+      .slick-dots{ 
+        // background-color: #ff0000;
+        bottom: 0px;
+        li.slick-active{
+          button{
+            color: #fff;
+            font-size: 10px;
+            background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+          }
+        }
+        li{
+          button{
+            color: #fff;
+            font-size: 10px;
+            background: linear-gradient(180deg, #004960 0%, #004b62 100%);
+          }
+          
+          button::before{
+            content: '';
+            background-color: transparent;
+            
+          }
+        }
+        
+        
+      }
       .slick-list {
         height: 100%;
+        width: 100%;
 
         div {
           height: 100%;
+          width: 100%;
         }
       }
     }
@@ -110,10 +145,17 @@ export default {
     .item {
       img {
         height: 100%;
+        width: 100%;
       }
     }
   }
-
+  .nodata{
+    background-color: #1a434bbb;
+    width: 100%;
+    text-align: center;
+    line-height: 100px;
+    color: #ccccccbb;
+  }
   .arrow {
     cursor: pointer;
     width: 15px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/data.js
index 04481efc..63908c2f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/data.js
@@ -19,7 +19,7 @@ export const _formList = [
   },
   {
     label: "行驶方向:",
-    key: "direction",
+    key: "stringDirection",
     type: "input",
     options: {
       disabled: true,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/index.vue
index 81f931dc..ef2821ff 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/EventDetailDialog/index.vue
@@ -6,15 +6,15 @@
       <div class="video-pic" :style="{
     height: formData.component === 'VideoMulti' ? '242px' : undefined,
   }">
-        <component :is="formData.component" style="height: 100%; width: 380px"
+        <!-- <component :is="formData.component" style="height: 100%; width: 380px"
           :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
     ? formData.videoList[1]
     : ''
     " :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
-          :videoType="formData.videoType" />
+          :videoType="formData.videoType" /> -->
 
-        <Carousel style="flex: 1" :videos="formData.videoList" :pictures="[]" />
-        <Carousel style="flex: 1" :pictures="formData.pictures" :videos="[]" />
+        <Carousel style="flex: 1" :list="formData.videoList" type="video" />
+        <Carousel style="flex: 1" :list="formData.pictures" type="picture" />
       </div>
     
     </div>
@@ -33,7 +33,7 @@ import Form from "@screen/components/FormConfig";
 import { _formList } from "./data";
 import Video from "@screen/components/Video";
 import VideoMulti from "@screen/components/VideoMulti";
-import Carousel from "./Carousel/index.vue";
+import Carousel from "@screen/pages/control/event/event/EventDetailDialog/Carousel";
 import Button from "@screen/components/Buttons/Button.vue";
 var moment = require("moment");
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/PresetFormItems.js
index 31232308..9a83cb9e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/PresetFormItems.js
@@ -18,7 +18,7 @@ export const source = {
       },
       {
         key: "2",
-        label: "交通转接",
+        label: "交警转接",
       },
       {
         key: "3",
@@ -273,7 +273,7 @@ export const eventSources = {
       },
       {
         key: "2",
-        label: "交通转接",
+        label: "交警转接",
       },
       {
         key: "3",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/index.vue
index 8cbc3e4d..52affd3d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/FormEvent/index.vue
@@ -11,7 +11,7 @@
     </div>
 
     <template #footer>
-      <Button style="background: #c9c9c9; padding: 0 24px"
+      <Button style="background: #0e708b; padding: 0 24px"
         @click.native="(modelVisible = false), (submitting = false)">取消</Button>
       <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">保存</Button>
     </template>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
index 26ebccb4..0da740b9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
@@ -137,7 +137,7 @@ export const searchFormList = [
         // },
         {
           key: "7",
-          label: "气象监测器",
+          label: "气象检测器",
         },
       ],
     },
@@ -145,8 +145,9 @@ export const searchFormList = [
   {
     label: "方向:",
     key: "direction",
-    type: "RadioGroup",
+    type: "select",
     options: {
+      clearable: true,
       options: [
         {
           key: "1",
@@ -156,6 +157,10 @@ export const searchFormList = [
           key: "3",
           label: "济南方向",
         },
+        {
+          key: "2",
+          label: "双向",
+        },
       ],
     },
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue
index 7425e73c..b0b95441 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue
@@ -22,21 +22,27 @@
     </div>
 
     <!-- 内容 -->
-    <div class="body" v-loading>
+    <div class="body">
+        <div class="content">
+              <!-- 内容 -->
+    <div class="scrollPanel" v-loading>
       <RoadStateCard v-for="(item, index) in data" :key="index" v-bind="getStateCardBind(item)"
         @firstBtnClick="firstBtnClick" @lastBtnClick="onLastBtnClick" />
     </div>
-
+</div>  
+</div>  
     <!-- 分页 -->
     <div class="footer">
       <Pagination @current-change="getData" @size-change="onSizeChange" width="'100%'"
-        :page-sizes="[12, 16, 20, 30, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        :page-sizes="[12, 16, 20, 32, 48]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
         layout="total, sizes, prev, pager, next" :total="total">
       </Pagination>
     </div>
 
     <!-- "详情"弹出框 -->
-    <EventDetailDialog @update:value="handleDialogClose" :visible="eventDetailDialogVisible" :formData="detailDialogFormData" />
+    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" activeName="-1"
+    @update:value="handleDialogClose" />
+
   </div>
 </template>
 
@@ -46,7 +52,7 @@ import Tabs from "@screen/components/Tabs/index.vue";
 import RoadStateCard from "@screen/components/RoadStateCard/index.vue";
 import Pagination from "@screen/components/Pagination.vue";
 import InputSearch from "@screen/components/InputSearch/index.vue";
-import EventDetailDialog from "./EventDetailDialog/index";
+
 import FormEvent from "./FormEvent/index";
 import { tabMap,searchFormList } from "./data";
 import request from "@/utils/request";
@@ -62,7 +68,6 @@ export default {
     Pagination,
     RoadStateCard,
     InputSearch,
-    EventDetailDialog,
     FormEvent,
   },
   data() {
@@ -113,7 +118,6 @@ export default {
             it.stringEventType = warningTypeMapping[it.warningType] + strSub;
 
             it.startTime = it.warningTime;
-
             if (it.otherConfig) {
               let otherConfig = JSON.parse(it.otherConfig);
               it.pictures = otherConfig.pictures || [];
@@ -169,7 +173,6 @@ export default {
         });
     },
     firstBtnClick(id) {//点击去确认/详情/处置记录等第一个按钮
-      console.log("id", id);
       request({
           url: `/perceivedEvents/warning/getWarningById`,//感知事件
           method: "post",
@@ -180,10 +183,11 @@ export default {
 
           data.stringEventSource = data?.warningSource ? warningSourceMapping[data.warningSource] : '';
           data.nickName = data.userName;
-          data.direction = gzDirectionMapping[data.direction] || data.direction;
+          // data.direction = gzDirectionMapping[data.direction] || data.direction;
           data.startTime = data.warningTime;
           data.stringEventState = warningStateMapping[data.warningState];
           data.stringEventType = warningTypeMapping[data.warningType];
+          data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
 
           data.videoList = [];
           if (data.otherConfig) {
@@ -193,7 +197,8 @@ export default {
             data.windSpeed = otherConfig.windSpeed;
             data.visibility = otherConfig.visibility;
 
-            data.pictures = otherConfig.pictures || [];
+            //[...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures] //
+            data.pictures =otherConfig.pictures || [];
             data.videoList = otherConfig.videoList || [];
             // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4',
             // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
@@ -202,7 +207,6 @@ export default {
           data.component = "Video";
           this.detailDialogFormData = data;
           // console.log('data', this.detailDialogFormData)
-
           this.eventDetailDialogVisible = true;
         });
     },
@@ -218,10 +222,10 @@ export default {
       let dStakeMark = data.stakeMark;
       let dendStakeMark = data.endStakeMark;
 
-      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : '';
+      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0].padStart(3,'0')}+${dStakeMark[1].padStart(3,'0')}` : '';
       let endStakeMark = '';
       if (dendStakeMark) {
-        endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : '';
+        endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0].padStart(3,'0')}+${dendStakeMark[1].padStart(3,'0')}` : '';
       }
 
       this.searchData = {
@@ -236,7 +240,6 @@ export default {
         startStakeMark: stakeMark,
         endStakeMark: endStakeMark,
       };
-      console.log(this.searchData)
       this.getData();
     }
   },
@@ -262,16 +265,42 @@ export default {
     }
   }
 
+
   .body {
     flex: 1;
-    overflow: auto;
-    display: grid;
-    grid-template-columns: repeat(4, 1fr);
-    grid-gap: 24px;
-    // grid-row-gap: 9px;
-    // grid-column-gap: 9px;
-    grid-auto-rows: min-content;
+    overflow: hidden;
+    position: relative;
+    overflow: hidden;
+
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(4, 1fr);
+        grid-gap: 24px;
+        grid-auto-rows: minmax(220px, max-content);
+        position: relative;
+        flex: 1;
+        overflow-y: auto;
+        overflow-x: hidden;
+      }
+    }
   }
+  // .body {
+  //   flex: 1;
+  //   overflow: none;
+  //   display: grid;
+  //   grid-template-columns: repeat(4, 1fr);
+  //   grid-gap: 24px;
+  //   // grid-row-gap: 9px;
+  //   // grid-column-gap: 9px;
+  //   grid-auto-rows: min-content;
+  // }
 
   .footer {
     margin-top: 15px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue
index e15aaa3a..25536094 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue
@@ -19,7 +19,7 @@
             <div class="messBody">
               <div class="item">
                 <span class="title">地址：</span>
-                <span class="text">{{ item.name || "--" }}</span>
+                <span class="text">{{ item.regionName || "--" }}</span>
               </div>
               <!-- <div class="item">
                 <span class="title">天气：</span>
@@ -27,23 +27,23 @@
               </div> -->
               <div class="item">
                 <span class="title">天气状况：</span>
-                <span class="text">{{ item.text || "--" }} </span>
+                <span class="text">{{ item.text }} </span>
               </div>
               <div class="item">
                 <span class="title">温度：</span>
-                <span class="text">{{ item.temp || "--" }}℃</span>
+                <span class="text">{{ item.temp }}℃</span>
               </div>
               <div class="item">
                 <span class="title">湿度：</span>
-                <span class="text">{{ item.humidity || "--" }}%</span>
+                <span class="text">{{ item.humidity }}%</span>
               </div>
               <div class="item">
                 <span class="title">风向：</span>
-                <span class="text">{{ item.windDir || "--" }}</span>
+                <span class="text">{{ item.windDir }}</span>
               </div>
               <div class="item">
                 <span class="title">风力：</span>
-                <span class="text">{{ item.windScale || "--" }}级</span>
+                <span class="text">{{ item.windScale  }}级</span>
               </div>
               <div class="item">
                 <span class="title">降水量：</span>
@@ -51,7 +51,7 @@
               </div>
               <div class="item">
                 <span class="title">能见度：</span>
-                <span class="text">{{ item.vis || "--" }}km</span>
+                <span class="text">{{ item.vis }}km</span>
               </div>
               <!-- <div class="item">
                 <span class="title">能见度等级：</span>
@@ -60,7 +60,7 @@
               <div class="item">
                 <span class="title">发布时间：</span>
                 <span class="text">{{
-                  moment(item.obsTime).format("YYYY-MM-DD HH:mm:ss") || "--"
+                  moment(item.obsTime).format("YYYY-MM-DD HH:mm:ss")
                 }}</span>
               </div>
             </div>
@@ -78,7 +78,6 @@ import {
 } from "@/api/perception/meteorologyCheck";
 import moment from "moment";
 import request from '@/utils/request'
-import { forEach } from "lodash";
 import { getWeatherFormat }from '../../data'
 
 export default {
@@ -172,16 +171,17 @@ export default {
         let result=[];
         res.data.forEach((x,index)=>{
           let z = x;
-        
           if(x.forecastList && x.forecastList.length > 0){
             x.forecastList.sort((a, b) => moment.duration(moment(b.weatherTime).diff(moment(a.weatherTime))))
             z = x.forecastList[0]
+            z.weatherCondition = x.weatherCondition
+            z.weatherConditionCode = x.weatherConditionCode
             z.weatherTime = z.forecastTime;
           }
 
           const temp = getWeatherFormat(z);
           result.push({
-            name: this.regionList[index].regionName,
+            regionName: this.regionList[index].regionName,
             ...temp
           })
         })
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
index 5b08c0f1..466eeca8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="congestion">
-    <WgtTitle :title="'天气预报'"></WgtTitle>
+    <WgtTitle :title="'实况天气'"></WgtTitle>
     <div class="board">
       <div class="showRoad">
         <div class="weaterIcon">
           <div
             class="img"
             :style="{
-              backgroundImage: `url(${cityWeather.icon ? require(`@screen/images/weather/${cityWeather.icon}.svg`):''})`,
+              backgroundImage: `url(${require(`@screen/images/weather/${cityWeather.icon}.svg`)})`,
             }"
           ></div>
           <div>
@@ -112,7 +112,7 @@ export default {
   data() {
     return {
       city: "长清区",
-      cityWeather: {},
+      cityWeather: {icon:0},
     };
   },
   watch: {
@@ -188,8 +188,8 @@ export default {
         margin-right: 27px;
 
         .img {
-          width: 30px;
-          height: 30px;
+          width: 40px;
+          height: 40px;
           background-size: 100% 100%;
         }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js
index 4c35fec9..0d951b5d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js
@@ -5,7 +5,7 @@ var options = {
     show: true,
     trigger: "axis",
     valueFormatter: function (value) {
-      return value + " km";
+      return value + " ㎞";
     },
   },
   grid: {
@@ -73,7 +73,7 @@ var options = {
     ],
   },
   yAxis: {
-    name: "M  ",
+    name: "㎞",
     type: "value",
     splitNumber: 5,
     nameTextStyle: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue
index 48bed662..f4cd1714 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="congestionData">
-    <WgtTitle :title="'气象监测数据'"></WgtTitle>
+    <WgtTitle :title="'气象检测数据'"></WgtTitle>
     <div class="board">
       <div class="showRoad">
         <div class="item">
@@ -180,9 +180,8 @@ export default {
   height: 100%;
   justify-content: flex-start;
   .board {
-    flex: 1;
     width: 100%;
-    height: 100%;
+    flex: 1;
     padding: 0px 20px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
     border-radius: 5px 5px 5px 5px;
@@ -208,9 +207,9 @@ export default {
       > .item {
         display: flex;
         width: 50%;
-        height: 23px;
-        padding: 20px 0px;
-        margin: 15px 0px;
+        height: 25px;
+        padding: 15px 0px;
+        margin: 10px 0px;
         flex-direction: row;
 
         > span.label {
@@ -224,6 +223,7 @@ export default {
 
         > span.text {
           font-size: 14px;
+          height: 25px;
           font-family: PingFang SC, PingFang SC;
           font-weight: 400;
           color: #ffffff;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue
index 94a742f2..d11ae593 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue
@@ -68,7 +68,7 @@ export default {
       dataItem: {},
       weatherData: [],
       data: Array.from({ length: 10 }).map(() => ({
-        name: "气象监测器1",
+        name: "气象检测器1",
         rote: "济南方向",
         arrdeass: "K59+256",
         time: "2024.01.04 13:00:00",
@@ -89,14 +89,17 @@ export default {
     getList() {
       getListLatest().then((res) => {
         this.dataList = res.rows;
-        this.dataItem = _.find(res.rows,{deviceState:'1'});
+        const _dataItem = _.find(res.rows,{deviceState:'1'});
+        this.dataItem = _dataItem || {}
         this.getWeather();
       });
     },
     getWeather() {
-      // getDeviceNameListLatest(this.deviceName).then((res) => {
-      //   this.weatherData = res.rows;
-      // });
+      if(this.dataItem.deviceName){
+        getDeviceNameListLatest(this.dataItem.deviceName).then((res) => {
+        this.weatherData = res.rows;
+      });
+      }
     },
     handleClick(item) {
       this.dataItem = item;
@@ -125,10 +128,11 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: row;
+  padding-bottom: 20px;
 
   .weather {
     flex: 1;
-    margin: 0px 20px;
+    margin: 0px 15px;
   }
 
   .queryList {
@@ -142,7 +146,7 @@ export default {
       background:url(./assets/default.png);
       background-size: 100% 100%;
       width: 200px;
-      height: 40px;
+      height: 35px;
       font-size: 15px;
       line-height: 40px;
       margin-bottom: 20px;
@@ -159,7 +163,7 @@ export default {
     }
   }
   .querycharts{
-    width: 40vw;
+    width: 49vw;
     display: flex;
     flex-direction: column;
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/components/weaterData/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/components/weaterData/index.vue
index 6063132e..87170177 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/components/weaterData/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/components/weaterData/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="congestion">
-    <WgtTitle :title="'气象监测数据'"></WgtTitle>
+    <WgtTitle :title="'气象检测数据'"></WgtTitle>
     <div class="board">
       <div class="showRoad">
         <div class="item">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/index.vue
index a0c27b3c..c786103c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery2/index.vue
@@ -89,7 +89,7 @@ export default {
       dataItem: {},
       weatherData: [],
       data: Array.from({ length: 10 }).map(() => ({
-        name: "气象监测器1",
+        name: "气象检测器1",
         rote: "济南方向",
         arrdeass: "K59+256",
         time: "2024.01.04 13:00:00",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
index e533d794..289456ad 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
@@ -1,28 +1,11 @@
 <template>
-  <div class="congestion">
+  <div class="congestionWarning" :style="menu.isRecentOpen?'height:calc(100vh - 380px)':'height:calc(100vh - 420px)'">
     <WgtTitle :title="'气象预警信息'"></WgtTitle>
-    <div class="board">
       <div class="weaterMain">
         <div class="weaterTitle">
           <span class="text">当前气象预警信息数：</span>
           <span class="num">{{ warningList.length }}</span>
         </div>
-        <!-- <div>
-          <el-select
-            v-model="colorSelect"
-            size="mini"
-            class="selectRoad"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in colors"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </div> -->
       </div>
       <div class="warningList" v-if="warningList.length > 0">
         <div class="itemWarning" v-for="item in warningList">
@@ -37,12 +20,12 @@
                 {{ item.stationName }}
               </div>
             </div>
-            <div class="left-row">
+            <!-- <div class="left-row">
               <div class="label">预警信号：</div>
               <div class="value">
                 {{ item.earlyWorningSignal }}
               </div>
-            </div>
+            </div> -->
             <div class="left-row">
               <div class="label">预警发布时间：</div>
               <div class="value">
@@ -60,7 +43,7 @@
       </div>
       <Empty v-else text="暂无数据..."></Empty>
     </div>
-  </div>
+  
 </template>
 
 <script>
@@ -70,60 +53,26 @@ import { getMeteorologicalEarlyWarning } from "@/api/perception/meteorologyCheck
 import moment from "moment";
 import request from '@/utils/request'
 
+import {  mapState } from "vuex";
 export default {
   name: "infoWarning",
   components: {
     WgtTitle,
   },
+  computed: {
+    ...mapState(["menu"]),
+  },
   data() {
     return {
       moment,
       warningList: [],
       warningData: [],
-      colorSelect: "all",
-      colors: [
-        { label: "全部", value: "all" },
-        { label: "蓝色", value: "Blue" },
-        { label: "黄色", value: "Yellow" },
-        { label: "橙色", value: "Orange" },
-        { label: "红色", value: "Red" },
-      ],
     };
   },
-  watch: {
-    colorSelect(val) {
-      this.warningList = []; // 将清空数组的操作移至循环之外
-
-      this.warningData.forEach((item) => {
-        if (
-          val === "Blue" &&
-          ["White", "Blue", "Green"].includes(item.severityColor)
-        ) {
-          // item.severityColorText = "蓝色";
-          this.warningList.push(item);
-        } else if (
-          val === "Red" &&
-          ["Red", "Black"].includes(item.severityColor)
-        ) {
-          // item.severityColorText = "红色";
-          this.warningList.push(item);
-        } else if (val === "Yellow" && item.severityColor === "Yellow") {
-          // item.severityColorText = "黄色";
-          this.warningList.push(item);
-        } else if (val === "Orange" && item.severityColor === "Orange") {
-          // item.severityColorText = "橙色";
-          this.warningList.push(item);
-        } else if (val === "all") {
-          // 确保只有当val不是预定义颜色时才推送
-          this.warningList.push(item);
-        }
-      });
-    },
-  },
+ 
   created() {},
   methods: {
     getWarningData() {
-
       request({url: '/weatherForecast/currentWeatherWarningInformationQuery',
         method: 'post',
         data: {
@@ -131,39 +80,19 @@ export default {
           "earlyWorningLevel":"1|2|3"
         }
       }).then(res=>{
-        this.warningList = res.data;
+        
+        res.data.forEach(e=>{
+            e.earlyWorningIssueDate = e.earlyWorningIssueDate.replace('T',' ')
+          })
+          this.warningList = res.data;
       })
-
-
-      return;
-      getMeteorologicalEarlyWarning().then((res) => {
-        let data = [];
-        for (let key in res.data) {
-          if (res.data[key].length > 0) {
-            res.data[key].forEach((value) => {
-              data.push(value);
-            });
-          }
-        }
-        this.warningData = data;
-        this.warningData.forEach((item) => {
-          if (["White", "Blue", "Green"].includes(item.severityColor)) {
-            item.severityColorText = "蓝色";
-          } else if (["Red", "Black"].includes(item.severityColor)) {
-            item.severityColorText = "红色";
-          } else if (item.severityColor === "Yellow") {
-            item.severityColorText = "黄色";
-          } else if (item.severityColor === "Orange") {
-            item.severityColorText = "橙色";
-          }
-        });
-
-        this.warningList = this.warningData;
-      });
     },
   },
   mounted() {
-    this.getWarningData();
+    setTimeout(() => {
+      this.getWarningData();  
+    }, 500);
+    
   },
 };
 </script>
@@ -183,296 +112,274 @@ export default {
   }
 }
 
-.congestion {
-  display: inline-flex;
-  width: 100%;
-  height: 600px;
+.congestionWarning {
+  display: flex;
   flex-direction: column;
   width: 100%;
-  height: 100%;
-
-  .board {
-    height: 690px;
-    width: 100%;
-    padding: 0px 0px;
-    border-radius: 5px 5px 5px 5px;
-    opacity: 1;
+  .warningList {
     display: flex;
-    justify-content: space-between;
-    align-items: center;
     flex-direction: column;
-    margin-top: 20px;
+    width: 100%;
+    flex: 1;
+    overflow-y: auto;
+    overflow-x: hidden;
+    > div::after {
+      content: "";
+      top: 0;
+      left: -3px;
+      position: absolute;
+      width: 0;
+      height: 0;
+      border-right: 6px solid transparent;
+      border-left: 6px solid transparent;
+      border-bottom: 6px solid rgba(55, 231, 255, 1);
+      transform: rotate(-45deg);
+    }
 
-    .warningList {
+    > div::before {
+      content: "";
+      bottom: 0;
+      right: -3px;
+      position: absolute;
+      width: 0;
+      height: 0;
+      border-right: 6px solid transparent;
+      border-left: 6px solid transparent;
+      border-bottom: 6px solid rgba(55, 231, 255, 1);
+      transform: rotate(135deg);
+    }
+
+    > div {
+      position: relative;
       display: inline-flex;
-      flex-direction: column;
       width: 100%;
-      height: calc(100% - 40px);
-      overflow-y: auto;
-      overflow-x: hidden;
-      > div::after {
-        content: "";
-        top: 0;
-        left: -3px;
-        position: absolute;
-        width: 0;
-        height: 0;
-        border-right: 6px solid transparent;
-        border-left: 6px solid transparent;
-        border-bottom: 6px solid rgba(55, 231, 255, 1);
-        transform: rotate(-45deg);
-      }
-
-      > div::before {
-        content: "";
-        bottom: 0;
-        right: -3px;
-        position: absolute;
-        width: 0;
-        height: 0;
-        border-right: 6px solid transparent;
-        border-left: 6px solid transparent;
-        border-bottom: 6px solid rgba(55, 231, 255, 1);
-        transform: rotate(135deg);
-      }
-
-      > div {
-        position: relative;
+      height: 138px;
+      background: #133242;
+      border-radius: 2px 2px 2px 2px;
+      opacity: 1;
+      border: 1px solid;
+      border-image: linear-gradient(
+          360deg,
+          rgba(55, 231, 255, 0.2),
+          rgba(55, 231, 255, 0)
+        )
+        1 1;
+      margin-bottom: 20px;
+      padding: 23px 29px;
+      font-size: 14px;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      color: #37e7ff;
+
+      > .left-w {
         display: inline-flex;
-        width: 100%;
-        height: 138px;
-        background: #133242;
-        border-radius: 2px 2px 2px 2px;
-        opacity: 1;
-        border: 1px solid;
-        border-image: linear-gradient(
-            360deg,
-            rgba(55, 231, 255, 0.2),
-            rgba(55, 231, 255, 0)
-          )
-          1 1;
-        margin-top: 20px;
-        padding: 23px 29px;
-        font-size: 14px;
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 400;
-        color: #37e7ff;
+        width: 40%;
+        height: 100%;
+        flex-direction: column;
 
-        > .left-w {
-          display: inline-flex;
-          width: 40%;
-          height: 100%;
-          flex-direction: column;
-
-          .left-row {
-            margin: 2px;
-            display: inline-flex;
-            width: 100%;
-            height: 30px;
-            flex-direction: row;
-
-            > .value {
-              color: #fff;
-            }
-
-            .org {
-              font-size: 14px !important;
-              margin-top: 2px;
-              font-family: PangMenZhengDao;
-              font-weight: 400;
-              color: #f4a125;
-            }
-            .White {
-              color: #fff;
-            }
-            .Blue {
-              color: blue;
-            }
-            .Green {
-              color: green;
-            }
-            .Yellow {
-              color: yellow;
-            }
-            .Orange {
-              color: orange;
-            }
-            .Red {
-              color: red;
-            }
-            .Black {
-              color: #000;
-            }
-          }
-        }
-
-        > .right-w {
-          margin-left: 30px;
+        .left-row {
+          margin: 2px;
           display: inline-flex;
           width: 100%;
-          height: 100%;
-          flex-direction: column;
+          height: 30px;
+          flex-direction: row;
 
-          .right-row {
-            margin-bottom: 10px;
+          > .value {
+            color: #fff;
           }
 
-          .right-text {
+          .org {
+            font-size: 14px !important;
+            margin-top: 2px;
+            font-family: PangMenZhengDao;
+            font-weight: 400;
+            color: #f4a125;
+          }
+          .White {
             color: #fff;
-            overflow-y: auto;
+          }
+          .Blue {
+            color: blue;
+          }
+          .Green {
+            color: green;
+          }
+          .Yellow {
+            color: yellow;
+          }
+          .Orange {
+            color: orange;
+          }
+          .Red {
+            color: red;
+          }
+          .Black {
+            color: #000;
           }
         }
       }
-    }
 
-    .weaterMain {
-      display: inline-flex;
-      flex-direction: row;
-      width: 100%;
-      height: 40px;
-
-      .buttons {
+      > .right-w {
+        margin-left: 30px;
+        display: inline-flex;
         width: 100%;
-        height: 38px;
-        margin-left: 20px;
+        height: 100%;
+        flex-direction: column;
 
-        > div {
-          display: inline-flex;
-          width: 10%;
-          height: 35px;
-          justify-content: center;
-          align-items: center;
-          font-size: 12px;
-          font-family: PangMenZhengDao;
-          font-weight: 800;
-          color: #ffffff;
-          z-index: 9;
+        .right-row {
+          margin-bottom: 10px;
         }
 
-        > div::after {
-          content: "";
-          position: absolute;
-          display: inline-flex;
-          width: 55px;
-          height: 36px;
-          background: linear-gradient(
-            180deg,
-            #6557d7 0%,
-            rgba(101, 87, 216, 0) 100%
-          );
-          border-radius: 50%;
-          opacity: 1;
-          z-index: -1;
-          cursor: pointer;
-        }
-
-        .redSel::after {
-          background: linear-gradient(
-            180deg,
-            #e73a14 0%,
-            rgba(240, 92, 9, 0) 100%
-          );
-        }
-
-        .yelSel::after {
-          background: linear-gradient(
-            180deg,
-            #fffa79 0%,
-            rgba(255, 208, 137, 0) 100%
-          );
+        .right-text {
+          color: #fff;
+          overflow-y: auto;
         }
+      }
+    }
+  }
 
-        .bluSel::after {
-          background: linear-gradient(
-            180deg,
-            #121ade 0%,
-            rgba(40, 18, 228, 0) 100%
-          );
-        }
+  .weaterMain {
+    display: inline-flex;
+    flex-direction: row;
+    width: 100%;
+    height: 40px;
+    margin: 10px 0px;
+    .buttons {
+      width: 100%;
+      height: 38px;
+      margin-left: 20px;
 
-        .orgSel::after {
-          background: linear-gradient(
-            180deg,
-            #ffa623 0%,
-            rgba(255, 173, 53, 0) 100%
-          );
-        }
+      > div {
+        display: inline-flex;
+        width: 10%;
+        height: 35px;
+        justify-content: center;
+        align-items: center;
+        font-size: 12px;
+        font-family: PangMenZhengDao;
+        font-weight: 800;
+        color: #ffffff;
+        z-index: 9;
       }
 
-      .weaterTitle::after {
+      > div::after {
         content: "";
         position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 100%;
-        height: 2px;
+        display: inline-flex;
+        width: 55px;
+        height: 36px;
         background: linear-gradient(
-          90deg,
-          rgba(189, 255, 246, 0) 0%,
-          #bdfff6 52%,
-          rgba(189, 255, 246, 0) 100%
+          180deg,
+          #6557d7 0%,
+          rgba(101, 87, 216, 0) 100%
         );
-        border-radius: 0px 0px 0px 0px;
+        border-radius: 50%;
         opacity: 1;
+        z-index: -1;
+        cursor: pointer;
       }
 
-      .weaterTitle::before {
-        content: "";
-        position: absolute;
-        top: 38px;
-        left: 0px;
-        width: 100%;
-        height: 2px;
+      .redSel::after {
         background: linear-gradient(
-          90deg,
-          rgba(189, 255, 246, 0) 0%,
-          #bdfff6 52%,
-          rgba(189, 255, 246, 0) 100%
+          180deg,
+          #e73a14 0%,
+          rgba(240, 92, 9, 0) 100%
         );
-        border-radius: 0px 0px 0px 0px;
-        opacity: 1;
       }
 
-      .weaterTitle {
-        position: relative;
-        display: inline-flex;
-        width: 287px;
-        height: 38px;
+      .yelSel::after {
         background: linear-gradient(
-          269deg,
-          rgba(55, 231, 255, 0) 6%,
-          rgba(55, 231, 255, 0.6) 50%,
-          rgba(55, 231, 255, 0) 92%
+          180deg,
+          #fffa79 0%,
+          rgba(255, 208, 137, 0) 100%
         );
-        border-radius: 0px 0px 0px 0px;
-        opacity: 1;
+      }
+
+      .bluSel::after {
+        background: linear-gradient(
+          180deg,
+          #121ade 0%,
+          rgba(40, 18, 228, 0) 100%
+        );
+      }
+
+      .orgSel::after {
+        background: linear-gradient(
+          180deg,
+          #ffa623 0%,
+          rgba(255, 173, 53, 0) 100%
+        );
+      }
+    }
+
+    .weaterTitle::after {
+      content: "";
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      width: 100%;
+      height: 2px;
+      background: linear-gradient(
+        90deg,
+        rgba(189, 255, 246, 0) 0%,
+        #bdfff6 52%,
+        rgba(189, 255, 246, 0) 100%
+      );
+      border-radius: 0px 0px 0px 0px;
+      opacity: 1;
+    }
+
+    .weaterTitle::before {
+      content: "";
+      position: absolute;
+      top: 38px;
+      left: 0px;
+      width: 100%;
+      height: 2px;
+      background: linear-gradient(
+        90deg,
+        rgba(189, 255, 246, 0) 0%,
+        #bdfff6 52%,
+        rgba(189, 255, 246, 0) 100%
+      );
+      border-radius: 0px 0px 0px 0px;
+      opacity: 1;
+    }
+
+    .weaterTitle {
+      position: relative;
+      display: inline-flex;
+      width: 287px;
+      height: 38px;
+      background: linear-gradient(
+        269deg,
+        rgba(55, 231, 255, 0) 6%,
+        rgba(55, 231, 255, 0.6) 50%,
+        rgba(55, 231, 255, 0) 92%
+      );
+      border-radius: 0px 0px 0px 0px;
+      opacity: 1;
+      justify-content: center;
+      align-items: center;
+      > span.text {
+        display: inline-flex;
+        font-size: 16px;
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+      }
+
+      .num {
+        display: inline-flex;
         justify-content: center;
         align-items: center;
-        margin-left: 30px;
-        > span.text {
-          display: inline-flex;
-          font-size: 16px;
-          font-family: PingFang SC, PingFang SC;
-          font-weight: 400;
-          color: #ffffff;
-        }
-
-        .num {
-          display: inline-flex;
-          justify-content: center;
-          align-items: center;
-          font-size: 20px;
-          font-family: PangMenZhengDao;
-          font-weight: 400;
-          color: #d9001b;
-        }
+        font-size: 20px;
+        font-family: PangMenZhengDao;
+        font-weight: 400;
+        color: #d9001b;
       }
     }
   }
 }
 
-.charts {
-  height: 180px;
-  width: 100%;
-}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue
index de26d7ce..9a81b6db 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue
@@ -1,18 +1,17 @@
 <template>
-  <div class="congestion">
+  <div class="congestionWL" >
     <WgtTitle title="能见度异常信息"></WgtTitle>
-    <div class="board">
-      <div class="weaterMain">
-        <el-table
+    
+      <div class="weaterMainWl" style="height:500px;width: 49vw;">
+        <Table
           :border="false"
           :data="tableData"
-          height="670"
-          style="width: 100%"
+          height="100%"
         >
-          <el-table-column prop="nem" label="" width="30"> </el-table-column>
-          <el-table-column prop="stakeMarkRange" label="桩号范围" width="230">
-          </el-table-column>
-          <el-table-column
+        <ElTableColumn prop="num" label="" width="20"/>
+          <ElTableColumn prop="stakeMarkRange" label="桩号范围" width="230">
+          </ElTableColumn>
+          <ElTableColumn
             prop="visibility"
             label="能见度"
             class-name="showClass"
@@ -20,11 +19,18 @@
             <template slot-scope="scope">
               <span class="showClass">{{ scope.row.visibility }}km</span>
             </template>
-          </el-table-column>
-          <el-table-column prop="createTime" label="发生时间" width="230">
-          </el-table-column>
-        </el-table>
+          </ElTableColumn>
+          <ElTableColumn prop="createTime" label="发生时间" width="200">
+          </ElTableColumn>
+        </Table>
       </div>
+
+
+    <div class="footer" style="display: flex;justify-content: center;">
+      <Pagination @current-change="getWarningType" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
+      </Pagination>
     </div>
   </div>
 </template>
@@ -32,6 +38,11 @@
 <script>
 import Card from "@screen/components/Card1/index.vue";
 import WgtTitle from "../../../../../widgets/title";
+import Table from '@screen/components/Table.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import request from "@/utils/request";
+
+import {  mapState } from "vuex";
 import {
   getMeteorologicalEarlyWarning,
   getListVisibility,
@@ -41,21 +52,42 @@ export default {
   name: "infoWarning",
   components: {
     WgtTitle,
+    Pagination,
+    Table
+  },
+  computed: {
+    ...mapState(["menu"]),
   },
   data() {
     return {
       tableData: [],
+      total: 10,
+      searchData: {
+        pageSize: 20,
+        pageNum: 1,
+      },
     };
   },
 
   created() {},
   methods: {
-    selectItem(index) {
-      this.selectIndex = index;
+    onSizeChange(pageSize) {
+      this.searchData.pageSize = pageSize;
+      this.getWarningType();
     },
     getWarningType() {
-      getListVisibility().then((res) => {
-        this.tableData = res.rows;
+      request({
+        url: `/dc/system/meteorologicalDetector/listVisibility?pageSize=${this.searchData.pageSize}&pageNum=${this.searchData.pageNum}`,
+        method: "get",
+      }).then((result) => {
+
+        if (result.code != 200) return;
+        result.rows.forEach(e => {
+          e.visibility = parseFloat(e.visibility )
+        });
+        this.tableData = result.rows;
+        this.total = result.total;
+        
       });
     },
   },
@@ -114,242 +146,11 @@ export default {
   background-color: transparent !important;
 }
 
-.congestion {
-  display: inline-flex;
+.congestionWL {
+  display: flex;
   width: 100%;
-  height: 600px;
+  height: 100%;
   flex-direction: column;
 
-  .board {
-    height: 670px;
-    width: 100%;
-    padding: 0px 0px;
-    border-radius: 5px 5px 5px 5px;
-    opacity: 1;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-direction: column;
-    margin-top: 20px;
-
-    .warningList {
-      display: inline-flex;
-      flex-direction: column;
-      width: 100%;
-      height: calc(100% - 40px);
-
-      > div {
-        display: inline-flex;
-        width: 100%;
-        height: 138px;
-        background: #133242;
-        border-radius: 2px 2px 2px 2px;
-        opacity: 1;
-        border: 1px solid;
-        border-image: linear-gradient(
-            360deg,
-            rgba(55, 231, 255, 1),
-            rgba(55, 231, 255, 0)
-          )
-          1 1;
-        overflow: hidden;
-        margin-top: 20px;
-        padding: 23px 29px;
-        font-size: 14px;
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 400;
-        color: #37e7ff;
-
-        > .left-w {
-          display: inline-flex;
-          width: 40%;
-          height: 100%;
-          flex-direction: column;
-
-          .left-row {
-            margin: 2px;
-            display: inline-flex;
-            width: 100%;
-            height: 30px;
-            flex-direction: row;
-
-            > .value {
-              color: #fff;
-            }
-
-            .org {
-              font-size: 14px;
-              font-family: PangMenZhengDao;
-              font-weight: 400;
-              color: #f4a125;
-            }
-          }
-        }
-
-        > .right-w {
-          margin-left: 30px;
-          display: inline-flex;
-          width: 100%;
-          height: 100%;
-          flex-direction: column;
-
-          .right-row {
-            margin-bottom: 10px;
-          }
-
-          .right-text {
-            color: #fff;
-          }
-        }
-      }
-    }
-
-    .weaterMain {
-      display: inline-flex;
-      flex-direction: row;
-      width: 100%;
-      height: 40px;
-
-      .buttons {
-        width: 100%;
-        height: 38px;
-
-        > div {
-          display: inline-flex;
-          width: 10%;
-          height: 35px;
-          justify-content: center;
-          align-items: center;
-          font-size: 12px;
-          font-family: PangMenZhengDao;
-          font-weight: 800;
-          color: #ffffff;
-          z-index: 9;
-        }
-
-        > div::after {
-          content: "";
-          position: absolute;
-          display: inline-flex;
-          width: 55px;
-          height: 36px;
-          background: linear-gradient(
-            180deg,
-            #6557d7 0%,
-            rgba(101, 87, 216, 0) 100%
-          );
-          border-radius: 50%;
-          opacity: 1;
-          z-index: -1;
-        }
-
-        .redSel::after {
-          background: linear-gradient(
-            180deg,
-            #e73a14 0%,
-            rgba(240, 92, 9, 0) 100%
-          );
-        }
-
-        .yelSel::after {
-          background: linear-gradient(
-            180deg,
-            #fffa79 0%,
-            rgba(255, 208, 137, 0) 100%
-          );
-        }
-
-        .bluSel::after {
-          background: linear-gradient(
-            180deg,
-            #121ade 0%,
-            rgba(40, 18, 228, 0) 100%
-          );
-        }
-
-        .orgSel::after {
-          background: linear-gradient(
-            180deg,
-            #ffa623 0%,
-            rgba(255, 173, 53, 0) 100%
-          );
-        }
-      }
-
-      .weaterTitle::after {
-        content: "";
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 100%;
-        height: 2px;
-        background: linear-gradient(
-          90deg,
-          rgba(189, 255, 246, 0) 0%,
-          #bdfff6 52%,
-          rgba(189, 255, 246, 0) 100%
-        );
-        border-radius: 0px 0px 0px 0px;
-        opacity: 1;
-      }
-
-      .weaterTitle::before {
-        content: "";
-        position: absolute;
-        top: 38px;
-        left: 0px;
-        width: 100%;
-        height: 2px;
-        background: linear-gradient(
-          90deg,
-          rgba(189, 255, 246, 0) 0%,
-          #bdfff6 52%,
-          rgba(189, 255, 246, 0) 100%
-        );
-        border-radius: 0px 0px 0px 0px;
-        opacity: 1;
-      }
-
-      .weaterTitle {
-        position: relative;
-        display: inline-flex;
-        width: 277px;
-        height: 38px;
-        background: linear-gradient(
-          269deg,
-          rgba(55, 231, 255, 0) 6%,
-          rgba(55, 231, 255, 0.6) 50%,
-          rgba(55, 231, 255, 0) 92%
-        );
-        border-radius: 0px 0px 0px 0px;
-        opacity: 1;
-        justify-content: center;
-        align-items: center;
-
-        > span.text {
-          display: inline-flex;
-          font-size: 16px;
-          font-family: PangMenZhengDao;
-          font-weight: 400;
-          color: #ffffff;
-        }
-
-        .num {
-          display: inline-flex;
-          justify-content: center;
-          align-items: center;
-          font-size: 22px;
-          font-family: PangMenZhengDao;
-          font-weight: 400;
-          color: #d9001b;
-        }
-      }
-    }
-  }
-}
-
-.charts {
-  height: 180px;
-  width: 100%;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/index.vue
index 1c9693f6..e109a422 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/index.vue
@@ -1,9 +1,7 @@
 <template>
-    <div class='congestion'>
-      <div class="board">
+    <div class='congestionWwa'>
         <InfoWarning class="contion-l" />
         <InfoWarningList class="contion-r" />
-       </div>
     </div>
   </template>
   
@@ -49,75 +47,25 @@
   </script>
   
   <style lang='scss' scoped>
-  .congestion {
+  .congestionWwa {
     width: 100%;
     height:100%;
-
-    .board{
-      height: calc(100% - 235px);
-      width: 100%;
-      padding: 0px 0px;
-      border-radius: 5px 5px 5px 5px;
-      opacity: 1;
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-start;
-      flex-direction: row;
-
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    flex-direction: row;
       .contion-l {
-        display: inline-flex;
-        width:60%;
-
+        display: flex;
+       flex: 1;
       }
-
       .contion-r {
         display: inline-flex;
-        width:40%;
+        width: 49vw;
         margin-left:20px;
       }
 
-      .queryCharts {
-        display: inline-flex;
-        width:100%;
-        height: 316px;
-
-        .charts-l {
-            width:30%;
-        }
 
-        .charts-ms {
-          width:40%;
-          margin-left:20px;
-        }
-      }
-
-      .queryList {
-        position: relative;
-        top:-10px;
-        display: inline-flex;
-        width:100%;
-        height:440px;
-        flex-direction: row;
-        flex-wrap: wrap;
-
-        > div {
-            width:calc(100%/5  - 22px);
-            height:203px;
-            margin-top:10px;
-            margin-left:20px;
-        }
-
-        > div:nth-child(5n + 1) {
-            margin-left:0px;
-        }
-      }
-
-    }
   }
-      .charts {
-        height:180px;
-        width: 100%;
-      }
   
   </style>
   
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue
index b92c6e98..6cad363c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue
@@ -96,10 +96,10 @@ export default {
   padding: 14px;
   .row_01 {
     display: flex; flex-direction: row; align-items: stretch;
-    .unit_01,.unit_02{
-      flex-basis: 50%;
+    .unit_02{
+      width: 49vw;  
     }
-    .unit_01{ margin-right: 14px;}
+    .unit_01{ margin-right: 14px;flex:1}
   }
   .row_02 {
     flex: 1;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/noStakeWaning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/noStakeWaning/index.vue
new file mode 100644
index 00000000..d997290d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/noStakeWaning/index.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class='board_record'>
+    <!-- 搜索栏 -->
+    <div class="filter">
+      <div>
+        <ButtonGradient @click="onRefreshForm" class="refresh-btn">
+        <template #prefix>
+          <img src="@screen/images/refresh.svg" />
+        </template>
+        刷新
+      </ButtonGradient>
+      </div>
+      
+      <InputSearch ref="searchComp" style="width: 400px" :formList="searchFormList"
+        :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
+
+    </div>
+    <!-- 内容 -->
+    <div class="body">
+      
+      <Table :data="tableData" height="75vh"  @cell-click="onCellClick">
+        <el-table-column label="序号" type="index" :index="indexMethod" width="100" align="center"
+          header-align="center" />
+        <ElTableColumn label="预警类型" prop="warningType" width="160" align="center" header-align="center" />
+        <ElTableColumn label="报警内容" show-overflow-tooltip prop="warningDescription"  header-align="center" />
+        <ElTableColumn label="报警时间" prop="warningTime" width="220" align="center" header-align="center" />
+     
+      </Table>
+    </div>
+
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
+      </Pagination>
+    </div>
+
+    <DialogWarning ref="refDigWarn" v-model="dialogWarningVisible" ></DialogWarning>
+  </div>
+</template>
+
+<script>
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import Table from '@screen/components/Table.vue';
+import request from '@/utils/request'
+import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import { searchFormList } from "./data";
+import { getToken } from "@/utils/auth";
+import { delay, exportFile, confirm } from "@screen/utils/common";
+import { Message } from "element-ui";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+
+import DialogWarning from '@screen/components/HeaderMenu/dialogWarn/DialogWarning.vue'
+
+export default {
+  name: 'boardRecord',
+  components: {
+    ButtonGradient,
+    Pagination,
+    Table,
+    Button,
+    Form,
+    DialogWarning,
+    BoardRecordPreview,
+    InputSearch
+  },
+  data() {
+    return {
+      WarningType:{
+        1: '交通流预警',
+        2: '气象预警'
+      },
+      tableData: [],
+      searchFormList,
+      total: 20,
+      searchData: {
+        pageSize: 20,
+        pageNum: 1
+      },
+      dialogWarningVisible: false,
+    }
+  },
+  created() {
+    this.initData();
+  },
+  mounted(){
+  },
+  methods: {
+    
+      onCellClick(row, column, cell, event) {
+        if(row.warningType === '交通流预警'){
+          this.dialogWarningVisible = true;
+          this.$refs.refDigWarn.bind(row.id,row.remark)
+        }
+    },
+    onRefreshForm(){
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    handleSearch(data) {
+      let startTime = null;
+      let endTime = null;
+      if(data.warningTime && data.warningTime.length ===2){
+        startTime = data.warningTime[0]+' 00:00:00'
+        endTime = data.warningTime[1]+' 23:59:59'
+      }
+      this.searchData = {
+        ...this.searchData,
+        warningType: (data.warningType===undefined||data.warningType===''?null:data.warningType),
+        startTime,
+        endTime
+      };
+      this.initData();
+    },
+    indexMethod(index) {
+        return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
+    },
+
+    //
+  
+    handleDelete(row){
+      const self = this;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          request({
+            url: `/business/dcNoStakeWarningTable/${row.id}`,
+            method: 'delete',
+          }).then(res=>{
+            self.initData();
+            self.$modal.msgSuccess("删除成功");
+          })
+        }).catch(function() {});
+    },
+   
+    initData() {
+      request({
+        url: `/business/dcNoStakeWarningTable/list`,
+        method: "get",
+        params: this.searchData,
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        result.rows.forEach(e=>{
+          e.warningTime = moment(e.warningTime).format('YYYY-MM-DD HH:mm:ss')
+          e.warningType = this.WarningType[e.warningType]
+        })
+        this.tableData = result.rows;
+        this.total = result.total;
+      });
+    },
+    onSizeChange(pageSize) {
+      this.tableData = [];
+      this.searchData.pageSize = pageSize;
+      this.searchData.pageNum = 1;
+      this.initData();
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.board_record {
+  padding: 0 14px 14px;
+  width:100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .filter {
+    height: 60px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    >div {
+      display: flex;
+      gap: 6px;
+    }
+  }
+
+  .body {
+    flex: 1;
+    height: 0;
+    min-height: 0;
+  }
+
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .board_shower{
+    margin: 4px;
+  }
+  ::v-deep .el-carousel__indicators--horizontal{
+    line-height: 0; height: 16px;
+    .el-carousel__indicator--horizontal{
+      padding: 7px 4px;
+    }
+  }
+  ::v-deep .el-table__cell div.cell {
+    padding: 0 10px !important;
+  }
+}
+.upload-file{
+  width: 100%;
+  margin: 20px 0px;
+  background-color: #104c66 !important;
+  border: 1px solid #359cbc !important;
+  border-radius: 5px;
+  text-align: center;
+  padding: 5px 0px;
+  font-size: 14px;
+  cursor: pointer;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/bg.png b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/classification/assets/bg.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/bg.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/classification/assets/bg.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/classification/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/classification/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/classification/index.vue
similarity index 99%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/classification/index.vue
index c5539c06..50e84194 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/classification/index.vue
@@ -21,7 +21,7 @@
 
 <script>
 import * as echarts from "echarts";
-import WgtTitle from "../../../widgets/title";
+import WgtTitle from "../../../../widgets/title";
 import chartsStatistics from "./assets/charts";
 
 const drawRoundRect = (ctx, x, y, width, height, radius) => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/congestion/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/congestion/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/congestion/index.vue
similarity index 96%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/congestion/index.vue
index 4574a88e..fb396e70 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/congestion/index.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import WgtTitle from "../../../widgets/title";
+import WgtTitle from "../../../../widgets/title";
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
 export default {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/flowstate/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/flowstate/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/flowstate/index.vue
similarity index 96%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/flowstate/index.vue
index 9c7edf9f..57a25202 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/flowstate/index.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import WgtTitle from "../../../widgets/title";
+import WgtTitle from "../../../../widgets/title";
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
 export default {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/heightway/index.vue
similarity index 99%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/heightway/index.vue
index 02a4c272..2800c887 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/heightway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/heightway/index.vue
@@ -100,7 +100,7 @@
 </template>
 
 <script>
-import WgtTitle from "../../../widgets/title";
+import WgtTitle from "../../../../widgets/title";
 export default {
   name: "Heightway",
   components: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/situation/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/situation/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/situation/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/situation/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/situation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/situation/index.vue
similarity index 97%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/situation/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/situation/index.vue
index 39a79bb4..19ac3e7f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/situation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/situation/index.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import WgtTitle from "../../../widgets/title";
+import WgtTitle from "../../../../widgets/title";
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
 export default {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/traffic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/traffic/index.vue
new file mode 100644
index 00000000..019551ae
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/traffic/index.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class='trafficAna'>
+      <div v-for="(item, index) in list">
+        <div>{{ item.label }}</div>
+        <div class="boardNumber">
+          <div class="value" v-if="item.unit !== ''">{{ item.value }}</div>
+          <div class="value" v-else :style="'color:'+item.color">{{ item.value }}</div>
+          <div class="unit">{{ item.unit }}</div>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+
+import request from "@/utils/request";
+import moment from "moment";
+export default {
+  name: 'TrafficAna',
+  data() {
+    return {
+      list: [
+        { label: '当前在途车流量', value: '-', unit: '万辆' },
+        { label: '日累计车流量', value: '-', unit: '万辆' },
+        { label: '昨日累计车流量', value: '-', unit: '万辆' },
+        { label: '昨日较前日增长', value: '-', unit: '', color:'#D9001B' },
+        { label: '本年度总车流量', value: '-', unit: '万辆' },
+        { label: '当前平均速度', value: '-', unit: 'km/h' },
+        { label: '缓行拥堵路段', value: '-', unit: '处' },
+        { label: '缓行拥堵里程', value: '-', unit: 'km' },
+        { label: '车道占有率', value: '-', unit: '%' }
+      ]
+    }
+  },
+  created() {
+    this.bind();
+  },
+  methods: {
+    getAccumulatedFlow(params){
+      return request({
+        url: `/business/traffic-statistics/history/accumulated-flow`,
+        method: "get",
+        params
+      })
+    },
+    toDecimal(x){
+      var f = parseFloat(x)
+      if(isNaN(f)){
+        return 0;
+      }
+      f = Math.round(x*100)/100;
+      return f.toFixed(1);
+    },
+    bind(){
+      //当前在途车流量
+      request({
+        url: `/business/traffic-statistics/current/in-transit-vehicles`,
+        method: "get",
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        let _count = 0;
+        for(let i in result.data[0]){
+          _count += result.data[0][i]
+        }
+        this.list[0].value = this.toDecimal(_count/10000)
+      })
+
+
+      //日累计车流量
+      request({
+          url: `/business/traffic-statistics/history/trafficFlowAtToll`,
+          method: "get",
+          params: {
+            periodType: 4,
+            startTime: moment().format('YYYY-MM-DD')+ ' 00:00:00',
+            endTime: moment().format('YYYY-MM-DD')+ ' 23:59:59',
+        }
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        let _count = result.data;
+        this.list[1].value = this.toDecimal(_count/10000)
+      })
+      
+      this.getAccumulatedFlow({
+          periodType: 4,
+          startTime: moment().subtract(1,'day').format('YYYY-MM-DD')+ ' 00:00:00',
+          endTime: moment().subtract(1,'day').format('YYYY-MM-DD')+ ' 23:59:59',
+      }).then((resultYes) => {
+        this.getAccumulatedFlow({
+            periodType: 4,
+            startTime: moment().subtract(2,'day').format('YYYY-MM-DD')+ ' 00:00:00',
+            endTime: moment().subtract(2,'day').format('YYYY-MM-DD')+ ' 23:59:59',
+        }).then((resultYes2) => {
+          if(resultYes.data.length > 0){
+            let _countYes = resultYes.data[0].trafficVolume;
+             this.list[2].value = this.toDecimal(_countYes/10000)
+
+             if(resultYes2.data.length > 0){
+                
+                let _countYes2 = resultYes2.data[0].trafficVolume;
+                let num = ((_countYes - _countYes2)/_countYes2 * 100)
+
+                if(num > 0){
+                  this.list[3].color = '#22cd39'  
+                  num = `↑ +${ this.toDecimal(num)}%`
+                } else {
+                  this.list[3].color = '#D9001B'
+                  num = `↓ ${ this.toDecimal(num)}%`  
+                }
+                this.list[3].value = num
+              }
+              
+            }
+          })
+        
+      })
+
+      this.getAccumulatedFlow({
+          periodType: 1,
+          startTime: moment().format('YYYY')+ '-01-01 00:00:00',
+          endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+      }).then(result=>{
+        if (result.code != 200) return Message.error(result?.msg);
+        if(result.data.length > 0){
+          let _count = result.data[0].trafficVolume;
+          this.list[4].value = this.toDecimal(_count/10000)
+        }
+        
+      })
+
+      //当前平均速度
+      request({
+        url: `/business/traffic-statistics/current/average-speed`,
+        method: "get",
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        if(result.data.length > 0){
+          let _count = 0;
+          result.data.map(x=>_count+=x.avgSpeed)
+          this.list[5].value = this.toDecimal(_count/result.data.length)
+        }
+      })
+      //拥堵路段
+      request({
+        url: `/business/traffic-statistics/current/congested`,
+        method: "get"
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        this.list[6].value = result.data.length
+      })
+
+
+      //拥堵里程
+      request({
+        url: `/business/traffic-statistics/current/section-congested`,
+        method: "get"
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        let _count = 0;
+        result.data.forEach(e => {
+          e.upCongestionSections.forEach(u => {
+            _count+=u.congestionDistance
+          });
+        });
+        this.list[7].value = this.toDecimal(_count/1000)
+         
+      })
+
+      //车道占有率
+      request({
+        url: `/business/traffic-statistics/history/lane-occupancy`,
+        method: "get",
+        params:{
+          startDate: moment().format('YYYY-MM-DD'),
+          endDate: moment().format('YYYY-MM-DD'),
+        }
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        if(result.data.length > 0){
+          let _count = 0;
+          result.data.map(x=>_count+=x.congestion)
+          this.list[8].value = this.toDecimal(_count/result.data.length)
+        }
+         
+      })
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.trafficAna {
+  display: flex; 
+    justify-content: space-between;
+    align-items: center;
+    padding: 0px 60px;
+    height: 100%;
+  .boardNumber {
+      margin-top: 20px;
+      display: flex;
+      // align-items: flex-end;
+      justify-content: center;
+
+      .value {
+        font-family: PangMenZhengDao;
+      }
+    }
+    .boardNumber div:first-child {
+      color: #00cffd;
+      font-weight: bold;
+      font-size: 24px;
+    }
+    .boardNumber div:last-child {
+      color: #6E8189;
+      font-size: 12px;
+      margin-left: 10px;
+      margin-top: 8px;
+    }
+  .board {
+    flex: 1;
+    padding: 0px 70px;
+    background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #31a640 100%);
+    border-radius: 5px 5px 5px 5px;
+    opacity: 1;
+    border: 1px solid;
+    border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/unblocked/assets/bg.png b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/unblocked/assets/bg.png
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/unblocked/assets/bg.png
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/unblocked/assets/bg.png
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/unblocked/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/unblocked/assets/charts.js
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/unblocked/assets/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/unblocked/assets/charts.js
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/unblocked/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/unblocked/index.vue
similarity index 97%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/unblocked/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/unblocked/index.vue
index 4feb33de..5101bbb0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/unblocked/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/unblocked/index.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import WgtTitle from '../../../widgets/title'
+import WgtTitle from '../../../../widgets/title'
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
 export default {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/fee/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/fee/charts.js
similarity index 81%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/fee/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/fee/charts.js
index 9f40fa54..485cbbb4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/fee/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/fee/charts.js
@@ -6,16 +6,37 @@ var options = {
     trigger: "axis",
     formatter: (params) => {
       console.log(params)
-      return `${params[0].name.replace(/-/g, "")}${params[1].name.replace(
-        /-/g,
-        ""
-      )}<br/>${params[0].marker}${
-        params[0].seriesName
-      }: <span style="font-weight:bold;"> ${params[0].value}  辆</span><br/>${
-        params[1].marker
-      }${params[1].seriesName}: <span style="font-weight:bold;"> ${
-        params[1].value
-      }  辆</span>`;
+      let name = params[0].name.replace(/-/g, "")
+      let name1 = name+'-入口'
+      let name2 = name+'-出口'
+      if(params[0].axisIndex === 1){
+        name1 = name+'-出口'
+        name2 = name+'-入口'
+      } 
+      if(params.length === 4){
+
+        return `${name1}
+        <br/>
+        ${params[0].marker}${params[0].seriesName}: <span style="font-weight:bold;"> ${params[0].value}  辆</span>
+        <br/>
+        ${params[1].marker}${params[1].seriesName}: <span style="font-weight:bold;"> ${params[1].value}  辆</span>
+        <br/><br/>
+        ${name2}
+        <br/>
+        ${params[2].marker}${params[2].seriesName}: <span style="font-weight:bold;"> ${params[2].value}  辆</span>
+        <br/>
+        ${params[3].marker}${params[3].seriesName}: <span style="font-weight:bold;"> ${params[3].value}  辆</span>`
+        
+      } else if (params.length === 2){
+        return `${name1}
+        <br/>
+        ${params[0].marker}${params[0].seriesName}: <span style="font-weight:bold;"> ${params[0].value}  辆</span>
+       
+        <br/><br/>
+        ${name2}
+        <br/>
+        ${params[1].marker}${params[1].seriesName}: <span style="font-weight:bold;"> ${params[1].value}  辆</span>`
+      }
     },
   },
   axisPointer: {
@@ -54,12 +75,13 @@ var options = {
     {
       left: 40,
       right: 10,
+      top: '25%',
       height: "35%",
     },
     {
       left: 40,
       right: 10,
-      top: "55%",
+      top: "60%",
       height: "35%",
     },
   ],
@@ -123,8 +145,7 @@ var options = {
         color: "#fff",
         margin: -20,
         formatter: function (params) {
-          let value = params.split("-");
-          return `${value[0]}\n\n${value[1]}`;
+          return `${params}`;
         },
       },
       axisTick: {
@@ -136,8 +157,6 @@ var options = {
     {
       name: "车流量          ",
       type: "value",
-      // max: 300,
-      interval: 50,
       axisLabel: {
         color: "#FFF",
       },
@@ -152,7 +171,6 @@ var options = {
       },
     },
     {
-      interval: 50,
       gridIndex: 1,
       name: "",
       type: "value",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/fee/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/fee/index.vue
new file mode 100644
index 00000000..701b3b9d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/fee/index.vue
@@ -0,0 +1,124 @@
+<template>
+  <div class="flowstate">
+      <div class="tag1">入口</div>
+      <div class="tag2">出口</div>
+      <div class="chartsFT" id="feeChart"></div>
+    </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartOptions from "./charts";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: "Flowstate",
+  components: {
+  },
+  data() {
+    return {};
+  },
+  
+  mounted() {
+    this.$nextTick(()=>{
+        this.bind();
+    })
+  },
+  created() {},
+  methods: {
+    async service(startDate,stationType){
+      return await request({
+        url: '/business/traffic-statistics/history/trafficFlowAtTollStationEntranceHour',
+        method: 'get',
+        params: {
+          startDate,
+          endDate: startDate,
+          stationType
+        }
+      })
+    },
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportTrafficFlowAtTollStationEntranceHour",
+        filename: name,
+        data:{},
+      });
+    },
+    async bind(){
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("feeChart"));
+      }
+      // 济南方向
+      let _dateTime = moment().format("YYYY-MM-DD");
+      let _lastTime = moment().subtract(1,'year').format("YYYY-MM-DD");
+      const ck = await this.service(_dateTime, 1)
+      const rk = await this.service(_dateTime, 2)
+      const ck1 = await this.service(_lastTime, 1)
+      const rk1 = await this.service(_lastTime, 2)
+      const names = ck.data.map(x=>x.name);
+      const ckq = [],rkq = [];
+      for(let n of names){
+        const c = _.find(ck1.data,{name:n})
+        const r = _.find(rk1.data,{name:n})
+        if(c){
+          ckq.push(c.value)
+          rkq.push(r.value)
+        } else {
+          ckq.push(0)
+          rkq.push(0)
+        }
+      }
+      chartOptions.xAxis[0].data =names;
+      chartOptions.xAxis[1].data =names;
+      chartOptions.series[0].data = ck.data.map(x=>x.value)
+      chartOptions.series[1].data = ckq
+      chartOptions.series[2].data = rk.data.map(x=>x.value)
+      chartOptions.series[3].data = rkq
+     
+      this.myChart.setOption(chartOptions);
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chartsFT {
+    width: 100%;
+    height: 100%;
+}
+
+.flowstate {
+    width: 100%;
+    height: 100%;
+   
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  
+  .tag1 {
+    position: absolute;
+    margin-top: -174px;
+    margin-left: 60px;
+    font-size: 12px;
+    span{
+      color: #8be8fe;
+      font-weight: bold;
+      margin-left: 10px;
+    }
+  }
+
+  .tag2 {
+    position: absolute;
+    font-size: 12px;
+    margin-top: 220px;
+    margin-left: 800px;
+    span{
+      color: #8be8fe;
+      font-weight: bold;
+      margin-right: 10px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/flow/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js
similarity index 86%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/flow/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js
index 93bd5fc5..317045ae 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/flow/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js
@@ -19,7 +19,7 @@ var options = {
   grid: {
     left: "1%",
     right: "0",
-    top: "30px",
+    top: "60px",
     bottom: "0px",
     containLabel: true,
   },
@@ -30,11 +30,11 @@ var options = {
     textStyle: {
       color: "#fff",
     },
+    itemHeight: 5,
+    itemWidth: 10,
     data: [
       {
         name: "客车",
-        itemHeight: 5,
-        itemWidth: 10,
       },
       {
         name: "货车"
@@ -53,9 +53,7 @@ var options = {
     formatter: function (params) {
       let result = '<span style="font-size:14px;font-weight: 600;color: #20253B">'+params[0].axisValue +'</span><br>';
       params.forEach(p => {
-        if(p.data > 0){
-          result += '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + p.color + '"></span><span style="color: #20253B">'+ p.seriesName +'</span>'+'：'+(p.value)+ '起<br>'  
-        }
+        result += '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + p.color + '"></span><span style="color: #20253B">'+ p.seriesName +'</span>'+'：'+(p.value)+ '辆<br>'  
       });
       return result;
     },
@@ -124,21 +122,6 @@ var options = {
         },
       },
     },
-    {
-      type: "value",
-      axisLabel: {
-        show: false,
-      },
-      axisLine: {
-        show: false,
-      },
-      axisTick: {
-        show: false,
-      },
-      splitLine: {
-        show: false,
-      },
-    },
   ],
   series: [
     {
@@ -177,7 +160,6 @@ var options = {
       type: "line",
       symbol: 'none',
       smooth: true,
-      yAxisIndex: 1,
       lineStyle: {
         type:'dashed',
         width: 1
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/flow/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/index.vue
similarity index 51%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/flow/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/index.vue
index 03d58ccf..f650c688 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/flow/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/index.vue
@@ -1,30 +1,83 @@
 <template>
-  <div
-        class="chartsDay"
-        id="railwayDay"
-      ></div>
+  <div class="chartsDay" id="anaFlow" ></div>
 </template>
 
 <script>
 import * as echarts from "echarts";
 import chartsStatistics from "./charts";
-import { getSectionPerceivedNumber } from "@/api/event/perceiveEvent";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
 
 export default {
-  name: "RailWayDay",
+  name: "AnaFlow",
   components: {
   },
-  data() {
-    return {
-      dataList: [],
-    };
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter' (a, b) {
+      if(a){
+        this.bind(a)
+      }
+    }
   },
 
   created() {},
-  methods: {},
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportRealTimeTrafficFlow",
+        filename: name,
+        data: this.data,
+      });
+    },
+    bind(data){
+      this.data = {
+          startDate: data.currently,
+          periodType: data.type,
+          direction: data.direction
+      }
+      request({
+        url: '/business/traffic-statistics/history/realTimeTrafficFlow',
+        method: 'get',
+        params:this.data
+      }).then(res=>{
+        if (res.code != 200) return this.$message.error(res?.msg)
+        // 去年同期
+        request({
+          url: '/business/traffic-statistics/history/realTimeTrafficFlow',
+          method: 'get',
+          params: {
+            startDate: data.lastYear,
+            periodType: data.type,
+            direction: data.direction
+          }
+        }).then(resLastYear=>{
+          chartsStatistics.xAxis.data = res.data.map(x=>x.name);
+          chartsStatistics.series[0].data = res.data.map(x=>x.totalPassengerFlow);
+          chartsStatistics.series[1].data = res.data.map(x=>x.typeTruckFlow);
+          chartsStatistics.series[2].data = res.data.map(x=>x.typeSpecialVehicleFlow);
+          chartsStatistics.series[3].data = resLastYear.data.map(x=>x.totalPassengerFlow+x.typeTruckFlow+x.typeSpecialVehicleFlow);
+          if(!this.myChart){
+            this.myChart = echarts.init(document.getElementById("anaFlow"));
+          }
+          this.myChart.setOption(chartsStatistics);
+          echarts.getInstanceByDom(document.getElementById("anaFlow")).resize()
+        })
+        
+      })
+    }
+  },
   mounted() {
-    var myChart = echarts.init(document.getElementById("railwayDay"));
-    myChart.setOption(chartsStatistics);
+    // this.$nextTick(() => {
+    //   var myChart = echarts.init(document.getElementById("anaFlow"));
+    //   myChart.setOption(chartsStatistics);
+    // })
+    
         // getSectionPerceivedNumber().then((res) => {
         //   if (res.code == 200) {
         //     this.dataList = res.data;
@@ -88,6 +141,5 @@ export default {
 .chartsDay {
   height: 100%;
   width: 100%;
-  margin-top: 30px;
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/index.vue
new file mode 100644
index 00000000..a5867c17
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/index.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="TrafficFlow fl-col">
+    <!-- 交通路网状况 -->
+    <section class="row_01">
+      <div class="title"><div class="icon"></div>路网交通状况</div>
+      <Traffic />
+    </section>
+    <section class="row_02">
+      <section class="chartPanel">
+        <section class="panel" style="margin-right:20px;">
+          <div class="title"><div class="icon"></div>全路段双向实时车流量
+          <ChartExport @export="$refs.refReal.export('全路段双向实时车流量')" /></div>
+          <Real v-show="isKeep"  ref="refReal"></Real>
+        </section>
+        <section class="panel">
+          <div class="title"><div class="icon"></div>收费站出入口实时车流量
+          <ChartExport @export="$refs.refFee.export('收费站出入口实时车流量')" /></div>
+          <Fee v-show="isKeep"  ref="refFee"></Fee>
+        </section>
+      </section>
+    </section>
+    <section class="row_02"  style="flex-direction: column;">
+      <Search ref="refSearch"  />
+      <section class="chartPanel">
+        <section class="panel">
+          <div class="title"><div class="icon"></div>全路段车流量状况分析
+          <ChartExport @export="$refs.refFlow.export('全路段车流量状况分析')" /></div>
+          <Flow v-show="isKeep" ref="refFlow" :filter="filter"></Flow>
+        </section>
+        <section class="panel" style="margin:0px 20px;">
+          <div class="title"><div class="icon"></div>车流量时段分析
+          <ChartExport @export="$refs.refTimer.export('车流量时段分析')" /></div>
+          <Timer v-show="isKeep" ref="refTimer" :filter="filter"></Timer>
+        </section>
+        <section class="panel">
+          <div class="title"><div class="icon"></div>断面车流量排名
+          <ChartExport @export="$refs.refSection.export('断面车流量排名')" /></div>
+          <Section v-show="isKeep" ref="refSection" :filter="filter"></Section>
+        </section>
+      </section>
+    </section>
+  </div>
+</template>
+
+<script>
+import Search from "./search/index.vue";
+import Traffic from "./components/traffic/index.vue";
+import Flow from "./flow/index.vue";
+import Timer from "./timer/index.vue";
+import Section from "./section/index.vue";
+import Real from "./real/index.vue";
+import Fee from "./fee/index.vue";
+
+import { delay } from "@screen/utils/common";
+import ChartExport from "@screen/components/ChartExport/index.vue"
+
+export default {
+  name: "TrafficFlow",
+  components: {
+    Traffic,
+    Search,
+    Flow,
+    Timer,
+    Section,
+    Real,
+    Fee,
+    ChartExport
+  },
+  data() {
+    return {
+      filter: undefined,
+      isKeep: true
+    }
+  },
+  mounted() {
+    this.bind();
+    window.addEventListener("resize", async () => {
+      this.isKeep = false;
+      await delay(100)
+      this.$refs.refFlow.myChart.resize();
+      this.$refs.refTimer.myChart.resize();
+      this.$refs.refSection.myChart.resize();
+      this.$refs.refReal.myChart.resize();
+      this.$refs.refFee.myChart.resize();
+      await delay(100)
+      this.isKeep = true;
+      this.$nextTick(()=>{
+        this.$refs.refFlow.myChart.resize();
+        this.$refs.refTimer.myChart.resize();
+        this.$refs.refSection.myChart.resize();
+        this.$refs.refReal.myChart.resize();
+        this.$refs.refFee.myChart.resize();
+      })
+      
+    });
+  },
+  methods:{
+    bind(){
+      this.filter = this.$refs.refSearch.getQuery();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.TrafficFlow {
+  width: 100%;
+  height: 100%;
+
+  .row_01 {
+    height: 160px;
+    padding:10px;
+    background-color: #132d38;
+  }
+
+  .row_02 {
+    padding:10px;
+    background-color: #132d38;
+    // --keep-ratio: scaleX(1);
+    flex: 1;
+    margin-top: 12px;
+    display: flex;
+  }
+  .chartPanel{
+    display: flex;
+    flex: 1;
+    flex-direction: row;
+    .panel{
+      flex: 1;
+    }
+  }
+}
+
+.title{
+      display: flex;
+      position: absolute;
+      align-items: center;
+      .icon {
+        width: 5px;
+        height: 16px;
+        background-color: #3DE8FF;
+        margin-right: 10px;
+        border-radius: 2px;
+      }
+    }
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/index2.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/index2.vue
similarity index 100%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/index2.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/index2.vue
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/real/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/charts.js
similarity index 85%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/real/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/charts.js
index fb009c86..a54da39d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/real/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/charts.js
@@ -4,16 +4,25 @@ var options = {
     show: true,
     trigger: "axis",
     formatter: (params) => {
-      return `${params[0].name.replace(/-/g, "")}${params[1].name.replace(
-        /-/g,
-        ""
-      )}<br/>${params[0].marker}${
-        params[0].seriesName
-      }: <span style="font-weight:bold;"> ${params[0].value}  辆</span><br/>${
-        params[1].marker
-      }${params[1].seriesName}: <span style="font-weight:bold;"> ${
-        params[1].value
-      }  辆</span>`;
+
+      let name = params[0].name.replace(/-/g, "")
+      let name1 = name+'-济南'
+      let name2 = name+'-菏泽'
+      if(params[0].axisIndex === 1){
+        name1 = name+'-菏泽'
+        name2 = name+'-济南'
+      } 
+      return `${name1}
+      <br/>
+      ${params[0].marker}${params[0].seriesName}: <span style="font-weight:bold;"> ${params[0].value}  辆</span>
+      <br/>
+      ${params[1].marker}${params[1].seriesName}: <span style="font-weight:bold;"> ${params[1].value}  辆</span>
+      <br/><br/>
+      ${name2}
+      <br/>
+      ${params[2].marker}${params[2].seriesName}: <span style="font-weight:bold;"> ${params[2].value}  辆</span>
+      <br/>
+      ${params[3].marker}${params[3].seriesName}: <span style="font-weight:bold;"> ${params[3].value}  辆</span>`;
     },
   },
   axisPointer: {
@@ -51,13 +60,15 @@ var options = {
   grid: [
     {
       left: 40,
+      top: '25%',
       right: 10,
       height: "35%",
     },
     {
       left: 40,
+      
       right: 10,
-      top: "55%",
+      top: "60%",
       height: "35%",
     },
   ],
@@ -120,8 +131,7 @@ var options = {
         color: "#fff",
         margin: -20,
         formatter: function (params) {
-          let value = params.split("-");
-          return `${value[0]}\n\n${value[1]}`;
+          return `${params.substr(0,params.length-2)}\n\n${params.substr(params.length-2)}`;
         },
       },
       axisTick: {
@@ -133,8 +143,6 @@ var options = {
     {
       name: "车流量          ",
       type: "value",
-      // max: 300,
-      interval: 50,
       axisLabel: {
         color: "#FFF",
       },
@@ -149,12 +157,10 @@ var options = {
       },
     },
     {
-      interval: 50,
       gridIndex: 1,
       name: "",
       type: "value",
       inverse: true,
-      // max: 300,
       axisLabel: {
         color: "#FFF",
       },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/index.vue
new file mode 100644
index 00000000..fd2ab8fb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/index.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="flowstate">
+      <div class="tag1" @click="bind">方向：济南<span>←</span></div>
+      <div class="tag2"><span>→</span>方向：菏泽</div>
+      <div class="chartsFs " id="flowStateEchartBox"></div>
+    </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartOptions from "./charts";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
+
+
+export default {
+  name: "Flowstate",
+  components: {
+  },
+  data() {
+    return {};
+  },
+  mounted() {
+    this.$nextTick(()=>{
+        this.bind();
+    })
+  },
+  created() {},
+  methods: {
+    async service(startDate,direction){
+      return await request({
+        url: '/business/traffic-statistics/history/realTimeTrafficFlowHour',
+        method: 'get',
+        params: {
+          startDate,
+          direction
+        }
+      })
+    },
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportRealTimeTrafficFlowHour",
+        filename: name,
+        data:{},
+      });
+    },
+    async bind(){
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("flowStateEchartBox"));
+      }
+      // 济南方向
+      // let _dateTime = moment().format("YYYY-MM-DD");
+      // let _lastTime = moment().subtract(1,'year').format("YYYY-MM-DD");
+
+      // const jn = await this.service(_dateTime, 3)
+      // const jn = await this.service(_dateTime, 3)
+      // const hz = await this.service(_dateTime, 1)
+      // const jn2 = await this.service(_lastTime, 3)
+      // const hz2 = await this.service(_lastTime, 1)
+      // // console.log(jn,hz,jn2,hz2)
+      // chartOptions.xAxis[0].data = jn.data.map(x=>x.name)
+      // chartOptions.xAxis[1].data = jn.data.map(x=>x.name);
+      // chartOptions.series[0].data = jn.data.map(x=>x.totalFlow)
+      // chartOptions.series[1].data = jn2.data.map(x=>x.totalFlow)
+      // chartOptions.series[2].data = hz.data.map(x=>x.totalFlow)
+      // chartOptions.series[3].data = hz2.data.map(x=>x.totalFlow)
+      
+      request({
+        url: '/business/traffic-statistics/history/realTimeTrafficFlowHour',
+        method: 'get'
+      }).then(res=>{
+        const xAxis = res.data["1"].map(x=>x.name);
+        chartOptions.xAxis[0].data = xAxis;
+        chartOptions.xAxis[1].data = xAxis;
+        // 1今年菏泽 2今年济南 3去年菏泽 4去年济南
+        chartOptions.series[0].data = res.data['2'].map(x=>x.totalFlow)
+        chartOptions.series[1].data = res.data['4'].map(x=>x.totalFlow)
+        chartOptions.series[2].data = res.data['1'].map(x=>x.totalFlow)
+        chartOptions.series[3].data = res.data['3'].map(x=>x.totalFlow)
+        this.myChart.setOption(chartOptions);
+      })
+
+      
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.flowstate {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  
+  .chartsFs {
+    height: 100%;
+    width: 100%;
+  }
+
+  .tag1 {
+    position: absolute;
+    margin-top: -174px;
+    margin-left: 60px;
+    font-size: 12px;
+    span{
+      color: #8be8fe;
+      font-weight: bold;
+      margin-left: 10px;
+    }
+  }
+
+  .tag2 {
+    position: absolute;
+    font-size: 12px;
+    margin-top: 220px;
+    margin-left: 800px;
+    span{
+      color: #8be8fe;
+      font-weight: bold;
+      margin-right: 10px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/search/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/search/index.vue
similarity index 74%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/search/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/search/index.vue
index 8a2674c9..1bdfbb49 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/search/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/search/index.vue
@@ -8,17 +8,13 @@
     <el-select v-model="type" class="selectRoad" placeholder="请选择">
       <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
-    <!-- 日期区间 -->
-    <el-select style="width: 120px" size="mini" v-model="quarter" v-if="type == '3'" class="selectRoad" placeholder="请选择">
-      <el-option v-for="item in quarterOptions" :key="item.value" :label="item.label" :value="item.value" />
-    </el-select>
     <!-- 日期选择 -->
-    <el-date-picker size="mini" v-if="type != '3'" class="selectRoad" v-model="dateTime" style="width: 140px"
-      :picker-options="pickerOptions" :type="type == 1
+    <el-date-picker size="mini" class="selectRoad" v-model="dateTime" style="width: 140px"
+      :picker-options="pickerOptions" :type="type == '4'
         ? 'date'
-        : type == 2
+        : type == '3'
           ? 'month'
-          : type == 4
+          : type == '1'
             ? 'year'
             : ''
       " placeholder="请选择" />
@@ -31,6 +27,7 @@
 import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
 
 import { getRoadSectionList } from "@/api/event/perceiveEvent";
+import moment from "moment";
 
 
 export default {
@@ -44,24 +41,24 @@ export default {
       selectId: 1,
       reset: false,
       direction: "1",
-      type: "1",
+      type: "4",
       typeOptions: [
         {
           label: "年",
-          value: "4",
+          value: "1",
         },
         {
           label: "月",
-          value: "2",
+          value: "3",
         },
         {
           label: "日",
-          value: "1",
-        },
-        {
-          label: "季",
-          value: "3",
+          value: "4",
         },
+        // {
+        //   label: "季",
+        //   value: "3",
+        // },
       ],
       quarter: "1",
       quarterOptions: [
@@ -96,14 +93,35 @@ export default {
 
   created() { },
   methods: {
-
-    searchQuery() { },
+    getQuery(){
+      let _currently = moment(this.dateTime);
+      let _lastYear =  moment(_currently).subtract(1,'year')
+      if(this.type === '4'){
+        _currently = _currently.format('YYYY-MM-DD')
+        _lastYear = _lastYear.format('YYYY-MM-DD')
+      } else if(this.type === '3'){
+        _currently = _currently.format('YYYY-MM')
+        _lastYear = _lastYear.format('YYYY-MM')
+      } else if(this.type === '1'){
+        _currently = _currently.format('YYYY')
+        _lastYear = _lastYear.format('YYYY')
+      }
+      return {
+        type: this.type,
+        direction: this.direction,
+        currently: _currently,
+        lastYear: _lastYear
+      }
+    },
+    searchQuery() {
+      this.$parent.bind();
+    },
     onReset() {
       this.selectId = 1;
       this.selectIndex = 1;
       this.reset = true;
       this.direction = "1";
-      this.type = "1";
+      this.type = "4";
       this.dateTime = moment().format("YYYY-MM-DD HH:mm:ss");
       this.searchQuery();
     },
@@ -118,11 +136,10 @@ export default {
 .searchPanel {
   display: flex;
   align-items: center;
-
   height: 40px;
   width: 500px;
   font-size: 14px;
-  margin: 10px 0px;
+  margin-bottom: 10px;
   z-index: 1;
 
   div {
@@ -167,9 +184,5 @@ export default {
     border-color: transparent;
     color: white;
   }
-
-  .keep-ratio {
-    height: 200px;
-  }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/section/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/section/charts.js
similarity index 95%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/section/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/section/charts.js
index 0eb18fb3..ccda4f25 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/section/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/section/charts.js
@@ -12,7 +12,7 @@ let xdata = {
 };
 let ind = -30;
 let sdata = {
-  value: [32774, 30067, 28774, 30067, 30021, 30067, 32774],
+  value: [36774, 35067,  34067, 33021, 32067, 31774,28774],
 };
 
 var options = {
@@ -20,8 +20,8 @@ var options = {
     containLabel: true,
     // 边距自行修改
     bottom: "5%",
-    left: "0%",
-    top: "0%",
+    left: "2%",
+    top: "40px",
     right: "10%",
   },
   xAxis: {
@@ -49,17 +49,15 @@ var options = {
         inside: true,
         verticalAlign: "bottom",
         color: "#fff",
-        padding: 10,
+        padding: 5,
         margin: -5,
-        formatter: function (value) {
-          let index = xdata.value.indexOf(value);
-          return `{a|Top${(ind += 1)}} {b|${value}}`;
+        formatter: function (value,index) {
+          return `{a|Top${(index += 1)}} {b|${value}}`;
         },
         rich: {
           a: {
             fontSize: "10px",
           },
-
           b: {
             fontSize: "12px",
             padding: [0, 0, 0, 70],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/section/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/section/index.vue
new file mode 100644
index 00000000..cf559444
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/section/index.vue
@@ -0,0 +1,76 @@
+<template>
+ <div class="chartsSit "id="anaSituation"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsOption from "./charts";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: "AnaSituation",
+  components: {
+  },
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter' (a, b) {
+      if(a){
+        this.bind(a)
+      }
+    }
+  },
+
+  created() {},
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportSectionTrafficRanking",
+        filename: name,
+        data: this.data,
+      });
+    },
+    bind(data){
+      this.data = {
+          startDate: data.currently,
+          periodType: data.type,
+          direction: data.direction
+      }
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("anaSituation"));
+      }
+      request({
+        url: '/business/traffic-statistics/history/sectionTrafficRanking',
+        method: 'get',
+        params: this.data
+      }).then(res=>{
+        if (res.code != 200) return this.$message.error(res?.msg)
+          if(res.data.length > 6){
+            res.data = res.data.splice(0,6)
+          }
+          chartsOption.yAxis[0].data = res.data.map(x=>x.facilityName);
+          chartsOption.series[0].data = res.data.map(x=>x.trafficVolume);
+
+         
+          this.myChart.setOption(chartsOption);
+      })
+    }
+  },
+  mounted() {
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+.chartsSit {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/timer/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/timer/charts.js
similarity index 96%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/timer/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/timer/charts.js
index f5db31bd..8347b436 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/timer/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/timer/charts.js
@@ -4,14 +4,14 @@ var options = {
   tooltip: {
     trigger: "axis",
     valueFormatter: function (value) {
-      return value + " 起";
+      return value + " 辆";
     },
   },
   grid: {
-    left: "1%",
+    left: "2%",
     right: "0",
-    top: "30px",
-    bottom: "60px",
+    top: "50px",
+    bottom: "30px",
     containLabel: true,
   },
   dataZoom: [
@@ -22,7 +22,7 @@ var options = {
       endValue: 7,
       filterMode: "filter",
       height: 10,
-      bottom: '40px',
+      bottom: '10px',
       handleSize: "200%",
       handleIcon:
         "path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z",
@@ -91,7 +91,7 @@ var options = {
     itemWidth: 10,
     data: [
       {
-        name: "本期事件"
+        name: "本期车流量"
       },
       {
         name: "去年同期"
@@ -142,7 +142,7 @@ var options = {
     ],
   },
   yAxis: {
-    name: "起",
+    name: "辆",
     nameTextStyle: {
       color: "#fff",
       fontSize: 10,
@@ -168,7 +168,7 @@ var options = {
     },
   },
   series: [
-    {name:'本期事件',
+    {name:'本期车流量',
       type: 'pictorialBar',
          barWidth: 40,
          symbol: 'path://M0,10 L10,10 L5,0 L0,10 z',
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/timer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/timer/index.vue
new file mode 100644
index 00000000..b2e947c9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/timer/index.vue
@@ -0,0 +1,115 @@
+<template>
+ <div class="chartsTimer "id="chartsTimer"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartOption from "./charts";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: "Timer",
+  components: {
+  },
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter' (a, b) {
+      if(a){
+        this.bind(a)
+      }
+    }
+  },
+
+  created() {},
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportTrafficPeriodAnalysis",
+        filename: name,
+        data: this.data,
+      });
+    },
+    bind(data){
+      this.data = {
+        startDate: data.currently,
+        periodType: data.type,
+        direction: data.direction
+      }
+      if(!this.myChart){
+          this.myChart = echarts.init(document.getElementById("chartsTimer"));
+        }
+      request({
+        url: '/business/traffic-statistics/history/trafficPeriodAnalysis',
+        method: 'get',
+        params: this.data
+      }).then(res=>{
+        if (res.code != 200) return this.$message.error(res?.msg)
+        // 去年同期
+        request({
+          url: '/business/traffic-statistics/history/trafficPeriodAnalysis',
+          method: 'get',
+          params: {
+            startDate: data.lastYear,
+            periodType: data.type,
+            direction: data.direction
+          }
+        }).then(resLastYear=>{
+          chartOption.series[0].data = res.data.map(x=>x.trafficVolume);
+          chartOption.series[1].data = resLastYear.data.map(x=>x.trafficVolume);
+         
+          this.myChart.setOption(chartOption);
+        })
+        
+      })
+    }
+  },
+  mounted() {
+    // var myChart = echarts.init(document.getElementById("chartsTimer"));
+    //     getDailyCumulativeMonth().then((res) => {
+    //       if (res.code == 200) {
+    //         this.dataList = res.data;
+    //         let data = res.data;
+    //         let timeData = [];
+    //         let datasN = [];
+    //         let datasN2 = [];
+    //         for (var i = 0; i < 24; i++) {
+    //           let k = 0;
+    //           for (var j = 0; j < data.length; j++) {
+    //             let it = data[j];
+    //             if (it.time == i) {
+    //               timeData.push(i + "点至" + (i + 1) + "点");
+    //               datasN.push(it.number);
+    //               datasN2.push(it.number-1);
+    //               k++;
+    //             }
+    //           }
+    //           if (k == 0) {
+    //             timeData.push(i + "点至" + (i + 1) + "点");
+    //             datasN.push(0);
+    //             datasN2.push(0);
+    //           }
+    //         }
+    //         chartOption.xAxis.data = timeData;
+    //         chartOption.series[0].data = datasN;
+    //         chartOption.series[1].data = datasN2;
+
+    //         myChart.setOption(chartOption);
+    //       }
+    //     });
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+.chartsTimer {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/traffic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/traffic/index.vue
deleted file mode 100644
index 906f3fce..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/traffic/index.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div class='traffic'>
-    <WgtTitle :title="'路网交通状况'"></WgtTitle>
-    <div class="board">
-      <div v-for="(item, index) in list">
-        <div>{{ item.label }}</div>
-        <div class="boardNumber">
-          <div class="value" v-if="item.unit !== ''">{{ item.value }}</div>
-          <div class="value" v-else style="color:#D9001B">{{ item.value }}</div>
-          <div class="unit">{{ item.unit }}</div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-import WgtTitle from '../../../widgets/title'
-export default {
-  name: 'Traffic',
-  components: {
-    WgtTitle
-  },
-  data() {
-    return {
-      list: [
-        { label: '当前在途车流量', value: '1.7', unit: '万辆' },
-        { label: '日累计车流量', value: '137.8', unit: '万辆' },
-        { label: '昨日累计车流量', value: '1.7', unit: '万辆' },
-        { label: '昨日较前日增长', value: '↑+25.4%', unit: '' },
-        { label: '本年度总车流量', value: '102,670.1', unit: '万辆' },
-        { label: '当前平均速度', value: '70', unit: 'km/h' },
-        { label: '缓行拥堵路段', value: '0', unit: '处' },
-        { label: '缓行拥堵里程', value: '0', unit: 'km' },
-        { label: '车道占有率', value: '0.04', unit: '%' }
-      ]
-    }
-  },
-  created() {
-
-  },
-  methods: {
-
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.traffic {
-  display: flex; flex-direction: column;
-
-  .board {
-    flex: 1;
-    padding: 0px 70px;
-    background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
-    border-radius: 5px 5px 5px 5px;
-    opacity: 1;
-    border: 1px solid;
-    border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .boardNumber {
-      margin-top: 20px;
-      display: flex;
-      // align-items: flex-end;
-      justify-content: center;
-
-      .value {
-        font-family: PangMenZhengDao;
-      }
-    }
-    .boardNumber div:first-child {
-      color: #00cffd;
-      font-weight: bold;
-      font-size: 24px;
-    }
-    .boardNumber div:last-child {
-      color: #6E8189;
-      font-size: 12px;
-      margin-left: 10px;
-      margin-top: 8px;
-    }
-  }
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/fee/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/fee/index.vue
deleted file mode 100644
index ba39c2c6..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/fee/index.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <div class="flowstate">
-      <div class="tag1">入口</div>
-      <div class="tag2">出口</div>
-      <div class="charts " id="feeChart"></div>
-    </div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-import chartsStatistics from "./charts";
-export default {
-  name: "Flowstate",
-  components: {
-  },
-  data() {
-    return {};
-  },
-  mounted() {
-    var myChart = echarts.init(
-          document.getElementById("feeChart")
-        );
-        myChart.setOption(chartsStatistics);
-  },
-  created() {},
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped>
-.flowstate {
-  width: 100%;
-    height: 300px;
-    padding: 0px 10px;
-   
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  
-  .charts {
-    height: 300px;
-    width: 100%;
-  }
-
-  .tag1 {
-    position: absolute;
-    margin-top: -174px;
-    margin-left: 60px;
-    font-size: 12px;
-    span{
-      color: #8be8fe;
-      font-weight: bold;
-      margin-left: 10px;
-    }
-  }
-
-  .tag2 {
-    position: absolute;
-    font-size: 12px;
-    margin-top: 230px;
-    margin-left: 780px;
-    span{
-      color: #8be8fe;
-      font-weight: bold;
-      margin-right: 10px;
-    }
-  }
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/index.vue
index 096808eb..85b342cf 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/index.vue
@@ -1,100 +1,61 @@
 <template>
-  <div class="TrafficFlow fl-col">
-    <!-- 交通路网状况 -->
-    <Traffic class="row_01" />
-    <section class="row_02"  style="flex-direction: column;">
-      <Search />
-      <section class="chartPanel">
-        <section class="panel">
-          <div class="title"><div class="icon"></div>全路段车流量状况分析</div>
-          <Flow></Flow>
-        </section>
-        <section class="panel" style="margin:0px 20px;">
-          <div class="title"><div class="icon"></div>车流量时段分析</div>
-          <Timer></Timer>
-        </section>
-        <section class="panel">
-          <div class="title"><div class="icon"></div>断面车流量排名</div>
-          <Section></Section>
-        </section>
-      </section>
-    </section>
-    <section class="row_02">
-      <section class="chartPanel">
-        <section class="panel" style="margin-right:20px;">
-          <div class="title"><div class="icon"></div>全路段双向实时车流量</div>
-          <Real></Real>
-        </section>
-        <section class="panel">
-          <div class="title"><div class="icon"></div>收费站出入口实时车流量</div>
-          <Fee></Fee>
-        </section>
-      </section>
-    </section>
+  <div class="TrafficFlowMain">
+    <el-tabs class="full_tab" v-model="activeName">
+      <el-tab-pane label="交通流分析" name="first" class="tab_con">
+        <TrafficFlowAnalysis />
+      </el-tab-pane>
+      <el-tab-pane label="交通流统计" name="second" class="tab_con">
+        <TrafficFlowStatistics />
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
 <script>
-import Search from "./search/index.vue";
-import Traffic from "./components/traffic/index.vue";
-import Flow from "./flow/index.vue";
-import Timer from "./timer/index.vue";
-import Section from "./section/index.vue";
-import Real from "./real/index.vue";
-import Fee from "./fee/index.vue";
+import TrafficFlowAnalysis from "./analysis/index.vue";
+import TrafficFlowStatistics from "./statistics/index.vue";
 
 export default {
   name: "TrafficFlow",
   components: {
-    Traffic,
-    Search,
-    Flow,
-    Timer,
-    Section,
-    Real,
-    Fee
+    TrafficFlowAnalysis,
+    TrafficFlowStatistics
   },
+  data() {
+    return {
+      activeName:'first'
+    }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-.TrafficFlow {
+.TrafficFlowMain {
   width: 100%;
   height: 100%;
-  padding: 14px;
-
-  .row_01 {
-    height: 160px;
-  }
-
-  .row_02 {
-    padding:10px;
-    background-color: #132d38;
-    // --keep-ratio: scaleX(1);
-    flex: 1;
-    margin-top: 14px;
-    display: flex;
+  display: flex;
+  flex-direction: column;
+  padding: 8px 20px 20px;
+}
+.full_tab {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  ::v-deep .el-tabs__header {
+    margin: 0 0 15px;
   }
-  .chartPanel{
-    display: flex;
+  ::v-deep .el-tabs__content {
     flex: 1;
-    flex-direction: row;
-    .panel{
-      flex: 1;
+    .el-tab-pane {
+      width: 100%;
+      height: 100%;
     }
   }
 }
-
-.title{
-      display: flex;
-      position: absolute;
-      align-items: center;
-      .icon {
-        width: 5px;
-        height: 16px;
-        background-color: #3DE8FF;
-        margin-right: 10px;
-        border-radius: 2px;
-      }
-    }
+.tab_con {
+  display: flex;
+  flex-direction: column;
+}
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/real/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/real/index.vue
deleted file mode 100644
index 09b2e74b..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/real/index.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <div class="flowstate">
-      <div class="tag1">方向：济南<span>←</span></div>
-      <div class="tag2"><span>→</span>方向：菏泽</div>
-      <div class="charts " id="flowStateEchartBox"></div>
-    </div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-import chartsStatistics from "./charts";
-export default {
-  name: "Flowstate",
-  components: {
-  },
-  data() {
-    return {};
-  },
-  mounted() {
-    var myChart = echarts.init(
-          document.getElementById("flowStateEchartBox")
-        );
-        myChart.setOption(chartsStatistics);
-  },
-  created() {},
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped>
-.flowstate {
-  width: 100%;
-    height: 300px;
-    padding: 0px 10px;
-   
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  
-  .charts {
-    height: 300px;
-    width: 100%;
-  }
-
-  .tag1 {
-    position: absolute;
-    margin-top: -174px;
-    margin-left: 60px;
-    font-size: 12px;
-    span{
-      color: #8be8fe;
-      font-weight: bold;
-      margin-left: 10px;
-    }
-  }
-
-  .tag2 {
-    position: absolute;
-    font-size: 12px;
-    margin-top: 230px;
-    margin-left: 780px;
-    span{
-      color: #8be8fe;
-      font-weight: bold;
-      margin-right: 10px;
-    }
-  }
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/section/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/section/index.vue
deleted file mode 100644
index 1c25d68a..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/section/index.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
- <div class="chartsSit "id="situation"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-import chartsOption from "./charts";
-
-export default {
-  name: "Muliple",
-  components: {
-  },
-  data() {
-    return {
-      dataList: [],
-    };
-  },
-
-  created() {},
-  methods: {},
-  mounted() {
-    var myChart = echarts.init(document.getElementById("situation"));
-    myChart.setOption(chartsOption);
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-
-.chartsSit {
-  height: 90%;
-  width: 100%;
-  margin-top: 40px;
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/index.vue
new file mode 100644
index 00000000..41de34ef
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/statistics/index.vue
@@ -0,0 +1,235 @@
+<template>
+  <div class='board_record'>
+    <!-- 搜索栏 -->
+    <div class="filter">
+      <div>
+        <!-- <ButtonGradient @click.native="handleExport">
+          <template #prefix>
+            <img src="@screen/images/export.svg" />
+          </template>
+          导出
+        </ButtonGradient>  -->
+        <ButtonGradient @click="onRefreshForm" class="refresh-btn">
+        <template #prefix>
+          <img src="@screen/images/refresh.svg" />
+        </template>
+        刷新
+      </ButtonGradient>
+      </div>
+      
+      <InputSearch ref="searchComp" style="width: 400px" :formList="searchFormList" @handleSearch="handleSearch" />
+    </div>
+    <!-- 内容 -->
+    <div class="body">
+      <Table :data="tableData" :height="menu.isRecentOpen?'calc(100vh - 300px)':'calc(100vh - 260px)'">
+        <el-table-column label="序号" type="index" :index="indexMethod" width="120" align="center"
+          header-align="center" />
+        <ElTableColumn label="路段名称" prop="intervalName"  align="center" header-align="center" />
+        <ElTableColumn label="方向" prop="direction"  align="center" header-align="center" />
+        <ElTableColumn label="开始桩号" prop="stakeMake" width="120" align="center" header-align="center" />
+        <ElTableColumn label="结束桩号" prop="endMake" width="120" align="center" header-align="center" />
+        <ElTableColumn label="门架名称" prop="facilityName"  align="center" header-align="center" />
+        <ElTableColumn label="车流量" prop="trafficVolume" width="120" align="center" header-align="center" />
+        <ElTableColumn label="采集时间" prop="statisticalDate" width="240" align="center" header-align="center" />
+      </Table>
+    </div>
+
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
+      </Pagination>
+    </div>
+
+     
+  </div>
+</template>
+
+<script>
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import Table from '@screen/components/Table.vue';
+import request from "@/utils/request";
+import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
+import {DirectionTypes,deviceTypeOptions,directionOptions} from '@screen/utils/enum.js';
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import { searchFormList } from "./data";
+import { getToken } from "@/utils/auth";
+import { delay, exportFile, confirm } from "@screen/utils/common";
+import { Message } from "element-ui";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import Dialog from "@screen/components/Dialog/index.vue";
+import {  mapState } from "vuex";
+import moment from 'moment';
+
+export default {
+  name: 'boardRecord',
+  components: {
+    ButtonGradient,
+    Pagination,
+    Table,
+    Button,
+    Form,
+    Dialog,
+    BoardRecordPreview,
+    InputSearch
+  },
+  data() {
+    return {
+      DirectionTypes,
+      tableData: [],
+      searchFormList,
+      total: 20,
+      searchData: {
+        pageSize: 20,
+        pageNum: 1,
+      },
+    }
+  },
+  computed: {
+    ...mapState(["menu"]),
+  },
+  created() {
+    this.initData();
+  },
+  mounted(){
+  },
+  methods: {
+
+    onRefreshForm(){
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    handleSearch(data) {
+      let _search = {};
+      if(data.time && data.time.length === 2){
+        _search['startDate'] = moment(data.time[0]).format('yyyy-MM-DD')
+        _search['endDate'] = moment(data.time[1]).format('yyyy-MM-DD')
+      } else {
+        _search['startDate'] = moment().format('yyyy-MM-DD')
+        _search['endDate'] = moment().format('yyyy-MM-DD')
+      }
+      if(data.direction){
+        _search['direction'] = data.direction;
+      } else {
+        _search['direction'] = null
+      }
+      this.searchData = {
+        ...this.searchData,
+       ..._search
+      };
+      this.initData();
+    },
+    indexMethod(index) {
+        return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
+    },
+    //
+    /** 导出按钮操作 */
+    handleExport() {
+      exportFile({
+        url: "/business/device/export",
+        filename: "设备列表",
+        data: this.getSearchData(),
+      });
+    },
+    getSearchData() {
+      let params = {
+        direction: this.searchData?.direction,
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+
+      };
+      return params;
+    },
+    initData() {
+      if(!this.searchData.startDate){
+        this.searchData.startDate = moment().format('YYYY-MM-DD')
+      } 
+      if(!this.searchData.endDate){
+        this.searchData.endDate = moment().format('YYYY-MM-DD')
+      } 
+      this.searchData.periodType = 4
+      request({
+        url: `/business/traffic-statistics/history/trafficFlowStatistics`,
+        method: "get",
+        params: this.searchData,
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        result.rows.forEach(e=>{
+          e.direction = e.direction === '1' ? '菏泽方向' : '济南方向'
+          e.statisticalDate = moment(e.statisticalDate).format('YYYY-MM-DD HH:mm:ss')
+        })
+        this.tableData = result.rows;
+        this.total = result.total;
+      });
+    },
+    onSizeChange(pageSize) {
+      this.tableData = [];
+      this.searchData.pageSize = pageSize;
+      this.searchData.pageNum = 1;
+      this.initData();
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.board_record {
+  width:100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .filter {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+    >div {
+      display: flex;
+      gap: 6px;
+    }
+  }
+
+  .body {
+    flex: 1;
+    height: 0;
+  }
+
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .board_shower{
+    margin: 4px;
+  }
+  ::v-deep .el-carousel__indicators--horizontal{
+    line-height: 0; height: 16px;
+    .el-carousel__indicator--horizontal{
+      padding: 7px 4px;
+    }
+  }
+  ::v-deep .el-table__cell div.cell {
+    padding: 0 10px !important;
+  }
+}
+.upload-file{
+  position: absolute;
+  width: 120px;
+  height: 120px;
+  margin-left: 55%;
+  bottom: 210px;
+  z-index: 9999;  
+}
+::v-deep .el-upload-dragger{
+    background-color: #104c66 !important;
+    border: 1px solid #359cbc !important;
+    
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/timer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/timer/index.vue
deleted file mode 100644
index 3b04ad4f..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/timer/index.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
- <div class="chartsM "id="chartsMuliple"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-import chartsStatistics from "./charts";
-import { getDailyCumulativeMonth } from "@/api/event/perceiveEvent";
-
-export default {
-  name: "Muliple",
-  components: {
-  },
-  data() {
-    return {
-      dataList: [],
-    };
-  },
-
-  created() {},
-  methods: {},
-  mounted() {
-    var myChart = echarts.init(document.getElementById("chartsMuliple"));
-        getDailyCumulativeMonth().then((res) => {
-          if (res.code == 200) {
-            this.dataList = res.data;
-            let data = res.data;
-            let timeData = [];
-            let datasN = [];
-            let datasN2 = [];
-            for (var i = 0; i < 24; i++) {
-              let k = 0;
-              for (var j = 0; j < data.length; j++) {
-                let it = data[j];
-                if (it.time == i) {
-                  timeData.push(i + "点至" + (i + 1) + "点");
-                  datasN.push(it.number);
-                  datasN2.push(it.number-1);
-                  k++;
-                }
-              }
-              if (k == 0) {
-                timeData.push(i + "点至" + (i + 1) + "点");
-                datasN.push(0);
-                datasN2.push(0);
-              }
-            }
-            chartsStatistics.xAxis.data = timeData;
-            chartsStatistics.series[0].data = datasN;
-            chartsStatistics.series[1].data = datasN2;
-
-            myChart.setOption(chartsStatistics);
-          }
-        });
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-
-.chartsM {
-  height: 100%;
-  width: 100%;
-  margin-top: 30px;
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/index.vue
new file mode 100644
index 00000000..d6687efd
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/index.vue
@@ -0,0 +1,118 @@
+<template>
+  <div class="TrafficFlow">
+    <Search ref="refSearch" />
+    <section class="contentTF">
+      <section class="cleft">
+        <div class="title"><div class="icon"></div>路段交通指标分析
+        <ChartExport @export="$refs.refSection.export('路段交通指标分析')" /></div>
+        <Section v-show="isKeep" ref="refSection" :filter="filter"></Section>
+      </section>
+      <section class="cright">
+        <div class="title"><div class="icon"></div>交通指标雷达图
+        <ChartExport @export="$refs.refRadar.export('交通指标雷达图')" /></div>
+        <Radar v-show="isKeep" ref="refRadar" :filter="filter" />
+      </section>
+    </section>
+
+    <section class="contentTF">
+      <section class="cleft">
+        <div class="title"><div class="icon"></div>交通指标时间分布
+        <ChartExport @export="$refs.refTimer.export('交通指标时间分布')" /></div>
+        <Timer v-show="isKeep" ref="refTimer"  :filter="filter"></Timer>
+      </section>
+      <section class="cright">
+        <div class="title"><div class="icon"></div>交通指标排名
+        <!-- <ChartExport @export="$refs.refIndicator.export('交通指标排名')" /> -->
+      </div>
+        <Indicator v-show="isKeep" ref="refIndicator" :filter="filter"></Indicator>
+      </section>
+    </section>
+  </div>
+</template>
+
+<script>
+import Search from "./search";
+import Radar from "./radar";
+import Section from "./section";
+import Timer from "./timer";
+import Indicator from "./indicator";
+import { delay } from "@screen/utils/common";
+import ChartExport from "@screen/components/ChartExport/index.vue"
+
+export default {
+  name: "IndicatorAnalysis",
+  components: {
+    Search,
+    Radar,
+    Section,
+    Timer,
+    Indicator,
+    ChartExport
+  },
+  data() {
+    return {
+      filter: undefined,
+      isKeep: true,
+    };
+  },
+  mounted() {
+    this.bind();
+
+    window.addEventListener("resize", async () => {
+      this.isKeep = false;
+      await delay(100)
+      this.$refs.refSection.myChart.resize();
+      this.$refs.refRadar.myChart.resize();
+      this.$refs.refTimer.myChart.resize();
+      await delay(100)
+      this.isKeep = true;
+      this.$nextTick(()=>{
+        this.$refs.refSection.myChart.resize();
+        this.$refs.refRadar.myChart.resize();
+        this.$refs.refTimer.myChart.resize();
+      })
+    });
+  },
+  methods:{
+    bind(){
+      this.filter = this.$refs.refSearch.getQuery();
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.TrafficFlow {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  z-index: 6;
+  color: white;
+  .contentTF {
+    flex: 1;
+    display: flex;
+    flex-direction: row;
+    .cleft{
+      width: 67vw;
+      margin-right: 3vw;
+    }
+    .cright{
+      flex:1;
+    }
+    .title{
+      display: flex;
+      position: absolute;
+      align-items: center;
+      .icon {
+        width: 5px;
+        height: 16px;
+        background-color: #3DE8FF;
+        margin-right: 10px;
+        border-radius: 2px;
+      }
+    }
+  }
+
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/indicator/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/indicator/index.vue
similarity index 66%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/indicator/index.vue
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/indicator/index.vue
index eb8e3125..59b5e1cc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/indicator/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/indicator/index.vue
@@ -3,20 +3,20 @@
     <div class="board">
       <div class="textStr">
         <div
-          :class="action == 1 ? 'action' : 'textbar'"
-          @click="handleClick(1)"
+          :class="action == 'crowdingRate' ? 'action' : 'textbar'"
+          @click="handleClick('crowdingRate')"
         >
           拥挤度
         </div>
         <div
-          :class="action == 2 ? 'action' : 'textbar'"
-          @click="handleClick(2)"
+          :class="action == 'saturationRate' ? 'action' : 'textbar'"
+          @click="handleClick('saturationRate')"
         >
           饱和度
         </div>
         <div
-          :class="action == 3 ? 'action' : 'textbar'"
-          @click="handleClick(3)"
+          :class="action == 'trafficCompositionRate' ? 'action' : 'textbar'"
+          @click="handleClick('trafficCompositionRate')"
         >
           交通组成特征指数
         </div>
@@ -43,67 +43,89 @@
 </template>
 
 <script>
-import WgtTitle from "../../../../../widgets/title";
-import * as echarts from "echarts";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
 
 export default {
   name: "CongestionIndicator",
   components: {
-    WgtTitle,
   },
   data() {
     return {
-      action: "1",
-      count: 2000,
+      action: "crowdingRate",
+      count: 0,
+      where:{},
       tableData: [
-        {
-          name: "大学城-长清",
-          num: 1036,
-        },
-        {
-          name: "大学城-长清",
-          num: 1036,
-        },
-        {
-          name: "大学城-长清",
-          num: 1036,
-        },
-        {
-          name: "大学城-长清",
-          num: 1036,
-        },
-        {
-          name: "大学城-长清",
-          num: 1036,
-        },
-        {
-          name: "大学城-长清",
-          num: 1036,
-        },
-        {
-          name: "大学城-长清",
-          num: 1036,
-        },
+        
       ],
     };
   },
 
   created() {},
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter'(a, b) {
+      if (a) {
+        this.where = a;
+        this.bind()
+      }
+    }
+  },
   methods: {
-    selectItem(index) {
-      this.selectIndex = index;
-    },
     handleClick(value) {
       this.action = value;
+      this.bind();
+    },
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportSectionTrafficIndexAnalysis",
+        filename: name,
+        data: {
+          startDate: this.where.currently,
+          periodType: this.where.type,
+          direction: this.where.direction
+        },
+      });
     },
+    bind(){
+      request({
+        url: '/business/traffic-statistics/history/sectionTrafficIndexAnalysis',
+        method: 'get',
+        params: {
+          startDate: this.where.currently,
+          periodType: this.where.type,
+          direction: this.where.direction
+        }
+      }).then(res => {
+        if (res.code != 200) return this.$message.error(res?.msg)
+        let _data = []
+        let _count = 0;
+          res.data.forEach(e => {
+            if(this.action == 'saturationRate'){
+              e[this.action] = parseFloat(e[this.action].toFixed(2))
+            }
+            _data.push({
+              name:e.groupName,
+              num: e[this.action]
+            })
+            _count += e[this.action]
+            
+          });
+          _data.sort(function(a,b){return b.num-a.num})
+          if(_data.length > 7){
+            _data = _data.slice(0,7)
+          }
+          this.count = _count;
+          this.tableData = _data;
+      })
+    }
   },
   mounted() {
-    setTimeout(() => {
-      this.$nextTick(() => {
-        var myChart = echarts.init(document.getElementById("ChangesIndictors"));
-        myChart.setOption(chartsStatistics);
-      });
-    });
   },
 };
 </script>
@@ -131,6 +153,7 @@ export default {
     .bodySort {
       flex: 1;
       overflow: auto;
+      width: 100%;
       > div:first-child {
         .barTitle {
           background: linear-gradient(180deg, #ff6969 0%, #ffb904 100%);
@@ -148,9 +171,9 @@ export default {
       .sortItem {
         display: inline-flex;
         width: 100%;
-        height: 42px;
+        height: 34px;
         background: #0c293a;
-        margin-bottom: 5px;
+        margin-bottom: 6px;
         border-radius: 0px 0px 0px 0px;
         font-size: 14px;
         font-family: PingFang SC, PingFang SC;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/radar/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/radar/charts.js
new file mode 100644
index 00000000..e28bd07f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/radar/charts.js
@@ -0,0 +1,90 @@
+
+const option = {
+  color: ['#39B1FF', '#76F7B0'],
+  tooltip: {
+    show: true,
+    trigger: "item",
+    valueFormatter: function (value) {
+      return value ;
+    },
+  },
+  legend: {
+    data: ["本期指标", "去年同期"],
+    right: 0,
+    textStyle:{
+      color: '#fff'
+    }
+  },
+  radar: [
+    {
+      indicator: [
+        { text: "拥挤度" },
+        { text: "交通组成特征指数" },
+        { text: "饱和度" },
+      ],
+      radius: '80%',
+      startAngle: 90,
+      splitNumber: 5,
+      shape: "circle",
+      name: {
+        show:false,
+        formatter: "{value}",
+        textStyle: {
+          color: "#ffffff",
+        },
+      },
+      axisLine: {
+        lineStyle: {
+          color: '#3180e0',
+          type: "dashed",
+        },
+      },
+      splitLine: {
+        show:false
+      },
+      splitArea:{
+        areaStyle:{
+          color:['#1896D0','#1270BE','#1163A6','#105285','#0F3B59'],
+        }
+      }
+    },
+  ],
+  series: [
+    {
+      name: "雷达图",
+      type: "radar",
+      itemStyle: {
+        emphasis: {
+          // color: 各异,
+          lineStyle: {
+            width: 4,
+          },
+        },
+      },
+      data: [
+        {
+          value: [2, 1,0],
+          name: "本期指标",
+          symbol: "none",
+          areaStyle:{
+            normal: {
+              opacity: 0.5,
+            },
+          }
+        }, {
+          value: [0, 0,0],
+          name: "去年同期",
+          symbol: "none",
+          areaStyle:{
+            normal: {
+              opacity: 0.5,
+            },
+          }
+        },
+      ],
+    },
+  ],
+};
+
+
+export default option;
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/radar/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/radar/index.vue
new file mode 100644
index 00000000..b05741e2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/radar/index.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="radar">
+    <div class="cname" id="name1"><div class="cname2">拥挤度</div></div>
+    <div class="cname" id="name2"><div class="cname2">交通特征组成指数</div></div>
+    <div class="cname" id="name3"><div class="cname2">饱和度</div></div>
+    <div class="radar keep-ratio"  id="refChart"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import request from '@/utils/request'
+import chartOption from "./charts";
+import { exportFile } from "@screen/utils/common";
+
+export default {
+  name: "Radar",
+  data() {
+    return {
+     
+    };
+  },
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter'(a, b) {
+      if (a) {
+        this.bind(a)
+      }
+    }
+  },
+  created() { },
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportRadarMapOfTrafficIndicators",
+        filename: name,
+        data: this.data,
+      });
+    },
+    bind(data){
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("refChart"));
+      }
+      this.data = {
+          startDate: data.currently,
+          periodType: data.type,
+          direction: data.direction
+      }
+      request({
+        url: '/business/traffic-statistics/history/radarMapOfTrafficIndicators',
+        method: 'get',
+        params: this.data
+      }).then(res => {
+        request({
+          url: '/business/traffic-statistics/history/radarMapOfTrafficIndicators',
+          method: 'get',
+          params: {
+            startDate: data.lastYear,
+            periodType: data.type,
+            direction: data.direction
+          }
+        }).then(resLastYear => {
+           chartOption.series[0].data[0].value = [
+            parseInt(res.data.trafficCompositionRate),
+            parseInt(res.data.crowdingRate),
+            parseFloat(res.data.saturationRate).toFixed(2)
+          ]
+          chartOption.series[0].data[1].value = [
+            parseInt(resLastYear.data.trafficCompositionRate),
+            parseInt(resLastYear.data.crowdingRate),
+            parseFloat(resLastYear.data.saturationRate).toFixed(2)
+          ]
+          this.myChart.setOption(chartOption);
+
+          const domMap = document.getElementById("refChart");
+          let parentDiv = domMap.firstChild;
+          const name1 = document.getElementById("name1");
+          name1.style.marginLeft =(parentDiv.offsetWidth *.37)+'px';
+          name1.style.marginTop ='30px';
+
+          const name2 = document.getElementById("name2");
+          name2.style.marginTop =(parentDiv.offsetHeight * .65 )+'px';
+
+          const name3 = document.getElementById("name3");
+          name3.style.marginTop =(parentDiv.offsetHeight * .7 )+'px';
+          name3.style.marginLeft =(parentDiv.offsetWidth * .64 )+'px';
+        })
+      })
+      
+
+      
+    }
+  },
+  mounted() {
+    // this.$nextTick(()=>{
+    //   this.bind();
+    // })
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.radar {
+  width: 100%;
+  height: 100%;
+}
+.cname{
+  position: absolute;
+  background: linear-gradient(to right,#3290d7,  #3290d700);
+  border-radius: 18px;
+  font-size: 14px;
+  padding: 2px 1px;
+  z-index: 99999;
+  .cname2{
+    width: 100%;
+    height: 100%;
+    border-radius: 18px;
+    background: linear-gradient(to right,#0d5994dd, #0d599400);
+    padding: 5px 70px 5px 20px;  
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/search/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/search/index.vue
new file mode 100644
index 00000000..b088e71a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/search/index.vue
@@ -0,0 +1,207 @@
+<template>
+  <div class="searchPanel">
+    <!-- 路段选择 -->
+    <RadioGroup :options="[
+      { key: '1', label: '菏泽' },
+      { key: '3', label: '济南' },
+    ]" v-model="direction" type="button" size="mini" />
+    <el-select v-model="type" class="selectRoad" placeholder="请选择">
+      <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
+    </el-select>
+    <!-- 日期选择 -->
+    <el-date-picker size="mini" class="selectRoad" v-model="dateTime" style="width: 140px"
+      :picker-options="pickerOptions" :type="type == '4'
+        ? 'date'
+        : type == '3'
+          ? 'month'
+          : type == '1'
+            ? 'year'
+            : ''
+      " placeholder="请选择" />
+
+    <el-button type="primary" size="mini" class="btnSearch" @click="searchQuery" icon="el-icon-search">查询</el-button>
+    <el-button class="btnReset" size="mini" icon="el-icon-refresh-left" @click="onReset">重置</el-button>
+
+
+    <el-popover
+      placement="right"
+      width="500"
+      trigger="hover"
+      >
+      <p>
+        拥挤度描述道路交通流拥挤的程度：<br />
+        其中，拥挤度越低，交通运行状况越好； 反之，交通运行状况越差。<br />
+        拥挤度划分如下：<br />畅通(0) / 基本畅通(1) / 轻度拥堵(2) / 中度拥堵(3) / 严重拥堵(4)<br /><br />
+        交通组成特征指数用来描述不同交通组成(车辆类别)对行车的影响程度：<br />
+        其中，交通组成特征指数越低，不同交通组成对行车安全的影响程度越小;反之，不同交通组成对行车安全的影响程度越大。<br />
+        交通组成特征指数划分如下：<br />低(0) / 中(2) / 高(4)<br /><br />
+        饱和度是指道路已通过的交通量占最大通行交通量的比重，用来反映道路的利用效率：<br />
+        其中，饱和度越高，道路利用效率越高;反之，道路利用效率越低。<br />
+      </p>
+      <el-button type="text" slot="reference" class="el-icon-s-opportunity" style="margin-left:20px; color:#fff"></el-button>
+    </el-popover>
+  </div>
+</template>
+<script>
+import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
+
+import { getRoadSectionList } from "@/api/event/perceiveEvent";
+import moment from "moment";
+
+
+export default {
+  name: "EventQuery",
+  components: {
+    RadioGroup,
+  },
+  data() {
+    return {
+      selectIndex: 1,
+      selectId: 1,
+      reset: false,
+      direction: "1",
+      type: "4",
+      typeOptions: [
+        {
+          label: "年",
+          value: "1",
+        },
+        {
+          label: "月",
+          value: "3",
+        },
+        {
+          label: "日",
+          value: "4",
+        },
+        // {
+        //   label: "季",
+        //   value: "3",
+        // },
+      ],
+      quarter: "1",
+      quarterOptions: [
+        {
+          label: "第一季度",
+          value: "1",
+        },
+        {
+          label: "第二季度",
+          value: "2",
+        },
+        {
+          label: "第三季度",
+          value: "3",
+        },
+        {
+          label: "第四季度",
+          value: "4",
+        },
+      ],
+      dateTime: moment().format("YYYY-MM-DD HH:mm:ss"),
+      dataList: [],
+      year: "",
+
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+    };
+  },
+
+  created() { },
+  methods: {
+    getQuery(){
+      let _currently = moment(this.dateTime);
+      let _lastYear =  moment(_currently).subtract(1,'year')
+      if(this.type === '4'){
+        _currently = _currently.format('YYYY-MM-DD')
+        _lastYear = _lastYear.format('YYYY-MM-DD')
+      } else if(this.type === '3'){
+        _currently = _currently.format('YYYY-MM')
+        _lastYear = _lastYear.format('YYYY-MM')
+      } else if(this.type === '1'){
+        _currently = _currently.format('YYYY')
+        _lastYear = _lastYear.format('YYYY')
+      }
+      return {
+        type: this.type,
+        direction: this.direction,
+        currently: _currently,
+        lastYear: _lastYear
+      }
+    },
+    searchQuery() {
+      this.$parent.bind();
+    },
+    onReset() {
+      this.selectId = 1;
+      this.selectIndex = 1;
+      this.reset = true;
+      this.direction = "1";
+      this.type = "4";
+      this.dateTime = moment().format("YYYY-MM-DD HH:mm:ss");
+      this.searchQuery();
+    },
+  },
+  mounted() {
+
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.searchPanel {
+  display: flex;
+  align-items: center;
+  
+  width: 100%;
+  font-size: 14px;
+  margin: 10px 0px;
+  z-index: 1;
+
+  div {
+    white-space: nowrap;
+    margin-right: 4px;
+  }
+
+  ::v-deep {
+    .el-input__inner {
+      background-color: #064258 !important;
+      border-width: 0px !important;
+    }
+      .el-radio-button__inner{
+        margin-top: -1px;
+        height: 29px !important;
+        line-height: 29px !important;
+      }
+  }
+
+  .inputZh {
+    width: 47px;
+  }
+
+  .inputJl {
+    margin-left: 5px;
+    margin-right: 10px;
+  }
+
+  .selectRoad {
+    width: 89px;
+    border: 1px solid #00b3cc;
+  }
+
+  .btnSearch {
+    background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+    margin-left: 10px;
+    border-color: transparent;
+  }
+
+  .btnReset {
+    background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+    border-color: transparent;
+    color: white;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/section/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/section/charts.js
similarity index 95%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/section/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/section/charts.js
index 8780ff65..a534c978 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/section/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/section/charts.js
@@ -32,8 +32,8 @@ let options = {
   grid: {
     left: 0,
     right: 10,
-    top: "15%",
-    bottom: "8%",
+    top: "50px",
+    bottom: "29px",
     containLabel: true,
   },
   xAxis: {
@@ -69,6 +69,8 @@ let options = {
           color: "#27B5D7",
         },
       },
+      max:4,
+      interval: 1,
       splitLine: {
         show: true,
         lineStyle: {
@@ -142,6 +144,7 @@ let options = {
         borderRadius: [10, 10, 0, 0]
       },
       data: data3,
+      yAxisIndex: 1
     },
     {
       name: "拥挤度",
@@ -151,6 +154,7 @@ let options = {
       itemStyle: {
         borderRadius: [10, 10, 0, 0]
       },
+      yAxisIndex: 0,
       data: data2,
     },
     {
@@ -160,6 +164,7 @@ let options = {
       itemStyle: {
         borderRadius: [10, 10, 0, 0]
       },
+      yAxisIndex: 0,
       data: data1,
     },
     {
@@ -179,11 +184,11 @@ let options = {
       type: "line",
       symbol: 'none',
       smooth: true,
-      yAxisIndex: 1,
       lineStyle: {
         type:'dashed',
         width: 1
       },
+      yAxisIndex: 0,
       data: data6,
     },
     {
@@ -191,11 +196,11 @@ let options = {
       type: "line",
       symbol: 'none',
       smooth: true,
-      yAxisIndex: 1,
       lineStyle: {
         type:'dashed',
         width: 1
       },
+      yAxisIndex: 0,
       data: data5,
     },
   ],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/section/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/section/index.vue
new file mode 100644
index 00000000..d8735cff
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/section/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <div id="chtSection" class="section " origin="left"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import request from '@/utils/request'
+import chartOption from "./charts";
+import { exportFile } from "@screen/utils/common";
+
+const enum_group = [
+  {name: '殷家林枢纽', id: 1},
+  { name: '大学城立交', id: 2 },
+  { name: '长清立交', id: 3 },
+  { name: '松竹枢纽', id: 4 },
+  { name: '孝里立交', id: 5 },
+  { name: '平阴北立交', id: 6 },
+  { name: '平阴立交', id: 7 },
+  { name: '孔村枢纽', id: 8 },
+  { name: '平阴南立交', id: 9 },
+  { name: '东平立交', id: 10 },
+  { name: '东平湖枢纽', id: 11 },
+  { name: '梁山东立交', id: 12 },
+  { name: '梁山立交', id: 13 },
+  { name: '嘉祥西立交', id: 14 },
+]
+export default {
+  name: "Section",
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter'(a, b) {
+      if (a) {
+        this.bind(a)
+      }
+    }
+  },
+  created() { },
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportSectionTrafficIndexAnalysis",
+        filename: name,
+        data: this.data,
+      });
+    },
+    bind(data) {
+      if (!this.myChart) {
+          this.myChart = echarts.init(document.getElementById("chtSection"));
+        }
+        this.data = {
+          startDate: data.currently,
+          periodType: data.type,
+          direction: data.direction
+        }
+      request({
+        url: '/business/traffic-statistics/history/sectionTrafficIndexAnalysis',
+        method: 'get',
+        params: this.data
+      }).then(res => {
+        if (res.code != 200) return this.$message.error(res?.msg)
+        request({
+          url: '/business/traffic-statistics/history/sectionTrafficIndexAnalysis',
+          method: 'get',
+          params: {
+            startDate: data.lastYear,
+            periodType: data.type,
+            direction: data.direction
+          }
+        }).then(resLastYear => {
+          const xAxisData = enum_group.map(x => x.name)
+          const v0 = [];
+          const v1 = [];
+          const v2 = [];
+          const v3 = [];
+          const v4 = [];
+          const v5 = [];
+          enum_group.forEach(r => {
+            const t = _.find(res.data,{groupId:r.id})
+            if(t){
+              v0.push(t.saturationRate.toFixed(2)) // 饱和率
+              v1.push(t.crowdingRate) // 拥挤率
+              v2.push(t.trafficCompositionRate) // 交通特征指数
+            } else {
+              v0.push(0)
+              v1.push(0)
+              v2.push(0)
+            }
+            const y = _.find(resLastYear.data,{groupId:r.id})
+            if(y){
+              v3.push(y.saturationRate.toFixed(2)) // 饱和率
+              v4.push(y.crowdingRate) // 拥挤率
+              v5.push(y.trafficCompositionRate) // 交通特征指数
+            } else {
+              v3.push(0)
+              v4.push(0)
+              v5.push(0)
+            }
+          });
+
+          chartOption.xAxis.data = xAxisData;
+          chartOption.series[0].data = v0;
+          chartOption.series[1].data = v1;
+          chartOption.series[2].data = v2;
+          chartOption.series[3].data = v3;
+          chartOption.series[4].data = v4;
+          chartOption.series[5].data = v5;
+         
+          this.myChart.setOption(chartOption);
+        })
+      })
+
+    }
+  },
+  mounted() {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.section {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/timer/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/timer/charts.js
similarity index 98%
rename from ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/timer/charts.js
rename to ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/timer/charts.js
index b8ddd25e..b6a77871 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/timer/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/timer/charts.js
@@ -32,8 +32,8 @@ let options = {
   grid: {
     left: 0,
     right: 10,
-    top: "15%",
-    bottom: "10%",
+    top: "50px",
+    bottom: "20px",
     containLabel: true,
   },
   xAxis: {
@@ -64,6 +64,8 @@ let options = {
   yAxis: [
     {
       min: 0,
+      max: 4,
+      interval:1,
       axisLine: {
         lineStyle: {
           color: "#27B5D7",
@@ -160,6 +162,7 @@ let options = {
           );
         }
       },
+      yAxisIndex: 1,
       data: data3,
     },
     {
@@ -234,7 +237,6 @@ let options = {
       name: "拥挤度去年同期",
       type: "line",
       symbol: 'none',
-      yAxisIndex: 1,
       lineStyle: {
         type:'dashed',
         width: 1
@@ -245,7 +247,6 @@ let options = {
       name: "交通组成特征指数去年同期",
       type: "line",
       symbol: 'none',
-      yAxisIndex: 1,
       lineStyle: {
         type:'dashed',
         width: 1
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/timer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/timer/index.vue
new file mode 100644
index 00000000..b944722a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/analysis/timer/index.vue
@@ -0,0 +1,135 @@
+<template>
+   <div id="divTimer" class="chartTimer"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartOption from "./charts";
+import request from '@/utils/request'
+import { exportFile } from "@screen/utils/common";
+
+
+export default {
+  name: "TraffTimer",
+  props: {
+    filter: {
+      type: Object
+    }
+  },
+  watch: {
+    'filter'(a, b) {
+      if (a) {
+        this.bind(a)
+      }
+    }
+  },
+  created() {},
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/traffic-statistics/history/exportPassIndicatorTimeDistribution",
+        filename: name,
+        data: this.data,
+      });
+    },
+    bind(data){
+      this.data = {
+          startDate: data.currently,
+          periodType: data.type,
+          direction: data.direction
+      }
+      if (!this.myChart) {
+        this.myChart = echarts.init(document.getElementById("divTimer"));
+      }
+      request({
+        url: '/business/traffic-statistics/history/passIndicatorTimeDistribution',
+        method: 'get',
+        params: this.data
+      }).then(res => {
+        if (res.code != 200) return this.$message.error(res?.msg)
+        request({
+          url: '/business/traffic-statistics/history/passIndicatorTimeDistribution',
+          method: 'get',
+          params: {
+            startDate: data.lastYear,
+            periodType: data.type,
+            direction: data.direction
+          }
+        }).then(resLastYear => {
+          let perList = []
+          let _data = _.cloneDeep(res.data);
+          
+          let _dataYes = _.cloneDeep(resLastYear.data);
+
+          let substr = 11;
+          if(data.type === '3'){ // 月
+            substr = 8
+          } else if(data.type === '1'){
+            substr = 5
+          }
+          _data.forEach(e => {
+            e.per = parseInt(e.groupTime.substr(substr,2))
+          });
+          _dataYes.forEach(e => {
+            e.per = parseInt(e.groupTime.substr(substr,2))
+          });
+          _data.sort(function(a,b){return a.per-b.per})
+          perList = _data.map(x=>x.per)
+          const v0 = _data.map(x=>x.saturationRate.toFixed(2))
+          const v1 = _data.map(x=>x.crowdingRate)
+          const v2 = _data.map(x=>x.trafficCompositionRate)
+          const v3 = []
+          const v4 = []
+          const v5 = []
+          for(let i of perList){
+            const y = _.find(_dataYes,{per:i})
+            if(y){
+              v3.push(y.saturationRate) // 饱和率
+              v4.push(y.crowdingRate) // 拥挤率
+              v5.push(y.trafficCompositionRate) // 交通特征指数
+            } else {
+              v3.push(0)
+              v4.push(0)
+              v5.push(0)
+            }
+          }
+          let xAxisData = []
+          let unit = '时'
+          if(data.type === '3'){ // 日
+            unit = '日'
+          }else if(data.type === '1'){ // 月份
+            unit = '月'
+          }
+          perList.forEach(e => {
+            xAxisData.push(e+unit)
+          });
+            chartOption.xAxis.data = xAxisData;
+            chartOption.series[0].data = v0;
+            chartOption.series[1].data = v1;
+            chartOption.series[2].data = v2;
+            chartOption.series[3].data = v3;
+            chartOption.series[4].data = v4;
+            chartOption.series[5].data = v5;
+           
+            this.myChart.setOption(chartOption);
+            
+        })
+        
+      })
+      // this.myChart = echarts.init(document.getElementById("divTimer"));
+      // this.myChart.setOption(options);
+    }
+  },
+  mounted() {
+   
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+  .chartTimer {
+      height: 100%;
+      width: 100%;
+    }
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/radar/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/radar/index.vue
deleted file mode 100644
index 0b9e806b..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/radar/index.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <div class="radar">
-    <div class="cname" id="name1"><div class="cname2">拥挤度</div></div>
-    <div class="cname" id="name2"><div class="cname2">交通特征组成指数</div></div>
-    <div class="cname" id="name3"><div class="cname2">饱和度</div></div>
-    <div class="radar keep-ratio"  id="refChart"></div>
-  </div>
-</template>
-<script>
-import * as echarts from "echarts";
-
-export default {
-  name: "Radar",
-  data() {
-    return {
-     
-    };
-  },
-  created() { },
-  methods: {
-
-    bind(){
-      const option = {
-        color: ['#39B1FF', '#76F7B0'],
-        legend: {
-          data: ["本期指标", "去年同期"],
-          right: 0,
-          textStyle:{
-            color: '#fff'
-          }
-        },
-        radar: [
-          {
-            indicator: [
-              { text: "拥挤度" },
-              { text: "交通组成特征指数" },
-              { text: "饱和度" },
-            ],
-            radius: '80%',
-            startAngle: 90,
-            splitNumber: 5,
-            shape: "circle",
-            name: {
-              show:false,
-              formatter: "{value}",
-              textStyle: {
-                color: "#ffffff",
-              },
-            },
-            axisLine: {
-              lineStyle: {
-                color: '#3180e0',
-                type: "dashed",
-              },
-            },
-            splitLine: {
-              show:false
-            },
-            splitArea:{
-              areaStyle:{
-                color:['#1896D0','#1270BE','#1163A6','#105285','#0F3B59'],
-              }
-            }
-          },
-        ],
-        series: [
-          {
-            name: "雷达图",
-            type: "radar",
-            itemStyle: {
-              emphasis: {
-                // color: 各异,
-                lineStyle: {
-                  width: 4,
-                },
-              },
-            },
-            data: [
-              {
-                value: [50, 8,22],
-                name: "本期指标",
-                symbol: "none",
-                areaStyle:{
-                  normal: {
-                    opacity: 0.5,
-                  },
-                }
-              }, {
-                value: [55, 5,88],
-                name: "去年同期",
-                symbol: "none",
-                areaStyle:{
-                  normal: {
-                    opacity: 0.5,
-                  },
-                }
-              },
-            ],
-          },
-        ],
-      };
-
-      const chartIns = echarts.init(document.getElementById("refChart"));
-      chartIns.setOption(option);
-
-      const domMap = document.getElementById("refChart");
-      let parentDiv = domMap.firstChild;
-      const name1 = document.getElementById("name1");
-      name1.style.marginLeft =(parentDiv.offsetWidth *.37)+'px';
-      name1.style.marginTop ='30px';
-
-      const name2 = document.getElementById("name2");
-      name2.style.marginTop =(parentDiv.offsetHeight * .65 )+'px';
-
-      const name3 = document.getElementById("name3");
-      name3.style.marginTop =(parentDiv.offsetHeight * .7 )+'px';
-      name3.style.marginLeft =(parentDiv.offsetWidth * .64 )+'px';
-      
-    }
-  },
-  mounted() {
-    this.bind();
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.radar {
-  width: 100%;
-  height: 100%;
-}
-.cname{
-  position: absolute;
-  // background: linear-gradient(to right,#0D5994dd, #0D599400);
-  background: linear-gradient(to right,#3290d7,  #3290d700);
-  border-radius: 18px;
-  font-size: 14px;
-  padding: 2px 1px;
-  z-index: 99999;
-  .cname2{
-    width: 100%;
-    height: 100%;
-    border-radius: 18px;
-    background: linear-gradient(to right,#0d5994dd, #0d599400);
-    padding: 5px 70px 5px 20px;  
-  }
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/section/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/section/index.vue
deleted file mode 100644
index 8a18e0cc..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/section/index.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-   <div id="divSection" class="section " origin="left"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-
-import options from "./charts";
-export default {
-  name: "Section",
-  
-  data() {
-    return {
-     
-    };
-  },
-
-  created() {},
-  methods: {
-    bind(){
-      this.myChart = echarts.init(document.getElementById("divSection"));
-      this.myChart.setOption(options);
-    }
-  },
-  mounted() {
-    this.bind();
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-  .section {
-      height: 100%;
-      width: 100%;
-    }
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/timer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/timer/index.vue
deleted file mode 100644
index eec5758a..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/timer/index.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-   <div id="divTimer" class="timer " origin="left"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-
-import options from "./charts";
-export default {
-  name: "Section",
-  
-  data() {
-    return {
-     
-    };
-  },
-
-  created() {},
-  methods: {
-    bind(){
-      this.myChart = echarts.init(document.getElementById("divTimer"));
-      this.myChart.setOption(options);
-    }
-  },
-  mounted() {
-    this.bind();
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-  .timer {
-      height: 100%;
-      width: 100%;
-    }
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/index.vue
deleted file mode 100644
index cffba624..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/index.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div class="TrafficFlow">
-    <Search />
-    <section class="content">
-      <section class="cleft">
-        <div class="title"><div class="icon"></div>路段交通指标分析</div>
-        <Section></Section>
-      </section>
-      <section class="cright">
-        <div class="title"><div class="icon"></div>交通指标雷达图</div>
-        <Radar />
-      </section>
-    </section>
-
-    <section class="content">
-      <section class="cleft">
-        <div class="title"><div class="icon"></div>交通指标时间分布</div>
-        <Timer></Timer>
-      </section>
-      <section class="cright">
-        <div class="title"><div class="icon"></div>交通指标排名</div>
-        <Indicator></Indicator>
-      </section>
-    </section>
-  </div>
-</template>
-
-<script>
-import Search from "./components/search";
-import Radar from "./components/radar";
-import Section from "./components/section";
-import Timer from "./components/timer";
-import Indicator from "./components/indicator";
-
-export default {
-  name: "IndicatorAnalysis",
-  components: {
-    Search,
-    Radar,
-    Section,
-    Timer,
-    Indicator
-  },
-  data() {
-    return {
-
-    };
-  },
-  methods: {
-
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.TrafficFlow {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  // position: relative;
-  z-index: 6;
-  color: white;
-
-  .content {
-    flex: 1;
-    display: flex;
-    flex-direction: row;
-    .cleft{
-      width: 67vw;
-      margin-right: 3vw;
-    }
-    .cright{
-      flex:1;
-    }
-    .title{
-      display: flex;
-      position: absolute;
-      align-items: center;
-      .icon {
-        width: 5px;
-        height: 16px;
-        background-color: #3DE8FF;
-        margin-right: 10px;
-        border-radius: 2px;
-      }
-    }
-  }
-
-}
-</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue
index 4a040678..125c4b59 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/index.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-import IndicatorAnalysis from "./components/IndicatorAnalysis";
-import IndicatorQuery from "./components/IndicatorQuery";
+import IndicatorAnalysis from "./analysis";
+import IndicatorQuery from "./query";
 
 export default {
   name: "trafficSituation",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/query/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/query/index.vue
new file mode 100644
index 00000000..a6174dae
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/query/index.vue
@@ -0,0 +1,533 @@
+<template>
+  <div class='congestion'>
+    <div class="buttonbar">
+      <ButtonGradient @click="onRefreshForm" class="button">
+        <template #prefix>
+          <i class="el-icon-refresh-right"></i>
+        </template>
+        刷新
+      </ButtonGradient>
+      <ButtonGradient @click="onExport" class="button">
+        <template #prefix>
+          <i class="el-icon-upload2"></i>
+        </template>
+        导出
+      </ButtonGradient>
+      <InputSearch ref="searchComp" style="width: 402px;margin-left: 1300px;" :formList="formList" @handleSearch="handleSearch" />
+    </div>
+    <div class="body">
+
+        <Table :data="tableData" :height="menu.isRecentOpen?'calc(100vh - 300px)':'calc(100vh - 260px)'">
+          <el-table-column label="序号" type="index" :index="indexMethod" width="120" align="center"
+          header-align="center" />
+          <ElTableColumn prop="intervalName" label="路段名称">
+          </ElTableColumn>
+          <ElTableColumn prop="direction" label="方向">
+          </ElTableColumn>
+          <ElTableColumn prop="saturationRate" label="饱和度" width="100">
+          </ElTableColumn>
+          <ElTableColumn prop="crowdingRate" label="拥堵度" width="100">
+            
+          </ElTableColumn>
+          <ElTableColumn prop="trafficCompositionRate" label="交通特征指数" width="150">
+          </ElTableColumn>
+          <!-- <ElTableColumn prop="name" label="指标名称" class-name="showClass">
+            <template slot-scope="scope">
+              <span class="showClass">{{ scope.row.name }}</span>
+            </template>
+          </ElTableColumn> -->
+          <ElTableColumn prop="statisticalDate" label="采集时间">
+          </ElTableColumn>
+        </Table>
+      </div>
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
+      </Pagination>
+    </div>
+  </div>
+</template>
+  
+<script>
+import Pagination from "@screen/components/Pagination.vue";
+import Table from '@screen/components/Table.vue';
+import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+import {  mapState } from "vuex";
+import { searchFormList } from './data.js'
+import { Loading } from 'element-ui';
+const enum_CrowdingRate = {
+  1:'畅通',
+  2:'基本畅通',
+  3:'轻度拥堵',
+  4:'中度拥堵',
+  5:'重度拥堵'
+}
+const enum_TrafficCompositionRate = {
+  1:'低',
+  2:'中',
+  3:'高'
+}
+export default {
+  name: 'IndicatorQuery',
+  components: {
+    Table,
+    Pagination,
+    ButtonGradient,
+    InputSearch
+  },
+  data() {
+    return {
+      tableData: [],
+      formList:[],
+      searchFormList,
+      total: 20,
+      searchData: {
+        pageSize: 20,
+        pageNum: 1,
+      },
+    }
+  },
+  computed: {
+    ...mapState(["menu"]),
+  },
+  created() {
+    // this.formList = searchFormList;
+    this.queryLdAll();
+    this.initData();
+  },
+  methods: {
+    selectItem(index) {
+      this.selectIndex = index;
+    },
+    indexMethod(index) {
+      return (
+        index + (this.searchData.pageNum - 1) * this.searchData.pageSize + 1
+      );
+    },
+    initData() {
+      if(!this.searchData.startDate){
+        this.searchData.startDate = moment().format('YYYY-MM-DD')
+        this.searchData['periodType'] = 4
+      } 
+      if(!this.searchData.endDate){
+        this.searchData.endDate = moment().format('YYYY-MM-DD')
+      } 
+      request({
+        url: `/business/traffic-statistics/history/comprehensiveIndexQuery`,
+        method: "get",
+        params: this.searchData,
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        result.rows.forEach(e=>{
+          e.direction = e.direction === '1' ? '菏泽方向' : '济南方向';
+          e.saturationRate = e.saturationRate
+          e.crowdingRate = enum_CrowdingRate[e.crowdingRate]
+          e.trafficCompositionRate = enum_TrafficCompositionRate[e.trafficCompositionRate]
+          e.statisticalDate = moment(e.statisticalDate).format('YYYY-MM-DD HH:mm:ss')
+        })
+        
+        this.tableData = result.rows;
+        this.total = result.total;
+      });
+    },
+    onSizeChange(pageSize) {
+      this.tableData = [];
+      this.searchData.pageSize = pageSize;
+      this.searchData.pageNum = 1;
+      this.initData();
+    },
+    onRefreshForm(){
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    handleSearch(data) {
+      let _search = {};
+      if(data.time && data.time.length === 2){
+        _search['startDate'] = data.time[0].format('yyyy-MM-dd')
+        _search['endDate'] = data.time[1].format('yyyy-MM-dd')
+        _search['periodType'] = 4
+      } else {
+        _search['startDate'] = null
+        _search['endDate'] = null
+        _search['periodType'] = 4
+      }
+      if(data.direction){
+        _search['direction'] = data.direction;
+      } else {
+        _search['direction'] = null;
+      }
+      if(data.intervalName){
+        _search['intervalName'] = data.intervalName
+      } else {
+        _search['intervalName'] = null;
+      }
+      this.searchData = {
+        ...this.searchData,
+       ..._search
+      };
+      this.initData();
+    },
+    queryLdAll() {
+      request({
+        url: `/business/roadSection/listAll`,
+        method: "get",
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        let lds = [];
+        result.data.forEach(it => {
+          lds.push({
+            value: it.sectionName,
+            label: it.sectionName
+          })
+        })
+        searchFormList[0].options.options = lds;
+        this.formList = searchFormList;
+      });
+    },
+    onExport(){
+      const self = this;
+      this.$confirm("是否确认导出查询内容?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          let loadingInstance = Loading.service({
+            fullscreen: true,
+            background: "#00000052",
+            text: "文件正在下载...",
+          });
+          const _search = _.cloneDeep(self.searchData);
+          delete _search.pageSize
+          delete _search.pageNum
+          request({
+            url: `/business/traffic-statistics/export`,
+            method: "post",
+            data: _search,
+            responseType: 'blob',
+          }).then((res) => {
+            console.log(res)
+
+            const url = window.URL.createObjectURL(new Blob([res]));
+            let link = document.createElement("a");
+            link.style.display = "none";
+            link.href = url;
+            link.setAttribute("download", "综合指标查询.xlsx");
+            document.body.appendChild(link);
+            link.click();
+            URL.revokeObjectURL(link.href); // 释放URL 对象
+            document.body.removeChild(link);
+            link = null;
+            loadingInstance.close();
+          })
+        .catch((err) => {
+          self.$message.error(err);
+          loadingInstance.close();
+        });
+        })
+    },
+  },
+  mounted() {
+
+  },
+}
+</script>
+  
+<style lang='scss' scoped>
+.showClass {
+  color: #00EBC1;
+}
+
+// ::v-deep .el-table .cell {
+//   padding-left: 0px !important;
+// }
+
+// ::v-deep .el-table .el-table__header-wrapper th {
+//   background-color: #064258 !important;
+//   color: #00D1FF;
+//   border-color: #064258 !important;
+//   border: 0px !important;
+//   // font-size: 12px !important;
+// }
+
+// ::v-deep .el-table {
+//   border: 0px !important;
+//   background-color: transparent;
+//   // font-size: 12px !important;
+// }
+
+// ::v-deep .el-table__body-wrapper {
+//   background-color: #064258;
+//   color: #fff;
+// }
+
+// ::v-deep .el-table tr:hover td {
+//   background: #1b2528 !important;
+//   color: #00D1FF;
+// }
+
+// ::v-deep .el-table tr:nth-child(odd) td {
+//   background-color: #13272F;
+//   border: 0px !important;
+// }
+
+// ::v-deep .el-table tr:nth-child(even) td {
+//   border: 0px !important;
+// }
+
+// ::v-deep .el-table tr {
+//   background-color: #133242 !important;
+//   border-collapse: 0;
+//   border: 0px !important;
+//   background-color: transparent !important;
+// }
+
+.congestion {
+  display: inline-flex;
+  width: 100%;
+  height: 100%;
+  flex-direction: column;
+  .body {
+    flex: 1;
+    height: 0;
+  }
+  .buttonbar {
+    display: inline-flex;
+    flex-direction: row;
+    padding-top: 15px;
+    margin-bottom: 20px;
+    >.button {
+      display: inline-flex;
+      min-width: 90px;
+      height: 28px;
+      background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
+      border-radius: 2px 2px 2px 2px;
+      justify-content: center;
+      align-items: center;
+      padding: 1px 10px;
+      ;
+      opacity: 1;
+      font-size: 14px;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      color: #FFFFFF;
+      margin-left: 15px;
+    }
+
+  }
+
+  .board {
+    height: 829px;
+    width: 100%;
+    padding: 0px 0px;
+    border-radius: 5px 5px 5px 5px;
+    opacity: 1;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-direction: column;
+    margin-top: 20px;
+    overflow-y: auto;
+
+
+    .warningList {
+      display: inline-flex;
+      flex-direction: column;
+      width: 100%;
+      height: calc(100% - 40px);
+
+      >div {
+        display: inline-flex;
+        width: 100%;
+        height: 138px;
+        background: #133242;
+        border-radius: 2px 2px 2px 2px;
+        opacity: 1;
+        border: 1px solid;
+        border-image: linear-gradient(360deg, rgba(55, 231, 255, 1), rgba(55, 231, 255, 0)) 1 1;
+        overflow: hidden;
+        margin-top: 20px;
+        padding: 23px 29px;
+        font-size: 14px;
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 400;
+        color: #37E7FF;
+
+        >.left-w {
+          display: inline-flex;
+          width: 40%;
+          height: 100%;
+          flex-direction: column;
+
+          .left-row {
+            margin: 2px;
+            display: inline-flex;
+            width: 100%;
+            height: 30px;
+            flex-direction: row;
+
+            >.value {
+              color: #fff;
+            }
+
+            .org {
+              font-size: 14px;
+              font-family: PangMenZhengDao;
+              font-weight: 400;
+              color: #F4A125
+            }
+
+          }
+        }
+
+        >.right-w {
+          margin-left: 30px;
+          display: inline-flex;
+          width: 100%;
+          height: 100%;
+          flex-direction: column;
+
+          .right-row {
+            margin-bottom: 10px;
+          }
+
+          .right-text {
+            color: #fff;
+          }
+        }
+
+      }
+    }
+
+    .weaterMain {
+      display: inline-flex;
+      flex-direction: row;
+      width: 100%;
+      height: 100%;
+      ;
+
+
+      .buttons {
+        width: 100%;
+        height: 38px;
+
+        >div {
+          display: inline-flex;
+          width: 10%;
+          height: 35px;
+          justify-content: center;
+          align-items: center;
+          font-size: 12px;
+          font-family: PangMenZhengDao;
+          font-weight: 800;
+          color: #FFFFFF;
+          z-index: 9;
+        }
+
+        >div::after {
+          content: "";
+          position: absolute;
+          display: inline-flex;
+          width: 55px;
+          height: 36px;
+          background: linear-gradient(180deg, #6557D7 0%, rgba(101, 87, 216, 0) 100%);
+          border-radius: 50%;
+          opacity: 1;
+          z-index: -1;
+        }
+
+        .redSel::after {
+          background: linear-gradient(180deg, #E73A14 0%, rgba(240, 92, 9, 0) 100%);
+        }
+
+        .yelSel::after {
+          background: linear-gradient(180deg, #FFFA79 0%, rgba(255, 208, 137, 0) 100%);
+        }
+
+        .bluSel::after {
+          background: linear-gradient(180deg, #121ADE 0%, rgba(40, 18, 228, 0) 100%);
+        }
+
+        .orgSel::after {
+          background: linear-gradient(180deg, #FFA623 0%, rgba(255, 173, 53, 0) 100%);
+        }
+      }
+
+      .weaterTitle::after {
+        content: "";
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        height: 2px;
+        background: linear-gradient(90deg, rgba(189, 255, 246, 0) 0%, #BDFFF6 52%, rgba(189, 255, 246, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        opacity: 1;
+      }
+
+      .weaterTitle::before {
+        content: "";
+        position: absolute;
+        top: 38px;
+        left: 0px;
+        width: 100%;
+        height: 2px;
+        background: linear-gradient(90deg, rgba(189, 255, 246, 0) 0%, #BDFFF6 52%, rgba(189, 255, 246, 0) 100%);
+        border-radius: 0px 0px 0px 0px;
+        opacity: 1;
+      }
+
+      .weaterTitle {
+        position: relative;
+        display: inline-flex;
+        width: 277px;
+        height: 38px;
+        background: linear-gradient(269deg, rgba(55, 231, 255, 0) 6%, rgba(55, 231, 255, 0.6) 50%, rgba(55, 231, 255, 0) 92%);
+        border-radius: 0px 0px 0px 0px;
+        opacity: 1;
+        justify-content: center;
+        align-items: center;
+
+        >span.text {
+          display: inline-flex;
+          font-size: 16px;
+          font-family: PangMenZhengDao;
+          font-weight: 400;
+          color: #FFFFFF;
+        }
+
+
+        .num {
+          display: inline-flex;
+          justify-content: center;
+          align-items: center;
+          font-size: 22px;
+          font-family: PangMenZhengDao;
+          font-weight: 400;
+          color: #D9001B;
+        }
+      }
+    }
+
+  }
+
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.charts {
+  height: 180px;
+  width: 100%;
+}
+</style>
+  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/safe/files/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/safe/files/index.vue
new file mode 100644
index 00000000..cfa95f59
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/safe/files/index.vue
@@ -0,0 +1,382 @@
+<template>
+  <div class='board_record'>
+    <!-- 搜索栏 -->
+    <div class="filter">
+      <div>
+        <ButtonGradient @click.native="handleAddEdit(true)">
+          <template #prefix>
+            <img src="@screen/images/insert.svg" />
+          </template>
+          新增
+        </ButtonGradient>
+        <ButtonGradient @click="onRefreshForm" class="refresh-btn">
+        <template #prefix>
+          <img src="@screen/images/refresh.svg" />
+        </template>
+        刷新
+      </ButtonGradient>
+      </div>
+      
+      <InputSearch ref="searchComp" style="width: 480px" :formList="searchFormList"
+        :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
+
+    </div>
+    <!-- 内容 -->
+    <div class="body">
+      <Table :data="tableData" height="100%">
+        <el-table-column label="序号" type="index" :index="indexMethod" width="120" align="center"
+          header-align="center" />
+        <ElTableColumn label="文件名称" prop="fileName" align="center" header-align="center" />
+        <ElTableColumn label="文件大小" prop="size" align="center" header-align="center" />
+        <ElTableColumn label="文件类型" prop="extension" align="center" header-align="center" />
+        <ElTableColumn label="下载次数" prop="number" align="center" header-align="center" />
+        <ElTableColumn label="上传时间" prop="createTime" align="center" header-align="center" />
+        <ElTableColumn label="上传用户" prop="createBy" align="center" header-align="center" />
+        
+        <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleDownload(scope)"
+            >下载
+          </el-button>
+          <el-button
+            type="text"
+            style="color:#ff0000;margin-left: 20px;"
+            @click="handleDelete(scope.row)"
+            >删除
+          </el-button>
+        </template>
+      </el-table-column>
+      </Table>
+    </div>
+
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'"
+        :page-sizes="[10, 20, 30, 40, 50]" :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum"
+        layout="total, sizes, prev, pager, next" :total="total">
+      </Pagination>
+    </div>
+
+        <!-- 添加或修改控制码对话框 -->
+        <Dialog title="新增文件" v-model="modelVisible" width="500px" append-to-body>
+          <Form
+            column="1"
+            class="form"
+            ref="FormConfigRef"
+            :formList="formList"
+            :value="formData"
+          />
+          <div >
+            <el-upload
+              class="upload-file"
+              accept=".bmp,.gif,.jpg,.jpeg,.png,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.html,.htm,.txt,.rar,.zip,.gz,.bz2,.jar,.mp4,.avi,.rmvb,.pdf,.svg"
+              :file-list="fileList"
+              :show-file-list="false"
+              :on-success="handleUploadSuccess"
+              :on-error="handleUploadError"
+              :headers="headers"
+              :action="uploadFiles"
+              >
+              <div style="width:400px;height:100%;">{{ fileAddress !== ''?fileAddress:'点击上传' }}</div>
+            </el-upload>
+        </div>
+          <template #footer>
+            <Button
+              style="background-color: rgba(0, 179, 204, 0.3)"
+              @click.native="handleClose"
+            >
+              取消
+            </Button>
+            <Button @click.native="handleSubmit" :loading="submitting"> 确定 </Button>
+          </template>
+        </Dialog>
+  </div>
+</template>
+
+<script>
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
+import Pagination from '@screen/components/Pagination.vue';
+import Table from '@screen/components/Table.vue';
+import request from '@/utils/request'
+import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
+import {DirectionTypes,deviceTypeOptions,directionOptions} from '@screen/utils/enum.js';
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import { searchFormList } from "./data";
+import { getToken } from "@/utils/auth";
+import { delay, exportFile, confirm } from "@screen/utils/common";
+import { Message } from "element-ui";
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import Dialog from "@screen/components/Dialog/index.vue";
+
+export default {
+  name: 'boardRecord',
+  components: {
+    ButtonGradient,
+    Pagination,
+    Table,
+    Button,
+    Form,
+    Dialog,
+    BoardRecordPreview,
+    InputSearch
+  },
+  data() {
+    return {
+      DirectionTypes,
+      tableData: [],
+      searchFormList,
+      total: 20,
+      searchData: {
+        pageSize: 20,
+        pageNum: 1
+      },
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      uploadFiles: process.env.VUE_APP_BASE_API + "/business/download/uploadFileManagement", // 上传的图片服务器地址
+      fileList: [],
+      fileAddress: "",
+      fileSize:0,
+      fileExtension:'',
+      urlRoot: process.env.VUE_APP_BASE_API, // 上传的图片服务器地址
+      // 表单参数
+      modelVisible:false,
+      submitting: false,
+      formList: [
+        {
+          required: true,
+          label: "文件名称:",
+          key: "fileName",
+          type: "input"
+        }
+      ],
+      formData:{}
+    }
+  },
+  created() {
+    this.initData();
+  },
+  mounted(){
+  },
+  methods: {
+        // 上传成功
+    handleUploadSuccess(res, file) {
+      if(res.code !== 200){this.$message.error(res.msg); return;}
+      this.$message.success("上传成功");
+      this.fileAddress = res.fileName;
+      this.fileSize = res.size,
+      this.fileExtension = res.extension
+    },
+
+    // 上传失败
+    handleUploadError() {
+      this.$message.error("上传失败");
+    },
+
+    onRefreshForm(){
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    handleSearch(data) {
+      this.searchData = {
+        ...this.searchData,
+       ...data
+      };
+      this.initData();
+    },
+    indexMethod(index) {
+        return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
+    },
+
+    //
+    handleDownload({$index,row}){
+      
+      request({
+        url:`/business/download/downloadIncrease/${row.id}`,
+        method:'get'
+      }).then(res=>{
+        if(res.code === 200){
+          this.tableData[$index].number += 1;
+        }
+      })
+      window.open(this.urlRoot+row.fileAddress)
+    },
+    handleDelete(row){
+      const self = this;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          request({
+            url: '/common/delete/resource',
+            method: 'post',
+            data: {
+              filePath: row.fileAddress
+            }
+          }).then(res=>{
+            request({
+              url: `/business/download/${row.id}`,
+              method: 'delete',
+            }).then(res=>{
+              self.initData();
+              self.$modal.msgSuccess("删除成功");
+            })
+          })
+        }).catch(function() {});
+    },
+    handleClose() {
+      if(this.fileAddress !== ''){
+        request({
+          url: '/common/delete/resource',
+          method: 'post',
+          data: {
+            filePath: this.fileAddress
+          }
+        }).then(res=>{
+          this.modelVisible = false
+          this.submitting = false;
+        })
+      } else {
+        this.modelVisible = false
+        this.submitting = false;
+      }
+    
+    },
+    handleAddEdit(bool) {
+      this.fileAddress = '';
+      this.modelVisible = true;
+    },
+    /** 提交按钮 */
+    handleSubmit() {
+      if(this.fileAddress === ''){
+        this.$message.warning('请选择文件上传')
+        return;
+      }
+      this.$refs.FormConfigRef.validate().then((data) => {
+        this.submitting = true;
+        request({
+          url: `/business/download`,
+          method: "POST",
+          data:{
+            fileName: data.fileName,
+            fileAddress: this.fileAddress,
+            size: this.fileSize,
+            extension: this.fileExtension
+          },
+        })
+          .then((result) => {
+            if (result.code != 200) return Message.error(`提交失败`);
+
+            Message.success(`提交成功`);
+
+            this.modelVisible = false;
+            this.searchData.pageNum = 1;
+            this.initData();
+          })
+          .catch((err) => {
+            Message.error(`提交失败`);
+          })
+          .finally(() => {
+            this.submitting = false;
+          });
+      });
+    },
+     formatFileSize(bytes, decimalPoint = 2) {
+      if (bytes == 0) return "0 Bytes";
+      let k = 1000,
+        sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"],
+        i = Math.floor(Math.log(bytes) / Math.log(k));
+      return (
+        parseFloat((bytes / Math.pow(k, i)).toFixed(decimalPoint)) + " " + sizes[i]
+      );
+    },
+    initData() {
+      request({
+        url: `/business/download/list`,
+        method: "get",
+        params: this.searchData,
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        result.rows.forEach(e=>{
+          e.size = this.formatFileSize(e.size)
+        })
+        this.tableData = result.rows;
+        this.total = result.total;
+      });
+    },
+    onSizeChange(pageSize) {
+      this.tableData = [];
+      this.searchData.pageSize = pageSize;
+      this.searchData.pageNum = 1;
+      this.initData();
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.board_record {
+  padding: 0 14px 14px;
+  width:100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .filter {
+    height: 60px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    >div {
+      display: flex;
+      gap: 6px;
+    }
+  }
+
+  .body {
+    flex: 1;
+    height: 0;
+  }
+
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .board_shower{
+    margin: 4px;
+  }
+  ::v-deep .el-carousel__indicators--horizontal{
+    line-height: 0; height: 16px;
+    .el-carousel__indicator--horizontal{
+      padding: 7px 4px;
+    }
+  }
+  ::v-deep .el-table__cell div.cell {
+    padding: 0 10px !important;
+  }
+}
+.upload-file{
+  width: 100%;
+  margin: 20px 0px;
+  background-color: #104c66 !important;
+  border: 1px solid #359cbc !important;
+  border-radius: 5px;
+  text-align: center;
+  padding: 5px 0px;
+  font-size: 14px;
+  cursor: pointer;
+}
+</style>
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 be765244..fd1f98ba 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
@@ -1,26 +1,33 @@
 <template>
   <div class='DetailCard'>
     <div class="header">
-      <div class="left keep-ratio" origin="left" >
+      <div class="left" >
         <div class="title">{{ data.descTitle || '-' }}</div>
         <div class="state" :style="{ backgroundColor: status[data.state].color }">{{ status[data.state].text }}</div>
       </div>
-      <div class="right keep-ratio">
+      <div class="right">
         <span>
           <i class="el-icon-time"></i>
         </span>
         <span>{{ data.time || '-' }}</span>
       </div>
     </div>
-    <div class="body keep-ratio"  origin="left" >
+    <div class="body"  >
       <div class="content">
-        {{ data.desc }}
+        <el-carousel v-if="data.channel === '4' && data.contentDetailsInfo" direction="horizontal" :autoplay="false"  :indicator-position="data.contentDetailsInfo.length===1?'none':'inside'" height="50px"
+          arrow="never" class="board_shower">
+          <el-carousel-item v-for="item,index in data.contentDetailsInfo"
+            :key="index">
+            <BoardRecordPreview :tpl="item" style="height: 100%;" />
+          </el-carousel-item>
+        </el-carousel>
+        <span v-else>{{ data.desc }}</span>
       </div>
       <div class="people">
         <img src="@screen/images/people.svg" alt="">
         <span>发布人: {{ data.publisher }}</span>
       </div>
-      <div class="people">
+      <div class="people" v-if="data.facilityName">
         <img src="@screen/images/people.svg" alt="">
         <span>当前管制: {{data.facilityName}}</span>
       </div>
@@ -29,7 +36,8 @@
       </div> -->
       <div class="suffix share-with">
         分享至
-        <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`)">
+        <img v-for="(item,index) in shareWithData" :key="item.key" :src="require(`@screen/images/shareWith/${data.channel.indexOf(item.key.toString())===-1?item.key:(item.key+'-active')}.svg`)">
+        <div v-if="['4','7'].indexOf(data.channel) !== -1">{{ data.position && data.position.replace(/[\[,\]]/g,'') }}</div>
       </div>
     </div>
     <!-- <div class="footer">
@@ -40,6 +48,7 @@
 
 <script>
 import Button from "@screen/components/Buttons/Button.vue";
+import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
 
 const shareWith = require.context(
   "@screen/images/shareWith",
@@ -50,7 +59,8 @@ const shareWith = require.context(
 export default {
   name: 'DetailCard',
   components: {
-    Button
+    Button,
+    BoardRecordPreview
   },
   props: {
     data: {
@@ -65,10 +75,9 @@ export default {
   data() {
     return {
       shareWithData: [
-        { key: "2", label: "微信",icon:'weChat' },
-        { key: "1", label: "短信",icon:'message' },
-        { key: "5", label: "网站",icon:'website' },
-        { key: "3", label: "新浪",icon:'weibo' },
+        { key: "4", label: "情报板" },
+        { key: "7", label: "语音广播" },
+        { key: "8", label: "微信" },
       ],//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 4d3f2a85..0394cd67 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
@@ -1,5 +1,5 @@
 <template>
-  <Card2 class='AuditDetails' title="详情">
+  <Card2 class='AuditDetails' title="发布详情">
     <TimeLine2 :data="timeLine2List" style="flex: 1;" direction="right">
       <template #content="{ data }">
         <DetailCard :data="data" />
@@ -38,6 +38,36 @@ export default {
         
         
         temp.forEach(e => {
+          if(e.publishChannels === 4 || e.publishChannels === 7){
+              const contentDetailsInfo = JSON.parse(e.contentDetails)
+              if(e.publishChannels === 4){ //情报板
+                let msg = '情报板数据异常' + e.contentDetails
+                // 检查是否一键恢复
+                if(contentDetailsInfo.length > 0){
+                  if(contentDetailsInfo[0].functions.length > 1){
+                    const parameters = contentDetailsInfo[0].functions[1]?.params?.parameters
+                    if(parameters && parameters.length > 0){
+                      e.contentDetailsInfo = parameters
+                      msg = ''
+                    }
+                  }
+                  else if(contentDetailsInfo[0].functions.length > 0){
+                    if(contentDetailsInfo[0].functions[0].functionId && contentDetailsInfo[0].functions[0].functionId === '1B'){
+                      msg = '一键恢复操作'
+                    }
+                  }
+                }
+                e.contentDetails = msg
+              } else if(e.publishChannels === 7){
+                let msg = '语音广播数据异常'+e.contentDetails
+                if(contentDetailsInfo.length > 0){
+                  if(contentDetailsInfo[0].functions.length > 0){
+                    msg = contentDetailsInfo[0].functions[0].params.text
+                  }
+                }
+                e.contentDetails = msg;
+              }
+            }
           list.push({
             source: "1",
             onlyright:true,
@@ -49,6 +79,8 @@ export default {
             publisher:e.publisher,
             channel:e.publishChannels.toString(),
             state: e.eventState,
+            contentDetailsInfo: e.contentDetailsInfo,
+            position:e.position
           })
         });
           this.timeLine2List = list;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/data.js
index 7ec3d5d0..d724ba1e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/data.js
@@ -9,10 +9,10 @@ export const searchFormList = [
     type: "RadioGroup",
     options: {
       options: [
-        {
-          key: "0",
-          label: "待确认",
-        },
+        // {
+        //   key: "0",
+        //   label: "待确认",
+        // },
         {
           key: "1",
           label: "处理中",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue
index 8d1d593a..f89e7276 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditLists/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Card2 class="Auditlists" title="信息">
+  <Card2 class="Auditlists" title="事件信息">
     <InputSearch style="width: 100%" :formList="searchFormList" @handleSearch="handleSearch"  />
     <div class="body">
       <ListItem
@@ -104,6 +104,8 @@ export default {
         method: 'get',
         params: {...this.searchData,...this.p}
       }).then(res=>{
+        console.log(res,'-------')
+        
         res.rows.forEach(e => {
           const ev = _.find(enum_event_type,{key:e.eventType})
           e.content = `${e.eventTime} ${e.stakeMark} ${DirectionTypes[e.direction]} ${e.eventSubclass? EventSubclass[e.eventSubclass]:''}`
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/index.vue
index ecb64f56..8cc1c34e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class='info_publish'>
+  <div class='info_publish' :style="menu.isRecentOpen?'height:calc(100vh - 100px)':'height:calc(100vh - 60px)'">
     <AuditLists @click="onListClick" class="card" />
     <AuditDetails ref="refDetail" class="card" />
   </div>
@@ -8,7 +8,7 @@
 <script>
 import AuditDetails from "./Cards/AuditDetails/index.vue"
 import AuditLists from "./Cards/AuditLists"
-
+import {  mapState } from "vuex";
 export default {
   name: 'InformationReleaseManagement',
   components: {
@@ -16,6 +16,9 @@ export default {
     AuditDetails
   },
 
+  computed: {
+    ...mapState(["menu"]),
+  },
   methods:{
     onListClick(id){
       this.$refs.refDetail.bind(id)
@@ -29,9 +32,8 @@ export default {
   height: 100%;
   padding: 24px;
   display: grid;
-  gap: 30px;
+  gap: 20px;
   grid-template-columns: 0.42fr 1fr;
-
   .card {
     overflow: hidden;
     width: 100%;
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 7eba0146..d2b5fcfa 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
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" :title="title" width="550px">
+  <Dialog v-model="modelVisible" :title="title" width="570px">
     <div class="AddNEditDialog">
       <Form
         v-model="formData"
@@ -260,8 +260,7 @@ export default {
 
 <style lang="scss" scoped>
 .AddNEditDialog {
-  width: 450px;
-  height: 200px;
+  width: 100%;
   display: flex;
   flex-direction: column;
   gap: 15px;
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 2157b567..68c82092 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
@@ -27,8 +27,12 @@
 
     <!-- 内容 -->
     <div class="body">
+      <div class="content">
+        <div class="scrollPanel" >
       <Card v-for="item in channelsList" :key="item.id" :data="item" />
     </div>
+      </div>
+    </div>
 
     <!-- 分页 -->
     <div class="footer">
@@ -153,14 +157,29 @@ export default {
   }
 
   .body {
+    
     flex: 1;
     overflow: hidden;
-    display: grid;
-    grid-template-columns: repeat(5, 1fr);
-    grid-gap: 24px;
-    // grid-row-gap: 9px;
-    // grid-column-gap: 9px;
-    grid-auto-rows: min-content;
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(6, 1fr);
+        grid-gap: 15px;
+        grid-auto-rows: minmax(230px, max-content);
+        position: relative;
+        flex: 1;
+        overflow: auto;
+      }
+    }
   }
 
   .footer {
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 6242a419..5f187167 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="infoBoardBox">
+  <div class="infoBoardBox" :style="menu.isRecentOpen?'height:calc(100vh - 100px)':'height:calc(100vh - 60px)'">
     <div class="infoBoardCon">
       <!-- ++++++++++设备列表++++++++++ -->
       <div style="width: 20%" class="part partLeft">
@@ -246,6 +246,7 @@ import WgtTitle from "@screen/pages/perception/widgets/title";
 
 import InfoBoard from "@screen/mixins/InfoBoard";
 import { initSearch } from "@screen/utils/enum/common.js"
+import {  mapState } from "vuex";
 
 export default {
   name: "DeviceBord",
@@ -260,7 +261,6 @@ export default {
     vuescroll,
   },
   dicts: ["iot_board_direction"],
-
   data() {
     return {
       multiPublish: true,
@@ -368,6 +368,7 @@ export default {
     this.EventBus.$off("deviceState");
   },
   computed: {
+    ...mapState(["menu"]),
     ____boardScale() {
       let arr = this.selectedSize.split("*");
       let boxW = 540;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
index 14b0217e..b7ed6f53 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -136,8 +136,7 @@ export default {
     },
     handleSearch(data) {
       let daterange = data.daterange;
-      console.log(data, "dataaaaaaaaaaaa");
-
+      
       // let dStakeMark = data.stakeMark;
       // let dendStakeMark = data.endStakeMark;
 
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 9383fd65..cd5a60cd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="infoBoardBox">
+  <div class="infoBoardBox" :style="menu.isRecentOpen?'height:calc(100vh - 100px)':'height:calc(100vh - 60px)'">
     <div class="infoBoardCon">
       <!-- ++++++++++设备列表++++++++++ -->
       <div style="width: 20%" class="part partLeft">
@@ -98,7 +98,7 @@
           <div class="titleBtnBox">
             <el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()"
               :disabled="selectedBdMsg.length>=1">添加信息</el-button>
-            <el-button class=" btnInfoBoard" type="publish" @click="____onPublish"
+            <el-button class="btnInfoBoard" type="publish" @click="____onPublish"
               :disabled="selectedBdMsg.length <= 0 || selectedDevices.length <= 0">发布信息</el-button>
           </div>
         </WgtTitle>
@@ -144,7 +144,7 @@
       <!-- ++++++++++右边部分：信息模板++++++++++ -->
 
       <div style="width: 42.2%;" class="part partRight tpl_box">
-        <WgtTitle :title="`广播内容模板`" class="tpl_title">
+        <WgtTitle :title="`信息模板`" class="tpl_title">
           <div class="titleBtnBox">
             <el-button class="btnInfoBoard" type="add" @click="____onAddTemplate">添加模板</el-button>
           </div>
@@ -185,6 +185,11 @@ import WgtTitle from "@screen/pages/perception/widgets/title";
 import broadcast from "@screen/mixins/broadcast";
 import { initSearch } from "@screen/utils/enum/common.js"
 import BroadcastTplList from "@screen/components/broadcast/BroadcastTplList.vue";
+import {  mapState } from "vuex";
+import request from '@/utils/request'
+import { multiResultShow } from "@screen/utils/common";
+
+
 export default {
   name: "DeviceCast",
   mixins: [broadcast],
@@ -282,6 +287,7 @@ export default {
     this.hideScrollFn();
   },
   computed: {
+    ...mapState(["menu"]),
   },
   methods: {
     ____boardTxtStyle() {
@@ -502,10 +508,121 @@ export default {
     // 发布信息
     ____onPublish() {
       if (!this.selectedDevices.length) {
-        this.$message.warning("请选择设备！");
+        this.$message.warning("请选择设备");
         return;
       }
-      this.____publishInfo();
+      // this.____publishInfo();
+
+      let deviceList = [];
+      let checkList = [];
+      this.selectedDevices.forEach(item=>{
+          deviceList.push({
+            deviceType: item.deviceType,
+            id: item.id,
+            iotDeviceId: item.iotDeviceId,
+            otherConfig: JSON.stringify(item.otherConfig),
+          });
+          checkList.push(item.otherConfig)
+      })
+      this.$confirm("是否确定发布语音广播?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          
+          const param = {
+          "devices": deviceList,
+          "functions": [
+            {
+              "functionId": "1",//随便 不为空即可
+              "params": {
+                name: "task-3",
+                outVol: this.selectedBdMsg[0].outVol,
+                priority:this.selectedBdMsg[0].priority,
+                text: this.selectedBdMsg[0].content,
+                repeatTimes: this.selectedBdMsg[0].repeatTimes,
+                termList: checkList,
+                functionType: "startPaTts",
+              }
+            }
+
+          ]
+        }
+
+          let loading = this.$loading({
+            lock: true,
+            text: "Loading",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+          });
+          request({
+            url: `/business/device/batchFunctions`,
+            method: "post",
+            data: param,
+          }).then(data=>{
+            multiResultShow(data.data, item => item.result.retCode == '0', "广播控制");
+          }).catch((err) => {})
+          .finally(() => {
+            loading.close();
+          });
+
+          // let data = {
+          //     functionType : "startPaTts",
+          //     name : "task-3",
+          //     // outVol : "6",
+          //     outVol: this.selectedBdMsg[0].outVol,
+          //     // priority : "1",
+          //     priority: this.selectedBdMsg[0].priority,
+          //     repeatTimes: this.selectedBdMsg[0].repeatTimes,
+          //     // termList : [{ zoneld: "6001", termDN: "601" }, { zoneld: "6001", termDN: "608" }, { zoneld: "6001", termDN: "610" }],
+          //     termList: deviceList,
+          //     text: this.selectedBdMsg[0].content
+          // }
+          //   publishToBoard(data)
+          //     .then((res) => {
+          //       // this.saveLog(content);
+          //       const cbMsg = {
+          //         0: '成功',
+          //         1: '非法控制台标识',
+          //         2: '鉴权失败',
+          //         3: '非法分区标识',
+          //         4: '非法终端号码',
+          //         5: '非法分区名称',
+          //         6: '非法终端类型',
+          //         7: '非法控制话机号码',
+          //         8: '控制话机离线',
+          //         9: '控制话机忙',
+          //         10: '非法被叫号码',
+          //         11: '非法音乐标识',
+          //         12: '非法音乐资源链接',
+          //         13: '非法广播任务标识',
+          //         14: '非法文字广播内容',
+          //         15: '非法广播重复次数',
+          //         16: '非法广播文件列表',
+          //         17: '非法广播终端列表',
+          //         18: '非法呼叫标识'
+          //       }
+          //       if(res.retCode === 0){
+          //         this.$message({
+          //           type: "success",
+          //           message: "发布成功",
+          //         });
+          //       } else {
+          //         this.$message({
+          //           type: "error",
+          //           message: "发布失败，"+cbMsg[res.retCode],
+          //         });
+          //       }
+                
+          //       // !isMultiControl && this.____getDeviceInfo();
+          //     })
+          //     .catch((err) => {})
+          //     .finally(() => {
+          //       loading.close();
+          //     });
+        })
+
     },
 
     // 接收子组件form表单 修改
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/charts.js
new file mode 100644
index 00000000..05a874f4
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/charts.js
@@ -0,0 +1,425 @@
+var res = [
+  { value: 20, name: "情报板" },
+  { value: 20, name: "语音广播" },
+  { value: 20, name: "企业微信" },
+];
+//  var res = this.evaluatedCountList;
+var data1 = [],
+  data2 = [],
+  data3 = [],
+  legendData = [];
+var curIndex = 0;
+var index = 0;
+
+for (var i = 0; i < res.length; i++) {
+  data1.push({
+    value: res[i].value,
+    name: res[i].name,
+  });
+  data2.push({
+    value: res[i].value,
+    name: res[i].name,
+    itemStyle: {
+      opacity: 0.4,
+    },
+  });
+
+  data3.push({
+    value: res[i].value,
+    name: res[i].name,
+    itemStyle: {
+      opacity: 0.1,
+    },
+  });
+  if (res[i].name != "") legendData.push(res[i].name);
+}
+let angle = 0; //角度，用来做简单的动画效果的
+let decoDelta = 10;
+var options = {
+  color: ["#68F4DD", "#FFDD69", "#3CC3F0", "#5C8CFE", "#51D5AD"],
+  title: [
+    {
+      text: "0",
+      // top: "27%",
+      top: "33%",
+      textAlign: "center",
+      left: "49%",
+      textStyle: {
+        color: "#ffffff",
+        fontSize: 30,
+        fontFamily: "PangMenZhengDao",
+      },
+    },
+    {
+      text: "总数",
+      // top: "38%",
+      top: "48%",
+      textAlign: "center",
+      left: "49%",
+      textStyle: {
+        color: "rgba(242, 252, 253, 0.84)",
+        fontSize: 14,
+        fontWeight: 400,
+      },
+    },
+  ],
+  grid: {
+    top: "3%",
+    left: "6%",
+    right: "6%",
+    bottom: 0,
+    containLabel: true,
+  },
+  tooltip: {
+    trigger: "item",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
+  },
+  legend: {
+    show: false,
+    orient: "vertical",
+    // width: "350px",
+    height: "80px",
+    // left: "10%",
+    top: "68%",
+    itemWidth: 10,
+    itemHeight: 10,
+    icon: "circle",
+    textStyle: {
+      color: "#ffffff",
+      fontSize: 12,
+      lineHeight: 22,
+      rich: {
+        text: {
+          width: 80,
+          marginLeft: 32,
+          fontSize: 14,
+        },
+        number: {
+          fontSize: 14,
+          color: "#37E7FF",
+          marginLeft: 32,
+          fontWeight: "bold",
+        },
+        unit: {
+          fontSize: 14,
+        },
+      },
+    },
+    data: legendData,
+    formatter(name) {
+      const newData = res;
+      let tarValue = 0;
+      let total = 0;
+      for (let i = 0; i < newData.length; i++) {
+        total += newData[i].value;
+        if (newData[i].name === name) {
+          tarValue = newData[i].value;
+        }
+      }
+      var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
+      const arr = name + "  " + tarValue;
+      return `{text|${name}} {number|${tarValue} 起  }  {number|${percert}%}`;
+    },
+    pageIconColor: "#fff",
+    pageIconSize: 10,
+    pageTextStyle: {
+      color: "#fff",
+    },
+    type: "scroll",
+    pageButtonPosition: "end",
+  },
+  series: [
+    /** 饼图上刻度 */
+    {
+      type: "gauge",
+      // center: ["50%", "35%"],
+      // radius: "46%", // 错位调整此处
+      center: ["50%", "45%"],
+      radius: "60%", // 错位调整此处
+      startAngle: 0,
+      endAngle: 360,
+      splitNumber: 52,
+      axisLine: { show: false },
+      splitLine: {
+        // length: 39,
+        length: "2",
+        lineStyle: {
+          width: 5,
+          color: "#5CC5FF",
+        },
+      },
+      axisTick: { show: false },
+      axisLabel: { show: false },
+    },
+    /** 绘制外部圆弧-2-开始圆点 <left-top> */
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7;
+
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((350 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((350 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7,
+
+            startAngle: ((350 + -angle) * Math.PI) / 180,
+            endAngle: ((120 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7;
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((150 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((150 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7,
+            startAngle: ((150 + -angle) * Math.PI) / 180,
+            endAngle: ((-30 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8;
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((590 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((590 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8,
+            startAngle: ((590 + -angle) * Math.PI) / 180,
+            endAngle: ((350 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8;
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((90 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((90 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8,
+            startAngle: ((90 + -angle) * Math.PI) / 180,
+            endAngle: ((160 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "pie",
+      // radius: ["45%", "40%"],
+      // center: ["50%", "35%"],
+      radius: ["60%", "52%"],
+      center: ["50%", "45%"],
+      z: 10,
+      label: {
+        show: false,
+        position: "center",
+        formatter: (params) => {
+          return params.name + "\r\n" + params.value;
+        },
+        rich: {
+          total: {
+            fontSize: 16,
+            color: "#04F5FE",
+          },
+          efficiency: {
+            fontSize: 12,
+            color: "#00FD6D",
+          },
+        },
+        color: "#FFFFFF",
+        fontSize: 12,
+        lineHeight: 16,
+      },
+      data: data1,
+      labelLine: {
+        show: false,
+      },
+      itemStyle: {
+        // normal: {
+        //   borderWidth: 4,
+        //   shadowBlur: 10,
+        //   borderRadius: 50, // 圆角
+        // },
+        normal: {
+          borderRadius: "5",
+          borderWidth: 4,
+          borderType: "solid",
+          borderColor: "#0C2D3A",
+        },
+      },
+    },
+    {
+      type: "pie",
+      // radius: ["29%", "40%"],
+      // center: ["50%", "35%"],
+      radius: ["37%", "60%"],
+      center: ["50%", "45%"],
+      label: {
+        show: false,
+      },
+      data: data2,
+      labelLine: {
+        show: false,
+      },
+      itemStyle: {
+        normal: {
+          borderRadius: "5",
+          borderWidth: 8,
+          borderType: "solid",
+          borderColor: "#0C2D3A",
+        },
+      },
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/index.vue
new file mode 100644
index 00000000..b5a6c35d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/index.vue
@@ -0,0 +1,239 @@
+<template>
+  <div class="board">
+    <div class="charts" id="channelAnalytics"></div>
+    <div class="legend-box">
+      <el-carousel height="200px" direction="vertical">
+        <el-carousel-item
+          v-for="(item, index) in dataList"
+          :key="index"
+          class="legend-item"
+        >
+          <div v-for="(items, index) in item" class="legend-items">
+            <span class="legend-name">{{ items.name }}</span>
+            <span class="legend-num">{{ items.value }} 起</span>
+            <span class="legend-percert">{{ items.percert }}%</span>
+          </div>
+        </el-carousel-item>
+      </el-carousel>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsStatistics from "./charts";
+import request from "@/utils/request";
+import { exportFile } from "@screen/utils/common";
+export default {
+  name: "RailWayDay",
+  components: {
+  },
+  data() {
+    return {
+      enum_channelType:{
+        4:0,
+        7:1,
+        8:2
+      },
+      enum_channels: [
+        '情报板', //4
+        '语音广播',//7
+        '企业微信',//8
+      ],
+      dataList: [],
+      myChart: null
+    };
+  },
+
+  created() {},
+  methods: {
+
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/manage/exportStatisticsPublishManage",
+        filename: name,
+      });
+    },
+    bindStatisticsPublishManage(){
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("channelAnalytics"));
+      }
+      request({
+            url: `/business/manage/statisticsPublishManage`,
+            method: "post",
+            data: {},
+          })
+            .then((result) => {
+          if (result.code != 200) return;
+          let total = 0;
+          result.data.forEach((e,i) => {
+            total += e.number;
+          })
+          let legendData = [];
+          let data1=[],data2=[];
+          chartsStatistics.title[0].text = total.toString();
+          let _dataList = [];
+          result.data.forEach((e,i) => {
+            const _name = this.enum_channels[i];
+             
+            
+              if(e.number > 0){
+                _dataList.push({
+                name: _name,
+                value: e.number,
+                percert: total?(e.number/total*100).toFixed(2):0.00
+              })
+                legendData.push(_name)
+                data1.push({
+                  value: e.number,
+                  name: _name,
+                })
+                data2.push({
+                  value: e.number,
+                  name: _name,
+                  itemStyle: {
+                    opacity: 0.4,
+                  },
+                })
+              }
+          });
+          chartsStatistics.data = legendData;
+          chartsStatistics.series[9].data = data1;
+          chartsStatistics.series[10].data = data2;
+          this.myChart.setOption(chartsStatistics);
+          // const list = _dataList.reduce((acc, curr, index) => {
+          //   if (index % 2 === 0) acc.push([]);
+          //   acc[Math.floor(index / 2)].push(curr);
+          //   return acc;
+          // }, []);
+          this.dataList = [_dataList];
+        })  
+    },
+  },
+  
+  mounted() {
+    this.$nextTick(()=>{
+      this.bindStatisticsPublishManage(); 
+    })
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+  .board {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    .charts {
+      flex:1;
+      width: 100%;
+    }
+    .legend-box {
+      width: 60%;
+      margin: auto;
+      margin-top: 0px;
+      height: 60px;
+      overflow: hidden;
+      .legend-item {
+        width: 100%;
+        /**
+         单个动画循环样式 勿删
+        */
+        // height: 30px;
+        // display: flex;
+        // justify-content: space-between;
+        // align-items: center;
+        // animation: 5s infinite roll;
+        // position: relative;
+
+        // &::before {
+        //   // position: absolute;
+        //   content: "";
+        //   width: 8px;
+        //   height: 8px;
+        //   left: 0px;
+        //   border-radius: 50%;
+        //   background: #37e7ff;
+        // }
+        .legend-items {
+          width: 100%;
+          height: 20px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          &::before {
+            // position: absolute;
+            content: "";
+            width: 8px;
+            height: 8px;
+            left: 0px;
+            border-radius: 50%;
+            background: #37e7ff;
+          }
+        }
+        .legend-name {
+          width: 100px;
+          margin-left: 10px;
+          font-size: 14px;
+        }
+        .legend-num,
+        .legend-percert {
+          width: 80px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          font-size: 14px;
+          color: #37e7ff;
+          font-weight: bold;
+        }
+      }
+      .legend-item:nth-child(1) {
+        .legend-items:nth-child(1) {
+          &::before {
+            background: #68f4dd;
+          }
+        }
+        .legend-items:nth-child(2) {
+          &::before {
+            background: #ffdd69;
+          }
+        }
+      }
+      .legend-item:nth-child(2) {
+        .legend-items:nth-child(1) {
+          &::before {
+            background: #3cc3f0;
+          }
+        }
+        .legend-items:nth-child(2) {
+          &::before {
+            background: #5c8cfe;
+          }
+        }
+      }
+      .legend-item:nth-child(3) {
+        .legend-items:nth-child(1) {
+          &::before {
+            background: #51d5ad;
+          }
+        }
+        .legend-items:nth-child(2) {
+          &::before {
+            background: #1785c0;
+          }
+        }
+      }
+    }
+  }
+
+// .charts {
+//   height: 100%;
+//   width: 100%;
+// }
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue
index 05fe9162..0169ebf8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue
@@ -2,7 +2,7 @@
   <div class="congestion">
     <WgtTitle :title="'今日发布渠道分析'"></WgtTitle>
     <div class="board">
-      <div class="charts keep-ratio" id="channelAnalytics"></div>
+      <div class="charts" id="channelAnalytics"></div>
       <div class="legend-box">
         <el-carousel height="200px" direction="vertical">
           <el-carousel-item
@@ -107,7 +107,10 @@ export default {
   },
   
   mounted() {
-    this.bindStatisticsPublishManage(); 
+    this.$nextTick(()=>{
+      this.bindStatisticsPublishManage(); 
+    })
+    
   },
 };
 </script>
@@ -135,14 +138,14 @@ export default {
     // justify-content: space-between;
     // align-items: center;
     .charts {
-      height: 240px;
+      height: 200px;
       width: 100%;
     }
     .legend-box {
       width: 60%;
       margin: auto;
       margin-top: 0px;
-      height: 65px;
+      height: 50px;
       overflow: hidden;
 
       .legend-item {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js
index c9c3f9a9..e5e770cb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js
@@ -88,7 +88,7 @@ var options = {
     top: "38%",
     left: "6%",
     right: "6%",
-    bottom: "3%",
+    bottom: 0,
     containLabel: true,
   },
   tooltip: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue
index d340bf97..4a9aa056 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue
@@ -2,7 +2,7 @@
   <div class="congestion">
     <WgtTitle :title="'今日发布事件类型分析'"></WgtTitle>
     <div class="board">
-      <div class="charts keep-ratio" id="eventTypeAnalysis"></div>
+      <div class="charts " id="eventTypeAnalysis"></div>
       <div class="legend-box">
         <el-carousel height="200px" direction="vertical">
           <el-carousel-item
@@ -61,6 +61,7 @@ export default {
           })
             .then((result) => {
           if (result.code != 200) return;
+
           let total = 0;
           result.data.forEach((e,i) => {
             total += e.number;
@@ -102,13 +103,14 @@ export default {
                     acc[Math.floor(index / 2)].push(curr);
                     return acc;
                   }, []);
-                  this.dataList = list;
-          this.dataList = list;
+            this.dataList = list;
         })  
     },
   },
   mounted() {
-    this.bindEventTypePublishManage();
+    this.$nextTick(()=>{
+      this.bindEventTypePublishManage();
+    })
   },
 };
 </script>
@@ -136,14 +138,14 @@ export default {
     // justify-content: space-between;
     // align-items: center;
     .charts {
-      height: 240px;
+      height: 200px;
       width: 100%;
     }
     .legend-box {
       width: 60%;
       margin: auto;
       margin-top: 0px;
-      height: 65px;
+      height: 60px;
       overflow: hidden;
 
       .legend-item {
@@ -169,7 +171,7 @@ export default {
         // }
         .legend-items {
           width: 100%;
-          height: 30px;
+          height: 20px;
           display: flex;
           justify-content: space-between;
           align-items: center;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
index 273ffc13..7e7ebc14 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/nucleusThrough/index.vue
@@ -81,7 +81,6 @@ export default {
         result.data.forEach(e => {
           rawData[e.publishChannels-1].push(e.number)
         });
-        console.log(rawData,'------------------')
         const event_type =  [
           '交通事故',
           '车辆故障',
@@ -222,8 +221,10 @@ export default {
     },
   },
   mounted() {
-
-    this.init();
+    this.$nextTick(()=>{
+      this.init();
+    })
+    
     // setTimeout(() => {
     //   this.$nextTick(() => {
     //     var myChart = echarts.init(document.getElementById("nucleusThrough"));
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue
index e380e36b..cd5894d6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsDay/index.vue
@@ -48,7 +48,10 @@ export default {
     },
   },
   mounted() {
-    this.bindTrendsPublishManage();
+    this.$nextTick(() => {
+      this.bindTrendsPublishManage();
+    })
+    
     // setTimeout(() => {
     //   this.$nextTick(() => {
     //     var myChart = echarts.init(document.getElementById('postTrendsDay'));
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
index 1182b7df..7cd5da92 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/index.vue
@@ -49,22 +49,48 @@ export default {
   created() {},
   methods: {
     bindMonthTrendsPublishManage(){
+      const timeSearch = moment(this.dateTime).format('YYYY-MM-DD HH:mm:ss');
       request({
           url: `/business/manage/monthTrendsPublishManage`,
           method: "post",
-          data: {publishTime:moment(this.dateTime).format('YYYY-MM-DD HH:mm:ss')},
+          data: {publishTime:timeSearch},
         })
           .then((result) => {
         if (result.code != 200) return;
+          //
+          const start = 1; //当前日期当月第一天
+          //如果是本月的话则取当天
+          let end =  0;
+          if(timeSearch.substr(0,7) === moment().format('YYYY-MM')){
+            end = parseInt(moment().endOf('second').format('DD')) //当前日期
+          } else {
+            end = parseInt(moment(this.dateTime).endOf('month').format('DD')) //当前日期
+          }
+          const _xAsix = [];
+          for(let i = start; i <= end; i++){
+            _xAsix.push((i<10?'0'+i.toString():i.toString())+'日')
+          }
+         
           let sdata = [[],[],[],[],[],[],[]]
+         
+          _xAsix.forEach(x=>{
+            sdata.forEach(s=>{
+              s.push(0)
+            })
+          })
           for(let i of result.data){
-            sdata[i.publishChannels-1].push(i.number)
+            let d = parseInt(i.publishTime.substr(8,2))-1
+            sdata[i.publishChannels-1][d] = i.number
           }
           chartsStatistics.series.forEach((e,i) => {
             e.data = sdata[i]
           });
-          var myChart = echarts.init(document.getElementById("postTrendsMonth"));
-          myChart.setOption(chartsStatistics);
+          chartsStatistics.xAxis.data = _xAsix
+          if(!this.myChart){
+            this.myChart = echarts.init(document.getElementById("postTrendsMonth"));
+          }
+          
+          this.myChart.setOption(chartsStatistics);
       })
     },
     init(){
@@ -73,7 +99,10 @@ export default {
     }
   },
   mounted() {
-    this.init();
+    this.$nextTick(()=>{
+      this.init();
+    })
+    
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/data.js
index 45e71a0a..527b15c6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/data.js
@@ -10,34 +10,18 @@ export const searchFormList = [
     options: {
       clearable: true,
       options: [
-        {
-          key: "1",
-          label: "手机短信",
-        },
-        {
-          key: "2",
-          label: "微信公众号",
-        },
-        {
-          key: "3",
-          label: "微博",
-        },
         {
           key: "4",
           label: "情报板",
         },
-        {
-          key: "5",
-          label: "服务网站",
-        },
-        {
-          key: "6",
-          label: "微信小程序",
-        },
         {
           key: "7",
           label: "语音广播",
         },
+        {
+          key: "8",
+          label: "企业微信",
+        },
       ],
     },
   },
@@ -61,11 +45,11 @@ export const searchFormList = [
     options: {
       options: [
         {
-          key: '1',
+          key: 1,
           label: "成功",
         },
         {
-          key: '2',
+          key: 2,
           label: "失败",
         },
       ],
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 a600a8ad..1f1346d1 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
@@ -28,29 +28,41 @@
 
         <ElTableColumn label="发布渠道" prop="publishChannels" width="120" align="center" header-align="center">
           <template slot-scope="scope">
-            {{ enum_channels[scope.row.publishChannels-1] }}
+            {{ enum_channels[scope.row.publishChannels] }}
           </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="position" align="center" width="260"  header-align="center">
           <template slot-scope="scope">
-            {{ scope.row.position.replace(/\[/,'').replace(/\]/,'') }}
+            {{ scope.row.position && scope.row.position.replace(/\[/,'').replace(/\]/,'') }}
           </template>
         </ElTableColumn>
-        <ElTableColumn label="发布内容" prop="contentDetails"  align="center" header-align="center">
+        <ElTableColumn label="发布内容" show-overflow-tooltip prop="contentDetails"  align="center" header-align="center">
+          <template slot-scope="scope">
+            <el-carousel v-if="scope.row.publishChannels === 4 && scope.row.contentDetailsInfo" direction="horizontal" :autoplay="false" :indicator-position="scope.row.contentDetailsInfo.length===1?'none':'inside'" height="50px"
+              arrow="never" class="board_shower">
+              <el-carousel-item v-for="item,index in scope.row.contentDetailsInfo"
+                :key="index">
+                <BoardRecordPreview :tpl="item" style="height: 100%;" />
+              </el-carousel-item>
+            </el-carousel>
+            <span v-else>{{ scope.row.contentDetails }}</span>
+
+            <!-- <span >{{ scope.row.contentDetails }}</span> -->
+          </template>
         </ElTableColumn>
-        <ElTableColumn label="发布人" prop="publisher" width="120" align="center" header-align="center" />
-        <ElTableColumn label="发布结果" prop="status" width="140" align="center" header-align="center">
+        <ElTableColumn label="发布人" prop="publisher" width="100" align="center" header-align="center" />
+          <ElTableColumn label="发布结果" prop="status" width="100" align="center" header-align="center">
           <template slot-scope="scope">
-            <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.publishStatus == 1"></i>
+            <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.publishStatus === 1"></i>
             <i class="el-icon-error" style="font-size: 24px; color:#BBB;" v-else></i>
           </template>
         </ElTableColumn>
-        <ElTableColumn label="操作" prop="status" width="100" align="center" header-align="center">
+        <!-- <ElTableColumn label="操作" prop="status" width="100" align="center" header-align="center">
           <template slot-scope="scope">
             <el-button type="danger" icon="el-icon-delete" size="mini"  @click="onDelete(scope.row.id)">删除</el-button>
           </template>
-        </ElTableColumn>
+        </ElTableColumn> -->
       </Table>
     </div>
     <!-- 分页 -->
@@ -74,6 +86,7 @@ import InputSearch from "@screen/components/InputSearch/index.vue";
 import { searchFormList } from "./data";
 import moment from "moment";
 import { Loading } from 'element-ui';
+import { e } from 'mathjs';
 
 export default {
   name: 'boardRecord',
@@ -88,15 +101,11 @@ export default {
     return {
       DirectionTypes,
       moment,
-      enum_channels: [
-        '手机短信',
-        '微信公众号',
-        '微博',
-        '情报板',
-        '服务网站',
-        '微信小程序',
-        '语音广播'
-      ],
+      enum_channels: {
+        4:'情报板',
+        7:'语音广播',
+        8:'企业微信',
+      },
       tableData: [],
       searchFormList,
       isShowPhrases: false,
@@ -112,7 +121,7 @@ export default {
     }
   },
   created() {
-    this.initData();
+    
   },
   methods: {
     onRefreshForm(){
@@ -164,7 +173,7 @@ export default {
             let link = document.createElement("a");
             link.style.display = "none";
             link.href = url;
-            link.setAttribute("download", "事件信息列表.xlsx");
+            link.setAttribute("download", "公众服务统计.xlsx");
             document.body.appendChild(link);
             link.click();
             URL.revokeObjectURL(link.href); // 释放URL 对象
@@ -212,8 +221,50 @@ export default {
         data: this.searchData,
       }).then((result) => {
         if (result.code != 200) return Message.error(result?.msg);
+        
+        result.rows.forEach(e => {
+            if(e.publishChannels === 4 || e.publishChannels === 7){
+              const contentDetailsInfo = JSON.parse(e.contentDetails)
+              if(e.publishChannels === 4){ //情报板
+                let msg = '情报板数据异常' + e.contentDetails
+                // 检查是否一键恢复
+                if(contentDetailsInfo.length > 0){
+                  if(contentDetailsInfo[0].functions.length > 1){
+                    const parameters = contentDetailsInfo[0].functions[1]?.params?.parameters
+                    if(parameters && parameters.length > 0){
+                      e.contentDetailsInfo = parameters
+                      msg = ''
+                    }
+                  }
+                  else if(contentDetailsInfo[0].functions.length > 0){
+                    if(contentDetailsInfo[0].functions[0].functionId && contentDetailsInfo[0].functions[0].functionId === '1B'){
+                      msg = '一键恢复操作'
+                    }
+                  }
+                }
+                e.contentDetails = msg
+              } else if(e.publishChannels === 7){
+                let msg = '语音广播数据异常'+e.contentDetails
+                console.log(contentDetailsInfo)
+                if(contentDetailsInfo.length > 0){
+                  if(contentDetailsInfo[0].functions.length > 0){
+                    msg = contentDetailsInfo[0].functions[0].params.text
+                  }
+                }
+                e.contentDetails = msg;
+              }
+            }
+        });
+        
         this.tableData = result.rows;
+        setTimeout(() => {
+          this.tableData = result.rows;
+        }, 200);
+        // this.$nextTick(()=>{
+          
+        // })
         this.total = result.total;
+        
       });
     },
 
@@ -236,8 +287,8 @@ export default {
   flex-direction: column;
 
   .filter {
-    height: 60px;
     display: flex;
+    margin-bottom: 10px;
     justify-content: space-between;
     align-items: center;
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/topComponent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/topComponent/index.vue
index 7a6e5393..433980a9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/topComponent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/topComponent/index.vue
@@ -2,7 +2,7 @@
   <div class="TrafficFlow">
     <section class="foot">
       <template v-for="(item, index) in topDatas">
-      <div class="item keep-ratio">
+      <div class="item">
         <div class="item-title">
           <span>
             {{ item.text }} <span class="num">{{ item.textNum }}</span
@@ -10,15 +10,12 @@
           >
         </div>
         <div class="item-body">
-          <div class="">
+          <!-- <div class="">
             <img :src="item.icon" />
-          </div>
+          </div> -->
           <div class="text-right">
-            <div v-for="(e,idx) in enum_channels">
-              <template v-if="item.reviewed[idx]>0">
-                {{e}} <span class="num">{{ item.reviewed[idx] }}</span> 起
-              </template>
-              <div v-else style="width: 200px"></div>
+            <div v-for="(e,idx) in enum_channels" style="display: flex;justify-content: space-between;">
+                <div style="width: 100px">{{e}}</div> <div class="num" :style="'margin:0px 10px;'+ (item.reviewed[idx]===0?'opacity: .3':'')">{{ item.reviewed[idx] }}</div> 起
             </div>
           </div>
         </div>
@@ -37,14 +34,15 @@ export default {
   data() {
     return {
       activeName: "first",
+      enum_channelType:{
+        4:0,
+        7:1,
+        8:2
+      },
       enum_channels: [
-        '手机短信',
-        '微信公众号',
-        '微博',
-        '情报板',
-        '服务网站',
-        '微信小程序',
-        '语音广播'
+        '情报板', //4
+        '语音广播',//7
+        '企业微信',//8
       ],
       topDatas: [
         {
@@ -52,77 +50,77 @@ export default {
           textEnd: "起",
           icon: require("./assets/交通事故.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "车辆故障",
           textEnd: "起",
           icon: require("./assets/车辆故障.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "交通管制",
           textEnd: "起",
           icon: require("./assets/交通管制.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "交通拥堵",
           textEnd: "起",
           icon: require("./assets/交通拥堵.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "非法上路",
           textEnd: "起",
           icon: require("./assets/非法上路.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "路障清除",
           textEnd: "起",
           icon: require("./assets/路障清除.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "施工建设",
           textEnd: "起",
           icon: require("./assets/施工建设.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "服务区异常",
           textEnd: "起",
           icon: require("./assets/服务区异常.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "设备设施隐患",
           textEnd: "起",
           icon: require("./assets/设备设施隐患.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "异常天气",
           textEnd: "起",
           icon: require("./assets/异常天气.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
         {
           text: "其他事件",
           textEnd: "起",
           icon: require("./assets/其他事件.png"),
           textNum: 0,
-          reviewed: [0,0,0,0,0,0,0],
+          reviewed: [0,0,0],
         },
       ],
     };
@@ -139,13 +137,9 @@ export default {
       })
         .then((result) => {
           if (result.code != 200) return;
-          if(result.data.length !== 77){
-            this.$message.warning('返回数据数量异常')
-            return;
-          }
           result.data.forEach(e => {
             this.topDatas[e.eventType-1].textNum = this.topDatas[e.eventType-1].textNum + e.number;
-            this.topDatas[e.eventType-1].reviewed[e.publishChannels-1] = e.number;
+            this.topDatas[e.eventType-1].reviewed[this.enum_channelType[e.publishChannels]] = e.number;
           });
         })
     },
@@ -195,8 +189,8 @@ export default {
     flex-direction: row;
     width: 100%;
     height: 100%;
-    justify-content: space-between;
-    align-items: center;
+ 
+    background-color: #132d38;
 
     .item {
       position: relative;
@@ -215,11 +209,12 @@ export default {
         flex-direction: row;
         justify-content: center;
         align-items: center;
-        background: linear-gradient(
-          180deg,
-          rgba(3, 60, 82, 0) 0%,
-          #033c52 100%
-        );
+        // background: linear-gradient(
+        //   180deg,
+        //   rgba(3, 60, 82, 0) 0%,
+        //   #033c52 100%
+        // );
+        background-color: #033c52;
         border-radius: 4px 4px 4px 4px;
         font-size: 16px;
         font-family: PingFang SC, PingFang SC;
@@ -262,7 +257,7 @@ export default {
           margin-right: 0px;
         }
 
-        span.num {
+        .num {
           font-size: 18px;
           font-family: PangMenZhengDao;
           font-weight: 400;
@@ -272,20 +267,25 @@ export default {
     }
 
     .item-line {
-      display: inline-flex;
-      top: 20px;
-      right: 0px;
-      width: 1px;
-      height: 116px;
-      background: linear-gradient(
-        90deg,
-        rgba(8, 135, 182, 0.2),
-        rgba(0, 100, 137, 1),
-        rgba(3, 60, 81, 0.2)
-      );
-      opacity: 1;
+      // display: inline-flex;
+      // top: 20px;
+      // right: 0px;
+      // width: 1px;
+      // height: 116px;
+      // background: linear-gradient(
+      //   90deg,
+      //   rgba(8, 135, 182, 0.2),
+      //   rgba(0, 100, 137, 1),
+      //   rgba(3, 60, 81, 0.2)
+      // );
+      // opacity: 1;
+      width: 2px;
+      height: 120px;
+      background: url("~@screen/images/divide.svg");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
     }
-    .item:last-child::after{ background: none;}
+    // .item:last-child::after{ background: none;}
   }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/charts.js
new file mode 100644
index 00000000..f724e234
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/charts.js
@@ -0,0 +1,438 @@
+var res = [
+  { value: 20, name: "交通事故" },
+  { value: 20, name: "车辆故障" },
+  { value: 15, name: "路障清除" },
+  { value: 10, name: "交通管制" },
+  { value: 5, name: "道路拥堵" },
+  { value: 5, name: "异常天气" },
+  { value: 5, name: "其他事件" },
+  { value: 10, name: "施工建设" },
+  { value: 10, name: "服务区异常" },
+];
+let angle = 0; //角度，用来做简单的动画效果的
+
+//获取圆上面某点的坐标(x0,y0表示坐标，r半径，angle角度)
+function getCirlPoint(x0, y0, r, angle) {
+  let x1 = x0 + r * Math.cos((angle * Math.PI) / 180);
+  let y1 = y0 + r * Math.sin((angle * Math.PI) / 180);
+  return {
+    x: x1,
+    y: y1,
+  };
+}
+
+//  var res = this.evaluatedCountList;
+var data1 = [],
+  data2 = [],
+  legendData = [];
+var curIndex = 0;
+var index = 0;
+
+for (var i = 0; i < res.length; i++) {
+  data1.push({
+    value: res[i].value,
+    name: res[i].name,
+  });
+  data2.push({
+    value: res[i].value,
+    name: res[i].name,
+    itemStyle: {
+      opacity: 0.4,
+    },
+  });
+  if (res[i].name != "") legendData.push(res[i].name);
+}
+// let decoDelta = 48;
+let decoDelta = 10;
+var options = {
+  color: [
+    "#2867FF",
+    "#58C3FF",
+    "#FF6A3B",
+    "#FDA474",
+    "#FEE58F",
+    "#8DFEBF",
+    "#66F4DC",
+    "#58C3FF",
+    "#33E27D",
+    "#5D8CFE",
+    "#FDA474",
+  ],
+  title: [
+    {
+      text: "999",
+      // top: "27%",
+      top: "33%",
+      textAlign: "center",
+      left: "49%",
+      textStyle: {
+        color: "#ffffff",
+        fontSize: 30,
+        fontFamily: "PangMenZhengDao",
+      },
+    },
+    {
+      text: "总数",
+      // top: "38%",
+      top: "48%",
+      textAlign: "center",
+      left: "49%",
+      textStyle: {
+        color: "rgba(242, 252, 253, 0.84)",
+        fontSize: 14,
+        fontWeight: 400,
+      },
+    },
+  ],
+  grid: {
+    top: "3%",
+    left: "6%",
+    right: "6%",
+    bottom: 0,
+    containLabel: true,
+  },
+  tooltip: {
+    trigger: "item",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
+  },
+  legend: {
+    show: false,
+    orient: "vertical",
+    height: "80px",
+    // left: "0%",
+    top: "68%",
+    itemWidth: 10,
+    itemHeight: 10,
+    icon: "circle",
+    textStyle: {
+      color: "#ffffff",
+      fontSize: 14,
+      lineHeight: 22,
+      rich: {
+        text: {
+          width: 80,
+          marginLeft: 32,
+          fontSize: 14,
+        },
+        number: {
+          fontSize: 14,
+          color: "#37E7FF",
+          marginLeft: 32,
+          fontWeight: "bold",
+        },
+        unit: {
+          fontSize: 14,
+        },
+      },
+    },
+    data: legendData,
+    formatter(name) {
+      const newData = res;
+      let tarValue = 0;
+      let total = 0;
+      for (let i = 0; i < newData.length; i++) {
+        total += newData[i].value;
+        if (newData[i].name === name) {
+          tarValue = newData[i].value;
+        }
+      }
+      var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
+      const arr = name + "  " + tarValue;
+      return `{text|${name}} {number|${tarValue} 起  }  {number|${percert}%}`;
+    },
+    pageIconColor: "#fff",
+    pageIconSize: 10,
+    pageTextStyle: {
+      color: "#fff",
+    },
+    type: "scroll",
+    pageButtonPosition: "end",
+  },
+  series: [
+    /** 饼图上刻度 */
+    {
+      type: "gauge",
+      // center: ["50%", "35%"],
+      // radius: "46%", // 错位调整此处
+      center: ["50%", "45%"],
+      radius: "60%", // 错位调整此处
+      startAngle: 0,
+      endAngle: 360,
+      splitNumber: 52,
+      axisLine: { show: false },
+      splitLine: {
+        // length: 39,
+        length: "2",
+        lineStyle: {
+          width: 5,
+          color: "#5CC5FF",
+        },
+      },
+      axisTick: { show: false },
+      axisLabel: { show: false },
+    },
+    /** 绘制外部圆弧-2-开始圆点 <left-top> */
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7;
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((350 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((350 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7,
+            startAngle: ((350 + -angle) * Math.PI) / 180,
+            endAngle: ((120 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7;
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((150 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((150 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7,
+            startAngle: ((150 + -angle) * Math.PI) / 180,
+            endAngle: ((-30 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8;
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((590 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((590 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8,
+            startAngle: ((590 + -angle) * Math.PI) / 180,
+            endAngle: ((350 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        let x0 = api.getWidth() / 2;
+        let y0 = api.getHeight() / 2 - decoDelta;
+        // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56;
+        let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8;
+        return {
+          type: "circle",
+          shape: {
+            /** 角度175° 外弧2开始角度 */
+            cx: x0 + r * Math.cos(((90 + -angle) * Math.PI) / 180),
+            cy: y0 + r * Math.sin(((90 + -angle) * Math.PI) / 180),
+            r: 4,
+          },
+          style: {
+            fill: "#5BC4FF",
+            stroke: "#5BC4FF",
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "custom",
+      coordinateSystem: "none",
+      renderItem: (params, api) => {
+        return {
+          type: "arc",
+          shape: {
+            cx: api.getWidth() / 2,
+            cy: api.getHeight() / 2 - decoDelta,
+            // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56,
+            r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8,
+            startAngle: ((90 + -angle) * Math.PI) / 180,
+            endAngle: ((160 + -angle) * Math.PI) / 180,
+          },
+          style: {
+            fill: "transparent",
+            stroke: "#5BC4FF66",
+            lineWidth: 2.6,
+          },
+          silent: true,
+        };
+      },
+      data: [0],
+    },
+    {
+      type: "pie",
+      // radius: ["45%", "40%"],
+      // center: ["50%", "35%"],
+      radius: ["60%", "52%"],
+      center: ["50%", "45%"],
+      z: 10,
+      label: {
+        show: false,
+        position: "center",
+        formatter: (params) => {
+          return params.name + "\r\n" + params.value;
+        },
+        rich: {
+          total: {
+            fontSize: 16,
+            color: "#04F5FE",
+          },
+          efficiency: {
+            fontSize: 12,
+            color: "#00FD6D",
+          },
+        },
+        color: "#FFFFFF",
+        fontSize: 12,
+        lineHeight: 16,
+      },
+      data: data1,
+      labelLine: {
+        show: false,
+      },
+      itemStyle: {
+        normal: {
+          borderRadius: "5",
+          borderWidth: 4,
+          borderType: "solid",
+          borderColor: "#0C2D3A",
+        },
+      },
+    },
+    {
+      type: "pie",
+      // radius: ["29%", "39%"],
+      // center: ["50%", "35%"],
+      radius: ["37%", "60%"],
+      center: ["50%", "45%"],
+      label: {
+        show: false,
+      },
+      data: data2,
+      labelLine: {
+        show: false,
+      },
+      itemStyle: {
+        normal: {
+          borderRadius: "5",
+          borderWidth: 4,
+          borderType: "solid",
+          borderColor: "#0C2D3A",
+        },
+      },
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/index.vue
new file mode 100644
index 00000000..02e0554a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/index.vue
@@ -0,0 +1,263 @@
+<template>
+ <div class="board">
+    <div class="charts " id="eventTypeAnalysis"></div>
+    <div class="legend-box">
+      <el-carousel height="200px" direction="vertical">
+        <el-carousel-item
+          v-for="(item, index) in dataList"
+          :key="index"
+          class="legend-item"
+        >
+          <div v-for="(items, index) in item" class="legend-items">
+            <span class="legend-name">{{ items.name }}</span>
+            <span class="legend-num">{{ items.value }} 起</span>
+            <span class="legend-percert">{{ items.percert }}%</span>
+          </div>
+        </el-carousel-item>
+      </el-carousel>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsStatistics from "./charts";
+import request from "@/utils/request";
+import { exportFile } from "@screen/utils/common";
+export default {
+  name: "RailWayDay",
+  components: {
+  },
+  data() {
+    return { 
+      enum_channels: [
+        '交通事故',
+        '车辆故障',
+        '交通管制',
+        '交通拥堵',
+        '非法上路',
+        '路障清除',
+        '施工建设',
+        '服务区异常',
+        '设施设备隐患',
+        '异常天气',
+        '其他事件'
+      ],
+      dataList: [] 
+    };
+  },
+
+  created() {},
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/manage/exportEventTypePublishManage",
+        filename: name,
+      });
+    },
+    bindEventTypePublishManage() {
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("eventTypeAnalysis"));
+      }
+      request({
+            url: `/business/manage/eventTypePublishManage`,
+            method: "post",
+            data: {},
+          })
+            .then((result) => {
+          if (result.code != 200) return;
+          let total = 0;
+          result.data.forEach((e,i) => {
+            total += e.number;
+          })
+          let legendData = [];
+          let data1=[],data2=[];
+          chartsStatistics.title[0].text = total.toString();
+          let _dataList = [];
+          result.data.forEach((e,i) => {
+        
+            const _name = this.enum_channels[i];
+             
+              if(e.number > 0){
+                _dataList.push({
+                name: _name,
+                value: e.number,
+                percert: total?(e.number/total*100).toFixed(2):0.00
+              })
+                legendData.push(_name)
+                data1.push({
+                  value: e.number,
+                  name: _name,
+                })
+                data2.push({
+                  value: e.number,
+                  name: _name,
+                  itemStyle: {
+                    opacity: 0.4,
+                  },
+                })
+              }
+          });
+          chartsStatistics.data = legendData;
+          chartsStatistics.series[9].data = data1;
+          chartsStatistics.series[10].data = data2;
+          
+          this.myChart.setOption(chartsStatistics);
+          const list = _dataList.reduce((acc, curr, index) => {
+                    if (index % 2 === 0) acc.push([]);
+                    acc[Math.floor(index / 2)].push(curr);
+                    return acc;
+                  }, []);
+                  this.dataList = list;
+        })  
+    },
+  },
+  mounted() {
+    this.$nextTick(()=>{
+      this.bindEventTypePublishManage();
+    })
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+
+.board {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  .charts {
+    flex:1;
+    width: 100%;
+  }
+  .legend-box {
+    width: 60%;
+    margin: auto;
+    margin-top: 0px;
+    height: 60px;
+    overflow: hidden;
+
+    .legend-item {
+      width: 100%;
+      /**
+        单个动画循环样式 勿删
+      */
+      // height: 30px;
+      // display: flex;
+      // justify-content: space-between;
+      // align-items: center;
+      // animation: 5s infinite roll;
+      // position: relative;
+
+      // &::before {
+      //   // position: absolute;
+      //   content: "";
+      //   width: 8px;
+      //   height: 8px;
+      //   left: 0px;
+      //   border-radius: 50%;
+      //   background: #37e7ff;
+      // }
+      .legend-items {
+        width: 100%;
+        height: 30px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        &::before {
+          // position: absolute;
+          content: "";
+          width: 8px;
+          height: 8px;
+          left: 0px;
+          border-radius: 50%;
+          background: #37e7ff;
+        }
+      }
+      .legend-name {
+        width: 100px;
+        margin-left: 10px;
+        font-size: 14px;
+      }
+      .legend-num,
+      .legend-percert {
+        width: 80px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 14px;
+        color: #37e7ff;
+        font-weight: bold;
+      }
+    }
+    .legend-item:nth-child(1) {
+      .legend-items:nth-child(1) {
+        &::before {
+          background: #2867ff;
+        }
+      }
+      .legend-items:nth-child(2) {
+        &::before {
+          background: #58c3ff;
+        }
+      }
+    }
+    .legend-item:nth-child(2) {
+      .legend-items:nth-child(1) {
+        &::before {
+          background: #ff6a3b;
+        }
+      }
+      .legend-items:nth-child(2) {
+        &::before {
+          background: #fda474;
+        }
+      }
+    }
+    .legend-item:nth-child(3) {
+      .legend-items:nth-child(1) {
+        &::before {
+          background: #fee58f;
+        }
+      }
+      .legend-items:nth-child(2) {
+        &::before {
+          background: #8dfebf;
+        }
+      }
+    }
+    .legend-item:nth-child(4) {
+      .legend-items:nth-child(1) {
+        &::before {
+          background: #66f4dc;
+        }
+      }
+      .legend-items:nth-child(2) {
+        &::before {
+          background: #33e27d;
+        }
+      }
+    }
+    .legend-item:nth-child(5) {
+      .legend-items:nth-child(1) {
+        &::before {
+          background: #5d8cfe;
+        }
+      }
+      .legend-items:nth-child(2) {
+        &::before {
+          background: #8dfebf;
+        }
+      }
+    }
+  }
+}
+
+::v-deep .el-carousel__indicators--vertical {
+  display: none;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue
index 972820fe..1918ce5c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index.vue
@@ -1,22 +1,43 @@
 <template>
-  <div class="public_service_statistic">
-
-      <el-tabs class="content_tab" v-model="activeName" @tab-click="changeTabs">
+  <div class="public_service_statistic" :style="menu.isRecentOpen?'height:calc(100vh - 90px)':'height:calc(100vh - 60px)'">
+      <el-tabs class="content_tab" v-model="activeName">
         <el-tab-pane label="公众服务统计分析" name="first" class="con_tab first_tab">
           <TopComponent class="line_01"/>
           <div class="line_02">
-            <ChannelAnalytics class="unit" />
-            <EventTypeAnalysis class="unit" />
-            <NucleusThrough class="unit2" />
-            <!-- <PostTrendsDay class="unit" /> -->
+            <section class="cleft">
+              <div class="title"><div class="icon"></div>今日发布渠道分析
+              <ChartExport @export="$refs.refChannelAnalytics.export('今日发布渠道分析')" /></div>
+              <ChannelAnalytics v-show="isKeep" ref="refChannelAnalytics" />
+            </section>
+            <section class="cleft" style="margin:0px 10px">
+              <div class="title"><div class="icon"></div>今日发布事件类型分析
+              <ChartExport @export="$refs.refEventTypeAnalysis.export('今日发布事件类型分析')" /></div>
+               <EventTypeAnalysis ref="refEventTypeAnalysis" />
+            </section>
+            <section class="cright" style="flex:1;">
+              <div class="title"><div class="icon"></div>今日发布趋势分析
+              <ChartExport @export="$refs.refPostTrendsDay.export('今日发布趋势分析')" /></div>
+              <PostTrendsDay v-show="isKeep" ref="refPostTrendsDay" />
+            </section>
           </div>
           <div class="line_03">
-            <PostTrendsMonth class="unit" />
-            <PostTrendsDay class="unit" />
+            <Search ref="refSearch" @search="bind"></Search>
+            <div class="chartPanel">
+            <section class="cright" style="width:calc(50vw + 10px); margin-right: 10px;">
+              <div class="title"><div class="icon"></div>月发布渠道趋势分析
+              <ChartExport @export="$refs.refPostTrendsMonth.export('月发布渠道趋势分析')" /></div>
+                <PostTrendsMonth v-show="isKeep" ref="refPostTrendsMonth" />
+            </section>
+            <section class="cright" style="flex:1;">
+              <div class="title"><div class="icon"></div>各事件发布渠道分析
+              <ChartExport @export="$refs.refNucleusThrough.export('各事件发布渠道分析')" /></div>
+              <NucleusThrough v-show="isKeep" ref="refNucleusThrough" />
+            </section>
+          </div>
           </div>
         </el-tab-pane>
         <el-tab-pane label="公众服务统计查询" name="second" class="con_tab">
-          <Record />
+          <Record v-show="isKeep" ref="refRecord" />
         </el-tab-pane>
       </el-tabs>
 
@@ -25,13 +46,17 @@
 
 <script>
 import TopComponent from "./components/topComponent";
-import ChannelAnalytics from "./components/channelAnalytics";
-import EventTypeAnalysis from "./components/eventTypeAnalysis";
+import ChannelAnalytics from "./channelAnalytics";
+import EventTypeAnalysis from "./eventTypeAnalysis";
 import AuditAnalytics from "./components/auditAnalytics";
-import PostTrendsDay from "./components/postTrendsDay";
-import PostTrendsMonth from "./components/postTrendsMonth";
-import NucleusThrough from "./components/nucleusThrough";
+import PostTrendsDay from "./postTrendsDay";
+import PostTrendsMonth from "./postTrendsMonth";
+import NucleusThrough from "./nucleusThrough";
+import Search from "./search";
 import Record from "./components/record";
+import {  mapState } from "vuex";
+import { delay } from "@screen/utils/common";
+import ChartExport from "@screen/components/ChartExport/index.vue"
 
 export default {
   name: "publicService",
@@ -44,15 +69,60 @@ export default {
     PostTrendsDay,
     PostTrendsMonth,
     NucleusThrough,
+    Search,
+    ChartExport
+  },
+  computed: {
+    ...mapState(["menu"]),
   },
   data() {
     return {
       activeName: "first",
+      isKeep: true
     };
   },
+  watch: {
+    activeName(v) {
+      if(v === 'second'){
+        setTimeout(() => {
+          this.$refs.refRecord.initData();
+        }, 200);
+      }
+    },
+  },
   methods: {
-    changeTabs() {},
+    bind(){
+      const dateTime = this.$refs.refSearch.getQuery();
+      this.$refs.refPostTrendsMonth.bind(dateTime);
+      this.$refs.refNucleusThrough.bind(dateTime);
+    }
+    
   },
+  mounted() {
+    this.$nextTick(()=>{
+      this.bind();
+
+      window.addEventListener("resize", async () => {
+        this.isKeep = false;
+        await delay(100)
+        this.$refs.refChannelAnalytics.myChart.resize();
+        this.$refs.refEventTypeAnalysis.myChart.resize();
+        this.$refs.refPostTrendsDay.myChart.resize();
+        this.$refs.refPostTrendsMonth.myChart.resize();
+        this.$refs.refNucleusThrough.myChart.resize();
+        await delay(100)
+        this.isKeep = true;
+        this.$nextTick(()=>{
+          this.$refs.refChannelAnalytics.myChart.resize();
+          this.$refs.refEventTypeAnalysis.myChart.resize();
+          this.$refs.refPostTrendsDay.myChart.resize();
+          this.$refs.refPostTrendsMonth.myChart.resize();
+          this.$refs.refNucleusThrough.myChart.resize();
+        })
+        
+      });
+    })
+  }
 };
 </script>
 
@@ -77,7 +147,24 @@ export default {
   background-color: #133242;
   opacity: 0.1;
 }
-
+.cleft{
+  width: 25vw;
+}
+.cright{
+  
+}
+.title{
+  display: flex;
+  position: absolute;
+  align-items: center;
+  .icon {
+    width: 5px;
+    height: 16px;
+    background-color: #3DE8FF;
+    margin-right: 10px;
+    border-radius: 2px;
+  }
+}
 .public_service_statistic {
   width: 100%;
   height: 100%;
@@ -104,19 +191,22 @@ export default {
     }
     .line_02{
       flex: 1;
-      height: 0;
       display: flex;
       margin-bottom: 16px;
-      .unit{ margin-right: 16px; flex: 1; width: 0;}
-      .unit2{width: 50%;margin-left:-4px}
-      .unit:last-child{ margin-right: 0;}
+      background-color: #132d38;
+      padding: 10px;
     }
     .line_03{
-      height: 0;
+      height: 330px;
+      display: flex; 
+      flex-direction: column;
+      background-color: #132d38;
+      padding: 10px;
+    }
+    .chartPanel{
+      display: flex;
+      flex-direction: row;
       flex: 1;
-      display: flex; align-items: stretch;
-      .unit{ margin-right: 16px; flex: 1; }
-      .unit:last-child{ margin-right: 0;}
     }
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index2.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index2.vue
new file mode 100644
index 00000000..a8f9c5bd
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/index2.vue
@@ -0,0 +1,123 @@
+<template>
+  <div class="public_service_statistic" :style="menu.isRecentOpen?'height:calc(100vh - 90px)':'height:calc(100vh - 60px)'">
+      <el-tabs class="content_tab" v-model="activeName" @tab-click="changeTabs">
+        <el-tab-pane label="公众服务统计分析" name="first" class="con_tab first_tab">
+          <TopComponent class="line_01"/>
+          <div class="line_02">
+            <ChannelAnalytics class="unit" />
+            <EventTypeAnalysis class="unit" />
+            <NucleusThrough class="unit2" />
+          </div>
+          <div class="line_03">
+            <PostTrendsMonth class="unit" />
+            <PostTrendsDay class="unit" />
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="公众服务统计查询" name="second" class="con_tab">
+          <Record />
+        </el-tab-pane>
+      </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import TopComponent from "./components/topComponent";
+import ChannelAnalytics from "./components/channelAnalytics";
+import EventTypeAnalysis from "./components/eventTypeAnalysis";
+import AuditAnalytics from "./components/auditAnalytics";
+import PostTrendsDay from "./components/postTrendsDay";
+import PostTrendsMonth from "./components/postTrendsMonth";
+import NucleusThrough from "./components/nucleusThrough";
+import Record from "./components/record";
+import {  mapState } from "vuex";
+
+export default {
+  name: "publicService",
+  components: {
+    Record,
+    TopComponent,
+    ChannelAnalytics,
+    EventTypeAnalysis,
+    AuditAnalytics,
+    PostTrendsDay,
+    PostTrendsMonth,
+    NucleusThrough,
+  },
+  computed: {
+    ...mapState(["menu"]),
+  },
+  data() {
+    return {
+      activeName: "first",
+    };
+  },
+  methods: {
+    changeTabs() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-tabs__item {
+  display: inline-flex;
+  justify-content: center;
+  font-size: 16px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 500;
+  color: #ffffff;
+  min-width: 128px;
+  position: relative;
+  // left: 10px;
+}
+
+::v-deep .el-tabs__active-bar {
+  min-width: 128px;
+}
+
+::v-deep .el-tabs__nav-wrap::after {
+  background-color: #133242;
+  opacity: 0.1;
+}
+
+.public_service_statistic {
+  width: 100%;
+  height: 100%;
+  padding: 15px;
+  display: flex; justify-content: stretch; align-items: stretch;
+  // position: relative;
+  z-index: 6;
+  color: white;
+  overflow: hidden;
+
+  .content_tab{
+    display: flex; flex-direction: column; flex: 1;
+    ::v-deep .el-tabs__header{}
+    ::v-deep .el-tabs__content{ flex: 1;}
+  }
+
+  .con_tab{
+    width: 100%; height: 100%;
+  }
+  .first_tab{
+    display: flex; flex-direction: column;
+    .line_01 {
+      flex-basis: 140px; margin-bottom: 16px;
+    }
+    .line_02{
+      flex: 1;
+      display: flex;
+      margin-bottom: 16px;
+      .unit{ margin-right: 16px; flex: 1; width: 0;}
+      .unit2{width: 50%;margin-left:-4px}
+      .unit:last-child{ margin-right: 0;}
+    }
+    .line_03{
+      height: 300px;
+      display: flex; align-items: stretch;
+      .unit{ margin-right: 16px; flex: 1; }
+      .unit:last-child{ margin-right: 0;}
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/nucleusThrough/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/nucleusThrough/index.vue
new file mode 100644
index 00000000..087b3294
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/nucleusThrough/index.vue
@@ -0,0 +1,265 @@
+<template>
+  <div class="charts" id="nucleusThrough"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import request from "@/utils/request";
+import { exportFile } from "@screen/utils/common";
+export default {
+  name: "nucleusThrough",
+  components: {
+  },
+  data() {
+    return {
+      enum_channelType: {
+        4: 0,
+        7: 1,
+        8: 2
+      },
+    };
+  },
+
+  created() { },
+  methods: {
+
+    export(name){
+      exportFile({
+        method:'get',
+        url: `/business/manage/exportEventTypePublishManageMonth`,
+        filename: name,
+        data: this.data
+      });
+    },
+    bind(dateTime) {
+      if (!this.myChart) {
+        this.myChart = echarts.init(document.getElementById("nucleusThrough"));
+      }
+      this.data = { publishTime: moment(dateTime).format('YYYY-MM-DD HH:mm:ss') }
+      request({
+        url: `/business/manage/eventTypePublishManageMonth`,
+        method: "post",
+        data: this.data
+      })
+        .then((result) => {
+         
+          if (result.code != 200) return;
+
+          const totalData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+          result.data.forEach(e => {
+            totalData[e.eventType - 1] = totalData[e.eventType - 1] + e.number
+          });
+
+          const rawData = [[], [], []]
+          result.data.forEach(e => {
+            rawData[this.enum_channelType[e.publishChannels]].push(e.number)
+          });
+          const event_type = [
+            '交通事故',
+            '车辆故障',
+            '交通管制',
+            '交通拥堵',
+            '非法上路',
+            '路障清除',
+            '施工建设',
+            '服务区异常',
+            '设施设备隐患',
+            '异常天气',
+            '其他事件'
+          ]
+          const color = [
+            {
+              areaStyle: {
+                width: 4,
+                opacity: 0.25,
+                color: {
+                  type: "linear",
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    { offset: 0.389, color: "#FB6D0799" },
+                    { offset: 1, color: "#FB6D0700" },
+                  ],
+                  global: false,
+                },
+              },
+              // yAxisIndex: 1, // 与第二个 y 轴关联
+              itemStyle: {
+                color: "#FB6D07",
+              }
+            }, {
+              areaStyle: {
+                width: 4,
+                opacity: 0.25,
+                color: {
+                  type: "linear",
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    { offset: 0.389, color: "#08BAF490" },
+                    { offset: 1, color: "#08BAF400" },
+                  ],
+                  global: false,
+                },
+              },
+              // yAxisIndex: 1, // 与第二个 y 轴关联
+              itemStyle: {
+                color: "#08BAF4",
+              }
+            }, {
+              areaStyle: {
+                width: 4,
+                opacity: 0.25,
+                color: {
+                  type: "linear",
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [
+                    { offset: 0.389, color: "#51BFA490" },
+                    { offset: 1, color: "#51BFA400" },
+                  ],
+                  global: false,
+                },
+              },
+              // yAxisIndex: 1, // 与第二个 y 轴关联
+              itemStyle: {
+                color: "#51BFA4",
+              }
+            }
+          ]
+          const series = [
+            '情报板',
+            '语音广播',
+            '企业微信',
+          ].map((name, sid) => {
+            return {
+              name,
+              type: 'bar',
+              stack: 'total',
+              barWidth: '60%',
+              label: {
+                show: true,
+                formatter: (params) => {
+                  if (params.value > 0) {
+                    return Math.round(params.value * 1000) / 10 + '%'
+                  } else {
+                    return '';
+                  }
+
+                }
+              },
+              data: rawData[sid].map((d, did) =>
+                totalData[did] <= 0 ? 0 : d / totalData[did]
+              ),
+              ...color[sid]
+            };
+          });
+
+          const option = {
+            legend: {
+              icon: "circle",
+              itemHeight: 8,
+              itemWidth: 8,
+              top: 0,
+              right: "0%",
+              textStyle: {
+                color: "#fff",
+              },
+            },
+            grid: {
+              left: "0",
+              right: "0",
+              top: "50px",
+              bottom: "0px",
+              containLabel: true,
+            },
+            yAxis: {
+              type: 'value',
+              axisLabel: {
+                fontSize: 10,
+                color: "#fff",
+                formatter: function (params) {
+                  return Math.round(params * 1000) / 10 + "%";
+                },
+              },
+            },
+            tooltip: {
+              show: true,
+              trigger: "axis",
+              formatter: function (params) {
+                let result = '<span style="font-size:14px;font-weight: 600;color: #20253B">' + params[0].axisValue + '</span><br>';
+                params.forEach(p => {
+                  if (p.data > 0) {
+                    result += '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + p.color + '"></span><span style="color: #20253B">' + p.seriesName + '</span>' + '：' + (rawData[p.seriesIndex][p.dataIndex]) + '次<br>'
+                  }
+                });
+                return result;
+              },
+            },
+            xAxis: {
+              type: 'category',
+              data: event_type,
+              axisLabel: {
+                interval: 0,
+                align: "center",
+                rotate: "1",
+                margin: "20",
+                textStyle: {
+                  fontSize: 10,
+                  color: "#fff",
+                },
+                formatter: function (value) {
+                  var ret = "";//拼接加\n返回的类目项
+                  var maxLength = 2;//每项显示文字个数
+                  var valLength = value.length;//X轴类目项的文字个数
+                  var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
+                  if (rowN > 1)//如果类目项的文字大于3,
+                  {
+                    for (var i = 0; i < rowN; i++) {
+                      var temp = "";//每次截取的字符串
+                      var start = i * maxLength;//开始截取的位置
+                      var end = start + maxLength;//结束截取的位置
+                      //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
+                      temp = value.substring(start, end) + "\n";
+                      ret += temp; //凭借最终的字符串
+                    }
+                    return ret;
+                  }
+                  else {
+                    return value;
+                  }
+                }
+              },
+            },
+            series
+          };
+          this.myChart.setOption(option);
+        })
+    },
+  },
+  mounted() {
+    // this.$nextTick(()=>{
+    //   this.init();
+    // })
+    // setTimeout(() => {
+    //   this.$nextTick(() => {
+    //     var myChart = echarts.init(document.getElementById("nucleusThrough"));
+    //     myChart.setOption(chartsStatistics);
+    //   });
+    // });
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.charts {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/charts.js
new file mode 100644
index 00000000..1015a838
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/charts.js
@@ -0,0 +1,249 @@
+/* 数据 */
+let nameList = [
+  "00:00",
+  "01:00",
+  "02:00",
+  "03:00",
+  "04:00",
+  "05:00",
+  "06:00",
+  "07:00",
+  "08:00",
+  "09:00",
+  "10:00",
+  "11:00",
+  "12:00",
+  "13:00",
+  "14:00",
+  "15:00",
+  "16:00",
+  "17:00",
+  "18:00",
+  "19:00",
+  "20:00",
+  "21:00",
+  "22:00",
+  "23:00",
+]; // 类别
+let valueList = [
+  800, 520, 650, 950, 420, 600, 450, 720, 303, 503, 203, 703, 903,
+]; // 人数
+var yList = ["1000", "800", "轻度拥堵", "基本畅通", "畅通"];
+/* 数据整合 */
+let dataList = [];
+nameList.map((item, index) => {
+  if (index === 4) {
+    dataList.push({
+      name: item,
+      value: valueList[index],
+      itemStyle: {
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            {
+              offset: 0,
+              color: "#FFB904", // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: "#FF6969", // 100% 处的颜色
+            },
+          ],
+          global: false, // 缺省为 false
+        },
+        borderRadius: 6,
+      },
+      label: { show: false },
+    });
+  } else {
+    dataList.push({
+      name: item,
+      value: valueList[index],
+      itemStyle: {
+        borderRadius: 6,
+      },
+    });
+  }
+});
+
+var options = {
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    valueFormatter: function (value) {
+      return value + " 次";
+    },
+  },
+  legend: {
+    // orient: 'vertical',
+    icon: "circle",
+    itemHeight: 8,
+    itemWidth: 8,
+    top: "0px",
+    right: "0px",
+    textStyle: {
+      color: "#fff",
+    },
+  },
+  grid: {
+    top: "75px", //上边距
+    right: "0", //右边距
+    left: "3px", //左边距
+    bottom: "20px", //下边距
+    containLabel: true,
+  },
+  xAxis: {
+    type: "category",
+    data: nameList,
+    axisTick: {
+      show: false, //隐藏X轴刻度
+    },
+    axisLine: {
+      lineStyle: {
+        color: "rgba(49, 217, 255, 0.8)",
+      },
+    },
+    axisLabel: {
+      show: true,
+      color: "#fff",
+      fontSize: 10,
+    },
+  },
+  yAxis: [
+    {
+      type: "value",
+      name: "(次)",
+      nameTextStyle: {
+        color: "#fff",
+        fontSize: 10,
+        align: "right",
+        verticalAlign: "center",
+      },
+      axisLabel: {
+        fontSize: 10,
+        color: "#fff",
+        // formatter:function(value,index){
+        //    return yList[index]
+        // }
+      },
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        lineStyle: {
+          color: "rgba(49, 217, 255, 0.5)",
+        },
+      },
+    },
+  ],
+  series: [
+    {
+      name: "情报板",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#FB6D07",
+      },
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#FB6D0799" },
+            { offset: 1, color: "#FB6D0700" },
+          ],
+          global: false,
+        },
+      },
+      lineStyle: {
+        width: 2,
+      },
+      data: [],
+    },
+    {
+      name: "语音广播",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#08BAF4",
+      },
+      lineStyle: {
+        width: 2,
+      },
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#08BAF490" },
+            { offset: 1, color: "#08BAF400" },
+          ],
+          global: false,
+        },
+      },
+      data: [],
+    },
+    {
+      name: "企业微信",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+  
+      lineStyle: {
+        width: 2,
+      },
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#51BFA490" },
+            { offset: 1, color: "#51BFA400" },
+          ],
+          global: false,
+        },
+      },
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#51BFA4",
+      },
+      data: [],
+    },
+   
+   
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/index.vue
new file mode 100644
index 00000000..09f7394c
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/index.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="charts" id="postTrendsDay"></div>
+</template>
+  
+<script>
+import * as echarts from "echarts";
+import chartsStatistics from "./charts";
+import request from "@/utils/request";
+import { exportFile } from "@screen/utils/common";
+export default {
+  name: 'RailWayDay',
+  components: {
+  },
+  data() {
+    return {
+      enum_channelType:{
+        4:0,
+        7:1,
+        8:2
+      },
+    }
+  },
+
+  created() {
+
+  },
+  methods: {
+    export(name){
+      exportFile({
+        method:'get',
+        url: "/business/manage/exportTrendsPublishManage",
+        filename: name,
+      });
+    },
+    bindTrendsPublishManage(){
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("postTrendsDay"));
+      }
+      request({
+          url: `/business/manage/trendsPublishManage`,
+          method: "post",
+          data: {},
+        })
+          .then((result) => {
+        if (result.code != 200) return;
+          let sdata = [[],[],[]]
+          for(let i of result.data){
+            sdata[this.enum_channelType[i.publishChannels]].push(i.number)
+          }
+          chartsStatistics.series.forEach((e,i) => {
+            e.data = sdata[i]
+          });
+          this.myChart.setOption(chartsStatistics);
+      }) 
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.bindTrendsPublishManage();
+    })
+    
+    // setTimeout(() => {
+    //   this.$nextTick(() => {
+    //     var myChart = echarts.init(document.getElementById('postTrendsDay'));
+    //     myChart.setOption(chartsStatistics);
+    //   });
+    // });
+  },
+}
+</script>
+  
+<style lang='scss' scoped>
+
+
+.charts {
+  height: 100%;
+  width: 100%;
+}
+</style>
+  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/charts.js
new file mode 100644
index 00000000..f49071ba
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/charts.js
@@ -0,0 +1,246 @@
+/* 数据 */
+let nameList = [
+  "00:00",
+  "01:00",
+  "02:00",
+  "03:00",
+  "04:00",
+  "05:00",
+  "06:00",
+  "07:00",
+  "08:00",
+  "09:00",
+  "10:00",
+  "11:00",
+  "12:00",
+  "13:00",
+  "14:00",
+  "15:00",
+  "16:00",
+  "17:00",
+  "18:00",
+  "19:00",
+  "20:00",
+  "21:00",
+  "22:00",
+  "23:00",
+]; // 类别
+let valueList = [
+  800, 520, 650, 950, 420, 600, 450, 720, 303, 503, 203, 703, 903, 903,
+]; // 人数
+/* 数据整合 */
+let dataList = [];
+nameList.map((item, index) => {
+  if (index === 4) {
+    dataList.push({
+      name: item,
+      value: valueList[index],
+      itemStyle: {
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            {
+              offset: 0,
+              color: "#FFB904", // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: "#FF6969", // 100% 处的颜色
+            },
+          ],
+          global: false, // 缺省为 false
+        },
+        borderRadius: 6,
+      },
+      label: { show: false },
+    });
+  } else {
+    dataList.push({
+      name: item,
+      value: valueList[index],
+      itemStyle: {
+        borderRadius: 6,
+      },
+    });
+  }
+});
+
+var options = {
+  tooltip: {
+    show: true,
+    trigger: "axis",
+    valueFormatter: function (value) {
+      return value + " 起";
+    },
+  },
+  legend: {
+    // orient: 'vertical',
+    icon: "circle",
+    itemHeight: 8,
+    itemWidth: 8,
+    top: 0,
+    right: 0,
+    textStyle: {
+      color: "#fff",
+    },
+  },
+  grid: {
+    top: "50px", //上边距
+    right: "0", //右边距
+    left: "3px", //左边距
+    bottom: "20px", //下边距
+    containLabel: true,
+  },
+  xAxis: {
+    type: "category",
+    data: nameList,
+    axisTick: {
+      show: false, //隐藏X轴刻度
+    },
+    axisLine: {
+      lineStyle: {
+        color: "rgba(49, 217, 255, 0.8)",
+      },
+    },
+    axisLabel: {
+      show: true,
+      color: "#fff",
+      fontSize: 10,
+    },
+  },
+  yAxis: [
+    {
+      type: "value",
+      name: "(起)",
+      nameTextStyle: {
+        color: "#fff",
+        fontSize: 10,
+        align: "right",
+        verticalAlign: "center",
+      },
+      axisLabel: {
+        fontSize: 10,
+        color: "#fff",
+        //   fontFamily: "HarmonyOS Sans-Regular",
+        // formatter:function(value,index){
+        //    return yList[index]
+        // }
+      },
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
+      splitLine: {
+        lineStyle: {
+          color: "rgba(49, 217, 255, 0.5)",
+        },
+      },
+    },
+  ],
+  series: [
+    
+    {
+      name: "情报板",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#FB6D07",
+      },
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#FB6D0799" },
+            { offset: 1, color: "#FB6D0700" },
+          ],
+          global: false,
+        },
+      },
+      lineStyle: {
+        width: 2,
+      },
+      data: [],
+    },
+   
+    {
+      name: "语音广播",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#08BAF4",
+      },
+      lineStyle: {
+        width: 2,
+      },
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#08BAF490" },
+            { offset: 1, color: "#08BAF400" },
+          ],
+          global: false,
+        },
+      },
+      data: [],
+    },
+    {
+      name: "企业微信",
+      type: "line",
+      symbol: "circle",
+      symbolSize: 0,
+      smooth: true,
+      areaStyle: {
+        width: 4,
+        opacity: 0.25,
+        color: {
+          type: "linear",
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
+          colorStops: [
+            { offset: 0.389, color: "#51BFA490" },
+            { offset: 1, color: "#51BFA400" },
+          ],
+          global: false,
+        },
+      },
+      // yAxisIndex: 1, // 与第二个 y 轴关联
+      itemStyle: {
+        color: "#51BFA4",
+      },
+      lineStyle: {
+        width: 2,
+      },
+      data: [],
+    },
+  ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/index.vue
new file mode 100644
index 00000000..87734602
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/index.vue
@@ -0,0 +1,99 @@
+<template>
+<div class="charts " id="postTrendsMonth"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import chartsStatistics from "./charts";
+import request from "@/utils/request";
+import moment from "moment";
+import { exportFile } from "@screen/utils/common";
+export default {
+  name: "postTrendsMonth",
+  components: {
+  },
+  data() {
+    return {
+      dateTime: "",
+      enum_channelType:{
+        4:0,
+        7:1,
+        8:2
+      },
+    };
+  },
+
+  created() {},
+  methods: {
+
+    export(name){
+      exportFile({
+        method:'get',
+        url: `/business/manage/exportMonthTrendsPublishManage`,
+        filename: name,
+        data:this.data,
+      });
+    },
+    bind(dateTime){
+      if(!this.myChart){
+        this.myChart = echarts.init(document.getElementById("postTrendsMonth"));
+      }
+      
+      const timeSearch = moment(dateTime).format('YYYY-MM-DD HH:mm:ss');
+      this.data = {publishTime:timeSearch}
+      request({
+          url: `/business/manage/monthTrendsPublishManage`,
+          method: "post",
+          data:this.data,
+        })
+          .then((result) => {
+        if (result.code != 200) return;
+          //
+          const start = 1; //当前日期当月第一天
+          //如果是本月的话则取当天
+          let end =  0;
+          if(timeSearch.substr(0,7) === moment().format('YYYY-MM')){
+            end = parseInt(moment().endOf('second').format('DD')) //当前日期
+          } else {
+            end = parseInt(moment(dateTime).endOf('month').format('DD')) //当前日期
+          }
+          const _xAsix = [];
+          for(let i = start; i <= end; i++){
+            _xAsix.push((i<10?'0'+i.toString():i.toString())+'日')
+          }
+         
+          let sdata = [[],[],[]]
+         
+          _xAsix.forEach(x=>{
+            sdata.forEach(s=>{
+              s.push(0)
+            })
+          })
+          for(let i of result.data){
+            let d = parseInt(i.publishTime.substr(8,2))-1
+            sdata[this.enum_channelType[i.publishChannels]][d] = i.number
+          }
+          chartsStatistics.series.forEach((e,i) => {
+            e.data = sdata[i]
+          });
+          chartsStatistics.xAxis.data = _xAsix
+       
+          this.myChart.setOption(chartsStatistics);
+      })
+    },
+    
+  },
+  mounted() {
+   
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+ 
+.charts {
+  height: 100%;
+  width: 100%;
+}
+
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/search/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/search/index.vue
new file mode 100644
index 00000000..ebea3241
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/search/index.vue
@@ -0,0 +1,129 @@
+<template>
+   <div class="searchPanel ">
+        <el-date-picker
+          size="mini"
+          type="month"
+          class="selectRoad"
+          v-model="dateTime"
+          style="width: 140px"
+          placeholder="请选择"
+        />
+        <!-- <el-quarter-picker
+          size="mini"
+          class="selectRoad"
+          style="width: 180px"
+          v-if="year == 'quarter'"
+          v-model="quarter"
+          aria-placeholder="请选季度"
+        /> -->
+
+        <el-button
+          type="primary"
+          size="mini"
+          class="btnSearch"
+          icon="el-icon-search"
+          @click="searchQuery"
+          >查询</el-button
+        >
+        <el-button class="btnReset" size="mini" icon="el-icon-refresh-left"
+                   @click="onReset"
+        >重置</el-button
+        >
+      </div>
+</template>
+<script>
+import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
+
+import { getRoadSectionList } from "@/api/event/perceiveEvent";
+import moment from "moment";
+
+
+export default {
+  name: "EventQuery",
+  components: {
+    RadioGroup,
+  },
+  data() {
+    return {
+      dateTime: "",
+    }
+  },
+
+  created() { },
+  methods: {
+    getQuery(){
+      return this.dateTime
+    },
+    searchQuery() {
+      this.$emit('search');
+    },
+    onReset() {
+      this.dateTime = new Date();
+      this.searchQuery();
+    },
+  },
+  mounted() {
+    this.dateTime = new Date();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+ .searchPanel {
+      display: flex;
+      align-items: center;
+      height: 40px;
+      width: 100%;
+      font-size: 14px;
+      margin-bottom: 10px;
+      right: 0px;
+      top: 0px;
+      z-index: 9;
+
+      div {
+        white-space: nowrap;
+        margin-right: 4px;
+      }
+
+      .inputZh {
+        width: 47px;
+
+        ::v-deep {
+          .el-input__inner {
+            background-color: #064258 !important;
+            border-width: 0px !important;
+          }
+        }
+      }
+
+      .inputJl {
+        margin-left: 5px;
+        margin-right: 10px;
+      }
+
+      .selectRoad {
+        width: 89px;
+        border: 1px solid #00b3cc;
+
+        ::v-deep {
+          .el-input__inner {
+            background-color: #064258 !important;
+            border-width: 0px !important;
+          }
+        }
+      }
+
+      .btnSearch {
+        background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+        margin-left: 10px;
+        border-color: transparent;
+      }
+
+      .btnReset {
+        background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+        border-color: transparent;
+        color: white;
+      }
+    }
+  
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
index 75b57ef5..03f920d5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/components/AddNEditDialog.vue
@@ -124,7 +124,7 @@ export default {
           .then((result) => {
             if (result.code != 200) return;
 
-            Message.success(`提交成功!`);
+            Message.success(`提交成功`);
             this.$emit("onSuccess");
 
             this.modelVisible = false;
@@ -135,7 +135,7 @@ export default {
               "font-size:15px; background:#547bf2; color:#98bfff;",
               err
             );
-            // Message.error(`提交失败!`);
+            // Message.error(`提交失败`);
           })
           .finally(() => {
             this.submitting = false;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
index e2841a55..1702eb10 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@@ -13,6 +13,18 @@
           </template>
           新增
         </ButtonGradient>
+        <ButtonGradient @click.native="handleExportTemplate">
+          <template #prefix>
+            <img src="@screen/images/import.svg" />
+          </template>
+          敏感词模板
+        </ButtonGradient>
+        <ButtonGradient @click.native="uploadFile">
+          <template #prefix>
+            <img src="@screen/images/export.svg" />
+          </template>
+          批量导入
+        </ButtonGradient>
         <ButtonGradient @click.native="handleExport">
           <template #prefix>
             <img src="@screen/images/export.svg" />
@@ -39,53 +51,69 @@
     </div>
 
     <div class="body">
-      <Empty
-        v-if="!data.length && !isFirst"
-        class="no-data"
-        style="position: absolute"
-        >暂无数据</Empty
-      >
-      <template v-else>
-        <div
-          class="cardBox"
-          v-for="(item, index) in data"
-          :key="index"
-          style="overflow: hidden; height: 145px"
+
+      <div class="content">
+     
+        <Empty
+          v-if="!data.length && !isFirst"
+          class="no-data"
+          style="position: absolute"
+          >暂无数据</Empty
         >
-          <Card
-            :buttonIcon="null"
-            :keyMap="keyMap"
-            :cardData="item"
-            class="card"
-            buttonText="详情"
+        <div class="scrollPanel" v-else>
+          <div
+            class="cardBox"
+            v-for="(item, index) in data"
+            :key="index"
+            style="overflow: hidden; height: 145px"
           >
-            <template #form-word="{ data }">
-              <div class="keyword">
-                {{ data.word }}
-              </div>
-            </template>
-            <template #button>
+            <div class="keyword">{{ item.word }}</div>
+            <div class="actions">
               <Button @click.native="() => handleAddEdit(true, item)">
-                修改
-              </Button>
-              <Button
-                style="background-color: #ff5f5f"
-                @click.native="handleDelete(item)"
-              >
-                删除
-              </Button>
-            </template>
-          </Card>
+                  修改
+                </Button>
+                <Button
+                  style="background-color: #ff5f5f"
+                  @click.native="handleDelete(item)"
+                >
+                  删除
+                </Button>
+            </div>
+            <!-- <Card
+              :buttonIcon="null"
+              :keyMap="keyMap"
+              :cardData="item"
+              class="card"
+              buttonText="详情"
+            >
+              <template #form-word="{ data }">
+                <div class="keyword">
+                  {{ data.word }}
+                </div>
+              </template>
+              <template #button>
+                <Button @click.native="() => handleAddEdit(true, item)">
+                  修改
+                </Button>
+                <Button
+                  style="background-color: #ff5f5f"
+                  @click.native="handleDelete(item)"
+                >
+                  删除
+                </Button>
+              </template>
+            </Card> -->
+          </div>
         </div>
-      </template>
-    </div>
+      </div>
+    </div>  
 
     <!-- 分页 -->
     <div class="footer" v-if="numTotal > 0">
       <Pagination
         :total="numTotal"
         :current-page.sync="currentPage"
-        :page-sizes="[35, 70, 105, 140, 175]"
+        :page-sizes="[36, 72, 144, 288, 576]"
         :page-size="pageSize"
         layout="total,sizes,prev, pager, next, jumper"
         @size-change="handleSizeChange"
@@ -109,11 +137,10 @@ import InputSearch from "@screen/components/InputSearch/index.vue";
 import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
 import Button from "@screen/components/Buttons/Button.vue";
 import Pagination from "@screen/components/Pagination.vue";
-
 import { searchFormList } from "./data";
 import request from "@/utils/request";
 // import { setLoading } from "@screen/utils/index.js"
-import { delay, exportFile, confirm } from "@screen/utils/common";
+import { delay, exportFile, confirm, uploadFile } from "@screen/utils/common";
 import { Message } from "element-ui";
 
 // 辖段管理
@@ -135,7 +162,7 @@ export default {
       searchFormList,
 
       numTotal: 0,
-      pageSize: 42,
+      pageSize: 36,
       currentPage: 1,
 
       keyMap: [
@@ -159,6 +186,19 @@ export default {
     // this.getSearchOptions();
   },
   methods: {
+    uploadFile() {
+      uploadFile({ url: "/business/dcInfoBoardVocabulary/importVocabulary" }).then(() => {
+        this.getData();
+      })
+    },
+
+    handleExportTemplate() {
+      exportFile({
+        url: "/business/dcInfoBoardVocabulary/exportModel",
+        filename: "敏感词模板",
+        data: {},
+      });
+    },
     getSearchData() {
       let params = {
         word: this.searchData?.word,
@@ -195,7 +235,7 @@ export default {
     handleExport() {
       exportFile({
         url: "/business/dcInfoBoardVocabulary/export",
-        filename: "情报板敏感词",
+        filename: "敏感词",
         data: this.getSearchData(),
       });
     },
@@ -269,22 +309,60 @@ export default {
   }
 
   .body {
-    height: 0;
     flex: 1;
     overflow: hidden;
-    display: flex;
-    flex-wrap: wrap;
-    align-content: flex-start;
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      .scrollPanel {
+        display: grid;
+        grid-template-columns: repeat(6, 1fr);
+        grid-gap: 15px;
+        grid-auto-rows: minmax(140px, max-content);
+        position: relative;
+        flex: 1;
+        overflow: auto;
+      }
+    }
     .cardBox {
-      flex-basis: percentage(1/7);
-      width: 0;
-      padding-right: 10px;
-      padding-bottom: 10px;
+      background: linear-gradient(180deg,
+        rgba(25, 40, 52, 0.6) 0%,
+        rgba(28, 50, 60, 0.6) 100%);
+        border: 1px solid;
+  border-image: linear-gradient(360deg,
+      rgba(55, 231, 255, 0.42),
+      rgba(55, 231, 255, 0)) 1 1;
+      // flex-basis: percentage(1/7);
+      // width: 0;
+      // padding-right: 10px;
+      // padding-bottom: 10px;
     }
     .keyword {
-      font-size: 14px;
-      font-weight: bold;
+      font-size: 30px;
+      text-align: center;
+      // font-weight: bold;
       color: #00b3cc;
+      line-height: 100px;
+      font-family: "ErYaFenghua";
+      white-space: nowrap; 
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    }
+    .actions{
+      display: flex;
+      width: 100%;
+      justify-content: center;
+      div{
+        margin:0px 10px;
+      }
     }
   }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
index 537ce4df..83f58d1e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
+++ b/ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
@@ -618,4 +618,8 @@ div.el-popper.el-cascader__dropdown {
 .el-month-table td.disabled .cell{
   color: #C0C4CC!important;
   background: #1B586D;
-}
\ No newline at end of file
+}
+
+.el-select-dropdown{
+  z-index: 9999 !important;
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/scss/reset.scss b/ruoyi-ui/src/views/JiHeExpressway/scss/reset.scss
index cdc38d10..693f918d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/scss/reset.scss
+++ b/ruoyi-ui/src/views/JiHeExpressway/scss/reset.scss
@@ -52,3 +52,4 @@ body {
     height: 100%;
   }
 }
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
index d20e4f47..f134847d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
@@ -10,7 +10,7 @@ import { Message, MessageBox } from "element-ui";
 export const multiResultShow = (allItems, predicate, operationName) => {
   const successItems = allItems.filter(predicate);
   if (successItems.length == allItems.length) {
-    Message.success(`${operationName}成功!`);
+    Message.success(`${operationName}成功`);
   } else {
     Message.error(
       `${operationName}成功${successItems.length}个, 失败${
@@ -20,6 +20,15 @@ export const multiResultShow = (allItems, predicate, operationName) => {
   }
 };
 
+export function toDecimal(x){
+  var f = parseFloat(x)
+  if(isNaN(f)){
+    return 0;
+  }
+  f = Math.round(x*100)/100;
+  return f;
+}
+
 export function delay(ms = 240) {
   return new Promise((resolve) => setTimeout(() => resolve(void 0), ms));
 }
@@ -68,7 +77,48 @@ export function exportFile({
     })
     .finally(() => closeMessage());
 }
+/**
+ *
+ * @param {{ method?: string; url: string; data?: string; type?: string; filename?: string; }} options
+ */
+export function exportFile2({
+  url,
+  method = "post",
+  data,
+  type = "application/vnd.ms-excel",
+  filename = "download",
+  ext = "xlsx",
+} = {}) {
+  if (!url) return;
+  const closeMessage = loadingMessage({ message: "文件下载中..." });
+  const formData = new FormData();
+  for(let i in data){
+    formData.append(i, data[i]);
+  }
+  request({
+    url,
+    method,
+    responseType: "blob",
+    data: formData,
+  })
+    .then((result) => {
+      const blob = new Blob([result], { type });
+      const downloadElement = document.createElement("a");
+      const href = window.URL.createObjectURL(blob);
+      downloadElement.href = href;
+      downloadElement.download = result.filename || `${filename}.${ext}`;
+      document.body.appendChild(downloadElement);
+      downloadElement.click();
+      document.body.removeChild(downloadElement);
+      window.URL.revokeObjectURL(href);
 
+      Message.success("文件下载成功");
+    })
+    .catch((err) => {
+      Message.error("文件下载失败");
+    })
+    .finally(() => closeMessage());
+}
 /**
  * Loading 状态的消息
  * @param {ElMessageOptions} options
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 8e60b42e..b7d4e044 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -11,7 +11,20 @@ function arrayToDic(arr) {
   });
   return obj;
 }
-
+export const WarnintType = {
+  1: "交通拥堵",   
+  2: "行人",
+  3: "非机动车",
+  4: "停车",
+  5: "违规驾驶",
+  6: "路障",
+  7: "道路施工",
+  8: "异常天气",
+  9: "护栏碰撞",
+  10: "交通事故",
+  11: "车辆故障",
+  99: "其他"
+}
 // 相机状态
 export const CameraStatusEnum = {
   "-1": {
@@ -758,6 +771,83 @@ export const eventSubClassMap = {
   },
 };
 
+
+
+
+export const WarningSubclassOptions = {
+  1: [
+    {value:"1-1",label:"拥堵"},
+    {value:"1-2",label:"缓行"},
+  ],
+  2:[
+    {value:"2-1",label:"普通行人"},
+    {value:"2-2",label:"工作人员"},
+],
+  3:[
+    {value:"3-1",label:"摩托车"},
+    {value:"3-2",label:"自行车"},
+    {value:"3-3",label:"三轮车"},
+],
+  4:[
+    {value:"4-1",label:"非工程车"},
+    {value:"4-2",label:"工程车"},
+    {value:"4-3",label:"主路有车"},
+    {value:"4-4",label:"匝道有车"},
+    {value:"4-7",label:"应急车道被占用"},
+    {value:"4-9",label:"其他"},
+    {value:"4-10",label:"未知车辆"},
+ ],
+  5:[
+    {value:"5-1",label:"倒车/逆行"},
+    {value:"5-2",label:"压线"},
+    {value:"5-3",label:"掉头"},
+    {value:"5-4",label:"超速"},
+    {value:"5-5",label:"低速"},
+    {value:"5-6",label:"违规变道"},
+    {value:"5-7",label:"未保持安全距离"},
+],
+  6:[
+    {value:"6-1",label:"烟雾"},
+    {value:"6-2",label:"火灾"},
+    {value:"6-3",label:"障碍物"},
+    {value:"6-4",label:"抛洒物"},
+],
+  7:[
+    {value:"7-1",label:"道路施工"},
+],
+  8:[
+    {value:"8-1",label:"雨"},
+    {value:"8-2",label:"冰雹"},
+    {value:"8-3",label:"风"},
+    {value:"8-4",label:"雾"},
+    {value:"8-5",label:"高温"},
+    {value:"8-6",label:"积水"},
+    {value:"8-7",label:"路面湿滑"},
+    {value:"8-8",label:"路面结冰"},
+    {value:"8-9",label:"道路能见度低"},
+    {value:"8-10",label:"道路团雾"},
+],
+  9:[
+    {value:"9-1",label:"只碰撞不倾斜"},
+    {value:"9-2",label:"只倾斜无碰撞"},
+    {value:"9-3",label:"碰撞后倾斜"},
+],
+  10:[
+    {value:"10-1",label:"未知"},
+    {value:"10-2",label:"单车事故"},
+    {value:"10-3",label:"多车事故"},
+],
+  11:[
+    {value:"11-1",label:"车辆抛锚"},
+    {value:"11-2",label:"车辆炸胎（有备胎）"},
+    {value:"11-3",label:"车辆炸胎（无备胎）"},
+],
+  99:[
+    {value:"99-1",label:"其他事件"},
+],
+};
+
+
 //路网设施类型
 // 1-收费站
 // 2-桥梁
@@ -811,9 +901,9 @@ export const InfoWarningSource = {
   6: {
     text: "非机预警",
   },
-  // 7: {
-  //   text: "气象监测器",
-  // },
+  7: {
+    text: "气象检测器",
+  },
 };
 
 export const warningSourceMapping = {
@@ -823,7 +913,7 @@ export const warningSourceMapping = {
   4: "护栏碰撞",
   5: "扫码报警",
   6: "非机预警",
-  // 7: '气象监测器'
+  7: '气象检测器'
 };
 
 export const warningStateMapping = {
@@ -846,7 +936,7 @@ export const deviceTypeOptions = [
   },
   {
     value: 3,
-    label: "气象监测器",
+    label: "气象检测器",
   },
   {
     value: 4,
@@ -931,7 +1021,7 @@ export const gzmsMap = {
 export const planDeviceMap = {
   1: "摄像机",
   2: "可变信息标志",
-  // 3: "气象监测器",
+  // 3: "气象检测器",
   // 4: "出口诱导灯",
   5: "路段语音广播",
   // 6: "护栏碰撞",
@@ -956,7 +1046,7 @@ export const planDeviceOptions = [
   },
   // {
   //   value: 3,
-  //   label: "气象监测器",
+  //   label: "气象检测器",
   // },
   // {
   //   value: 4,
@@ -1075,7 +1165,7 @@ export const CameraChildTypes = {
 
 export const BoardChildTypes = {
   "2-1": "门架式可变信息标志",
-  "2-2": "大学城入口站前板",
+  "2-2": "站前可变信息标志",
   "2-3": "雨棚可变信息标志",
   "2-4": "站前悬臂式可变信息标志",
 };
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 baebca15..ba0c9580 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js
@@ -1,7 +1,27 @@
 import request from "@/utils/request";
 import { Message } from "element-ui";
 import moment from "moment";
-
+const roles_int = {
+  message: "请输入正确数字",
+  callback(value, data) {
+    if (!value || value==='' || parseInt(value).toString() === value.toString())
+      return true;
+    else return false;
+  },
+}
+const stake_start = {
+  message: "请输入正确桩号",
+  callback(value, data) {
+    if (!value ||
+      value==='' || 
+      (parseInt(value) >= 55 && parseInt(value) <= 208)
+    ){
+      return true;
+    } else {
+      return false;
+    }
+  },
+}
 export const source = {
   label: "来源:",
   key: "eventSource",
@@ -18,7 +38,7 @@ export const source = {
       },
       {
         key: 2,
-        label: "交通转接",
+        label: "交警转接",
       },
       {
         key: 3,
@@ -113,6 +133,10 @@ export const station = {
           },
         },
         key: "stakeMark[0]",
+        rules: [stake_start],
+        options: {
+          maxlength:3
+        }
       },
       {
         prefix: {
@@ -122,6 +146,9 @@ export const station = {
           },
         },
         key: "stakeMark[1]",
+        options: {
+          maxlength:3
+        }
       },
     ],
   },
@@ -149,6 +176,10 @@ export const startEndStation = {
           },
         },
         key: "stakeMark[0]",
+        rules: [stake_start],
+        options: {
+          maxlength:3
+        }
       },
       {
         prefix: {
@@ -158,6 +189,9 @@ export const startEndStation = {
           },
         },
         key: "stakeMark[1]",
+        options: {
+          maxlength:3
+        }
       },
       {
         prefix: {
@@ -167,6 +201,10 @@ export const startEndStation = {
           },
         },
         key: "endStakeMark[0]",
+        rules: [stake_start],
+        options: {
+          maxlength:3
+        }
       },
       {
         prefix: {
@@ -176,6 +214,9 @@ export const startEndStation = {
           },
         },
         key: "endStakeMark[1]",
+        options: {
+          maxlength:3
+        }
       },
     ],
   },
@@ -195,7 +236,7 @@ export const direction = {
 };
 
 export const problemDescription = {
-  label: "问题描述:",
+  label: "事件描述:",
   key: "description",
   isAlone: true,
   options: {
@@ -297,7 +338,7 @@ export const eventSources = {
       },
       {
         key: 2,
-        label: "交通转接",
+        label: "交警转接",
       },
       {
         key: 3,
@@ -495,6 +536,7 @@ export const casualties = (keyPrefix = "dcEventAccident") => ({
           text: "人",
         },
         key: `${keyPrefix}.minorInjuries`,
+        rules: [roles_int],
       },
       {
         prefix: {
@@ -504,6 +546,7 @@ export const casualties = (keyPrefix = "dcEventAccident") => ({
           text: "人",
         },
         key: `${keyPrefix}.seriousInjuries`,
+        rules: [roles_int],
       },
       {
         prefix: {
@@ -513,6 +556,7 @@ export const casualties = (keyPrefix = "dcEventAccident") => ({
           text: "人",
         },
         key: `${keyPrefix}.fatalities`,
+        rules: [roles_int],
       },
     ],
   },
@@ -523,6 +567,9 @@ export const eventTitle = {
   key: "eventTitle",
   isAlone: true,
   required: true,
+  options: {
+    maxlength: 40
+  }
 };
 
 export const eventDesc = {
@@ -596,7 +643,7 @@ export const weatherCondition = {
   key: "dcEventAccident.weatherCondition",
   type: "RadioGroup",
   isAlone: true,
-  required: true,
+  // required: true,
   options: {
     activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
     options: [
@@ -629,7 +676,7 @@ export const weatherSituation = {
   key: "dcEventAccident.weatherSituation",
   type: "RadioGroup",
   isAlone: true,
-  required: true,
+  // required: true,
   options: {
     activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
     options: [
@@ -689,6 +736,7 @@ export const callPolicePersonName = {
   key: "dcEventAccident.reporterName",
   options: {
     placeholder: "请输入报警人姓名",
+    maxlength: 6
   },
   required: true,
 };
@@ -698,6 +746,7 @@ export const callPolicePersonPhone = {
   key: "dcEventAccident.reporterPhoneNumber",
   options: {
     placeholder: "请输入报警人电话(区号+号码)",
+    maxlength: 20
   },
   required: true,
 };
@@ -1025,6 +1074,7 @@ export const ownerPhone = {
   key: "dcEventAccident.vehicleOwnerPhone",
   isAlone: true,
   options: {
+    maxlength: 120,
     placeholder: "车主电话（多个电话请以逗号分隔，不超过10个）",
   },
 };
@@ -1208,7 +1258,7 @@ export const congestionCause = {
   ons: {
     input(value, ...args) {
       const { formList } = args.slice(-1)[0];
-      const config = formList.find((it) => it.key == "detailedReasons");
+      const config = formList.find((it) => (it.key == "detailedReasons"||it.key === 'dcEventTrafficCongestion.detailedReasons'));
       let ad = {
         1: [
           {
@@ -1255,7 +1305,7 @@ export const congestionCause = {
           },
         ],
       };
-      config.options.options = value != 1 ? ad[1] : ad[2];
+      config.options.options = (value != 1 ? ad[1] : ad[2]);
     },
   },
   visible: (data) => {
@@ -1270,47 +1320,47 @@ export const congestionCause = {
 
 export const locationSelect = [
   {
-    value: 1,
+    value: "1",
     label: "入口车道",
   },
   {
-    value: 2,
+    value: "2",
     label: "入口匝道",
   },
   {
-    value: 3,
+    value: "3",
     label: "入口",
   },
   {
-    value: 4,
+    value: "4",
     label: "入口内广场",
   },
   {
-    value: 5,
+    value: "5",
     label: "出口车道",
   },
   {
-    value: 6,
+    value: "6",
     label: "出口匝道",
   },
   {
-    value: 7,
+    value: "7",
     label: "外广场",
   },
   {
-    value: 8,
+    value: "8",
     label: "出口",
   },
   {
-    value: 9,
+    value: "9",
     label: "(站外)入口匝道",
   },
   {
-    value: 10,
+    value: "10",
     label: "(站外)出口匝道",
   },
   {
-    value: 11,
+    value: "11",
     label: "出口内广场",
   },
 ];
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/equipment/eqlist/index.vue b/ruoyi-ui/src/views/equipment/eqlist/index.vue
index 2a7cea45..a0cb2f9f 100644
--- a/ruoyi-ui/src/views/equipment/eqlist/index.vue
+++ b/ruoyi-ui/src/views/equipment/eqlist/index.vue
@@ -1768,7 +1768,7 @@ export default {
           dangerouslyUseHTMLString: true,
         });
       } else {
-        const msg = "恭喜您，数据已全部导入成功！";
+        const msg = "恭喜您，数据已全部导入成功";
         this.$alert(msg, "导入结果", {
           customClass: "el-message-box_style",
           dangerouslyUseHTMLString: true,
diff --git a/ruoyi-ui/src/views/equipment/protocol/index.vue b/ruoyi-ui/src/views/equipment/protocol/index.vue
index 3e8a6641..26054ccb 100644
--- a/ruoyi-ui/src/views/equipment/protocol/index.vue
+++ b/ruoyi-ui/src/views/equipment/protocol/index.vue
@@ -576,7 +576,7 @@ export default {
           dangerouslyUseHTMLString: true,
         });
       } else {
-        const msg = "恭喜您，数据已全部导入成功！";
+        const msg = "恭喜您，数据已全部导入成功";
         this.$alert(msg, "导入结果", {
           customClass: "el-message-box_style",
           dangerouslyUseHTMLString: true,
diff --git a/ruoyi-ui/src/views/event/event/dispatch.vue b/ruoyi-ui/src/views/event/event/dispatch.vue
index cd6e720a..f11f3615 100644
--- a/ruoyi-ui/src/views/event/event/dispatch.vue
+++ b/ruoyi-ui/src/views/event/event/dispatch.vue
@@ -1652,7 +1652,7 @@ export default {
             loading.close();
             this.$message({
               type: "success",
-              message: "操作成功!",
+              message: "操作成功",
             });
             this.backSafeWarn();
             //回跳列表页
diff --git a/ruoyi-ui/src/views/event/strategy/components/timeControl.vue b/ruoyi-ui/src/views/event/strategy/components/timeControl.vue
index e0ea4606..345e08e6 100644
--- a/ruoyi-ui/src/views/event/strategy/components/timeControl.vue
+++ b/ruoyi-ui/src/views/event/strategy/components/timeControl.vue
@@ -586,7 +586,6 @@ export default {
         item.openState = item.openState.toString();
       });*/
       let params = this.strategyForm;
-      console.log(params);
       updateStrategyInfo(params).then((res) => {
         this.$modal.msgSuccess("修改策略成功");
       /*  this.$emit("dialogVisibleClose");*/
diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue
index ee7bf339..50c74921 100644
--- a/ruoyi-ui/src/views/information/board/index.vue
+++ b/ruoyi-ui/src/views/information/board/index.vue
@@ -902,9 +902,7 @@
           deviceId: deviceId
         }
         await getBoardContentData(param).then((res) => {
-          console.log(res, "onSubmit")
           var contents = res.data.parameters;
-          console.log(contents, "onSubmit-----contents")
           for (let i = 0; i < contents.length; i++) {
             let item = contents[i]
             item.COLOR = this.getColorStyle(item.COLOR);
diff --git a/ruoyi-ui/src/views/information/templateImage/index.vue b/ruoyi-ui/src/views/information/templateImage/index.vue
index 3436197a..553ccde5 100644
--- a/ruoyi-ui/src/views/information/templateImage/index.vue
+++ b/ruoyi-ui/src/views/information/templateImage/index.vue
@@ -666,7 +666,6 @@ export default {
       this.fileData.append("file", file.file); // append增加数据
     },
     uploadSuccess() {
-      console.log("成功了");
       this.$refs.upload.clearFiles();
     },
     // 选取文件超过数量提示
diff --git a/ruoyi-ui/src/views/intelligent/trafficBroadcasting/broadcastConfiguration/config/index.vue b/ruoyi-ui/src/views/intelligent/trafficBroadcasting/broadcastConfiguration/config/index.vue
index 2ad0c2df..0eeeb4a7 100644
--- a/ruoyi-ui/src/views/intelligent/trafficBroadcasting/broadcastConfiguration/config/index.vue
+++ b/ruoyi-ui/src/views/intelligent/trafficBroadcasting/broadcastConfiguration/config/index.vue
@@ -563,7 +563,7 @@ export default {
       //       this.saveRelaseRecord();
       //     } else {
       //       this.$message({
-      //         message: "广播发布失败！",
+      //         message: "广播发布失败",
       //         type: "error",
       //       });
       //     }
diff --git a/ruoyi-ui/src/views/iot/function/index.vue b/ruoyi-ui/src/views/iot/function/index.vue
index 94c4dcea..e812ebd9 100644
--- a/ruoyi-ui/src/views/iot/function/index.vue
+++ b/ruoyi-ui/src/views/iot/function/index.vue
@@ -522,7 +522,7 @@ export default {
         saveFvDataList: this.fv.valueList
       }
       saveFvData(form).then(response => {
-        this.$modal.msgSuccess("功能值定义成功！");
+        this.$modal.msgSuccess("功能值定义成功");
         this.getFvListValue(this.fv.functionKey);
       });
     }
diff --git a/ruoyi-ui/src/views/login copy.vue b/ruoyi-ui/src/views/login copy.vue
index a65882cb..54e849f4 100644
--- a/ruoyi-ui/src/views/login copy.vue	
+++ b/ruoyi-ui/src/views/login copy.vue	
@@ -184,7 +184,6 @@ export default {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
       const rememberMe = Cookies.get("rememberMe");
-      console.log("rem", rememberMe);
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password:
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 3be6a9f2..6986a46a 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -176,7 +176,6 @@ export default {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
       const rememberMe = Cookies.get("rememberMe");
-      console.log("rem", rememberMe);
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password:
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 7a1c6d1e..a73c7002 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -128,7 +128,7 @@ export default {
           this.loading = true;
           register(this.registerForm).then(res => {
             const username = this.registerForm.username;
-            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
+            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功</font>", '系统提示', {
               dangerouslyUseHTMLString: true
             }).then(() => {
               this.$router.push("/login");
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index 2573d605..878d8f11 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -6,7 +6,7 @@
           <div slot="header">
             <span>个人信息</span>
           </div>
-          <div>
+          <div style="height: 460px">
             <div class="text-center">
               <userAvatar :user="user" />
             </div>
@@ -53,6 +53,46 @@
             </el-tab-pane>
           </el-tabs>
         </el-card>
+
+        <el-card style="margin-top: 20px">
+          <div slot="header">
+            <span>个性化设置</span>
+          </div>
+          <el-form ref="form" label-width="120px">
+            <el-row :gutter="20">
+              <el-col :span="4">
+                <el-form-item label="通知弹窗：">
+                  <el-switch
+                      v-model="isNotify"
+                      style="margin-top: -5px;"
+                      active-color="#0BD" 
+                      inactive-color="#999" 
+                      active-value="on"
+                      inactive-value="off"
+                      @change="changeNotify"
+                    >
+                    </el-switch>
+                </el-form-item> 
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="通知语音播报：">
+                  <el-switch
+                      v-model="isSound"
+                      style="margin-top: -5px;"
+                      active-color="#0BD" 
+                      inactive-color="#999" 
+                      active-value="on"
+                      inactive-value="off"
+                      @change="changeSound"
+                    >
+                    </el-switch>
+                </el-form-item> 
+              </el-col>
+            </el-row>
+            
+           
+          </el-form>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -63,6 +103,7 @@ import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
 import { getUserProfile } from "@/api/system/user";
+import Cookies from 'js-cookie'
 
 export default {
   name: "Profile",
@@ -72,12 +113,20 @@ export default {
       user: {},
       roleGroup: {},
       postGroup: {},
-      activeTab: "userinfo"
+      activeTab: "userinfo",
+
+      isSound: 'on',
+      isNotify: 'on'
     };
   },
   created() {
     this.getUser();
   },
+
+  mounted(){
+    this.isSound = Cookies.get('warning-sound') || 'on';
+    this.isNotify = Cookies.get('warning-notify') || 'on';
+  },
   methods: {
     getUser() {
       getUserProfile().then(response => {
@@ -85,6 +134,12 @@ export default {
         this.roleGroup = response.roleGroup;
         this.postGroup = response.postGroup;
       });
+    },
+    changeSound(){
+      Cookies.set('warning-sound', this.isSound)
+    },
+    changeNotify(){
+      Cookies.set('warning-notify', this.isNotify)
     }
   }
 };
diff --git a/ruoyi-ui/src/views/websocket.vue b/ruoyi-ui/src/views/websocket.vue
index 14f748be..150e93e4 100644
--- a/ruoyi-ui/src/views/websocket.vue
+++ b/ruoyi-ui/src/views/websocket.vue
@@ -10,7 +10,6 @@
 
 <script>
 import { mapState } from "vuex";
-
 export default {
   name: "Websocket",
   data() {
@@ -31,7 +30,7 @@ export default {
       // 建立 websocket 连接
       this.socket.initialize({
         // url: 'ws://' + location.hostname + ':' + port + path,
-        url: 'wss://' + location.hostname + ':' + window.location.port  + '/ws' || 80 + '/ws',
+        url: 'wss://' + location.hostname + ':' + window.location.port + '/ws' || 80 + '/ws',
         // url: 'ws://10.168.77.128:7789/ws',
         // url: "ws://10.7.179.15" + ":" + port + path,
         // url: "ws://10.168.64.171" + ":" + port + path,
@@ -42,7 +41,9 @@ export default {
         heartRate: interval,
       });
 
-      this.socket.onopen = () => {};
+      this.socket.onopen = () => {
+
+      };
       this.socket.onmessage = (message) => {
 
         // debugger
@@ -57,9 +58,9 @@ export default {
         const subEvent = params.subEvent;
         const content = params.content;
         let contentList;
-        if(_.isString(content)){
-           contentList = JSON.parse(content);
-        }else{
+        if (_.isString(content)) {
+          contentList = JSON.parse(content);
+        } else {
           contentList = content;
         }
 
@@ -103,44 +104,112 @@ export default {
             break;
           case "0":
           case "1":
+          case "3":
+          case "trafficFlowDataEarlyWarning":
             this.$emit("newEvent", params);
             break;
+
           case "deviceState":
-            this.EventBus.$emit("deviceState", contentList );
+            this.EventBus.$emit("deviceState", contentList);
             break;
+
+          case "eventCount":
+            this.$root.$emit('update-warning', content);
+            break;
+          // 
           default:
         }
       };
     },
   },
-  created() {},
+  created() { },
   methods: {},
-  mounted(){
+  mounted() {
     let _this = this;
-    if (process.env.NODE_ENV == "development"){
+    if (process.env.NODE_ENV == "development") {
       //测试websocket用的
       return
       let deviceState = "0";
       document.onkeydown = function (e) {
         deviceState == "0" ? deviceState = "1" : deviceState = "0";
-          if (e.code == 'Space') {
-            let params = {
-              "subEvent": "deviceState",
-              "content": [
-                {
-                  "id": 896, 
-                  "iotDeviceId": "K67+240tynb", 
-                  "deviceType":"2",
-                  deviceState
-                }
-              ]
-            };
-            _this.EventBus.$emit("deviceState", params.content );
-          }
+        if (e.code == 'Space') {
+          // 消息数字
+          // _this.$root.$emit('update-warning', Math.floor(Math.random() * 20)); 
+
+          // 事件弹窗
+          let params = {
+            "subEvent": "1",
+            "content": {
+              "event": {
+                "id": "00029eee1f5c4319a7790cd66cc556b9",
+                "deptId": 103,
+                "stakeMark": "K059+289",
+                "endStakeMark": "",
+                "direction": "1",
+                "userId": 1,
+                "estimatedEndTime": "2024-04-11 00:00:00",
+                "eventType": 3,
+                "eventSubclass": "3-2",
+                "eventState": 0,
+                "eventSource": 1,
+                "inTunnel": 0,
+                "roadId": 1,
+                "occurrenceTime": "2024-04-10 16:56:02",
+                "lang": "",
+                "dcEventTrafficControl": {
+                  "controlType": 1,
+                  "controlCause": 1,
+                  "exitsInlets": 2,
+                  "facilityId": 11,
+                  "measure": 1,
+                  "classify": 1,
+                  "facilityIds": [
+                    11
+                  ]
+                },
+                "createTime": "2024-05-08 18:02:40"
+              },
+              "content": "菏泽方向 K059+289 发生收费站封闭和限行事件"
+            }
+          };
+          
+          // 交通流预警
+          // let params = {
+          //   "subEvent": "trafficFlowDataEarlyWarning",
+          //   "content": {
+          //     "id":209,
+          //     "content":"预计2024年7月2日-7月7日，高速车流量剧增。平台预警提醒您:提前调度路管人员前往匝道等交通事故多发路段巡查，以便及时救援。"
+          //   }
+          // }
+          // 气象预警
+          // let params = {
+          //   subEvent:"3",
+          //   content:{
+          //     "orgName":"济南","roadId":"G003537","managerId":"YG10109","sectionId":"G00353701","managerName":"济青济南运管中心",
+          //     "earlyWorningContent":"平阴县气象台2024年06月24日16时40分发布高温黄色预警信号。受大陆暖高压脊影响，预计25日至28日我县将出现大范围持续性高温天气，全部乡镇和街道最高气温可达35～37℃，其中28日部分地区最高气温可达40℃左右。请注意防范。",
+          //     "earlyWorningTitle":"高温黄色","roadName":"G35济广高速","sectionName":"G35济广高速济南段","earlyWorningLevel":3,"orgCode":"370124",
+          //     "earlyWorningContentNotic":"","stationName":"平阴","warningLevelString":"YELLOW_ALERT","earlyWarningTypeStringNumber":"6",
+          //     "earlyWorningSignal":"6yj1","warningLevelStringNumber":"1","earlyWorningIssueDate":"2024-06-24T16:40:00","earlyWarningTypeString":"HYPERTHERMIA"}  
+          // }
+          _this.$emit("newEvent", params);
 
+          // 测试事件变更
+          // let params = {
+          //   "subEvent": "deviceState",
+          //   "content": [
+          //     {
+          //       "id": 896, 
+          //       "iotDeviceId": "K67+240tynb", 
+          //       "deviceType":"2",
+          //       deviceState
+          //     }
+          //   ]
+          // };
+          // _this.EventBus.$emit("deviceState", params.content );
         }
+
       }
+    }
   }
 };
 </script>
-
diff --git a/ruoyi-ui/src/views/workbench/config/components/offlineDeviceModal.vue b/ruoyi-ui/src/views/workbench/config/components/offlineDeviceModal.vue
index 01366bc6..7a528385 100644
--- a/ruoyi-ui/src/views/workbench/config/components/offlineDeviceModal.vue
+++ b/ruoyi-ui/src/views/workbench/config/components/offlineDeviceModal.vue
@@ -910,7 +910,7 @@
             dangerouslyUseHTMLString: true,
           });
         } else {
-          const msg = "恭喜您，数据已全部导入成功！";
+          const msg = "恭喜您，数据已全部导入成功";
           this.$alert(msg, "导入结果", {
             customClass: "el-message-box_style",
             dangerouslyUseHTMLString: true,
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 594cd9ab..f2502a58 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -41,7 +41,7 @@ module.exports = {
         // 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.76.181:8089`, //王家宝
+        // target: `http://10.168.79.46:8089`, //王家宝
         // target: `http://10.168.77.128:8087`, //王兴琳
         changeOrigin: true,
         pathRewrite: {