From 408ba489ca1f954e67618c20d0b5322c83a82daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Fri, 26 Sep 2025 18:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E4=B8=8A=E4=B8=8B=E6=97=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Ems/DateRangeSelect/index.vue | 8 ++++----
 src/views/ems/search/DateTimeSelect.vue      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/Ems/DateRangeSelect/index.vue b/src/components/Ems/DateRangeSelect/index.vue
index 58f7b18..ae234d9 100644
--- a/src/components/Ems/DateRangeSelect/index.vue
+++ b/src/components/Ems/DateRangeSelect/index.vue
@@ -66,13 +66,13 @@ export default {
       const nowStartTimes = new Date(this.dateRange[0]).getTime(),nowEndTimes = new Date(this.dateRange[1]).getTime(),maxTime = new Date(this.defaultDateRange[1]).getTime()
       const nowDis = nowEndTimes - nowStartTimes//用户当前选择时间差 可能=0
       //baseTime,maxTime 毫秒数
-      const baseDis =  this.dataUnit === 3 ? 24 * 60 * 60 * 1000 :this.dataUnit === 2 ? 60 * 60 * 1000 : 60 * 1000
+      const baseDis =  24 * 60 * 60 * 1000
       const calcDis = nowDis === 0 ? baseDis : nowDis
       let start = type === 'before' ? nowStartTimes - calcDis : nowStartTimes + calcDis
-      start = Math.min(start,maxTime)
+      if(start>maxTime) start=maxTime
       let end = type === 'before' ? nowEndTimes - calcDis : nowEndTimes + calcDis
-      end = Math.min(end,maxTime)
-      this.dateRange = [formatDate(start,this.dataUnit !== 3),formatDate(end,this.dataUnit !== 3)]
+      if(end>maxTime) end=maxTime
+      this.dateRange = [formatDate(start),formatDate(end)]
       this.$emit('updateDate',this.dateRange)
     },
   }
diff --git a/src/views/ems/search/DateTimeSelect.vue b/src/views/ems/search/DateTimeSelect.vue
index 6c01274..9df5cb6 100644
--- a/src/views/ems/search/DateTimeSelect.vue
+++ b/src/views/ems/search/DateTimeSelect.vue
@@ -101,12 +101,12 @@ export default {
       const nowStartTimes = new Date(this.dateRange[0]).getTime(),nowEndTimes = new Date(this.dateRange[1]).getTime(),maxTime = new Date(this.defaultDateRange[1]).getTime()
       const nowDis = nowEndTimes - nowStartTimes//用户当前选择时间差 可能=0
       //baseTime,maxTime 毫秒数
-      const baseDis =  this.dataUnit === 3 ? 24 * 60 * 60 * 1000 :this.dataUnit === 2 ? 60 * 60 * 1000 : 60 * 1000
+      const baseDis =  this.dataUnit === 3 ? 24 * 60 * 60 * 1000 :60 * 60 * 1000
       const calcDis = nowDis === 0 ? baseDis : nowDis
       let start = type === 'before' ? nowStartTimes - calcDis : nowStartTimes + calcDis
-      start = Math.min(start,maxTime)
+      if(start>maxTime) start=maxTime
       let end = type === 'before' ? nowEndTimes - calcDis : nowEndTimes + calcDis
-      end = Math.min(end,maxTime)
+      if(end>maxTime) end=maxTime
       this.dateRange = [formatDate(start,this.dataUnit !== 3),formatDate(end,this.dataUnit !== 3)]
       this.$emit('updateDate',this.dateRange)
     },