From d939d095aa38879953884ea263eb45984b3876e7 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周六, 08 6月 2024 14:30:38 +0800 Subject: [PATCH] 优化界面 --- iwara-scada-web/src/utils/util.js | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/iwara-scada-web/src/utils/util.js b/iwara-scada-web/src/utils/util.js index 5756339..30ce33d 100644 --- a/iwara-scada-web/src/utils/util.js +++ b/iwara-scada-web/src/utils/util.js @@ -1,3 +1,17 @@ +import moment from 'moment' + +//榛樿璧嬪�� 褰撳墠涓�鍛ㄧ殑鏃堕棿 +export function getThisWeekRange(){ + const today = new Date(); + const startOfWeek = new Date(today); + startOfWeek.setDate(startOfWeek.getDate() - startOfWeek.getDay()); // 鍑忓幓浠婂ぉ鏄竴鍛ㄧ殑绗嚑澶╋紝寰楀埌鍛ㄤ竴鐨勬棩鏈� + const endOfWeek = new Date(startOfWeek); + endOfWeek.setDate(endOfWeek.getDate() + 6); // 鍔犱笂6澶╋紝寰楀埌鍛ㄦ棩鐨勬棩鏈� + + //return [moment(startOfWeek,"YYYY-MM-DD HH:mm"), moment(endOfWeek,"YYYY-MM-DD HH:mm")]; + return [moment(startOfWeek), moment(endOfWeek)]; +} + export function dateFormat(dateString, fmt) { const date = new Date(dateString) let ret -- Gitblit v1.9.3