Merge branch 'master' of https://git.oschina.net/cyf783/guns

src/main/webapp/WEB-INF/view/system/user/user.html

@@ -9,40 +9,34 @@
 				<div class="row row-lg">
 					<div class="col-sm-12">
 						<div class="row">
-                            <div class="col-sm-3">
+							<div class="col-lg-2 col-sm-3">
 								<div class="panel panel-default">
 									<div class="panel-heading">组织机构</div>
 									<div class="panel-body dept-tree">
-										<ul id="treeDemo" class="ztree"></ul>
+										<ul id="deptTree" class="ztree"></ul>
 									</div>
 								</div>
 							</div>
-                            <div class="col-sm-9">
+							<div class="col-lg-10 col-sm-9">
 								<div class="row">
-		                            <div class="col-sm-10">
+									<div class="col-lg-10 col-sm-3">
 										<div class="row">
-				                            <div class="col-sm-12">
+											<div class="col-lg-4 col-sm-12">
 												<#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
 											</div>
-				                        </div>
-				                        <div class="row">
-				                            <div class="col-sm-6">
+											<div class="col-lg-4 col-sm-6">
 												<#TimeCon id="beginTime" name="注册开始日期" isTime="false" pattern="YYYY-MM-DD"/>
 											</div>
-				                            <div class="col-sm-6">
+											<div class="col-lg-4 col-sm-6">
 												<#TimeCon id="endTime" name="注册结束日期" isTime="false" pattern="YYYY-MM-DD"/>
 											</div>
 										</div>
 									</div>
-		                            <div class="col-sm-2">
+									<div class="col-lg-2 col-sm-3">
 										<div class="row">
-				                            <div class="col-sm-12">
+											<div class="col-lg-12 col-sm-12">
 												<#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
-				                            </div>
-				                        </div>
-				                        <div class="row">
-				                            <div class="col-sm-12">
-		                                		<#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()"/>
+												<#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
 											</div>
 										</div>
 									</div>

src/main/webapp/static/modular/system/user/user.js

@@ -196,7 +196,7 @@ $(function () {
     var table = new BSTable("managerTable", "/mgr/list", defaultColunms);
     table.setPaginationType("client");
     MgrUser.table = table.init();
-    var ztree = new $ZTree("treeDemo", "/dept/tree");
+    var ztree = new $ZTree("deptTree", "/dept/tree");
     ztree.bindOnClick(MgrUser.onClickDept);
     ztree.init();
 });