From 9ab21680926a8e9938fe6195513bc166ad87044f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 23 Apr 2020 15:48:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
index a1536b3..f8e6a4f 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
@@ -4,6 +4,8 @@
}).extend({
formSelects: 'formSelects/formSelects-v4',
treetable: 'treetable-lay/treetable',
+ treetable2: 'treetable2/TreeTable',
+ autocomplete: 'complete/autocomplete',
step: 'step-lay/step'
}).use(['layer','config', 'index', 'element'], function () {
var $ = layui.jquery;
@@ -200,7 +202,7 @@
* @returns {}
*/
isEmpty:function(str){
- if(str != '' && str != undefined && str != null && str.length > 0){
+ if(str != '' && str != undefined && str != null){
return false;
}else{
return true;
@@ -257,3 +259,17 @@
return true;
}
};
+//从当前页面的url地址中获取参数数据
+function getRequest() {
+ debugger
+ var url = location.search; //获取url中"?"符后的字串
+ var theRequest = new Object();
+ if(url.indexOf("?") != -1) {
+ var str = url.substr(1);
+ strs = str.split("&");
+ for(var i = 0; i < strs.length; i++) {
+ theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+ }
+ }
+ return theRequest;
+}
--
Gitblit v1.8.0