From 5ffd0000cb6b7d437dd64f5a18ce726cb3871740 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Mon, 31 Mar 2025 09:53:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/equipment-supply/index.vue | 12 +++++------- src/views/home/maintain-balance/index.vue | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/views/home/equipment-supply/index.vue b/src/views/home/equipment-supply/index.vue index 09b9ca19..daf6b8a6 100644 --- a/src/views/home/equipment-supply/index.vue +++ b/src/views/home/equipment-supply/index.vue @@ -431,15 +431,14 @@ export default { // 默认日期范围 getDefaultDateRange() { const today = new Date() - const lastMonth = new Date() - // 设置为前一个月 + // 获取上个月的同一天 + const lastMonth = new Date(today) lastMonth.setMonth(today.getMonth() - 1) - // 处理跨年情况 - if (today.getMonth() === 0) { - lastMonth.setFullYear(today.getFullYear() - 1) - lastMonth.setMonth(11) + // 处理日期溢出问题 + if (lastMonth.getDate() !== today.getDate()) { + lastMonth.setDate(0) // 设置为上个月的最后一天 } const formatDate = date => { @@ -449,7 +448,6 @@ export default { return `${y}-${m}-${d}` } - // 返回从前一个月到今天的日期范围 return [formatDate(lastMonth), formatDate(today)] } }, diff --git a/src/views/home/maintain-balance/index.vue b/src/views/home/maintain-balance/index.vue index 4f995c37..6afa25d4 100644 --- a/src/views/home/maintain-balance/index.vue +++ b/src/views/home/maintain-balance/index.vue @@ -224,15 +224,14 @@ export default { // 默认日期范围 getDefaultDateRange() { const today = new Date() - const lastMonth = new Date() - // 设置为前一个月 + // 获取上个月的同一天 + const lastMonth = new Date(today) lastMonth.setMonth(today.getMonth() - 1) - // 处理跨年情况 - if (today.getMonth() === 0) { - lastMonth.setFullYear(today.getFullYear() - 1) - lastMonth.setMonth(11) + // 处理日期溢出问题 + if (lastMonth.getDate() !== today.getDate()) { + lastMonth.setDate(0) // 设置为上个月的最后一天 } const formatDate = date => { @@ -242,7 +241,6 @@ export default { return `${y}-${m}-${d}` } - // 返回从前一个月到今天的日期范围 return [formatDate(lastMonth), formatDate(today)] }, // 导出数据