From 6c01b15ed28cd128804274b18e78d0301e3781ab Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Wed, 18 May 2022 13:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=8E=A7=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/shortcuts.js | 52 ++++++++----------------------------------
 1 file changed, 10 insertions(+), 42 deletions(-)

diff --git a/src/utils/shortcuts.js b/src/utils/shortcuts.js
index d92edc3..fc4fc74 100644
--- a/src/utils/shortcuts.js
+++ b/src/utils/shortcuts.js
@@ -15,16 +15,9 @@ export const calendarBaseShortcuts = [{
     picker.$emit('pick', [startTime, endTime])
   }
 }, {
-  text: '最近一周',
+  text: '本周',
   onClick(picker) {
-    const startTime = new Date(new Date().daysAgo(7).setHours(0, 0, 0))
-    const endTime = new Date(new Date().setHours(23, 59, 59))
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: '最近30天',
-  onClick(picker) {
-    const startTime = new Date(new Date().daysAgo(30).setHours(0, 0, 0))
+    const startTime = new Date(new Date().daysAgo(new Date().getDay() - 1).setHours(0, 0, 0))
     const endTime = new Date(new Date().setHours(23, 59, 59))
     picker.$emit('pick', [startTime, endTime])
   }
@@ -36,12 +29,19 @@ export const calendarBaseShortcuts = [{
     picker.$emit('pick', [startTime, endTime])
   }
 }, {
-  text: '本季度',
+  text: '当前季度',
   onClick(picker) {
     const startTime = new Date(new Date().quarterBegin().setHours(0, 0, 0))
     const endTime = new Date(new Date().setHours(23, 59, 59))
     picker.$emit('pick', [startTime, endTime])
   }
+}, {
+  text: '最近一个月',
+  onClick(picker) {
+    const startTime = new Date(new Date().daysAgo(30).setHours(0, 0, 0))
+    const endTime = new Date(new Date().setHours(23, 59, 59))
+    picker.$emit('pick', [startTime, endTime])
+  }
 }]
 
 export const calendarMoveShortcuts = [{
@@ -68,38 +68,6 @@ export const calendarMoveShortcuts = [{
     endTime = picker.value[1].daysAgo(-1)
     picker.$emit('pick', [startTime, endTime])
   }
-}, {
-  text: '« 往前一周 ',
-  onClick(picker) {
-    let startTime = new Date(new Date().setHours(0, 0, 0))
-    let endTime = new Date(new Date().setHours(23, 59, 59))
-    if (!picker.value) {
-      picker.value = [startTime.daysAgo(new Date().getDay()),
-        endTime.daysAgo(new Date().getDay() + 1)]
-    } else {
-      picker.value = [picker.value[0].daysAgo(picker.value[0].getDay()),
-        picker.value[1].daysAgo(picker.value[1].getDay() + 1)]
-    }
-    startTime = picker.value[0].daysAgo(7)
-    endTime = picker.value[1]
-    picker.$emit('pick', [startTime, endTime])
-  }
-}, {
-  text: ' 往后一周 »',
-  onClick(picker) {
-    let startTime = new Date(new Date().setHours(0, 0, 0))
-    let endTime = new Date(new Date().setHours(23, 59, 59))
-    if (!picker.value) {
-      picker.value = [startTime.daysAgo(new Date().getDay() - 7),
-        endTime.daysAgo(new Date().getDay() - 6)]
-    } else {
-      picker.value = [picker.value[0].daysAgo(picker.value[0].getDay() - 7),
-        picker.value[1].daysAgo(picker.value[1].getDay() - 6)]
-    }
-    startTime = picker.value[0]
-    endTime = picker.value[1].daysAgo(-7)
-    picker.$emit('pick', [startTime, endTime])
-  }
 }]
 
 export const calendarShortcuts = [