快捷选择日期

ui/dasadmin/src/views/backend/alarms/index.vue

@@ -81,10 +81,19 @@ const adminInfo = useAdminInfo()
 
 const timeRange = ref([])
 const shortcuts = [
+    {
+        text: '今天',
+        value: () => {
+            const end = new Date()
+            const start = new Date()
+            return [start, end]
+        },
+    },
     {
         text: '昨天',
         value: () => {
             const end = new Date()
+            end.setDate(end.getDate() - 1)
             const start = new Date()
             start.setDate(start.getDate() - 1)
             return [start, end]
@@ -95,26 +104,20 @@ const shortcuts = [
         value: () => {
             const end = new Date()
             const start = new Date()
-            start.setDate(start.getDate() - 3)
+            start.setDate(start.getDate() - 2)
             return [start, end]
         },
     },
     {
-        text: '上周',
+        text: '本周',
         value: () => {
-            const end = new Date()
+            return getDateRange('week')
-            const start = new Date()
-            start.setDate(start.getDate() - 7)
-            return [start, end]
         },
     },
     {
-        text: '上个月',
+        text: '本月',
         value: () => {
-            const end = new Date()
+            return getDateRange('month')
-            const start = new Date()
-            start.setMonth(start.getMonth() - 1)
-            return [start, end]
         },
     },
 ]
@@ -201,25 +204,28 @@ const okSubmit = (val) => {
     console.log(val)
     getalarmsList()
 }
-const getTodayAndYesterday = () => {
+const getDateRange = (type: 'week' | 'month') => {
     const today = new Date()
-    const yesterday = new Date()
+    if (type === 'week') {
-    yesterday.setDate(today.getDate() - 1)
+        const dayOfWeek = today.getDay()
-    const formatDate = (date) => {
+        const startOfWeek = new Date(today)
-        const year = date.getFullYear()
+        startOfWeek.setDate(today.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1))
-        const month = String(date.getMonth() + 1).padStart(2, '0')
+        startOfWeek.setHours(0, 0, 0, 0)
-        const day = String(date.getDate()).padStart(2, '0')
+        const endOfWeek = new Date(startOfWeek)
-        return `${year}-${month}-${day}`
+        endOfWeek.setDate(startOfWeek.getDate() + 6)
+        endOfWeek.setHours(23, 59, 59, 999)
+        return [startOfWeek, endOfWeek]
     }
-
+    if (type === 'month') {
-    return {
+        const startOfMonth = new Date(today.getFullYear(), today.getMonth(), 1)
-        today: formatDate(today),
+        startOfMonth.setHours(0, 0, 0, 0)
-        yesterday: formatDate(yesterday),
+        const endOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0)
+        endOfMonth.setHours(23, 59, 59, 999)
+        return [startOfMonth, endOfMonth]
     }
 }
+
 onMounted(() => {
-    // timeRange[0] = getTodayAndYesterday().yesterday
-    // timeRange[1] = getTodayAndYesterday().today
     equipList({
         // orgId: adminInfo.orgid,
         objectType: 10002,