From 9f9736ea18db415b3c64f5e23e3037b3917c7871 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 16 6月 2024 09:31:12 +0800
Subject: [PATCH] 设置一周的时间
---
iwara-scada-web/src/utils/util.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/iwara-scada-web/src/utils/util.js b/iwara-scada-web/src/utils/util.js
index 30ce33d..39104e1 100644
--- a/iwara-scada-web/src/utils/util.js
+++ b/iwara-scada-web/src/utils/util.js
@@ -3,10 +3,10 @@
//榛樿璧嬪�� 褰撳墠涓�鍛ㄧ殑鏃堕棿
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澶╋紝寰楀埌鍛ㄦ棩鐨勬棩鏈�
+ const startOfWeek = new Date();
+ startOfWeek.setDate(today.getDate() -7); // 鍑忓幓浠婂ぉ鏄竴鍛ㄧ殑绗嚑澶╋紝寰楀埌鍛ㄤ竴鐨勬棩鏈焥tartOfWeek
+ const endOfWeek = new Date(today);
+
//return [moment(startOfWeek,"YYYY-MM-DD HH:mm"), moment(endOfWeek,"YYYY-MM-DD HH:mm")];
return [moment(startOfWeek), moment(endOfWeek)];
--
Gitblit v1.9.3