From 5b6c95d46ccc8d252e029d26b69edbf99d2bf97a Mon Sep 17 00:00:00 2001 From: Austin <1344583166@qq.com> Date: Thu, 16 Jan 2025 10:41:15 +0800 Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E8=BD=AE=E5=80=BC=E8=B5=B7?= =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20#9088?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/components/edit-rule/CustomRotate.vue | 2 +- .../duty-rule-manage/index/components/edit-rule/CycleRotate.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue index b2e2e120cf..fe64ab64cf 100644 --- a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue +++ b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue @@ -207,7 +207,7 @@ }; return { effective_time: dayjs(formModel.dateTimeRange![0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), - end_time: dayjs(formModel.dateTimeRange![1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), + end_time: dayjs(formModel.dateTimeRange![1]).endOf('day').format('YYYY-MM-DD HH:mm:ss'), duty_arranges: formModel.tableData.map(item => ({ date: item.dateTime, work_times: item.timeRange.map(data => data.value.map(str => splitTimeToMinute(str)).join('--')), diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue index 1bf7434b0a..e71ac0df97 100644 --- a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue +++ b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue @@ -409,7 +409,7 @@ }; return { effective_time: dayjs(dateTimeRange.value![0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), - end_time: dayjs(dateTimeRange.value![1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), + end_time: dayjs(dateTimeRange.value![1]).endOf('day').format('YYYY-MM-DD HH:mm:ss'), duty_arranges: tableData.value.map(item => ({ duty_number: formModel.singleDutyPeoples, duty_day: formModel.sinlgeDutyDays,