From b27a2ba1ccbd8e2e7b61a700dde5f891ed6ae35d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 05 7月 2024 06:55:15 +0800
Subject: [PATCH] 233
---
iwara-scada-web/src/utils/util.js | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/iwara-scada-web/src/utils/util.js b/iwara-scada-web/src/utils/util.js
index 5756339..7596919 100644
--- a/iwara-scada-web/src/utils/util.js
+++ b/iwara-scada-web/src/utils/util.js
@@ -1,3 +1,23 @@
+import moment from 'moment'
+
+//榛樿璧嬪�� 褰撳墠涓�鍛ㄧ殑鏃堕棿
+export function getThisWeekRange(flag){
+ const today = new Date();
+ const startOfWeek = new Date();
+ if(flag==1){//琛ㄧず瑕佹煡7澶╁唴鏁版嵁
+ startOfWeek.setDate(today.getDate() -7); // 鍑忓幓浠婂ぉ鏄竴鍛ㄧ殑绗嚑澶╋紝寰楀埌鍛ㄤ竴鐨勬棩鏈焥tartOfWeek
+ }
+
+ startOfWeek.setHours(0, 0, 0, 0); // 璁剧疆鏃躲�佸垎銆佺鍜屾绉掓暟
+
+ const endOfWeek = new Date(today);
+ endOfWeek.setHours(23, 59, 59, 999); // 璁剧疆鏃躲�佸垎銆佺鍜屾绉掓暟
+
+
+ //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