Skip to content

G
guns-vip
Commit c0c3b7a4 by cyf783
Options

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

parents 23315aa0 157f3cc8
Showing with 69 additions and 75 deletions
src/main/webapp/WEB-INF/view/system/user/user.html
@layout("/common/_container.html"){
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>用户管理</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
<div class="panel panel-default">
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>用户管理</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
<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="row">
<div class="col-sm-10">
<div class="row">
<div class="col-sm-12">
<#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<#TimeCon id="beginTime" name="注册开始日期" isTime="false" pattern="YYYY-MM-DD"/>
</div>
<div class="col-sm-6">
<#TimeCon id="endTime" name="注册结束日期" isTime="false" pattern="YYYY-MM-DD"/>
</div>
</div>
</div>
<div class="col-sm-2">
<div class="row">
<div class="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()"/>
</div>
</div>
</div>
</div>
<div class="hidden-xs" id="managerTableToolbar" role="group">
@if(shiro.hasPermission("/mgr/add")){
<#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
@}
@if(shiro.hasPermission("/mgr/edit")){
<#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/delete")){
<#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/reset")){
<#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/freeze")){
<#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/unfreeze")){
<#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/setRole")){
<#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
@}
</div>
<#table id="managerTable"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-10 col-sm-9">
<div class="row">
<div class="col-lg-10 col-sm-3">
<div class="row">
<div class="col-lg-4 col-sm-12">
<#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
</div>
<div class="col-lg-4 col-sm-6">
<#TimeCon id="beginTime" name="注册开始日期" isTime="false" pattern="YYYY-MM-DD"/>
</div>
<div class="col-lg-4 col-sm-6">
<#TimeCon id="endTime" name="注册结束日期" isTime="false" pattern="YYYY-MM-DD"/>
</div>
</div>
</div>
<div class="col-lg-2 col-sm-3">
<div class="row">
<div class="col-lg-12 col-sm-12">
<#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
<#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
</div>
</div>
</div>
</div>
<div class="hidden-xs" id="managerTableToolbar" role="group">
@if(shiro.hasPermission("/mgr/add")){
<#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
@}
@if(shiro.hasPermission("/mgr/edit")){
<#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/delete")){
<#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/reset")){
<#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/freeze")){
<#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/unfreeze")){
<#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/setRole")){
<#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
@}
</div>
<#table id="managerTable"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script src="${ctxPath}/static/modular/system/user/user.js"></script>
@}
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();
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment