From c6912ca1d5712d29f97600fcebe0411d5d9bd25c Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Tue, 18 Aug 2020 17:27:19 +0800
Subject: [PATCH] !64 修改sass为node-sass，避免el-icon图标乱码 Merge pull request !64 from 心悦李国楠/dev-心悦
---
ruoyi-ui/src/utils/ruoyi.js | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 87ba221..4333f82 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,12 +54,15 @@
}
// 添加日期范围
-export function addDateRange (params = {}, dateRange) {
- if (dateRange != null && dateRange !== '') {
- params.beginTime = this.dateRange[0]
- params.endTime = this.dateRange[1]
+export function addDateRange(params, dateRange) {
+ var search = params;
+ search.beginTime = "";
+ search.endTime = "";
+ if (null != dateRange && '' != dateRange) {
+ search.beginTime = this.dateRange[0];
+ search.endTime = this.dateRange[1];
}
- return params
+ return search;
}
// 回显数据字典
--
Gitblit v1.9.2