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

update dateOptions.js

Browse Source
This commit is contained in:
不做码农 2022-09-23 12:38:44 +08:00
parent 4e7d3be920
commit 29bdcf8ff3
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils/dateOptions.js
View File

@ -5,17 +5,25 @@ const dateOptions = [
{ {
text: '昨天', text: '昨天',
value: () => { value: () => {
const end = dayjs().format('YYYY-MM-DD')
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'
return [start, end]
}
},
{
text: '今天',
value: () => {
const start = dayjs().format('YYYY-MM-DD')
const end = start + ' 23:59:59'
// console.log(dayjs().format('YYYY-MM-DD HH:mm:ss'));
return [start, end] return [start, end]
} }
}, },
{ {
text: '本周', text: '本周',
value: () => { value: () => {
const end = dayjs().endOf('week').add(1, 'day').format('YYYY-MM-DD') const end = dayjs().endOf('week').add(1, 'day').format('YYYY-MM-DD') + ' 23:59:59'
const start = dayjs().startOf('week').add(1, 'day').format('YYYY-MM-DD') const start = dayjs().startOf('week').add(1, 'day').format('YYYY-MM-DD')
return [start, end] return [start, end]
} }
@ -24,7 +32,7 @@ const dateOptions = [
text: '上周', text: '上周',
value: () => { value: () => {
const start = dayjs().add(-1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD') const start = dayjs().add(-1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD')
const end = dayjs().add(-1, 'week').endOf('week').add(1, 'day').format('YYYY-MM-DD') const end = dayjs().add(-1, 'week').endOf('week').add(1, 'day').format('YYYY-MM-DD') + ' 23:59:59'
return [start, end] return [start, end]
} }
}, },
@ -49,7 +57,7 @@ const dateOptions = [
{ {
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 * 7) start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
return [start, end] return [start, end]