diff --git a/ruoyi-ui/src/api/event/perceiveEvent.js b/ruoyi-ui/src/api/event/perceiveEvent.js
index 7a147f24..c8336aa6 100644
--- a/ruoyi-ui/src/api/event/perceiveEvent.js
+++ b/ruoyi-ui/src/api/event/perceiveEvent.js
@@ -165,7 +165,7 @@ export function geTwarningTotal(query) {
     export function getRoadSectionList(query) {
       //system/status/tablist
       return request({
-          url: '/business/roadSection/list',
+          url: '/business/roadSection/listAll',
           method: 'get',
           params: {
             ...query,
diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index f12ce990..0105eb62 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -133,7 +133,8 @@
       .el-radio__label{ color: #fff; }
       &.is-checked{
         .el-radio__label {
-            color: #3de8ff;
+            // color: #3de8ff;
+            color: #fff;
           }
       }
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
index 09ec829d..7f61b9c2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
@@ -41,6 +41,24 @@ export const source = {
   },
 };
 
+export const releaseChannel = {
+  label: "发布渠道:",
+  key: "channel",
+  type: "CheckboxGroup",
+  isAlone: true,
+  default: [],
+  options: {
+    options: [
+      { key: "1", label: "微博" },
+      { key: "3", label: "微信小程序" },
+      { key: "4", label: "服务网站" },
+      { key: "5", label: "情报板" },
+      { key: "6", label: "手机短信" },
+      { key: "7", label: "微信公众号" },
+    ],
+  },
+};
+
 export const illegalTriggeringType = {
   label: "类型:",
   key: "eventSubclass",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
index 6126f45b..e0acb02b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
@@ -2,7 +2,7 @@
   <BorderRadiusImage class='RoadStateCard' borderRadius="2px"
     borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))" borderWidth="2px">
     <div class="left">
-      <img :src="(cardData.pictures ? cardData.pictures[0] : null) || require(`./test.png` )">
+      <img :src="(cardData.pictures ? cardData.pictures[0] : null) || require(`./test.png`)">
       <!-- <img :src="require(`./test.png`)"> -->
     </div>
     <div class="right">
@@ -15,10 +15,10 @@
       <div class="controls">
         <Button :style="{ background: firstBtnColor, width: '50%' }"
           @click.native="$emit('firstBtnClick', cardData.id)">{{
-            firstBtnText
+            getFirstBtnText(cardData.state)
           }}</Button>
-        <Button v-if="cardData.state != 3" :style="{ background: lastBtnColor, width: '50%' }"
-          @click.native="$emit('lastBtnClick', cardData.id)">{{ lastBtnText
+        <Button v-if="cardData.state == 4" :style="{ background: lastBtnColor, width: '50%' }"
+          @click.native="$emit('lastBtnClick', cardData.id)">{{ getLastBtnText(cardData.state)
           }}</Button>
       </div>
     </div>
@@ -82,7 +82,7 @@ export default {
       ])
     }
   },
-  data(){
+  data() {
     return {
       picUrl: './test.png'
     }
@@ -94,6 +94,19 @@ export default {
   },
   created() {
     this.statusMap = statusMap;
+  },
+  methods: {
+    getFirstBtnText(state) {
+      let text = '详情';
+      if(state == 5) text = '去确认'
+      if(state == 4) text = '详情'
+      if(state == 3) text = '处置记录'
+      return text;
+    },
+    getLastBtnText(state) {
+      let text = '去处置';
+      return text;
+    },
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
index a47c01f4..83f0da7e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="video-container">
-    <div class="header">
+    <div class="header" v-if="showHeader">
       <div class="left">
         <div class="radio">
           <span @click="active = 'img'" :class="{ active: active === 'img' }">图像</span>
@@ -46,6 +46,10 @@ export default {
     rangeIndex: {
       type: Number,
       default: 0
+    },
+    showHeader: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
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 d2dc382d..49ce8765 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
@@ -28,7 +28,7 @@
 <script>
 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 * as PresetFormItems from "@screen/common/PresetFormItems.js";
 import { merge, cloneDeep } from "lodash"
 import request from "@/utils/request";
 
@@ -42,74 +42,8 @@ export default {
     return {
       activeIcon: null,
       formList: [
-        merge(cloneDeep(PresetFormItems.station), {
-          required: false,
-          label: "起始桩号:",
-          options: {
-            options: [
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.startStakeMark[1]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "startStakeMark[0]",
-              },
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.startStakeMark[0]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "startStakeMark[1]",
-              },
-            ],
-          },
-        }),
-        merge(cloneDeep(PresetFormItems.station), {
-          required: false,
-          label: "结束桩号:",
-          options: {
-            options: [
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.endStakeMark[1]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "endStakeMark[0]",
-              },
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.endStakeMark[0]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "endStakeMark[1]",
-              },
-            ],
-          },
-        }),
+        PresetFormItems.startStation,
+        PresetFormItems.endStation,
         {
           label: "设备类型:",
           key: "deviceType",
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 28a546e3..4f7ea6e3 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,22 +1,22 @@
 <template>
-	<div class='HomeFrame'>
-		<ElPopover trigger="manual" :value="activeIcon === 'Frame'" :visibleArrow="false" placement="left"
-			popper-class="global-input-search-popover">
-			<Button :class="['btn', { 'btn-active': activeIcon }]" slot="reference" @click.native="handleClick('Frame')">
-				<img src="@screen/images/home-Frame/Frame.svg">
-			</Button>
+  <div class='HomeFrame'>
+    <ElPopover trigger="manual" :value="activeIcon === 'Frame'" :visibleArrow="false" placement="left"
+      popper-class="global-input-search-popover">
+      <Button :class="['btn', { 'btn-active': activeIcon }]" slot="reference" @click.native="handleClick('Frame')">
+        <img src="@screen/images/home-Frame/Frame.svg">
+      </Button>
 
-			<div class="body">
-				<div class="title">
-					图标含义
-				</div>
-				<!-- <Form labelWidth="90px" column="1" class="form" ref="FormConfigRef" :formList="formList" /> -->
-				<img class="image" src="@screen/images/home-Frame/logoMean.jpg">
-				<div class="footer">
-				</div>
-			</div>
-		</ElPopover>
-	</div>
+      <div class="body">
+        <div class="title">
+          图标含义
+        </div>
+        <!-- <Form labelWidth="90px" column="1" class="form" ref="FormConfigRef" :formList="formList" /> -->
+        <img class="image" src="@screen/images/home-Frame/logoMean.jpg">
+        <!-- <div class="footer">
+        </div> -->
+      </div>
+    </ElPopover>
+  </div>
 </template>
 
 <script>
@@ -26,69 +26,70 @@ import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/Pr
 import { merge, cloneDeep } from "lodash"
 
 export default {
-	name: 'HomeFrame',
-	components: {
-		Button,
-		Form
-	},
-	data() {
-		return {
-			activeIcon: null
-		}
-	},
-	methods: {
-		handleClick(type) {
-			this.activeIcon = this.activeIcon === type ? null : type;
-		},
-		filterEnd(data) {
-			this.activeIcon = null;
-			// this.filterData = data;
-			this.$parent.$refs.RoadAndEventsRef?.setFilterData?.(data);
-		},
-	}
+  name: 'HomeFrame',
+  components: {
+    Button,
+    Form
+  },
+  data() {
+    return {
+      activeIcon: null
+    }
+  },
+  methods: {
+    handleClick(type) {
+      this.activeIcon = this.activeIcon === type ? null : type;
+    },
+    filterEnd(data) {
+      this.activeIcon = null;
+      // this.filterData = data;
+      this.$parent.$refs.RoadAndEventsRef?.setFilterData?.(data);
+    },
+  }
 }
 </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);
+  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: 3vh;
 
-	.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%;
+  .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%;
 
-		}
-	}
+    }
+  }
 }
 </style>
 <style lang='scss' scoped>
 .image {
-	width: 1440px;
-	height: 900px;
+  width: 45vw;
+  height: 65vh;
 }
 
 .HomeFrame {
 
-	.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 {
+    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%);
-	}
+  .btn-active {
+    background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
+  }
 }
 </style>
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 d986cb28..be94807d 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
@@ -9,7 +9,7 @@
         刷新
       </ButtonGradient>
 
