From 23e93934cf0b6e375f20c28d0fddb874b89eb94d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 01 7月 2024 16:28:25 +0800
Subject: [PATCH] 优化查询
---
iwara-scada-web/src/utils/util.js | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/iwara-scada-web/src/utils/util.js b/iwara-scada-web/src/utils/util.js
index 30ce33d..7596919 100644
--- a/iwara-scada-web/src/utils/util.js
+++ b/iwara-scada-web/src/utils/util.js
@@ -1,12 +1,18 @@
import moment from 'moment'
//榛樿璧嬪�� 褰撳墠涓�鍛ㄧ殑鏃堕棿
-export function getThisWeekRange(){
+export function getThisWeekRange(flag){
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澶╋紝寰楀埌鍛ㄦ棩鐨勬棩鏈�
+ 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)];
--
Gitblit v1.9.3