From 27ae3571f15dd0b8f02ea6f1f81fef2a8dc91b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Mon, 4 Mar 2024 14:22:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2time?= =?UTF-8?q?Filter=E5=90=8E=E8=BF=BD=E8=B8=AA=E9=A1=B5=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=B4=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=B3=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=BF=94=E5=9B=9E=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=E4=B8=8D=E4=B8=BA=E6=95=B4=E5=88=86=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/TimeLine.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/common/TimeLine.vue b/src/components/common/TimeLine.vue index 15377766..c72bc0c7 100644 --- a/src/components/common/TimeLine.vue +++ b/src/components/common/TimeLine.vue @@ -38,6 +38,7 @@ export default { if (n) { this.currentTime = 99 this.getDate() + this.onChange('change') } } }, @@ -85,7 +86,7 @@ export default { for (let i = startTime; i <= timeFilter.endTime; i += showTimeInterval * 60 * 1000) { const obj = this.formatTime(i, showTimeInterval, timeInterval) if (obj) { - myTimeRange.push({ time: obj.time, time1: obj.time1, stamp: i, showFlag: obj.showFlag }) + myTimeRange.push({ time: obj.time, time1: obj.time1, stamp: new Date(obj.time1).getTime(), showFlag: obj.showFlag }) } } @@ -204,7 +205,14 @@ export default { } }, onChange (e) { - if (this.timeLine[e]) { + if (e === 'change') { + // 切换timeFilter时,选取最后一分钟 + const timeObj = { + startTime: this.timeLine.slice(-1)[0].stamp - 60 * 1000, + endTime: this.timeLine.slice(-1)[0].stamp + } + this.$emit('change', timeObj) + } else if (this.timeLine[e]) { // 返回所选时间后一分钟 const timeObj = { startTime: this.timeLine[e].stamp - 60 * 1000,