From 3d7fe2a288d4c5fe26756222d8f5e4ea46c569a1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 17 Nov 2020 20:36:59 +0800
Subject: [PATCH] Copyright 2018-2020
---
ruoyi-ui/src/utils/ruoyi.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 4fe1b1e..f4817e4 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -59,8 +59,8 @@
search.beginTime = "";
search.endTime = "";
if (null != dateRange && '' != dateRange) {
- search.beginTime = this.dateRange[0];
- search.endTime = this.dateRange[1];
+ search.beginTime = dateRange[0];
+ search.endTime = dateRange[1];
}
return search;
}
@@ -131,7 +131,7 @@
id = id || 'id'
parentId = parentId || 'parentId'
children = children || 'children'
- rootId = rootId || 0
+ rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
//对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data))
//循环所有项
--
Gitblit v1.9.3