From 6cf53bfacb627143c35a013496260deefd614182 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 24 三月 2021 15:31:51 +0800
Subject: [PATCH] !191 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. Merge pull request !191 from allworldg/N/A
---
ruoyi-ui/src/utils/ruoyi.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 994c0cc..81ee9c7 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,13 +54,17 @@
}
// 添加日期范围
-export function addDateRange(params, dateRange) {
+export function addDateRange(params, dateRange, propName) {
var search = params;
- search.beginTime = "";
- search.endTime = "";
+ search.params = {};
if (null != dateRange && '' != dateRange) {
- search.beginTime = dateRange[0];
- search.endTime = dateRange[1];
+ if (typeof(propName) === "undefined") {
+ search.params["beginTime"] = dateRange[0];
+ search.params["endTime"] = dateRange[1];
+ } else {
+ search.params["begin" + propName] = dateRange[0];
+ search.params["end" + propName] = dateRange[1];
+ }
}
return search;
}
--
Gitblit v1.9.2