wenyongda/ZRAdmin-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化日期快捷选项时间格式

Browse Source
This commit is contained in:
不做码农 2022-11-29 14:12:31 +08:00
parent fb0ec11bf1
commit 55b72b544d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/utils/dateOptions.js
View File

@ -8,7 +8,7 @@ const dateOptions = [
const start = dayjs().subtract(1, 'day').format('YYYY-MM-DD') const start = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
const end = start + ' 23:59:59' 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 end = dayjs().endOf('month').format('YYYY-MM-DD')
const start = dayjs().startOf('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 end = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
const start = new Date() const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
return [start, end] return [dayjs(start).format('YYYY-MM-DD'), end]
} }
}, },
{ {
text: '最近一个月', text: '最近一个月',
value: () => { value: () => {
const end = new Date() const end = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
const start = new Date() // const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30) //start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
return [start, end] return [dayjs().day(-30).format('YYYY-MM-DD'), end]
} }
}, },
{ {
text: '最近三个月', text: '最近三个月',
value: () => { value: () => {
const end = new Date() const end = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
const start = new Date() // const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90) // start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
return [start, end] return [dayjs().day(-90).format('YYYY-MM-DD'), end]
} }
} }
] ]