Skip to content

X
xzxt-shiro
Commit e2209f40 by liuyongshuai
Options

改版权限的批量修改；调节样式；增加根据状态查询

parent ccc27bc6
Showing with 318 additions and 120 deletions
src/main/java/com/xzxtshiro/controller/PageJunpController.java
......@@ -51,6 +51,6 @@ public class PageJunpController {
*/
@RequestMapping(value = "/welcome", method = RequestMethod.GET)
public String welcome(Model model) throws Exception {
return "redirect:/admin/user/index?msg=success";
return "redirect:/admin/member/index?msg=success";
}
}
src/main/java/com/xzxtshiro/dao/SysUserDao.java
......@@ -30,6 +30,8 @@ public interface SysUserDao {
Integer updateSysUserById(SysUser user);
List<SysUser> queryAllUserByCondition(SysUser user);
Integer insert(SysUser user);
Integer deleteSysUserRoleByUserId(@Param("userId")String userId);
......
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
......@@ -514,12 +514,33 @@
<if test="policemanid !=null"> and policemanid like '%'||#{policemanid}||'%'</if>
<if test="unitcode !=null"> and unitcode like '%'||#{unitcode}||'%'</if>
<if test="sex !=null"> and sex = #sex#</if>
<if test="openFlag !=null"> and OPEN_FLAG = #openFlag#</if>
<if test="openFlag !=null"> and OPEN_FLAG =#{openFlag,jdbcType=VARCHAR}</if>
) t where ROWNUM <![CDATA[<=]]>
${limit*page}
) where rn > ${(page-1)*limit}
</select>
<select id="queryAllUserByCondition" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />,ROLENAME
from SYS_USER t
left join
(select u.user_id ,
listagg( roleName, ',' ) within group ( order by u.user_id ) as roleName
from sys_role r join sys_user_role u on r.id=u.role_id where u.scbz='0' and r.scbz='0' GROUP BY u.user_id) tt
on t.id=tt.user_id
where scbz='0'
<if test="countycode !=null"> and UNITCODE like '%'||#{countycode}||'%'</if>
<if test="roleName !=null"> and ROLENAME like '%'||#{roleName}||'%'</if>
<if test="username !=null"> and USERNAME like '%'||#{username}||'%'</if>
<if test="trueName !=null"> and true_name like '%'||#{trueName}||'%'</if>
<if test="identitycard !=null"> and IDENTITYCARD like '%'||#{identitycard}||'%'</if>
<if test="policemanid !=null"> and policemanid like '%'||#{policemanid}||'%'</if>
<if test="unitcode !=null"> and unitcode like '%'||#{unitcode}||'%'</if>
<if test="sex !=null"> and sex = #sex#</if>
<if test="openFlag !=null"> and OPEN_FLAG = #openFlag#</if>
</select>
<select id="selectSysUserCountByCondition" resultType="integer">
<!---->
SELECT
......
src/main/java/com/xzxtshiro/pojo/SysUser.java
......@@ -115,5 +115,7 @@ public class SysUser extends BaseModel implements Serializable {
//保存失败的原因
protected String reason;
protected String type;
}
\ No newline at end of file
src/main/java/com/xzxtshiro/service/SysUserService.java
......@@ -19,6 +19,8 @@ public interface SysUserService {
List<SysRole> selectSysRoleByUserId(String userId);
List<SysUser> selectSysUserByCondition(SysUser user);
SysUser login(String username, String password);
List<List<SysPermissionNew>> selectMenusByUserId(SysUser user);
......
src/main/java/com/xzxtshiro/service/imp/SysRoleServiceImpl.java
......@@ -63,7 +63,8 @@ public class SysRoleServiceImpl implements SysRoleService{
Integer count = sysRoleDao.add(sysRole);
//确保角色保存成功再进行授权
if (count>0){
if (sysRole.getPermissionId() != null) {
System.out.println("角色拥有的权限========"+sysRole.getPermissionId());
if (sysRole.getPermissionId() != null&&!"".equals(sysRole.getPermissionId())) {
String[] permissions = sysRole.getPermissionId().split(",");
List<SysRolePermission> roleAndPermissions = new ArrayList<SysRolePermission>();
for (int i= 0; i < permissions.length; i++) {
......@@ -110,7 +111,7 @@ public class SysRoleServiceImpl implements SysRoleService{
//删除角色授权
int b=sysRoleDao.delectPermissionByRoleId(sysRole.getId());
//进行授权
if (sysRole.getPermissionId() != null) {
if (sysRole.getPermissionId() != null&&!"".equals(sysRole.getPermissionId())) {
String[] permissions = sysRole.getPermissionId().split(",");
List<SysRolePermission> roleAndPermissions = new ArrayList<SysRolePermission>();
for (int j = 0; j < permissions.length; j++) {
......
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
......@@ -36,6 +36,11 @@ public class SysUserServiceImpl implements SysUserService {
}
@Override
public List<SysUser> selectSysUserByCondition(SysUser user) {
return userDao.queryAllUserByCondition(user);
}
@Override
public SysUser login(String username, String password) {
SysUser user =new SysUser();
user.setUsername(username);
......@@ -215,11 +220,11 @@ public class SysUserServiceImpl implements SysUserService {
*/
@Override
public SysUser update(SysUser user) {
//1.首先修改用户的基本信息
SysUser dlUser = TokenUtil.getUser();
user.setGxr(dlUser.getUsername());
user.setGxsj(new Date());
user.setPassword(new Base64PasswordEncrypter().encryptPassword(user.getPassword()));
//从前台传过来的三员角色需要处理，因为layui是使用","进行拼接，
//而3.0中使用# 拼接，所以需要置换
String gzzmRole = user.getGzzmPlay();
......
src/main/resources/resource/db.properties
jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
jdbc.driver=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.126.129:1521:XZXT3
jdbc.url=jdbc:oracle:thin:@192.168.1.109:1521:XZXT3
jdbc.username=XZXT
jdbc.password=XZXT
......
src/main/webapp/WEB-INF/jsp/admin/member/detail.jsp
......@@ -18,13 +18,13 @@
<jsp:include page="inc.jsp"></jsp:include>
<div class="layui-row">
<div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
<div class="x-nav layui-elem-quote">
<div class="x-nav layui-elem-quote" style="line-height: 14px;">
<span class="layui-breadcrumb">
<a><cite><i class="layui-icon" style="line-height:25px">&#xe68e </i>首页</cite></a>
<a href="${pageContext.request.contextPath}/admin/member/index">个人资料</a>
<a><cite>个人资料</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:0px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="${pageContext.request.contextPath}/admin/member/index" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/member/updatepwd.jsp
......@@ -17,13 +17,13 @@
<jsp:include page="inc.jsp"></jsp:include>
<div class="layui-row">
<div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
<div class="x-nav layui-elem-quote">
<div class="x-nav layui-elem-quote" style="line-height: 14px;">
<span class="layui-breadcrumb">
<a><cite><i class="layui-icon" style="line-height:25px">&#xe68e </i>首页</cite></a>
<a href="${pageContext.request.contextPath}/admin/member/index">个人资料</a>
<a><cite>密码修改</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:0px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="${pageContext.request.contextPath}/admin/menu/index" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/menu/add.jsp
......@@ -26,7 +26,7 @@
<a href="${pageContext.request.contextPath}/admin/menu/index">菜单列表</a>
<a><cite>添加菜单</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:1px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/menu/list.jsp
......@@ -24,7 +24,7 @@
<a><cite><i class="layui-icon" style="line-height:25px">&#xe68e </i>首页</cite></a>
<a><cite>菜单列表</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:0px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="${pageContext.request.contextPath}/admin/menu/index" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/menu/update.jsp
......@@ -27,7 +27,7 @@
<a href="${pageContext.request.contextPath}/admin/menu/index">菜单列表</a>
<a><cite>添加菜单</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:0px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/permission/add.jsp
......@@ -26,7 +26,7 @@
<a href="${pageContext.request.contextPath}/admin/permission/index">权限列表</a>
<a><cite>添加权限</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:1px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/permission/list.jsp
......@@ -24,7 +24,7 @@
<a><cite><i class="layui-icon" style="line-height:25px">&#xe68e </i>首页</cite></a>
<a><cite>权限列表</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:0px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="${pageContext.request.contextPath}/admin/permission/index" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/permission/update.jsp
......@@ -28,7 +28,7 @@
<a href="${pageContext.request.contextPath}/admin/permission/index">权限列表</a>
<a><cite>添加权限</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:1px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/role/add.jsp
......@@ -26,7 +26,7 @@
<a href="${pageContext.request.contextPath}/admin/role/index">角色列表</a>
<a><cite>添加角色</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:1px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......@@ -60,22 +60,21 @@
</div>
</div>
<div class="layui-form-item btx">
<label class="layui-form-label">拥有权限</label>
<label class="layui-form-label">角色层级</label>
<div class="layui-input-block">
<input type="text" name="permissionName" id="permissionName" lay-verify="required"
class="layui-input">
<input type="text" id="permissionId" Name="permissionId" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('myPermissionTree');">选择权限</span>
<div id="myPermissionTree" style="display: none">
<ul id="permissionTree" class="ztree"></ul>
</div>
<select id="isParent" name="isParent" lay-verify="required" lay-filter="isParent">
<option value="">请选择</option>
<option value="01">父级</option>
<option value="02">子级</option>
</select>
</div>
</div>
<div class="layui-form-item">
<div class="layui-form-item btx" id="isParentRole">
<label class="layui-form-label">父级角色</label>
<div class="layui-input-block">
<input type="text" name="pidName" id="pidName"
class="layui-input">
class="layui-input" lay-verify="required">
<input type="text" id="pid" Name="pid" style="display: none;">
<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');">选择父级</span>
<div id="myRoleTree" style="display: none">
......@@ -83,6 +82,19 @@
</div>
</div>
</div>
<div class="layui-form-item btx" id="hasPermission">
<label class="layui-form-label">拥有权限</label>
<div class="layui-input-block">
<input type="text" name="permissionName" id="permissionName" lay-verify="required"
class="layui-input">
<input type="text" id="permissionId" Name="permissionId" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('myPermissionTree');">选择权限</span>
<div id="myPermissionTree" style="display: none">
<ul id="permissionTree" class="ztree"></ul>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
......@@ -119,6 +131,28 @@
form.on('submit(rulesSubmit)', function (data) {
//提交表单
});
form.on('select(isParent)', function(data){
if(data.value=="01"){
//如果是父级角色，权限选择框去掉，父级角色去掉
$("#hasPermission").removeClass("btx");
$("#isParentRole").removeClass("btx");
$("#permissionName").removeAttr('lay-verify');
$("#pidName").removeAttr('lay-verify');
$("#hasPermission").hide();
$("#isParentRole").hide();
}
if(data.value=="02"){
//如果是子级角色，权限选择为必填，父级角色为必填
$("#hasPermission").attr("class","layui-form-item btx");
$("#isParentRole").attr("class","layui-form-item btx");
$("#permissionName").attr('lay-verify',"required");
$("#pidName").attr('lay-verify',"required");
$("#hasPermission").show();
$("#isParentRole").show();
}
});
//监听CheckBox
form.on('checkbox(permission)', function (data) {
$('input[type=checkbox]:checked').map(function () {
......@@ -147,6 +181,7 @@
});
</script>
</body>
......
src/main/webapp/WEB-INF/jsp/admin/role/list.jsp
......@@ -24,7 +24,7 @@
<a><cite><i class="layui-icon" style="line-height:25px">&#xe68e </i>首页</cite></a>
<a><cite>角色列表</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:0px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="${pageContext.request.contextPath}/admin/role/index" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/role/update.jsp
......@@ -27,7 +27,7 @@
<a href="${pageContext.request.contextPath}/admin/role/index">角色列表</a>
<a><cite>添加角色</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:1px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......@@ -64,18 +64,16 @@
</div>
</div>
<div class="layui-form-item btx">
<label class="layui-form-label">拥有权限</label>
<label class="layui-form-label">角色层级</label>
<div class="layui-input-block">
<input type="text" name="permissionName" id="permissionName" lay-verify="required"
class="layui-input">
<input type="text" id="permissionId" Name="permissionId" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('myPermissionTree');">选择权限</span>
<div id="myPermissionTree" style="display: none">
<ul id="permissionTree" class="ztree"></ul>
</div>
<select id="isParent" name="isParent" lay-verify="required" lay-filter="isParent">
<option value="">请选择</option>
<option value="01">父级</option>
<option value="02">子级</option>
</select>
</div>
</div>
<div class="layui-form-item">
<div class="layui-form-item btx" id="isParentRole">
<label class="layui-form-label">父级角色</label>
<div class="layui-input-block">
<input type="text" name="pidName" id="pidName"
......@@ -87,6 +85,19 @@
</div>
</div>
</div>
<div class="layui-form-item btx" id="hasPermission">
<label class="layui-form-label">拥有权限</label>
<div class="layui-input-block">
<input type="text" name="permissionName" id="permissionName" lay-verify="required"
class="layui-input">
<input type="text" id="permissionId" Name="permissionId" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('myPermissionTree');">选择权限</span>
<div id="myPermissionTree" style="display: none">
<ul id="permissionTree" class="ztree"></ul>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
......@@ -124,6 +135,31 @@
form.on('submit(rulesSubmit)', function (data) {
//提交表单
});
form.on('select(isParent)', function(data){
if(data.value=="01"){
//如果是父级角色，权限选择框去掉，父级角色去掉
$("#hasPermission").removeClass("btx");
$("#isParentRole").removeClass("btx");
$("#permissionName").removeAttr('lay-verify');
$("#pidName").removeAttr('lay-verify');
$("#hasPermission").hide();
$("#isParentRole").hide();
$("#permissionName").val("");
$("#permissionId").val("");
$("#pidName").val("");
$("#pid").val("");
}
if(data.value=="02"){
//如果是子级角色，权限选择为必填，父级角色为必填
$("#hasPermission").attr("class","layui-form-item btx");
$("#isParentRole").attr("class","layui-form-item btx");
$("#permissionName").attr('lay-verify',"required");
$("#pidName").attr('lay-verify',"required");
$("#hasPermission").show();
$("#isParentRole").show();
}
});
//监听CheckBox
form.on('checkbox(permission)', function (data) {
$('input[type=checkbox]:checked').map(function () {
......
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
......@@ -26,7 +26,7 @@
<a href="${pageContext.request.contextPath}/admin/user/index">用户列表</a>
<a><cite>添加用户</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:1px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/user/inc.jsp
<%@ page contentType="text/html;charset=UTF-8" language="java"%>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/layui/css/layui.css" media="all">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/common/css/common.css" media="all">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/mycss/style.css" media="all">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/ztree/metroStyle/metroStyle.css"/>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/font-awesome/css/font-awesome.css"/>
<script src="${pageContext.request.contextPath}/resources/jquery-3.1.0.min.js"></script>
......
src/main/webapp/WEB-INF/jsp/admin/user/list.jsp
......@@ -19,6 +19,20 @@
.layui-form-item>.layui-input-block>input{
width: 20%;
}
#openFlag{
height: 30px;
line-height: 1.3;
line-height: 38px\9;
border-width: 1px;
border-style: solid;
background-color: #fff;
border-radius: 6px;
display: block;
width: 100%;
padding-left: 10px;
}
.searchDiv .layui-input{height:30px;}
.searchDiv label{padding:3px 15px;}
</style>
</head>
......@@ -37,7 +51,7 @@
<a><cite><i class="layui-icon" style="line-height:25px">&#xe68e </i>首页</cite></a>
<a><cite>用户列表</cite></a>
</span>
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:0px;float:right"
<a class="layui-btn layui-btn-mini" style="line-height:1.0em;margin-top:-3px;float:right"
href="${pageContext.request.contextPath}/admin/user/index" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......@@ -57,12 +71,22 @@
class="layui-input">
</div>
</div>
<div class="layui-form-mid">
<%--<div class="layui-form-mid">
<label class="layui-form-label">身份证号</label>
<div class="layui-input-block">
<input type="text" name="identitycard" id="identitycard" lay-verify="required"
class="layui-input">
</div>
</div>--%>
<div class="layui-form-mid">
<label class="layui-form-label">用户状态</label>
<div class="layui-input-block">
<select id="openFlag" name="openFlag" lay-filter="grade">
<option value="">请选择</option>
<option value="1">开启</option>
<option value="0">关闭</option>
</select>
</div>
</div>
<div class="layui-form-mid">
<label class="layui-form-label">用户警号</label>
......@@ -101,7 +125,7 @@
<button class="layui-btn layui-btn-normal queryUserList" data-type="reload" style="margin-left: 20px;">查询</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 20px;" onclick="reset();">清空</button>
<a class="layui-btn layui-btn-normal" role="button" style="margin-left: 20px;" href="${pageContext.request.contextPath}/admin/user/add">新增</a>
<button class="layui-btn layui-btn-normal" style="margin-left: 20px;" data-type="getCheckData">批量授权</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 20px;" data-type="getAllUserData">批量授权</button>
</div>
</div>
......@@ -127,61 +151,21 @@
</script>
<script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script>
<script>
//清空功能
function reset() {
$(".searchDiv input").each(function (i,v) {
v.value = "";
})
};
function post(URL, PARAMS) {
var temp_form = document.createElement("form");
temp_form .action = URL;
temp_form .method = "post";
temp_form .style.display = "none";
for (var x in PARAMS) {
var opt = document.createElement("textarea");
opt.name = x;
opt.value = PARAMS[x];
temp_form .appendChild(opt);
}
document.body.appendChild(temp_form);
temp_form .submit();
}
$(function () {
var url = "<%=perurl%>";
console.log("++++权限++++"+url);
$("#openFlag").width($("#username").width());
$(window).resize(function () {
$("#openFlag").width($("#username").width());
})
})
layui.use(['table', 'element','jquery'], function () {
var table = layui.table,
element = layui.element,
$ = layui.jquery;
var $ = layui.$, active = {
getCheckData: function(){ //获取选中数据
var checkStatus = table.checkStatus('testReload'),
data = checkStatus.data;
if(data.length==0){
layer.msg("请至少选择1个用户");
return;
}
for (var i=0;i<data.length;i++){
//去除影响数据转换的字段
delete data[i].gzzmZhy;
delete data[i].gzzmYpy;
delete data[i].gzzmZcy;
delete data[i].gzzmPlay;
delete data[i].ip;
}
post('${pageContext.request.contextPath}/admin/user/toBatchUpdate',{userList:JSON.stringify(data)});
<%--$.ajax({--%>
<%--url:"${pageContext.request.contextPath}/admin/user/batchUpdate",--%>
<%--type:"POST",--%>
<%--data:{userList:JSON.stringify(data)},--%>
<%--success:function (data) {--%>
<%--var obj = window.open("about:blank");--%>
<%--obj.document.write(data);--%>
<%--}--%>
<%--});--%>
//window.location.href = '${pageContext.request.contextPath}/admin/user/batchUpdate/' + JSON.stringify(data);
getAllUserData:function () {
window.location.href = '${pageContext.request.contextPath}/admin/user/toNewBatchUpdate'
}
};
$('.demoTable .layui-btn').on('click', function(){
......@@ -201,9 +185,6 @@
if (obj.event === 'update') {
window.location.href = '${pageContext.request.contextPath}/admin/user/update/' + data.id;
}
//此处需要完善
if (obj.event === 'delete') {
var id = obj.data.id;
......@@ -256,12 +237,11 @@
limit: 50 ,//默认采用10
url: '${pageContext.request.contextPath}/admin/user/list',
cols: [[
{ checkbox: true},
{field:'rn',title:'序号',align:'center', width:50, sort: true},
{field:'rn',title:'序号',align:'center', width:50},
{field:'username',title:'登录名',align:'center', width:90, sort: true},
{field:'trueName',title:'用户姓名', align:'center',width:100, sort: true},
{field:'unitname', title:'所属部门',align:'center',width:260, sort: true},
{field:'roleName',title:'用户角色', align:'center',width:200, sort: true},
{field:'roleName',title:'用户角色', align:'center',width:250, sort: true},
{field: 'id', style:'display:none;'},
{field:'openFlag',title:'用户状态',align:'center', width:100, sort: true,templet: '#userStateTpl'},
{width:200, title:'操作',align:'center', toolbar: '#toolBar'}
......@@ -271,7 +251,7 @@
done: function(res, curr, count){
$("[data-field='id']").css('display','none');
},
height: 315
height: 480
});
......@@ -279,7 +259,7 @@
reload: function(){
var username = cheNull($('#username').val());
var trueName = cheNull($('#trueName').val());
var identitycard = cheNull($('#identitycard').val());
var openFlag = cheNull($('#openFlag').val());
var policemanid = cheNull($('#policemanid').val());
var unitcode = cheNull($('#unitcode').val());
var roleName = cheNull($('#roleName').val());
......@@ -287,7 +267,7 @@
where: {
username: username,
trueName: trueName,
identitycard:identitycard,
openFlag:openFlag,
policemanid:policemanid,
unitcode:unitcode,
roleName:roleName
......@@ -303,7 +283,6 @@
};
$('.queryUserList').on('click', function(){
console.log("进入查询");
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
......@@ -320,10 +299,10 @@
<script>
layui.use('form', function() {
var form = layui.form, layer = layui.layer;
form.render('select');
form.on('switch', function(data){
var elem = $(data.elem);
var trelem = elem.parents("tr");
console.log(trelem);
var id=trelem.find(".laytable-cell-1-id").html();
//var data = obj.data;
var val =this.checked ? '1' : '0';
......@@ -335,7 +314,13 @@
window.location.href="${pageContext.request.contextPath}/admin/user/index";
}
})
});
});
layui.use(['form'], function () {
var form = layui.form;
form.render('select');
});
</script>
</body>
......
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
......@@ -26,7 +26,7 @@
<a href="${pageContext.request.contextPath}/admin/user/index">用户列表</a>
<a><cite>修改用户</cite></a>
</span>
<a class="layui-btn layui-btn-normal" style="line-height:1.0em;margin-top:1px;float:right"
<a class="layui-btn layui-btn-normal" style="line-height:1.0em;margin-top:-3px;float:right"
href="javascript:location.reload()" title="刷新">
<i class="fa fa-refresh line-size"></i></a>
</div>
......@@ -71,13 +71,13 @@
<input type="hidden" id="yhzpPath" name="yhzpPath" value=""/>
<button type="button" class="layui-btn" id="yhzpBtn"><i class="layui-icon"></i>上传照片</button>
</div>
<div class="layui-form-item btx">
<%--<div class="layui-form-item btx">
<label class="layui-form-label">登录密码</label>
<div class="layui-input-block">
<input type="password" name="password" lay-verify="required" placeholder="默认密码000000" value="${user.password}"
class="layui-input">
</div>
</div>
</div>--%>
<div class="layui-form-item btx">
<label class="layui-form-label">身份证号码</label>
......@@ -86,20 +86,20 @@
value="${user.identitycard}" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<%--<div class="layui-form-item">
<label class="layui-form-label">出生日期</label>
<div class="layui-input-block">
<input type="text" name="birthday" id="birthday" placeholder="请选择出生日期"
class="layui-input">
</div>
</div>
<div class="layui-form-item btx">
</div>--%>
<%--<div class="layui-form-item btx">
<label class="layui-form-label">联系电话</label>
<div class="layui-input-block">
<input type="text" name="telephone" lay-verify="phone" placeholder="请输入联系电话"
value="${user.telephone}" class="layui-input">
</div>
</div>
</div>--%>
<div class="layui-form-item btx">
<label class="layui-form-label">用户警号</label>
<div class="layui-input-block">
......@@ -155,13 +155,13 @@
</div>
</div>
</div>
<div class="layui-form-item">
<%--<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<input type="text" name="remark" placeholder="请输入备注"
value="${user.remark}" class="layui-input">
</div>
</div>
</div>--%>
<div class="layui-form-item">
<label class="layui-form-label">涉枪管理员</label>
<div class="layui-input-block">
......@@ -188,7 +188,7 @@
</c:if>
</div>
</div>
<div class="layui-form-item">
<%--<div class="layui-form-item">
<label class="layui-form-label">用户状态</label>
<div class="layui-input-block">
<c:if test="${user.openFlag==0 or user.openFlag==null}">
......@@ -200,8 +200,8 @@
<input type="radio" name="openFlag" value="1" title="已启用" checked>
</c:if>
</div>
</div>
<div class="layui-form-item">
</div>--%>
<%--<div class="layui-form-item">
<label class="layui-form-label">性别</label>
<div class="layui-input-block">
<c:if test="${user.sex==1 or user.sex==null}">
......@@ -213,8 +213,8 @@
<input type="radio" name="sex" value="2" title="女" checked>
</c:if>
</div>
</div>
<div class="layui-form-item">
</div>--%>
<%--<div class="layui-form-item">
<label class="layui-form-label">显示照片</label>
<div class="layui-input-block">
<c:if test="${user.isShow=='0' or user.isShow==null}">
......@@ -226,7 +226,7 @@
<input type="radio" name="isShow" value="1" title="是" checked>
</c:if>
</div>
</div>
</div>--%>
<div class="layui-form-item" style="text-align: center">
<div class="layui-form-item">
<button class="layui-btn" lay-submit="" lay-filter="rulesSubmit">提交</button>
......
src/main/webapp/WEB-INF/jsp/index.jsp
......@@ -27,7 +27,7 @@
<header class="navbar-wrapper">
<div class="navbar navbar-fixed-top">
<div class="container-fluid cl">
<a class="logo navbar-logo f-l mr-10 hidden-xs" href="javascript:;">权限控制<%--<img src="${pageContext.request.contextPath}/resources/h-ui/images/jinghui.png" class="jh-img"/>--%></a>
<a class="logo navbar-logo f-l mr-10 hidden-xs" href="javascript:;"><img src="${pageContext.request.contextPath}/resources/h-ui/images/jinghui.png" class="jh-img"/></a>
<%--<a class="logo navbar-logo-m f-l mr-10 visible-xs" href="javascript:;">权限控制</a>--%>
<span class="logo navbar-slogan f-l mr-10 hidden-xs"></span>
<a aria-hidden="false" class="nav-toggle Hui-iconfont visible-xs" href="javascript:;"
......@@ -156,7 +156,7 @@
<div class="Hui-tabNav-wp">
<ul id="min_title_list" class="acrossTab cl">
<li class="active">
<span title="用户中心" data-href="${pageContext.request.contextPath}/admin/user/list">用户中心</span>
<span title="用户中心" data-href="${pageContext.request.contextPath}/admin/member/index">个人资料</span>
<em></em></li>
</ul>
</div>
......
src/main/webapp/resources/common/common.js
......@@ -47,9 +47,11 @@ function setTree(data,treeId,type,kid,vid,glcs) {
if(thisName.indexOf("[")>-1){
thisName=thisName.substring(0,thisName.indexOf("["));
}
if(vid=="batchRoleName"){
$("#batchRoleName").append("<li>"+thisName+"</li>");
}
v+=thisName + ",";
k+=nodes[i].id + ",";
console.log("节点id:"+k+"节点名称"+v); //获取选中节点的值
}
$("#"+kid).val(k);
$("#"+vid).val(v);
......@@ -107,6 +109,7 @@ function setTree(data,treeId,type,kid,vid,glcs) {
* @param treeId 所需要展现树的div的id
*/
function checkTree(treeId){
layer.open({
type: 1,
area:['400px', '430px'],
......@@ -140,7 +143,6 @@ function chechFormData(form) {
identitycard: function (value) { //昵称 value：表单的值、item：表单的DOM对象
var reg = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
if (value.length > 0 ) {
console.log(reg.test(value));
if(reg.test(value)===false){
return '身份证号码格式不正确！';
}
......@@ -170,3 +172,24 @@ function chechFormData(form) {
});
}
//清空功能
function reset() {
$(".searchDiv input").each(function (i,v) {
v.value = "";
})
};
function post(URL, PARAMS) {
var temp_form = document.createElement("form");
temp_form .action = URL;
temp_form .method = "post";
temp_form .style.display = "none";
for (var x in PARAMS) {
var opt = document.createElement("textarea");
opt.name = x;
opt.value = PARAMS[x];
temp_form .appendChild(opt);
}
document.body.appendChild(temp_form);
layer.msg("保存成功");
temp_form .submit();
}
src/main/webapp/resources/common/css/common.css
......@@ -8,4 +8,7 @@
}
.btx>label{
color: red;
}
.layui-elem-quote{
line-height: 14px;
}
\ No newline at end of file
src/main/webapp/resources/h-ui/css/H-ui.admin.css
......@@ -60,6 +60,7 @@ h4{line-height:30px}
.Hui-aside .menu_dropdown dd li a{line-height:40px;padding-left:26px; border-bottom:none; font-weight:normal}
.Hui-aside .menu_dropdown li a:hover{text-decoration:none}
.Hui-aside .menu_dropdown li.current a,.menu_dropdown li.current a:hover{background-color:rgba(255,255,255,0.2)}
.Hui-aside .menu_dropdown dd ul li:hover{ background: #205356;}
/*菜单收缩切换*/
.dislpayArrow{position: absolute;top: 0;bottom: 0;left:200px;width:0px; height:100%;z-index:10}
.dislpayArrow a{ position:absolute; display:block; width:17px; height:61px;top:50%; margin-top:-30px;outline:none}
......
src/main/webapp/resources/layui/css/layui.css
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/resources/mycss/style.css
......@@ -4,6 +4,85 @@
.table-c table{border-right:1px solid #F00;border-bottom:1px solid #F00}
.table-c table td{border-left:1px solid #F00;border-top:1px solid #F00}
.selection-container{
height:350px;
margin:10px;
}
.select-box1,.select-box2,.select-box3{
height:100%;
border:1px solid #ccc;
float:left;
}
.select-box1{width:38%;}
.select-box2{width:24%;}
.select-box3{width:22%;position: relative;}
.list-juese{height:253px;overflow: auto;padding-left:20px;position: relative;top:40px;}
.list-juese li{line-height: 24px;}
.arrows-box{
width:50px;
height:100%;
float:left;
position:relative;
}
.select-content{
width:100%;
height:320px;
overflow-y:auto;
overflow-x:hidden;
}
.select-box-title{
width:90%;
height:30px;
line-height:30px;
font-size:12px;
font-family:"微软雅黑";
padding:0 5%;
border-bottom:1px solid #ccc;
}
.select-box-title input{
margin:8px 0;
}
.checkbox-all{
float:right;
}
.checkboxs{
vertical-align:middle;
}
.unselect-ul{
padding:10px 0;
}
.select-content li{
padding:5px 15px;
font-size:12px;
font-family:"微软雅黑";
}
.arrow-btns{
width:100%;
height:90px;
position:absolute;
top:50%;
margin-top:-45px;
}
.arrow-btn{
width:20px;
height:12px;
padding:18px 10px;
background:#eee;
border:1px solid #ccc;
margin:0 auto 5px;
cursor:pointer;
}
.arrow-btn i{
display:inline-block;
width:100%;
height:100%;
background:url("../image/arrow-left.png") no-repeat center center;
}
.arrow-btn.right i{
background:url("../image/arrow-right.png") no-repeat center center;
}
/*
css 注释：
只对table td设置左与上边框；
......
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