From 9a8d1409ebd4ced68a6a50bbf98c69f9a4c3bd99 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 21 May 2024 11:13:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/perception/eventAnalysis/data.js    | 49 +++++++++++++++++++
 .../pages/perception/eventAnalysis/index.vue  |  8 +--
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
index 5960c430..26ebccb4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/data.js
@@ -16,6 +16,19 @@ const station = {
           },
         },
         key: "stakeMark[0]",
+        rules: [
+          {
+            message: "请补全桩号",
+            callback(value, data) {
+              if (value || data.stakeMark[1]){
+                return /^0\d{2}|\d{3}$/.test(value);
+              } else {
+                return true
+              }
+            },
+          }
+        ],
+
       },
       {
         prefix: {
@@ -25,6 +38,18 @@ const station = {
           },
         },
         key: "stakeMark[1]",
+        rules: [
+          {
+            message: "请补全桩号",
+            callback(value, data) {
+              if (value || data.stakeMark[0]){
+                return /^0\d{2}|\d{3}$/.test(value);
+              } else {
+                return true
+              }
+            },
+          }
+        ],
       },
     ],
   },
@@ -214,9 +239,33 @@ export const searchFormList = [
       options: [
         {
           key: "endStakeMark[0]",
+          rules: [
+            {
+              message: "请补全桩号",
+              callback(value, data) {
+                if (value || data.endStakeMark[1]){
+                  return /^0\d{2}|\d{3}$/.test(value);
+                } else {
+                  return true
+                }
+              },
+            }
+          ],
         },
         {
           key: "endStakeMark[1]",
+          rules: [
+            {
+              message: "请补全桩号",
+              callback(value, data) {
+                if (value || data.endStakeMark[0]){
+                  return /^0\d{2}|\d{3}$/.test(value);
+                } else {
+                  return true
+                }
+              },
+            }
+          ],
         },
       ],
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
index 96b43006..4391926f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventAnalysis/index.vue
@@ -135,7 +135,7 @@ export default {
     },
     onExport() {
       let url ='/business/warning/export'
-      
+
       let loadingInstance = Loading.service({
         fullscreen: true,
         background: "#00000052",
@@ -230,13 +230,13 @@ export default {
         warningSource: data?.warningSource || '',
         direction: data.direction,
         startTime: daterange && daterange.length > 0 ? daterange[0] : "",
-        endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
-        completeTime: this.activeName == "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+        // endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
+        completeTime: daterange && daterange.length > 0 ? daterange[1] : "",
         startStakeMark: stakeMark,
         endStakeMark: endStakeMark,
       };
       console.log(this.searchData)
-      // this.getData();
+      this.getData();
     }
   },
 };