-      <InputSearch style="width: 402px;" />
+      <InputSearch style="width: 402px;" :formConfigOptions="{ labelWidth: '82px' }" :formList="searchFormList" @handleSearch="handleSearch" />
     </div>
 
     <!-- 内容 -->
@@ -30,6 +30,8 @@ import InputSearch from '@screen/components/InputSearch/index.vue';
 import Card from './components/Card/index.vue';
 import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
 
+import { searchFormList } from "./data";
+
 export default {
   name: 'CoordinateSchedulingRecords',
   components: {
@@ -40,6 +42,7 @@ export default {
   },
   data() {
     return {
+      searchFormList,
       eventDetailDialogVisible: false
     }
   },
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 2d9c992a..1d0c5c00 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
@@ -29,8 +29,8 @@ export default {
     pictures: {
       type: Array,
       default: () => [
-        "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
-        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
+        // "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')",
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 91349236..19d2210e 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,21 +1,23 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情">
-    <div class="EventDetail">
+    <div class="EventDetail" :style="{ height: (activeName == '-1' || activeName == '0') ? '380px' : '768px'}">
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
       <div class="video-pic">
-        <Video style="height: 100%;" />
+        <Video style="height: 100%;" :showHeader="activeName != '-1'"/>
+        <Video v-if="activeName != '-1'" style="height: 100%;" />
 
-        <Carousel style="flex: 1" :pictures="formData.pictures"/>
+        <Carousel v-else style="flex: 1" :pictures="formData.pictures"/>
       </div>
 
-      <TimeLine1 :data="timeLine1List" />
-      <TimeLine2 :data="timeLine2List" style="flex: 1;" />
+      <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
+      <TimeLine2 v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" style="flex: 1;" />
 
     </div>
     <template #footer>
-      <Button style="padding: 0 24px;" @click.native="modelVisible = false">确认</Button>
-      <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false"> 取消</Button>
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px;" @click.native="modelVisible = false">误报</Button>
+      <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }" @click.native="modelVisible = false">取消</Button>
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px;" @click.native="modelVisible = false">确认</Button>
     </template>
   </Dialog>
 </template>
@@ -50,6 +52,7 @@ export default {
   },
   props: {
     visible: Boolean,
+    activeName: String,
     formData: {
       type: Object,
       default: () => { }
@@ -89,6 +92,11 @@ export default {
   },
   methods: {
     getProcess() {
+      if(this.activeName == '-1' || this.activeName == '0'){
+        this.timeLine1List = [];
+        this.timeLine2List = [];
+        return;
+      }
 
       let directionFlg = true;
 
@@ -146,13 +154,14 @@ export default {
   display: flex;
   gap: 9px;
   width: 836px;
-  height: 768px;
+  // height: 768px;
   flex-direction: column;
 
   .video-pic {
     display: flex;
-    height: 150px;
-    gap: 15px
+    height: 190px;
+    gap: 15px;
+    justify-content: space-around;
   }
 }
 </style>
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 1fcdedac..b1abf167 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
@@ -716,7 +716,13 @@ export const locationMode = {
   },
   ons: {
     change(value, ...args) {
-      const { formList } = args.slice(-1)[0];
+      const { data, formList } = args.slice(-1)[0];
+      if(data.dcEventAccident) {
+        data.dcEventAccident.facilityId = null;
+      }
+      if(data.dcEventVehicleAccident) {
+        data.dcEventVehicleAccident.facilityId = null;
+      }
 
       let facilityType = 1;
       if (value == 2) {
@@ -744,7 +750,7 @@ export const locationMode = {
           
         }).catch((err) => {
           console.log('err',err)
-          Message.error("查询失败", err);
+          Message.error("查询失败1", err);
         })
       }
       
@@ -1129,9 +1135,9 @@ export const congestionCause = {
   },
   ons: {
     input(value, ...args) {
-      console.log(value);
+      // console.log(value);
       const { formList } = args.slice(-1)[0];
-      const config = formList.find((it) => it.key == "xxyy");
+      const config = formList.find((it) => it.key == "detailedReasons");
       let ad = {
         1: [
           {
@@ -1181,4 +1187,10 @@ export const congestionCause = {
       config.options.options = value != 1 ? ad[1] : ad[2];
     },
   },
+  visible: (data) => {
+    if (data?.eventSubclass != '4-1') {
+      return false;
+    }
+    return true;
+  },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
index 6d4420b0..274eccb1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
@@ -1,4 +1,53 @@
 import * as PresetFormItems from "./PresetFormItems";
+import request from "@/utils/request";
+import { Message } from "element-ui";
+
+const locationSelect = [
+  {
+    value: "1",
+    label: "入口车道",
+  },
+  {
+    value: "2",
+    label: "入口匝道",
+  },
+  {
+    value: "3",
+    label: "入口",
+  },
+  {
+    value: "4",
+    label: "入口内广场",
+  },
+  {
+    value: "5",
+    label: "出口车道",
+  },
+  {
+    value: "6",
+    label: "出口匝道",
+  },
+  {
+    value: "7",
+    label: "外广场",
+  },
+  {
+    value: "8",
+    label: "出口",
+  },
+  {
+    value: "9",
+    label: "(站外)入口匝道",
+  },
+  {
+    value: "10",
+    label: "(站外)出口匝道",
+  },
+  {
+    value: "11",
+    label: "出口内广场",
+  },
+];
 
 export const tabConfigList = [
   {
@@ -6,11 +55,23 @@ export const tabConfigList = [
     label: "交通事故",
     formConfig: {
       list: [
-        { ...PresetFormItems.callPolicePersonName, key: 'dcEventAccident.reporterName' },
-        { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventAccident.reporterPhoneNumber' },
-        { ...PresetFormItems.trafficAccidentType, key: 'dcEventAccident.accidentType' },
+        {
+          ...PresetFormItems.callPolicePersonName,
+          key: "dcEventAccident.reporterName",
+        },
+        {
+          ...PresetFormItems.callPolicePersonPhone,
+          key: "dcEventAccident.reporterPhoneNumber",
+        },
+        {
+          ...PresetFormItems.trafficAccidentType,
+          key: "dcEventAccident.accidentType",
+        },
         PresetFormItems.eventLevel,
-        { ...PresetFormItems.locationMode, key: 'dcEventAccident.locationType' },
+        {
+          ...PresetFormItems.locationMode,
+          key: "dcEventAccident.locationType",
+        },
         PresetFormItems.freeway,
         {
           label: "服务区:",
@@ -26,12 +87,12 @@ export const tabConfigList = [
               },
             ],
           },
-          visible:(data) => {
-            if(data?.dcEventAccident?.locationType == 2){
-               return true;
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 2) {
+              return true;
             }
             return false;
-          }
+          },
         },
         {
           label: "地点:",
@@ -41,12 +102,12 @@ export const tabConfigList = [
           options: {
             placeholder: "服务区地点",
           },
-          visible:(data) => {
-            if(data?.dcEventAccident?.locationType == 2){
-               return true;
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 2) {
+              return true;
             }
             return false;
-          }
+          },
         },
         {
           label: "立交桥:",
@@ -62,46 +123,39 @@ export const tabConfigList = [
               },
             ],
           },
-          visible:(data) => {
-            if(data?.dcEventAccident?.locationType == 3){
-               return true;
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 3) {
+              return true;
             }
             return false;
           },
           ons: {
             change(value, ...args) {
               const { formList } = args.slice(-1)[0];
-        
-              let facilityType = 1;
-              if (value == 2) {
-                facilityType = 6;
-              } else if (value == 3) {
-                facilityType = 3;
-              } else if (value == 4) {
-                facilityType = 1;
-              }
-              if(value && value != 1){
-                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
-              //   request({
-              //     url: `/business/facility/query?facilityType=${facilityType}`,
-              //     method: "get"
-              //   }).then((result) => {
-              //     if (result.code != 200) return Message.error(result?.msg);
-              //     let lwss = [];
-              //     result.data.forEach(it => lwss.push({ key: it.id, label: it.facilityName}))
-        
-              //     formList.forEach((it) => {
-              //       if(it.key == "dcEventAccident.facilityId" || it.key == "dcEventVehicleAccident.facilityId"){
-              //         it.options.options = lwss;
-              //       }
-              //     });
-                  
-              //   }).catch((err) => {
-              //     console.log('err',err)
-              //     Message.error("查询失败", err);
-              //   })
-              }
-              
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventAccident.rampId") {
+                      console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
             },
           },
         },
@@ -112,13 +166,14 @@ export const tabConfigList = [
           isAlone: false,
           required: true,
           options: {
+            options: [],
           },
-          visible:(data) => {
-            if(data?.dcEventAccident?.locationType == 3){
-               return true;
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 3) {
+              return true;
             }
             return false;
-          }
+          },
         },
         {
           label: "收费站:",
@@ -134,12 +189,12 @@ export const tabConfigList = [
               },
             ],
           },
-          visible:(data) => {
-            if(data?.dcEventAccident?.locationType == 4){
-               return true;
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 4) {
+              return true;
             }
             return false;
-          }
+          },
         },
         {
           label: "地点:",
@@ -149,44 +204,56 @@ export const tabConfigList = [
           required: true,
           options: {
             placeholder: "收费站地点",
-            options: [
-              {
-                value: "1",
-                label: "入口车道",
-              },
-              {
-                value: "2",
-                label: "出口车道",
-              },
-            ],
+            options: locationSelect,
           },
-          visible:(data) => {
-            if(data?.dcEventAccident?.locationType == 4){
-               return true;
+          visible: (data) => {
+            if (data?.dcEventAccident?.locationType == 4) {
+              return true;
             }
             return false;
-          }
+          },
         },
         PresetFormItems.direction,
         PresetFormItems.station,
         PresetFormItems.eventHappenTime,
         PresetFormItems.aEstimatedReleaseTime,
-        { ...PresetFormItems.pressure, key: 'dcEventAccident.trafficJam' },
-        { ...PresetFormItems.weatherCondition, key: 'dcEventAccident.weatherCondition' },
-        { ...PresetFormItems.effect, key: 'dcEventAccident.impactLevel' },
-        { ...PresetFormItems.isArrives, key: 'dcEventAccident.isReverseCargo' },
-        { ...PresetFormItems.isMaintenanceAccident, key: 'dcEventAccident.isMaintenance' },
-        { ...PresetFormItems.trafficPolicePhone, key: 'dcEventAccident.policeContact' },
-        { ...PresetFormItems.wreckerCalls, key: 'dcEventAccident.towingServiceContact' },
-        { ...PresetFormItems.isCongestionAhead, key: 'dcEventAccident.congestionAhead' },
-        { ...PresetFormItems.isForkRoad, key: 'dcEventAccident.atIntersection' },
-        { ...PresetFormItems.isCurveRoad, key: 'dcEventAccident.onCurve' },
-        { ...PresetFormItems.isInTunnel, key: 'dcEventAccident.inTunnel' },
-        { ...PresetFormItems.spillName, key: 'dcEventAccident.spillageItem' },
-        { ...PresetFormItems.ownerPhone, key: 'dcEventAccident.vehicleOwnerPhone' },
+        { ...PresetFormItems.pressure, key: "dcEventAccident.trafficJam" },
+        {
+          ...PresetFormItems.weatherCondition,
+          key: "dcEventAccident.weatherCondition",
+        },
+        { ...PresetFormItems.effect, key: "dcEventAccident.impactLevel" },
+        { ...PresetFormItems.isArrives, key: "dcEventAccident.isReverseCargo" },
+        {
+          ...PresetFormItems.isMaintenanceAccident,
+          key: "dcEventAccident.isMaintenance",
+        },
+        {
+          ...PresetFormItems.trafficPolicePhone,
+          key: "dcEventAccident.policeContact",
+        },
+        {
+          ...PresetFormItems.wreckerCalls,
+          key: "dcEventAccident.towingServiceContact",
+        },
+        {
+          ...PresetFormItems.isCongestionAhead,
+          key: "dcEventAccident.congestionAhead",
+        },
+        {
+          ...PresetFormItems.isForkRoad,
+          key: "dcEventAccident.atIntersection",
+        },
+        { ...PresetFormItems.isCurveRoad, key: "dcEventAccident.onCurve" },
+        { ...PresetFormItems.isInTunnel, key: "dcEventAccident.inTunnel" },
+        { ...PresetFormItems.spillName, key: "dcEventAccident.spillageItem" },
+        {
+          ...PresetFormItems.ownerPhone,
+          key: "dcEventAccident.vehicleOwnerPhone",
+        },
         PresetFormItems.laneOccupancy,
-        PresetFormItems.vehicleCondition('dcEventAccident'),
-        PresetFormItems.casualties('dcEventAccident'),
+        PresetFormItems.vehicleCondition("dcEventAccident"),
+        PresetFormItems.casualties("dcEventAccident"),
         PresetFormItems.eventTitle,
         PresetFormItems.eventDesc,
         PresetFormItems.source,
@@ -199,25 +266,192 @@ export const tabConfigList = [
     formConfig: {
       formOptions: {},
       list: [
-        { ...PresetFormItems.callPolicePersonName, key: 'dcEventVehicleAccident.reporterName' },
-        { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventVehicleAccident.reporterPhoneNumber' },
+        {
+          ...PresetFormItems.callPolicePersonName,
+          key: "dcEventVehicleAccident.reporterName",
+        },
+        {
+          ...PresetFormItems.callPolicePersonPhone,
+          key: "dcEventVehicleAccident.reporterPhoneNumber",
+        },
         PresetFormItems.vehicleMalfunctionType,
         PresetFormItems.eventLevel,
-        { ...PresetFormItems.locationMode, key: 'dcEventVehicleAccident.locationType' },
+        {
+          ...PresetFormItems.locationMode,
+          key: "dcEventVehicleAccident.locationType",
+        },
         PresetFormItems.freeway,
+        {
+          label: "服务区:",
+          key: "dcEventVehicleAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventVehicleAccident.location",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "服务区地点",
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventVehicleAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 3) {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventVehicleAccident.rampId") {
+                      // console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败2", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventVehicleAccident.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 3) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "收费站:",
+          key: "dcEventVehicleAccident.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 4) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventVehicleAccident.location",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "收费站地点",
+            options: locationSelect,
+          },
+          visible: (data) => {
+            if (data?.dcEventVehicleAccident?.locationType == 4) {
+              return true;
+            }
+            return false;
+          },
+        },
         PresetFormItems.direction,
         PresetFormItems.station,
         PresetFormItems.eventHappenTime,
         PresetFormItems.aEstimatedReleaseTime,
-        { ...PresetFormItems.pressure, key: 'dcEventVehicleAccident.trafficJam' },
-        { ...PresetFormItems.weatherCondition, key: 'dcEventVehicleAccident.weatherCondition' },
-        { ...PresetFormItems.isCongestionAhead, key: 'dcEventVehicleAccident.congestionAhead' },
-        { ...PresetFormItems.isForkRoad, key: 'dcEventVehicleAccident.atIntersection' },
-        { ...PresetFormItems.isCurveRoad, key: 'dcEventVehicleAccident.onCurve' },
-        { ...PresetFormItems.isInTunnel, key: 'dcEventVehicleAccident.inTunnel' },
+        {
+          ...PresetFormItems.pressure,
+          key: "dcEventVehicleAccident.trafficJam",
+        },
+        {
+          ...PresetFormItems.weatherCondition,
+          key: "dcEventVehicleAccident.weatherCondition",
+        },
+        {
+          ...PresetFormItems.isCongestionAhead,
+          key: "dcEventVehicleAccident.congestionAhead",
+        },
+        {
+          ...PresetFormItems.isForkRoad,
+          key: "dcEventVehicleAccident.atIntersection",
+        },
+        {
+          ...PresetFormItems.isCurveRoad,
+          key: "dcEventVehicleAccident.onCurve",
+        },
+        {
+          ...PresetFormItems.isInTunnel,
+          key: "dcEventVehicleAccident.inTunnel",
+        },
         PresetFormItems.laneOccupancy,
-        PresetFormItems.vehicleCondition('dcEventVehicleAccident'),
-        PresetFormItems.casualties('dcEventVehicleAccident'),
+        PresetFormItems.vehicleCondition("dcEventVehicleAccident"),
+        PresetFormItems.casualties("dcEventVehicleAccident"),
         PresetFormItems.eventTitle,
         PresetFormItems.eventDesc,
         PresetFormItems.source,
@@ -238,6 +472,7 @@ export const tabConfigList = [
           type: "RadioGroup",
           isAlone: true,
           required: true,
+          default: "3-1",
           options: {
             activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
             options: [
@@ -259,6 +494,81 @@ export const tabConfigList = [
               },
             ],
           },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              const classify = formList.find(
+                (it) => it.key == "dcEventTrafficControl.classify"
+              );
+              let ss = {
+                "3-1": "主线",
+                "3-2": "收费站",
+                "3-3": "立交",
+                "3-4": "服务区",
+              };
+              let ad = {
+                1: [
+                  {
+                    key: "1",
+                    label: `${ss[value]}关闭`,
+                  },
+                ],
+                2: [
+                  {
+                    key: "2",
+                    label: "主线限行",
+                  },
+                  {
+                    key: "3",
+                    label: "主线间隔放行",
+                  },
+                  {
+                    key: "4",
+                    label: "主线并道",
+                  },
+                  {
+                    key: "5",
+                    label: "主线限速",
+                  },
+                ],
+              };
+              classify.options.options = ad[data.dcEventTrafficControl.controlType];
+
+              if(data.dcEventTrafficControl) {
+                data.dcEventTrafficControl.facilityId = null;
+              }
+              let facilityType = 1;
+              if (value == '3-2') {
+                facilityType = 1;
+              } else if (value == '3-3') {
+                facilityType = 3;
+              } else if (value == '3-4') {
+                facilityType = 6;
+              }
+              if(value && value != '3-1'){
+                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+                request({
+                  url: `/business/facility/query?facilityType=${facilityType}`,
+                  method: "get"
+                }).then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let lwss = [];
+                  result.data.forEach(it => lwss.push({ key: it.id, label: it.facilityName}))
+        
+                  formList.forEach((it) => {
+                    if(it.key == "dcEventTrafficControl.facilityId"){
+                      it.options.options = lwss;
+                    }
+                  });
+                  
+                }).catch((err) => {
+                  console.log('err',err)
+                  Message.error("查询失败1", err);
+                })
+              }
+
+            },
+          },
         },
         {
           label: "管制分类:",
@@ -266,6 +576,7 @@ export const tabConfigList = [
           type: "RadioGroup",
           isAlone: true,
           required: true,
+          default: "1",
           options: {
             activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
             options: [
@@ -279,6 +590,85 @@ export const tabConfigList = [
               },
             ],
           },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              const classify = formList.find(
+                (it) => it.key == "dcEventTrafficControl.classify"
+              );
+              const measure = formList.find(
+                (it) => it.key == "dcEventTrafficControl.measure"
+              );
+              let ss = {
+                "3-1": "主线",
+                "3-2": "收费站",
+                "3-3": "立交",
+                "3-4": "服务区",
+              };
+              let ad = {
+                1: [
+                  {
+                    key: "1",
+                    label: `${ss[data.eventSubclass]}关闭`,
+                  },
+                ],
+                2: [
+                  {
+                    key: "2",
+                    label: "主线限行",
+                  },
+                  {
+                    key: "3",
+                    label: "主线间隔放行",
+                  },
+                  {
+                    key: "4",
+                    label: "主线并道",
+                  },
+                  {
+                    key: "5",
+                    label: "主线限速",
+                  },
+                ],
+              };
+              let cs = {
+                1: [
+                  {
+                    value: "1",
+                    label: "临时关闭",
+                  },
+                ],
+                2: [
+                  {
+                    value: "2",
+                    label: "限行车辆",
+                  },
+                  {
+                    value: "3",
+                    label: "限行车道",
+                  },
+                  {
+                    value: "4",
+                    label: "限行车道且限行车辆",
+                  },
+                  {
+                    value: "5",
+                    label: "间隔放行",
+                  },
+                  {
+                    value: "6",
+                    label: "并道行驶",
+                  },
+                  {
+                    value: "7",
+                    label: "限速",
+                  },
+                ],
+              };
+              measure.options.options = cs[value];
+              classify.options.options = ad[value];
+            },
+          },
         },
         {
           label: "分类:",
@@ -286,30 +676,14 @@ export const tabConfigList = [
           type: "RadioGroup",
           isAlone: true,
           required: true,
+          default: "1",
           options: {
             activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
             options: [
               {
                 key: "1",
                 label: "主线关闭",
-              },
-              {
-                key: "2",
-                label: "主线限行",
-              },
-              {
-                key: "3",
-                label: "主线间隔放行",
-              },
-              {
-                key: "4",
-                label: "主线并道",
-              },
-              {
-                key: "5",
-                label: "主线限速",
-              },
-            ],
+              },],
           },
         },
         {
@@ -318,6 +692,7 @@ export const tabConfigList = [
           type: "RadioGroup",
           isAlone: true,
           required: true,
+          default: "1",
           options: {
             activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
             options: [
@@ -342,104 +717,367 @@ export const tabConfigList = [
                 label: "警备任务",
               },
               {
-                key: "6",
-                label: "其他",
+                key: "6",
+                label: "其他",
+              },
+            ],
+          },
+          ons: {
+            input(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+              const config = formList.find(
+                (it) => it.key == "dcEventTrafficControl.causeType"
+              );
+              let ad = {
+                3: [
+                  {
+                    value: "3-1",
+                    label: "雨",
+                  },
+                  {
+                    value: "3-2",
+                    label: "雪",
+                  },
+                  {
+                    value: "3-3",
+                    label: "雾",
+                  },
+                  {
+                    value: "3-4",
+                    label: "道路积水",
+                  },
+                  {
+                    value: "3-5",
+                    label: "道路湿滑",
+                  },
+                  {
+                    value: "3-6",
+                    label: "道路结冰",
+                  },
+                  {
+                    value: "3-7",
+                    label: "沙尘暴",
+                  },
+                ],
+                4: [
+                  {
+                    value: "4-1",
+                    label: "专项工程施工",
+                  },
+                  {
+                    value: "4-2",
+                    label: "改扩建工程施工",
+                  },
+                  {
+                    value: "4-3",
+                    label: "其他施工",
+                  },
+                ],
+              };
+              config.options.options = ad[value];
+            },
+          },
+        },
+        PresetFormItems.isInTunnel,
+        {
+          label: "原因类型:",
+          key: "dcEventTrafficControl.causeType",
+          type: "select",
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (
+              data?.dcEventTrafficControl.controlCause == "3" ||
+              data?.dcEventTrafficControl.controlCause == "4"
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        PresetFormItems.freeway,
+        PresetFormItems.direction,
+        PresetFormItems.emptyLine,
+        {
+          label: "出入口:",
+          key: "dcEventTrafficControl.exitsInlets",
+          type: "RadioGroup",
+          isAlone: true,
+          required: true,
+          default: "2",
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "出口",
+              },
+              {
+                key: "2",
+                label: "入口",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-2" || data?.eventSubclass == "3-4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "收费站:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-2") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-3") {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  // console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventTrafficControl.rampId") {
+                      console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventTrafficControl.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "服务区:",
+          key: "dcEventTrafficControl.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "3-4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "措施:",
+          required: true,
+          key: "dcEventTrafficControl.measure",
+          type: "select",
+          options: {
+            options: [
+              {
+                value: "1",
+                label: "临时关闭",
               },
             ],
           },
         },
-        PresetFormItems.isInTunnel,
         {
-          label: "原因类型:",
-          key: "dcEventTrafficControl.causeType",
+          label: "限制类型:",
+          key: "dcEventAccident.limitedType",
+          required: true,
           type: "select",
           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: "沙尘暴",
-              },
-              {
-                value: "4-1",
-                label: "专项工程施工",
-              },
-              {
-                value: "4-2",
-                label: "改扩建工程施工",
-              },
-              {
-                value: "4-3",
-                label: "其他施工",
-              },
-            ]
-          }
+              { key: "1", label: "只允许" },
+              { key: "2", label: "禁止" },
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventTrafficControl.controlType == "2") {
+              return true;
+            }
+            return false;
+          },
         },
-        PresetFormItems.freeway,
-        PresetFormItems.direction,
-        PresetFormItems.emptyLine,
         {
-          label: "措施:",
+          label: "车辆类型:",
+          key: "dcEventAccident.vehicleType",
           required: true,
-          key: "dcEventTrafficControl.measure",
           type: "select",
           options: {
             options: [
+              { key: "1", label: "10座以下客车" },
+              { key: "2", label: "10座以下客车(间隔放行)" },
+              { key: "3", label: "19座以上客车" },
+              { key: "4", label: "一型客车(不含面包车)" },
+              { key: "5", label: "两客一危" },
+              { key: "6", label: "三类以上班线客车" },
               {
-                value: "1",
-                label: "临时关闭",
-              },
-              {
-                value: "2",
-                label: "限行车辆",
-              },
-              {
-                value: "3",
-                label: "限行车道",
-              },
-              {
-                value: "4",
-                label: "限行车道且限行车辆",
-              },
-              {
-                value: "5",
-                label: "间隔放行",
-              },
+                key: "7",
+                label: "四轴及四轴以上货车(运送生鲜果蔬、抗疫物资车辆除外)",
+              },
+              { key: "8", label: "三轴及以上(含三轴)货车" },
+              { key: "9", label: "3轴以上货车(不含危险品运输车)" },
+              { key: "10", label: "3轴以上货车" },
+              { key: "11", label: "四轴及以上(含四轴)货车" },
+              { key: "12", label: "4轴以上货车(不含危险品运输车)" },
+              { key: "13", label: "4轴以上货车" },
+              { key: "14", label: "4轴以下货车" },
+              { key: "15", label: "57座以上客车" },
+              { key: "16", label: "五轴及以上货车" },
+              { key: "17", label: "5轴以上货车" },
+              { key: "18", label: "5轴以上货车(不含危险品运输车)" },
+              { key: "19", label: "5轴以下货车" },
+              { key: "20", label: "6座以上客车" },
+              { key: "21", label: "6座以上面包车" },
+              { key: "22", label: "7座以上客车" },
+              { key: "23", label: "7座以下客车" },
+              { key: "24", label: "8座以上客车" },
+              //   25- 8座以下客车
+              //   26- 8座以下客车(间隔放行)
+              //   27- 9座以上客车
+              //   28- 半挂货车
+              //   29- 车辆（不含10座以下客车）
+              //   30- 车辆（不含8座以下客车）
+              //   31- 车辆（不含小轿车）
+              //   32- 不可解体物品超限运输车
+              //   33- 不可解体物品运输车
+              //   34- 超长超宽超高车辆
+              //   35- 车辆运输车
+              //   36- 超限运输车
+              //   37- 大型货车(不含危险品运输车)
+              //   38- 大型货车
+              //   39- 大型客车
+              //   40- 大中型货车
+              //   41- 已安装ETC的客车
+              //   42- 已安装ETC的小型客车
+              //   43- 罐车
+              //   44- 货车
+              //   45- 黄牌货车
+              //   46- 黄牌货车(不含危险品运输车)
+              //   47- 黄牌货车(运送民生物资车辆除外)
+              //   48- 核载总质量4.5吨以上货车(运送民生物资车辆除外)
+              // 49- 客车（包括小轿车）
+              // 50- 客运车辆
+              // 51- 蓝牌货车
+              // 52- 旅游包车
+              // 53- 面包车
+              // 54- 皮卡
+              // 55- 全部车型
+              // 56- (未安装ETC)车辆
+              // 57- 外埠号牌车辆
+              // 58- 危化品运输车
+              // 59- 危险物品运输车
+              // 60- 武装押运车辆
+              // 61- 小轿车
+              // 62- 厢式货车
+              // 63- 小型车辆
+              // 64- (已安装ETC)车辆
+              // 65- 已安装ETC的货车
+              // 66- 押款车辆
+              // 67- 疫情防控物资运输车辆
+              // 68- 运输剧毒、放射性物品车辆
+              // 69- 运输枪支弹药、爆炸、剧毒、放射性物品车辆
+              // 70- 营运客车
+              // 71- 重型货车
+              // 72- 核载总质量1.8吨以上货车
+              // 73- 中型货车
+              // 74- 小型车辆限速80公里/小时、大型车辆限速70
+            ],
+          },
+          visible: (data) => {
+            if (data?.dcEventTrafficControl.controlType == "2") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "桩号:",
+          key: "stakeMark",
+          required: true,
+          type: "MultipleLabelItem",
+          options: {
+            options: [
               {
-                value: "6",
-                label: "并道行驶",
+                prefix: {
+                  text: "K",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[0]",
               },
               {
-                value: "7",
-                label: "限速",
+                prefix: {
+                  text: "+",
+                  style: {
+                    color: "#3DE8FF",
+                  },
+                },
+                key: "stakeMark[1]",
               },
             ],
           },
+          visible: (data) => {
+            if (data?.eventSubclass == '3-1') {
+              return true;
+            }
+            return false;
+          },
         },
-        PresetFormItems.station,
         PresetFormItems.startTime,
         PresetFormItems.expectedEndTime,
         PresetFormItems.remark,
@@ -481,11 +1119,47 @@ export const tabConfigList = [
               },
             ],
           },
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              if (data.dcEventTrafficCongestion) {
+                data.dcEventTrafficCongestion.facilityId = null;
+              }
+              let facilityType = 1;
+              if (value == "4-2") facilityType = 3;
+              if (value == "4-3") facilityType = 1;
+              if (value == "4-4") facilityType = 6;
+              //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+              request({
+                url: `/business/facility/query?facilityType=${facilityType}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let lwss = [];
+                  result.data.forEach((it) =>
+                    lwss.push({ key: it.id, label: it.facilityName })
+                  );
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventTrafficCongestion.facilityId") {
+                      it.options.options = lwss;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败1", err);
+                });
+            },
+          },
+        },
+        {
+          ...PresetFormItems.congestionCause,
+          key: "dcEventTrafficCongestion.congestionCause",
         },
-        { ...PresetFormItems.congestionCause, key: 'dcEventTrafficCongestion.congestionCause' },
         {
           label: "详细原因:",
-          key: "xxyy",
+          key: "detailedReasons",
           type: "RadioGroup",
           isAlone: true,
           required: true,
@@ -527,14 +1201,162 @@ export const tabConfigList = [
               },
             ],
           },
-          visible:(data) => {
-            if(data?.dcEventTrafficCongestion?.congestionCause == 1 || data?.dcEventTrafficCongestion?.congestionCause == 6){
+          ons: {
+            input(value, ...args) {
+              const { data, formList } = args.slice(-1)[0];
+              if (data.dcEventTrafficCongestion) {
+                data.dcEventTrafficCongestion.facilityId = null;
+              }
+              if (
+                data.dcEventTrafficCongestion.congestionCause == 1 &&
+                value == 2
+              ) {
+                console.log("value2", value);
+                //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+                request({
+                  url: `/business/facility/query?facilityType=1`,
+                  method: "get",
+                })
+                  .then((result) => {
+                    if (result.code != 200) return Message.error(result?.msg);
+                    let sfz = [];
+                    result.data.forEach((it) =>
+                      sfz.push({ key: it.id, label: it.facilityName })
+                    );
+                    formList.forEach((it) => {
+                      if (it.key == "dcEventTrafficCongestion.facilityId") {
+                        it.options.options = sfz;
+                      }
+                    });
+                  })
+                  .catch((err) => {
+                    console.log("err", err);
+                    Message.error("查询失败1", err);
+                  });
+              }
+            },
+          },
+          visible: (data) => {
+            if (
+              data?.eventSubclass == "4-1" &&
+              (data?.dcEventTrafficCongestion?.congestionCause == 1 ||
+                data?.dcEventTrafficCongestion?.congestionCause == 6)
+            ) {
               return true;
             }
             return false;
           },
         },
         { ...PresetFormItems.isInTunnel, isAlone: true },
+        {
+          label: "高速公路:",
+          required: true,
+          key: "roadId",
+          type: "select",
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" || data?.eventSubclass == "4-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "方向:",
+          key: "direction",
+          required: true,
+          type: "select",
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" || data?.eventSubclass == "4-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "拥堵收费站:",
+          key: "dcEventTrafficCongestion.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (
+              data?.eventSubclass == "4-3" ||
+              (data?.eventSubclass == "4-1" &&
+                data?.dcEventTrafficCongestion.congestionCause == "1" &&
+                data.detailedReasons == "2")
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventTrafficCongestion.location",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "收费站地点",
+            options: locationSelect,
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-3") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "拥堵服务区:",
+          key: "dcEventTrafficCongestion.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-4") {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "地点:",
+          key: "dcEventTrafficCongestion.location",
+          isAlone: false,
+          required: true,
+          options: {
+            placeholder: "地点描述",
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-4") {
+              return true;
+            }
+            return false;
+          },
+        },
         {
           label: "地点类型:",
           key: "locationType",
@@ -555,6 +1377,12 @@ export const tabConfigList = [
               },
             ],
           },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1") {
+              return true;
+            }
+            return false;
+          },
         },
         {
           label: "桩号:",
@@ -583,12 +1411,12 @@ export const tabConfigList = [
               },
             ],
           },
-          visible:(data) => {
-            if(data?.locationType != 1){
-              return false;
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" && data?.locationType == 1) {
+              return true;
             }
-            return true;
-          }
+            return false;
+          },
         },
         {
           label: "起止桩号:",
@@ -636,13 +1464,80 @@ export const tabConfigList = [
               },
             ],
           },
-          visible:(data) => {
-            if(data?.locationType == 2){
+          visible: (data) => {
+            if (data?.eventSubclass == "4-1" && data?.locationType == 2) {
+              return true;
+            }
+            return false;
+          },
+        },
+        {
+          label: "立交桥:",
+          key: "dcEventTrafficCongestion.facilityId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [
+              {
+                value: "选项1",
+                label: "黄金糕",
+              },
+            ],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-2") {
+              return true;
+            }
+            return false;
+          },
+          ons: {
+            change(value, ...args) {
+              const { formList } = args.slice(-1)[0];
+
+              //匝道
+              request({
+                url: `/system/ramp/listAll?facilityId=${value}`,
+                method: "get",
+              })
+                .then((result) => {
+                  if (result.code != 200) return Message.error(result?.msg);
+                  let zd = [];
+                  result.rows.forEach((it) =>
+                    zd.push({ key: it.id, label: it.rampName })
+                  );
+                  console.log("zd", zd);
+                  formList.forEach((it) => {
+                    if (it.key == "dcEventTrafficCongestion.rampId") {
+                      console.log("it", it);
+                      it.options.options = zd;
+                    }
+                  });
+                })
+                .catch((err) => {
+                  console.log("err", err);
+                  Message.error("查询失败3", err);
+                });
+            },
+          },
+        },
+        {
+          label: "匝道:",
+          key: "dcEventTrafficCongestion.rampId",
+          type: "select",
+          isAlone: false,
+          required: true,
+          options: {
+            options: [],
+          },
+          visible: (data) => {
+            if (data?.eventSubclass == "4-2") {
               return true;
             }
             return false;
-          }
+          },
         },
+
         {
           label: "拥堵里程:",
           key: "dcEventTrafficCongestion.congestionMileage",
@@ -784,31 +1679,34 @@ export const tabConfigList = [
               },
             ],
           },
-          ons:{
-            input(value, ...args){
+          ons: {
+            input(value, ...args) {
               const { formList } = args.slice(-1)[0];
-              const config = formList.find(it => it.key == 'eventSubclass');
-              const ad = {1: [ 
-                { 
-                  key: "7-1",
-                  label: "道路养护施工",
-                },
-                {
-                  key: "7-2",
-                  label: "收费站养护施工",
-                },
-                {
-                  key: "7-3",
-                  label: "服务区养护施工",
-                },
-                {
-                  key: "7-4",
-                  label: "枢纽立交匝道养护施工",
-                },
-                {
-                  key: "7-5",
-                  label: "地方道路养护施工",
-                }], 2: [
+              const config = formList.find((it) => it.key == "eventSubclass");
+              const ad = {
+                1: [
+                  {
+                    key: "7-1",
+                    label: "道路养护施工",
+                  },
+                  {
+                    key: "7-2",
+                    label: "收费站养护施工",
+                  },
+                  {
+                    key: "7-3",
+                    label: "服务区养护施工",
+                  },
+                  {
+                    key: "7-4",
+                    label: "枢纽立交匝道养护施工",
+                  },
+                  {
+                    key: "7-5",
+                    label: "地方道路养护施工",
+                  },
+                ],
+                2: [
                   {
                     key: "7-6",
                     label: "道路建设施工",
@@ -828,11 +1726,12 @@ export const tabConfigList = [
                   {
                     key: "7-10",
                     label: "地方道路建设施工",
-                  }
-                ]};
-              config.options.options = ad[value] || []
-            }
-          }
+                  },
+                ],
+              };
+              config.options.options = ad[value] || [];
+            },
+          },
         },
         {
           label: "施工分类:",
@@ -887,7 +1786,10 @@ export const tabConfigList = [
           },
         },
         PresetFormItems.isInTunnel,
-        { ...PresetFormItems.locationType, key: 'dcEventConstruction.locationType' },
+        {
+          ...PresetFormItems.locationType,
+          key: "dcEventConstruction.locationType",
+        },
         PresetFormItems.freeway,
         PresetFormItems.direction,
         PresetFormItems.station,
@@ -904,8 +1806,14 @@ export const tabConfigList = [
             showWordLimit: true,
           },
         },
-        { ...PresetFormItems.specialConstruction, key: 'dcEventConstruction.specialConstruction' },
-        { ...PresetFormItems.constructionMeasurement, key: 'dcEventConstruction.constructionMeasurement' },
+        {
+          ...PresetFormItems.specialConstruction,
+          key: "dcEventConstruction.specialConstruction",
+        },
+        {
+          ...PresetFormItems.constructionMeasurement,
+          key: "dcEventConstruction.constructionMeasurement",
+        },
         PresetFormItems.startTime,
         PresetFormItems.expectedEndTime,
         PresetFormItems.remark,
@@ -1113,7 +2021,10 @@ export const tabConfigList = [
             ],
           },
         },
-        { ...PresetFormItems.weatherSituation, key: 'dcEventAbnormalWeather.weatherSituation' },
+        {
+          ...PresetFormItems.weatherSituation,
+          key: "dcEventAbnormalWeather.weatherSituation",
+        },
         PresetFormItems.additionalNotes,
         PresetFormItems.freeway,
         PresetFormItems.direction,
@@ -1133,8 +2044,8 @@ export const tabConfigList = [
                 value: "2",
                 label: "紧急",
               },
-            ]
-          }
+            ],
+          },
         },
         PresetFormItems.isInTunnel,
         PresetFormItems.startTime,
@@ -1175,6 +2086,4 @@ export const tabConfigList = [
       ],
     },
   },
-
-
 ];
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 9c94e6d4..65da9a77 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
@@ -88,7 +88,7 @@ export default {
             this.roads.push({ key: it.id, label: it.roadName })
           })
         }).catch((err) => {
-          Message.error("查询失败", err);
+          Message.error("查询失败4", err);
         }),
         //方向字典
         request({
@@ -100,7 +100,7 @@ export default {
             this.direction.push({ key: it.dictValue, label: it.dictLabel })
           })
         }).catch((err) => {
-          Message.error("查询失败", err);
+          Message.error("查询失败5", err);
         }),
         //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
         request({
@@ -108,9 +108,10 @@ export default {
           method: "get"
         }).then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
-          result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: facilityType }))
+          result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: it.facilityType }))
         }).catch((err) => {
-          Message.error("查询失败", err);
+          console.log('err', err)
+          Message.error("查询失败6", err);
         })
 
       ])
@@ -148,9 +149,15 @@ export default {
         if (this.index == 0 || this.index == 1) {
           formData.lang = formData.lang.join(',')
         }
-        if (this.index == 9) {
+        if (formData.endStakeMark) {
           let endStakeMark = formData.endStakeMark;
-          formData.dcEventAbnormalWeather.endStakeMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : '';
+          let strMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : '';
+          if (this.index == 3) {
+            formData.dcEventTrafficCongestion.endStakeMark = strMark;
+          }
+          if (this.index == 9) {
+            formData.dcEventAbnormalWeather.endStakeMark = strMark;
+          }
           formData.endStakeMark = '';
         }
         // console.log('formData',formData)
@@ -163,19 +170,17 @@ export default {
           data: {
             ...formData,
             eventType: Number(this.index) + 1,
-            stakeMark: (stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '',
+            stakeMark: stakeMark ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
           }
+        }).then((result) => {
+          if (result.code != 200) return Message.error(result?.msg);
+          Message.success("提交成功");
+          this.modelVisible = false;
+        }).catch(() => {
+          Message.error("提交失败");
+        }).finally(() => {
+          this.submitting = false;
         })
-          .then((result) => {
-            if (result.code != 200) return Message.error(result?.msg);
-            Message.success("提交成功");
-            this.modelVisible = false;
-          })
-          .catch(() => {
-            Message.error("提交失败");
-          }).finally(() => {
-            this.submitting = false;
-          })
 
       })
 
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 f958b6f8..a5423158 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
@@ -109,7 +109,7 @@ export const gjSearchFormList = [
     required: false,
     type: "datePicker",
     options: {
-      type: "daterange",
+      type: "datetimerange",
       format: "yyyy-MM-dd HH:mm:ss",
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index e60d42f8..6240f771 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
@@ -43,7 +43,7 @@
     </div>
 
     <!-- "详情"弹出框 -->
-    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" @update:value="handleClose" />
+    <EventDetailDialog :visible="eventDetailDialogVisible" :formData="detailDialogFormData" :activeName="activeName" @update:value="handleClose" />
     <!-- "新增"弹出框 -->
     <FormEvent :visible="isShowAddNew" @close="onCloseAddNew" />
   </div>
@@ -87,6 +87,11 @@ const directionMapping = {
   '2': '中',
   '3': '下行'
 }
+const gzDirectionMapping = {
+  '1': '菏泽方向',
+  '2': '双向',
+  '3': '济南方向'
+}
 const warningStateMapping = {
   1: '上报',
   2: '已完成',
@@ -184,7 +189,7 @@ export default {
         }).then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
           result.rows.forEach(it => {
-            it.stringEventSource = warningSourceMapping[it.warningSource];
+            it.stringEventSource = it?.warningSource ? warningSourceMapping[it?.warningSource] : '';
             it.stringDirection = directionMapping[it.direction] || it.direction;
             it.startTime = it.warningTime;
 
@@ -205,6 +210,13 @@ 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;
+            // if (it.otherConfig) {
+            //   let otherConfig = JSON.parse(it.otherConfig);
+            //   it.pictures = otherConfig.pictures || [];
+            // }
+          })
           this.data = result.rows;
           this.total = result.total;
         });
@@ -290,7 +302,7 @@ export default {
           if (result.code != 200) return Message.error(result?.msg);
           let data = result.data;
 
-          data.stringEventSource = warningSourceMapping[data.warningSource];
+          data.stringEventSource = data?.warningSource ? warningSourceMapping[data.warningSource] : '';
           data.direction = directionMapping[data.direction] || data.direction;
           data.startTime = data.warningTime;
           data.stringEventState = warningStateMapping[data.warningState];
@@ -341,7 +353,7 @@ export default {
         ...this.searchData,
         eventType: data.eventType,
         eventSources: data.eventSources,
-        warningSource: data.warningSource,
+        warningSource: data?.warningSource || '',
         direction: data.direction,
         startTime: daterange && daterange.length > 0 ? daterange[0] : "",
         endTime: daterange && daterange.length > 0 ? daterange[1] : "",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js
index d942d30c..c935e8b8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js
@@ -66,7 +66,7 @@ var options = {
     {
       name: "",
       type: "pie",
-      radius: "120px",
+      radius: "60px",
       width: "200px",
       center: ["130px", "50%"],
       roseType: "radius",
@@ -111,7 +111,7 @@ var options = {
     {
       name: "",
       type: "pie",
-      radius: "130px",
+      radius: "70px",
       hoverAnimation: false,
       emphasis: { scale: false },
       center: ["130px", "50%"],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
index bef82428..96e1de1c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
@@ -66,6 +66,7 @@ export default {
               for (let i = 0; i < data.length; i++) {
                 let it = data[i];
                 if (it.warningState == 1) {
+                  // it.number = 86;
                   echartsData.push({
                     name: "上报",
                     value: it.number
@@ -141,10 +142,10 @@ export default {
         context.lineWidth = 1; // 设置线段宽度
 
         // 绘制圆角矩形
-        drawRoundRect(context, 242, 36, 180, 24, 12, gr)
-        drawRoundRect(context, 242, 63, 180, 24, 12, gr)
-        drawRoundRect(context, 242, 90, 180, 24, 12, gr)
-        drawRoundRect(context, 242, 117, 180, 24, 12, gr)
+        drawRoundRect(context, 230, 36, 180, 24, 12, gr)
+        drawRoundRect(context, 230, 63, 180, 24, 12, gr)
+        drawRoundRect(context, 230, 90, 180, 24, 12, gr)
+        drawRoundRect(context, 230, 117, 180, 24, 12, gr)
       });
     });
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index copy.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index copy.vue
index eb1975e4..ab9ea83e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index copy.vue	
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index copy.vue	
@@ -437,7 +437,7 @@ export default {
         getRoadSectionList().then(res => {
           console.log(res);
           if (res.code == 200) {
-            let rows = res.rows;
+            let rows = res.data;
             this.dataList = [];
             rows.forEach(it => {
               this.dataList.push({
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
index d4331bab..9abb5d86 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
@@ -554,7 +554,7 @@ export default {
         getRoadSectionList().then((res) => {
           console.log(res);
           if (res.code == 200) {
-            let rows = res.rows;
+            let rows = res.data;
             this.dataList = [];
             rows.forEach((it) => {
               this.dataList.push({
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
new file mode 100644
index 00000000..ac61a401
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
@@ -0,0 +1,144 @@
+<template>
+  <Dialog v-model="modelVisible" :title="data ? '修改' : '新增'">
+    <div class='AddNEditDialog'>
+      <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList" column="1" labelWidth="90px" />
+    </div>
+
+    <template #footer>
+      <Button style="background-color: rgba(0, 179, 204, .3);" @click.native="modelVisible = false, submitting = false">
+        取消
+      </Button>
+      <Button @click.native="handleSubmit" :loading="submitting">
+        确定
+      </Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue"
+import Form from '@screen/components/FormConfig';
+
+import request from "@/utils/request";
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
+import { Message } from "element-ui";
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+
+export default {
+  name: 'AddNEditDialog',
+  components: {
+    Dialog,
+    Button,
+    Form
+  },
+  model: {
+    prop: 'visible',
+    event: "update:value"
+  },
+  props: {
+    visible: Boolean,
+    data: Object
+  },
+  inject: ['setCurrentPage'],
+  data() {
+    return {
+      submitting: false,
+      formData: {},
+      formList: [
+        {
+          label: "信息级别:",
+          key: "level",
+          type: "RadioGroup",
+          isAlone: true,
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "影响通行",
+              },
+              {
+                key: "2",
+                label: "不影响通行",
+              },
+            ],
+          },
+        },
+        PresetFormItems.releaseChannel,
+        {
+          label: "审核方式:",
+          key: "level",
+          type: "RadioGroup",
+          isAlone: true,
+          options: {
+            activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+            options: [
+              {
+                key: "1",
+                label: "单人审核",
+              },
+              {
+                key: "2",
+                label: "双人审核",
+              },
+            ],
+          },
+        },
+        {
+          label: "启用日期:",
+          key: "startDate",
+          type: "DatePicker",
+          required: true
+        }
+
+      ]
+    }
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:value', val)
+      }
+    }
+  },
+  watch: {
+    modelVisible: {
+      immediate: true,
+      handler(bool) {
+        if (!bool) return;
+
+        this.formData = {
+          ...this.data
+        }
+
+        this.getOptions();
+      }
+    }
+  },
+  methods: {
+    getOptions() {
+    },
+    handleSubmit() {
+
+    }
+  },
+}
+</script>
+
+<style lang='scss' scoped>
+.AddNEditDialog {
+  width: 450px;
+  height: 200px;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+
+  .tips {
+    font-size: 12px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
index 8522d4d8..fa854f02 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
@@ -16,7 +16,10 @@
     <Descriptions :list="list" style="gap: 15px; flex: 1; margin-top: 9px;" column="1" />
 
     <div class="footer">
-      <Button>修改</Button>
+      <Button @click.native="() => handleOpenDialogAddEdit(item)">修改</Button>
+      <Button style="background-color: #FF5F5F;" @click.native="handleDelete(item)">
+        删除
+      </Button>
     </div>
   </div>
 </template>
@@ -96,6 +99,7 @@ export default {
     width: 100%;
     align-items: center;
     justify-content: flex-end;
+    gap: 6px;
   }
 }
 </style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/data.js
new file mode 100644
index 00000000..09ad820f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/data.js
@@ -0,0 +1,56 @@
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+import { merge, cloneDeep } from "lodash";
+
+export const searchFormList = [
+  {
+    label: "启用日期:",
+    key: "daterange",
+    required: false,
+    type: "datePicker",
+    options: {
+      type: "daterange",
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
+    },
+  },
+  PresetFormItems.eventType,
+  PresetFormItems.releaseChannel,
+  {
+    label: "信息级别:",
+    key: "level",
+    type: "RadioGroup",
+    isAlone: true,
+    options: {
+      activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+      options: [
+        {
+          key: "1",
+          label: "影响通行",
+        },
+        {
+          key: "2",
+          label: "不影响通行",
+        },
+      ],
+    },
+  },
+  {
+    label: "启用状态:",
+    key: "status",
+    type: "RadioGroup",
+    isAlone: true,
+    options: {
+      activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+      options: [
+        {
+          key: "1",
+          label: "启用",
+        },
+        {
+          key: "2",
+          label: "停用",
+        },
+      ],
+    },
+  },
+];
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 7b8848e4..fff01f9a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
@@ -2,14 +2,22 @@
   <div class='PublishingChannelManagement'>
     <!-- 搜索栏 -->
     <div class="filter">
-      <ButtonGradient>
-        <template #prefix>
-          <img src="@screen/images/refresh.svg" />
-        </template>
-        刷新
-      </ButtonGradient>
+      <div>
+        <ButtonGradient @click.native="handleOpenDialogAddEdit()">
+          <template #prefix>
+            <img src="@screen/images/insert.svg" />
+          </template>
+          新增
+        </ButtonGradient>
+        <ButtonGradient>
+          <template #prefix>
+            <img src="@screen/images/refresh.svg" />
+          </template>
+          刷新
+        </ButtonGradient>
+      </div>
 
-      <InputSearch style="width: 402px;" />
+      <InputSearch style="width: 402px;" :formList="searchFormList" @handleSearch="handleSearch" />
     </div>
 
     <!-- 内容 -->
@@ -21,6 +29,9 @@
     <div class="footer">
       <Pagination :total="90" />
     </div>
+
+    <!-- 新增编辑弹窗 -->
+    <AddNEditDialog v-model="addNEditDialogVisible" :data="dialogData" />
   </div>
 </template>
 
@@ -29,6 +40,9 @@ import Pagination from '@screen/components/Pagination.vue';
 import InputSearch from '@screen/components/InputSearch/index.vue';
 import Card from './components/Card';
 import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
+import AddNEditDialog from "./components/AddNEditDialog.vue";
+
+import { searchFormList } from './data';
 
 export default {
   name: 'PublishingChannelManagement',
@@ -36,8 +50,28 @@ export default {
     Pagination,
     InputSearch,
     Card,
-    ButtonGradient
+    ButtonGradient,
+    AddNEditDialog
   },
+  data() {
+    return {
+      searchFormList,
+      data: [],
+      addNEditDialogVisible: false,
+      dialogData: null
+    }
+  },
+  methods: {
+    handleOpenDialogAddEdit(data) {
+      console.log('data', data);
+      this.addNEditDialogVisible = true;
+      this.dialogData = data;
+    },
+    handleSearch(data) {
+      // this.searchData = data;
+      // this.getData();
+    },
+  }
 }
 </script>
 
@@ -56,6 +90,10 @@ export default {
     height: 60px;
     display: flex;
     justify-content: space-between;
+    div {
+      display: flex;
+      gap: 6px;
+    }
   }
 
   .body {