From 5109eb0e7ed779c010d1bd6a4ea0409c77ee1d72 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 09 十二月 2020 13:37:04 +0800
Subject: [PATCH] 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
---
ruoyi-ui/src/utils/ruoyi.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 994c0cc..549d284 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -1,4 +1,4 @@
-锘�/**
+/**
* 閫氱敤js鏂规硶灏佽澶勭悊
* Copyright (c) 2019 ruoyi
*/
@@ -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[propName + "BeginTime"] = dateRange[0];
+ search.params[propName + "EndTime"] = dateRange[1];
+ }
}
return search;
}
--
Gitblit v1.9.3