From 55b72b544d0a281791e73335fba1dd680b2d1493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Tue, 29 Nov 2022 14:12:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E6=9C=9F=E5=BF=AB?= =?UTF-8?q?=E6=8D=B7=E9=80=89=E9=A1=B9=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dateOptions.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/utils/dateOptions.js b/src/utils/dateOptions.js index 3c6a23d..d886440 100644 --- a/src/utils/dateOptions.js +++ b/src/utils/dateOptions.js @@ -8,7 +8,7 @@ const dateOptions = [ const start = dayjs().subtract(1, 'day').format('YYYY-MM-DD') const end = start + ' 23:59:59' - return [start, end] + return [start, dayjs(end).toISOString()] } }, { @@ -42,7 +42,7 @@ const dateOptions = [ const end = dayjs().endOf('month').format('YYYY-MM-DD') const start = dayjs().startOf('month').format('YYYY-MM-DD') - return [start, end] + return [start, end + ' 23:59:59'] } }, { @@ -60,25 +60,25 @@ const dateOptions = [ const end = dayjs().format('YYYY-MM-DD') + ' 23:59:59' const start = new Date() start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) - return [start, end] + return [dayjs(start).format('YYYY-MM-DD'), end] } }, { text: '最近一个月', value: () => { - const end = new Date() - const start = new Date() - start.setTime(start.getTime() - 3600 * 1000 * 24 * 30) - return [start, end] + const end = dayjs().format('YYYY-MM-DD') + ' 23:59:59' + // const start = new Date() + //start.setTime(start.getTime() - 3600 * 1000 * 24 * 30) + return [dayjs().day(-30).format('YYYY-MM-DD'), end] } }, { text: '最近三个月', value: () => { - const end = new Date() - const start = new Date() - start.setTime(start.getTime() - 3600 * 1000 * 24 * 90) - return [start, end] + const end = dayjs().format('YYYY-MM-DD') + ' 23:59:59' + // const start = new Date() + // start.setTime(start.getTime() - 3600 * 1000 * 24 * 90) + return [dayjs().day(-90).format('YYYY-MM-DD'), end] } } ]