From cf7eda004123f2ee07bfa7d05f51f71f9dbb4bcd Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 18 七月 2024 11:48:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/WI/Web.V1.0
---
src/utils/util.ts | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/utils/util.ts b/src/utils/util.ts
index 327d7e7..13bfb8d 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -1,16 +1,15 @@
-import type { Ref } from 'vue';
-import JSONbig from 'json-bigint';
import { ElMessage, ElMessageBox } from 'element-plus';
+import JSONbig from 'json-bigint';
+import { storeToRefs } from 'pinia';
+import type { Ref } from 'vue';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
import { useThemeConfig } from '/@/stores/themeConfig';
-import { storeToRefs } from 'pinia';
import request from '/@/utils/request';
// 瀵煎叆渚濊禆
+import axios from 'axios';
import FileSaver from 'file-saver';
import * as XLSX from 'xlsx';
-import axios from 'axios';
import { MAIN_URL } from '../constants';
-
/**
* 鏅�氬璞¤浆涓� formData
@@ -45,7 +44,6 @@
addFormData(obj);
return formData;
};
-
/**
* @description 褰撶鍒� JSON 涓瓨鍦ㄨ繃闀跨殑鏁板瓧鏃讹紝浣跨敤 JSONbigString 瑙ｆ瀽锛屾暟瀛椾細杞负瀛楃涓插鐞�
@@ -290,7 +288,7 @@
) => {
if (!treeData || treeData.length === 0) return;
if (!parent) parent = treeData;
-
+
for (let index = 0; index < treeData.length; index++) {
const value = treeData[index] as any;
if (markParent) {
@@ -539,28 +537,35 @@
themeConfig.value.isTagsview = !isHide;
};
-
/**
* 鏈�杩� n 澶╃殑 startDate銆乪ndDate
* @param dates
*/
export const getRecentDateRange = (dates: number) => {
// 鑾峰彇褰撳墠鏃ユ湡
- const currentDate = new Date();
-
+ const endDate = new Date();
const startDate = new Date();
- startDate.setDate(currentDate.getDate() - dates + 1);
- // 灏嗘椂鍒嗙璁句负0
- startDate.setHours(0);
- startDate.setMinutes(0);
- startDate.setSeconds(0);
- // 鑾峰彇褰撳墠鏃ユ湡浣滀负缁堟鑺傜偣
- const endDate = currentDate;
- return { startDate, endDate };
+ startDate.setTime(startDate.getTime() - 3600 * 1000 * 24 * dates);
+ startDate.setHours(0, 0, 0, 0);
+ return [startDate, endDate];
+};
+
+/**
+ * 鏈�杩� n 澶╃殑 date
+ * @param dates
+ */
+export const getRecentDate = (dates: number) => {
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const recentDate = new Date();
+ recentDate.setTime(recentDate.getTime() - 3600 * 1000 * 24 * dates);
+ recentDate.setHours(0, 0, 0, 0);
+ return recentDate;
};
//#region ====================== 鏈�杩戞椂闂� ======================
-export const getAWeek = () => getRecentDateRange(7);
+export const getAWeek = () => {
+ return getRecentDateRange(7);
+};
export const getHalfMonth = () => getRecentDateRange(15);
export const getAMonth = () => getRecentDateRange(30);
export const getThreeMonth = () => getRecentDateRange(90);
--
Gitblit v1.9.3