From 63f5fe69a0c38a33a7920b74528476736f4923d0 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 1 Feb 2024 17:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/control/event/event/data.js         | 48 ++++++++++++++-----
 .../pages/control/event/event/index.vue       |  4 +-
 2 files changed, 39 insertions(+), 13 deletions(-)

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 926dc8c2..7b4be9ea 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
@@ -27,10 +27,31 @@ export const tabMap = {
 export const searchFormList = [
   PresetFormItems.eventSources,
   PresetFormItems.eventType,
+  {
+    label: "方向:",
+    key: "direction",
+    type: "RadioGroup",
+    options: {
+      options: [
+        {
+          key: "济南方向",
+          label: "济南方向",
+        },
+        {
+          key: "菏泽方向",
+          label: "菏泽方向",
+        },
+        {
+          key: "双向",
+          label: "双向",
+        },
+      ],
+    },
+  },
   {
     label: "时间范围:",
     key: "daterange",
-    required: true,
+    required: false,
     type: "datePicker",
     options: {
       type: "daterange",
@@ -41,16 +62,21 @@ export const searchFormList = [
   {
     ...PresetFormItems.station,
     label: "开始桩号:",
+    required: false,
   },
-  merge(cloneDeep(PresetFormItems.station), {options:{
-    options: [
-      {
-        key: "endStakeMark[0]",
-      },
-      {
-        key: "endStakeMark[1]",
-      },
-    ],
-  }}
+  merge(cloneDeep(PresetFormItems.station), {
+    options: {
+      options: [
+        {
+          key: "endStakeMark[0]",
+        },
+        {
+          key: "endStakeMark[1]",
+        },
+      ],
+    },
+    label: "结束桩号:",
+    required: false,
+  }
   )
 ];
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 82574952..a1288fdd 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
@@ -240,8 +240,8 @@ export default {
       let dStakeMark = data.stakeMark;
       let dendStakeMark = data.endStakeMark;
 
-      let stakeMark = `K${dStakeMark[0]}+${dStakeMark[1]}`;
-      let endStakeMark = `K${dendStakeMark[0]}+${dendStakeMark[1]}`;
+      let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : '';
+      let endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0]}+${dendStakeMark[1]}` : '';
 
       this.searchData = {
         ...this.searchData,