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] } } ]