diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
index a562d58c..d72620c8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
@@ -238,7 +238,7 @@ export default {
     modelVisible: {
       get() {
         if (this.visible) {
-          this.deviceId = 'K82+285';
+          // this.deviceId = 'K82+285';
           this.initData();
         }
         return this.visible
@@ -360,7 +360,7 @@ export default {
       }
 
 
-    }
+    },
 
   },
 }
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 026e67f5..f5ceb632 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
@@ -108,13 +108,71 @@ export const gjSearchFormList = [
       ],
     },
   },
+  {
+    label: "事件主类:",
+    key: "warningType",
+    type: "select",
+    options: {
+      clearable: true,
+      options: [
+        {
+          value: 1,
+          label: "交通拥堵",
+        },
+        {
+          value: 2,
+          label: "行人",
+        },
+        {
+          value: 3,
+          label: "非机动车",
+        },
+        {
+          value: 4,
+          label: "停车",
+        },
+        {
+          value: 5,
+          label: "违规驾驶",
+        },
+        {
+          value: 6,
+          label: "路障",
+        },
+        {
+          value: 7,
+          label: "道路施工",
+        },
+        {
+          value: 8,
+          label: "异常天气",
+        },
+        {
+          value: 9,
+          label: "护栏碰撞",
+        },
+        {
+          value: 10,
+          label: "交通事故",
+        },
+        {
+          value: 11,
+          label: "车辆故障",
+        },
+        {
+          value: 99,
+          label: "其他事件",
+        },
+      ],
+    },
+  },
   {
     label: "时间范围:",
     key: "daterange",
     required: false,
     type: "datePicker",
     options: {
-      style: 'width: auto',
+      style: "width: auto",
       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 1def4b6a..aec6be1c 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
@@ -343,6 +343,7 @@ export default {
       this.searchData = {
         ...this.searchData,
         eventType: data.eventType,
+        warningType: data.warningType,
         eventSource: data.eventSource,
         warningSource: data?.warningSource || '',
         direction: data.direction,