From 0e7609e5c02077212c584c6f884337f8fdfc4c46 Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 1 Aug 2025 17:53:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor(consume):=20=E9=87=91=E8=B1=86?= =?UTF-8?q?=E6=B6=88=E8=80=97=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/articleVideo.vue | 43 ++++++++------------------------------ src/views/consume/dieHardFan.vue | 43 ++++++++------------------------------ src/views/consume/liveStream.vue | 43 ++++++++------------------------------ 3 files changed, 27 insertions(+), 102 deletions(-) diff --git a/src/views/consume/articleVideo.vue b/src/views/consume/articleVideo.vue index 8da42ae..01ef78b 100644 --- a/src/views/consume/articleVideo.vue +++ b/src/views/consume/articleVideo.vue @@ -267,17 +267,9 @@ const reset = function () { } // 今天 const getToday = function () { - const today = new Date() - const startTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() - ) - const endTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() + 1 - ) + const today = dayjs() + const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = 'today' // 标记当前激活状态 @@ -286,18 +278,9 @@ const getToday = function () { } // 昨天 const getYesterday = function () { - const yesterday = new Date() - yesterday.setDate(yesterday.getDate() - 1) - const startTime = new Date( - yesterday.getFullYear(), - yesterday.getMonth(), - yesterday.getDate() - ) - const endTime = new Date( - yesterday.getFullYear(), - yesterday.getMonth(), - yesterday.getDate() + 1 - ) + const today = dayjs() + const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = 'yesterday' // 标记当前激活状态 @@ -306,17 +289,9 @@ const getYesterday = function () { } // 近7天 const get7Days = function () { - const today = new Date() - const startTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() - 6 - ) - const endTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() + 1 - ) + const today = dayjs() + const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = '7days' // 标记当前激活状态 diff --git a/src/views/consume/dieHardFan.vue b/src/views/consume/dieHardFan.vue index b5fa36c..e4a07f9 100644 --- a/src/views/consume/dieHardFan.vue +++ b/src/views/consume/dieHardFan.vue @@ -258,17 +258,9 @@ const reset = function () { } // 今天 const getToday = function () { - const today = new Date() - const startTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() - ) - const endTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() + 1 - ) + const today = dayjs() + const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = 'today' // 标记当前激活状态 @@ -277,18 +269,9 @@ const getToday = function () { } // 昨天 const getYesterday = function () { - const yesterday = new Date() - yesterday.setDate(yesterday.getDate() - 1) - const startTime = new Date( - yesterday.getFullYear(), - yesterday.getMonth(), - yesterday.getDate() - ) - const endTime = new Date( - yesterday.getFullYear(), - yesterday.getMonth(), - yesterday.getDate() + 1 - ) + const today = dayjs() + const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = 'yesterday' // 标记当前激活状态 @@ -297,17 +280,9 @@ const getYesterday = function () { } // 近7天 const get7Days = function () { - const today = new Date() - const startTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() - 6 - ) - const endTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() + 1 - ) + const today = dayjs() + const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = '7days' // 标记当前激活状态 diff --git a/src/views/consume/liveStream.vue b/src/views/consume/liveStream.vue index 681175e..eb4b456 100644 --- a/src/views/consume/liveStream.vue +++ b/src/views/consume/liveStream.vue @@ -289,17 +289,9 @@ const reset = function () { } // 今天 const getToday = function () { - const today = new Date() - const startTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() - ) - const endTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() + 1 - ) + const today = dayjs() + const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = 'today' // 标记当前激活状态 @@ -308,18 +300,9 @@ const getToday = function () { } // 昨天 const getYesterday = function () { - const yesterday = new Date() - yesterday.setDate(yesterday.getDate() - 1) - const startTime = new Date( - yesterday.getFullYear(), - yesterday.getMonth(), - yesterday.getDate() - ) - const endTime = new Date( - yesterday.getFullYear(), - yesterday.getMonth(), - yesterday.getDate() + 1 - ) + const today = dayjs() + const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = 'yesterday' // 标记当前激活状态 @@ -328,17 +311,9 @@ const getYesterday = function () { } // 近7天 const get7Days = function () { - const today = new Date() - const startTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() - 6 - ) - const endTime = new Date( - today.getFullYear(), - today.getMonth(), - today.getDate() + 1 - ) + const today = dayjs() + const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss') + const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss') getTime.value = [startTime, endTime] console.log('getTime', getTime.value) activeTimeRange.value = '7days' // 标记当前激活状态