Skip to content

G
guns-vip
Commit 1e5776fb by fengshuonan
Options

整理用户管理页面

parent 0b4dd3a6
Showing with 40 additions and 63 deletions
sql/guns.sql
...@@ -368,7 +368,7 @@ CREATE TABLE `sys_user` ( ...@@ -368,7 +368,7 @@ CREATE TABLE `sys_user` (
-- ---------------------------- -- ----------------------------
-- Records of sys_user -- Records of sys_user
-- ---------------------------- -- ----------------------------
INSERT INTO `sys_user` VALUES ('1', 'girl.gif', 'admin', 'ecfadcde9305f8891bcfe5a1e28c253e', '8pgby', '张三', '2017-05-05 00:00:00', '2', 'sn93@qq.com', '18200000000', '1', '27', '1', '2016-01-29 08:49:53', '25'); INSERT INTO `sys_user` VALUES ('1', '', 'admin', 'ecfadcde9305f8891bcfe5a1e28c253e', '8pgby', '张三', '2017-05-05 00:00:00', '2', 'sn93@qq.com', '18200000000', '1', '27', '1', '2016-01-29 08:49:53', '25');
INSERT INTO `sys_user` VALUES ('44', null, 'test', '45abb7879f6a8268f1ef600e6038ac73', 'ssts3', 'test', '2017-05-01 00:00:00', '1', 'abc@123.com', '', '5', '26', '3', '2017-05-16 20:33:37', null); INSERT INTO `sys_user` VALUES ('44', null, 'test', '45abb7879f6a8268f1ef600e6038ac73', 'ssts3', 'test', '2017-05-01 00:00:00', '1', 'abc@123.com', '', '5', '26', '3', '2017-05-16 20:33:37', null);
INSERT INTO `sys_user` VALUES ('45', null, 'boss', '71887a5ad666a18f709e1d4e693d5a35', '1f7bf', '老板', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:02', null); INSERT INTO `sys_user` VALUES ('45', null, 'boss', '71887a5ad666a18f709e1d4e693d5a35', '1f7bf', '老板', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:02', null);
INSERT INTO `sys_user` VALUES ('46', null, 'manager', 'b53cac62e7175637d4beb3b16b2f7915', 'j3cs9', '经理', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:24', null); INSERT INTO `sys_user` VALUES ('46', null, 'manager', 'b53cac62e7175637d4beb3b16b2f7915', 'j3cs9', '经理', '2017-12-04 00:00:00', '1', '', '', '1', '24', '1', '2017-12-04 22:24:24', null);
......
src/main/webapp/WEB-INF/common/_container.html
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
<!-- Custom CSS --> <!-- Custom CSS -->
<link href="${ctxPath}/assets/static/css/style.css" rel="stylesheet"> <link href="${ctxPath}/assets/static/css/style.css" rel="stylesheet">
<link href="${ctxPath}/assets/static/stylefeng/feng.css" rel="stylesheet">
<!-- You can change the theme colors from here --> <!-- You can change the theme colors from here -->
<link href="${ctxPath}/assets/static/css/colors/blue.css" id="theme" rel="stylesheet"> <link href="${ctxPath}/assets/static/css/colors/blue.css" id="theme" rel="stylesheet">
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
<script src="${ctxPath}/assets/plugins/sticky-kit-master/dist/sticky-kit.min.js"></script> <script src="${ctxPath}/assets/plugins/sticky-kit-master/dist/sticky-kit.min.js"></script>
<!--Guns JavaScript --> <!--Guns JavaScript -->
<script src="${ctxPath}/assets/static/js/Feng.js"></script> <script src="${ctxPath}/assets/static/stylefeng/Feng.js"></script>
<!--Custom JavaScript --> <!--Custom JavaScript -->
<script src="${ctxPath}/assets/static/js/custom.min.js"></script> <script src="${ctxPath}/assets/static/js/custom.min.js"></script>
......
src/main/webapp/WEB-INF/system/user/user.html
@layout("/common/_container.html"){ @layout("/common/_container.html",{title:"用户管理"}){
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-lg-12">
<div class="ibox float-e-margins"> <div class="card card-outline-info">
<div class="ibox-title"> <div class="card-block">
<h5>用户管理</h5> <div class="form-horizontal">
</div> <div class="form-body">
<div class="ibox-content"> <h4 class="card-title">查询条件</h4>
<div class="row row-lg"> <hr>
<div class="col-sm-12">
<div class="row"> <div class="row">
<div class="col-lg-2 col-sm-3"> <div class="col-md-3">
<div class="panel panel-default"> <div class="form-group row">
<div class="panel-heading">组织机构</div> <label for="name" class="col-sm-3 text-left control-label col-form-label">用户名称</label>
<div class="panel-body dept-tree"> <div class="col-sm-9 p-l-0">
<ul id="deptTree" class="ztree"></ul> <input type="email" class="form-control" id="name" placeholder="账号/姓名/手机号">
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-10 col-sm-9"> <div class="col-md-3">
<div class="row"> <div class="form-group row">
<div class="col-lg-10 col-sm-9"> <label for="timeLimit" class="col-sm-3 text-left control-label col-form-label">注册日期</label>
<div class="row"> <div class="col-sm-9 p-l-0">
<div class="col-lg-4 col-sm-12"> <input type="email" class="form-control" id="timeLimit" placeholder="注册日期">
<#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
</div> </div>
<div class="col-lg-4 col-sm-6">
<#TimeCon id="beginTime" name="注册开始日期" isTime="false"/>
</div> </div>
<div class="col-lg-4 col-sm-6">
<#TimeCon id="endTime" name="注册结束日期" isTime="false"/>
</div> </div>
<div class="col-md-3">
<div class="form-group row">
<div class="input-group-btn condition-button">
<button type="button" id="check-minutes" class="btn waves-effect waves-light btn-success">Check the minutes</button>
</div> </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> </div>
<div class="form-actions">
<h4 class="card-title">查询结果</h4>
<hr>
<div class="row">
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<button type="submit" class="btn btn-success">Submit</button>
<button type="button" class="btn btn-inverse">Cancel</button>
</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> </div>
<#table id="managerTable"/>
</div> </div>
<div class="col-md-6"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -73,13 +53,4 @@ ...@@ -73,13 +53,4 @@
</div> </div>
</div> </div>
</div> </div>
<script src="${ctxPath}/static/modular/system/user/user.js"></script>
<script>
laydate.render({
elem: '#beginTime'
});
laydate.render({
elem: '#endTime'
});
</script>
@} @}
src/main/webapp/assets/static/stylefeng/feng.css 0 → 100644
.condition-button{
height: 38px;
margin-left: 10px;
}
\ No newline at end of file
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