From 2ae81133d69f6721469d01853ded6a8880422e6a Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Sat, 21 Dec 2024 09:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E9=9D=9E=E6=9C=BA=E9=A2=84=E8=AD=A6=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/control/manual/events/data.js       | 19 ++++++++++++-------
 .../pages/control/manual/events/index.vue     |  4 ++--
 .../eventDetection/statistics/data.js         | 14 +++++++-------
 .../eventDetection/statistics/index.vue       |  4 ++--
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js
index bb7ef1fe..cbb04ae6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js
@@ -77,14 +77,19 @@ export const searchFormList = [
     type: "datePicker",
     options: {
       style:{width:'100%'},
-      type: "datetimerange",
-      format: "yyyy-MM-dd HH:mm:ss",
-      valueFormat: "yyyy-MM-dd HH:mm:ss",
+      type: "daterange",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
+      pickerOptions:{
+        disabledDate(time) {
+          return time.getTime() > Date.now() || time.getTime()<new Date(moment().subtract(3, "months").format("YYYY-MM-DD HH:mm:ss"));
+        },
+      }
     },
-    default: [
-      moment().startOf("month").format("YYYY-MM-DD HH:mm:ss"),
-      moment().format("YYYY-MM-DD HH:mm:ss"),
-    ],
+    // default: [
+    //   moment().startOf("month").format("YYYY-MM-DD HH:mm:ss"),
+    //   moment().format("YYYY-MM-DD HH:mm:ss"),
+    // ],
   }, {
     label: "收费站:",
     key: "facilityName",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue
index f4cc2229..553af159 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue
@@ -194,8 +194,8 @@ export default {
     firstBtnClick(id) {},
     handleSearch(data) {
       this.searchData.facilityName = data.facilityName;
-      this.searchData.startTime = data.warningTime && data.warningTime[0];
-      this.searchData.completeTime = data.warningTime && data.warningTime[1];
+      this.searchData.startTime = data.warningTime && data.warningTime[0]+' 00:00:00';
+      this.searchData.completeTime = data.warningTime && data.warningTime[1]+' 23:59:59';
       if(data.warningType){
         this.searchData.warningType = data.warningType
       } else {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
index 80a5d392..210efa35 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
@@ -259,19 +259,19 @@ export const searchFormList = [
     type: "datePicker",
     options: {
       style: "width: auto",
-      type: "datetimerange",
-      format: "yyyy-MM-dd HH:mm:ss",
-      valueFormat: "yyyy-MM-dd HH:mm:ss",
+      type: "daterange",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
       pickerOptions:{
         disabledDate(time) {
           return time.getTime() > Date.now() || time.getTime()<new Date(moment().subtract(3, "months").format("YYYY-MM-DD HH:mm:ss"));
         },
       }
     },
-    default: [
-      moment().startOf("month").format("YYYY-MM-DD HH:mm:ss"),
-      moment().format("YYYY-MM-DD HH:mm:ss"),
-    ],
+    // default: [
+    //   moment().startOf("month").format("YYYY-MM-DD HH:mm:ss"),
+    //   moment().format("YYYY-MM-DD HH:mm:ss"),
+    // ],
   },
   {
     ...station,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue
index 424f5338..f5035e96 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue
@@ -254,9 +254,9 @@ export default {
         warningSource: data?.warningSource || '',
         direction: data.direction,
         auditFlag:data.auditFlag,
-        startTime: daterange && daterange.length > 0 ? daterange[0] : "",
+        startTime: daterange && daterange.length > 0 ?  (daterange[0]+' 00:00:00') :  "",
         // endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "",
-        completeTime: daterange && daterange.length > 0 ? daterange[1] : "",
+        completeTime: daterange && daterange.length > 0 ? (daterange[1]+' 23:59:59'): "",
         startStakeMark: stakeMark,
         endStakeMark: endStakeMark,
       };