From f9902f7a3b79d22bde9f199263ac36de26816470 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 08 五月 2026 14:46:10 +0800
Subject: [PATCH] 测试完成
---
src/utils/ruoyi.js | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 601e46c..a635716 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -3,6 +3,7 @@
* Copyright (c) 2019 ruoyi
*/
import dayjs from "dayjs";
+import store from "@/store";
// 鏃ユ湡鏍煎紡鍖�
export function parseTime(time, pattern) {
@@ -50,18 +51,27 @@
return time_str;
}
// 鍑洪櫌/鍏ラ櫌澶╂暟璁＄畻
-export function Daycount(dateString1, dateString2){
-// 灏嗘棩鏈熷瓧绗︿覆杞崲涓烘棩鏈熷璞�
-var date1 = new Date(dateString1);
-var date2 = new Date(dateString2);
+export function daysBetween(dateString) {
+ // 灏嗚緭鍏ョ殑鏃ユ湡瀛楃涓茶浆鎹负Date瀵硅薄
+ var startDate = new Date(dateString);
+ // 鑾峰彇褰撳墠鏃ユ湡
+ var currentDate = new Date();
+ // 璁＄畻涓や釜鏃ユ湡涔嬮棿鐨勬椂闂村樊锛堟绉掞級
+ var differenceInTime = currentDate - startDate;
+ // 灏嗘椂闂村樊杞崲涓哄ぉ鏁�
+ var differenceInDays = differenceInTime / (1000 * 3600 * 24);
+ // 杩斿洖澶╂暟锛屽洓鑸嶄簲鍏ュ埌鏈�鎺ヨ繎鐨勬暣鏁�
+ return Math.round(differenceInDays);
+}
+export function followupAuthority() {
+ const depts = store.getters.belongDepts;
+ const wards = store.getters.belongWards;
+console.log(1);
-// 璁＄畻鏃堕棿宸紙姣锛�
-var timeDifference = date2 - date1;
-
-// 灏嗘椂闂村樊杞崲涓哄ぉ鏁�
-var daysDifference = Math.ceil(timeDifference / (1000 * 3600 * 24));
-
-return daysDifference;
+ return (
+ (Array.isArray(depts) && depts.length > 0) ||
+ (Array.isArray(wards) && wards.length > 0)
+ );
}
// 杩囨护鍣�
export function formatTime(val) {
@@ -84,8 +94,8 @@
let search = params;
search.params =
typeof search.params === "object" &&
- search.params !== null &&
- !Array.isArray(search.params)
+ search.params !== null &&
+ !Array.isArray(search.params)
? search.params
: {};
dateRange = Array.isArray(dateRange) ? dateRange : [];
--
Gitblit v1.9.3