Skip to content

X
xzxt-shiro
Commit 7857006e by chang_chao@founder.com.cn
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 1416bb53 ee2f47ca
Showing with 558 additions and 159 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/controller/admin/SysUserController.java
......@@ -73,6 +73,13 @@ public class SysUserController {
@ResponseBody
@RequestMapping(value = "/list", method = RequestMethod.GET)
public BaseModel list(SysUser user) {
System.out.println("openflag================="+user.getOpenFlag());
System.out.println("unitcode================="+user.getUnitcode());
user = setQueryParam(user);
return userService.selectSysUserPage(user);
}
public static SysUser setQueryParam(SysUser user) {
//获取当前登录用户
SysUser dlUser = TokenUtil.getUser();
String usergrade = dlUser.getGrade();
......@@ -96,7 +103,7 @@ public class SysUserController {
}
}
user.setCountycode(dw);
return userService.selectSysUserPage(user);
return user;
}
private static String subUnitCode(String usergrade, String unitcode, String dw) {
......@@ -134,13 +141,6 @@ public class SysUserController {
new ZtreeDataUtil().setUnitAndRole(model,dictitemService,userService,roleService);
}
/**
* 为方便调用现在将role和unit进行拆分，并写入到service层，
* 因为这些东西在roleController中，userController都会不止一次调用
*
*
*/
/**
* 添加用户---提交
......@@ -273,12 +273,7 @@ public class SysUserController {
}
}
/**
* 跳转到批量授权页面
* @param userList
* @param model
* @return
*/
/*
@RequestMapping(value = "/toBatchUpdate", method = RequestMethod.POST)
public String batchUpdateInex(String userList, Model model){
JSONArray jsonArray = JSONArray.fromObject(userList);
......@@ -289,6 +284,13 @@ public class SysUserController {
setZtreeData(model,userService,dictitemService,roleService);
model.addAttribute("userList", choseUsers);
return "admin/user/batchUpdate";
}*/
@RequestMapping(value = "/toNewBatchUpdate", method = RequestMethod.GET)
public String toOpenBatch(Model model){
setZtreeData(model,userService,dictitemService,roleService);
return "admin/user/batchUpdate";
}
/**
......
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
......@@ -437,7 +437,7 @@
<!--根据userId查询用户拥有的权限-->
<select id="selectSysPermissionsByUserId" resultType="com.xzxtshiro.pojo.SysPermissionNew" parameterType="java.lang.String">
SELECT
id,NAME ||'['||id||']' as NAME,menuname,permission,url,flag,zindex,pid,userid
distinct id,NAME ||'['||id||']' as NAME,menuname,permission,url,flag,zindex,pid,userid
FROM
VW_USER_PERMISSION
WHERE
......@@ -485,7 +485,7 @@
<select id="selectMencusByUserId" resultType="com.xzxtshiro.pojo.SysPermissionNew">
<!---->
SELECT
ID, NAME, MENUNAME, PID, PERMISSION, URL, TYPE
distinct ID, NAME, MENUNAME, PID, PERMISSION, URL, TYPE
FROM
VW_USER_PERMISSION
where flag=1
......@@ -511,15 +511,36 @@
<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 = #{policemanid}</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>
<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
......@@ -536,10 +557,10 @@
<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 =#{policemanid}</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>
<if test="openFlag !=null"> and OPEN_FLAG =#{openFlag,jdbcType=VARCHAR}</if>
</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
package com.xzxtshiro.service.imp;
import com.xzxtshiro.dao.SysRoleDao;
import com.xzxtshiro.dao.SysUserDao;
import com.xzxtshiro.pojo.*;
......@@ -36,6 +37,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,17 +221,20 @@ 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();
if(gzzmRole!=null&&!"".equals(gzzmRole)){
user.setGzzmPlay(gzzmRole.replace(",","# "));
}
Base64PasswordEncrypter base = new Base64PasswordEncrypter();
String password = base.encryptPassword(user.getPassword());
user.setPassword(password);
int a = userDao.updateSysUserById(user);
//2.删除用户的原有照片，添加新照片
if("1".equals(user.getHasZp())){
......
src/main/java/com/xzxtshiro/util/RedisUtil.java
......@@ -32,8 +32,8 @@ public class RedisUtil {
public static String getRedisParam(){
PropertiesUtils propertiesUtil=new PropertiesUtils("resource/db.properties");
String host=propertiesUtil.getValue("redis.host");
String port = propertiesUtil.getValue("redis.port");
String host=propertiesUtil.getValue("rest.host");
String port = propertiesUtil.getValue("rest.port");
return host+":"+port;
}
......
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.121:1521:XZXT3
jdbc.username=XZXT
jdbc.password=XZXT
redis.host=http://127.0.0.1
redis.port=9043
rest.host=http://127.0.0.1
rest.port=9043
src/main/webapp/WEB-INF/jsp/admin/member/detail.jsp
......@@ -18,18 +18,18 @@
<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:-4px;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>
</div>
<form class="layui-form" action="" style="align-self: center">
<form class="layui-form" action="" style="align-self: center;float:left;">
<div class="layui-form-item">
<label class="layui-form-label">用户姓名</label>
<div class="layui-input-inline">
......@@ -73,6 +73,14 @@
</div>
</div>
<%--<div class="grzl-mp">
<div class="mp-photo"><img src="${pageContext.request.contextPath}/resources/image/photo.png" class="photo-img"/></div>
<p>姓名：</p>
<p>警号：</p>
<p>身份证号：</p>
<p>姓名：</p>
<p>所属单位：</p>
</div>--%>
</form>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/member/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/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/common/css/common.css" media="all">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/h-ui/css/new-wrap.css" media="all">
<style>
body {
margin: 10px;
......@@ -11,5 +13,5 @@
line-height: 200px;
text-align: center;
}
body .line-size{font-size: 20px; line-height: 38px;}
body .line-size{font-size: 20px; line-height: 30px;}
</style>
\ No newline at end of file
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:-4px;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>
......@@ -66,7 +66,7 @@
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="updatePwd">立即提交</button>
<button class="layui-btn layui-btn-normal" lay-submit lay-filter="updatePwd">立即提交</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/menu/add.jsp
......@@ -26,11 +26,11 @@
<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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/menu/index">返回上一级</a>
</div>
......@@ -85,7 +85,7 @@
<div id="menu"></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>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/menu/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/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/h-ui/css/new-wrap.css" media="all">
<style>
body {
margin: 10px;
......@@ -11,5 +12,5 @@
line-height: 200px;
text-align: center;
}
body .line-size{font-size: 20px; line-height: 38px;}
body .line-size{font-size: 20px; line-height: 30px;}
</style>
\ No newline at end of file
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:-4px;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>
......@@ -53,8 +53,8 @@
</div>
</div>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-danger layui-btn-mini lineheight28" lay-event="update">修改</a>
<a class="layui-btn layui-btn-warm layui-btn-mini lineheight28" lay-event="delete">删除</a>
<a class="color1 lineheight28" lay-event="update">修改</a>
<a class="color2 lineheight28" lay-event="delete">删除</a>
</script>
<!--模板-->
<script type="text/html" id="menuTpl">
......
src/main/webapp/WEB-INF/jsp/admin/menu/update.jsp
......@@ -27,11 +27,11 @@
<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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/menu/index">返回上一级</a>
</div>
......@@ -96,7 +96,7 @@
<div id="menu"></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>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/permission/add.jsp
......@@ -26,11 +26,11 @@
<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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/permission/index">返回上一级</a>
</div>
......@@ -121,9 +121,9 @@
<label class="layui-form-label">父级权限</label>
<div class="layui-input-block">
<input type="text" name="pidName" id="pidName"
class="layui-input">
class="layui-input code-icon" onclick="checkTree('mytree');">
<input type="text" id="pid" Name="pid" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('mytree');" style="left: 440px">选择父级</span>
<%--<span class="layui-btn" id="checkPer" onclick="checkTree('mytree');" style="">选择父级</span>--%>
<div id="mytree" style="display: none;">
<ul id="tree" class="ztree"></ul>
</div>
......@@ -133,9 +133,9 @@
<label class="layui-form-label">关联角色</label>
<div class="layui-input-block">
<input type="text" name="roleName" id="roleName"
class="layui-input">
class="layui-input code-icon"onclick="checkTree('myRoleTree');">
<input type="text" id="roleId" Name="roleId" style="display: none;">
<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');" style="left: 440px;">选择角色</span>
<%--<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');" style="">选择角色</span>--%>
<div id="myRoleTree" style="display: none">
<ul id="roleTree" class="ztree"></ul>
</div>
......@@ -187,7 +187,7 @@
</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>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/permission/inc.jsp
......@@ -3,6 +3,7 @@
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/common/css/common.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"/>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/h-ui/css/new-wrap.css" media="all">
<script src="${pageContext.request.contextPath}/resources/jquery-3.1.0.min.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.core.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.excheck.js"></script>
......
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:-4px;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>
......@@ -51,8 +51,8 @@
</div>
</div>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-danger layui-btn-mini lineheight28" lay-event="update">修改</a>
<a class="layui-btn layui-btn-warm layui-btn-mini lineheight28" lay-event="delete">删除</a>
<a class="color1 lineheight28" lay-event="update">修改</a>
<a class="color2 lineheight28" lay-event="delete">删除</a>
</script>
<!--模板-->
<%--<script type="text/html" id="menuTpl">
......
src/main/webapp/WEB-INF/jsp/admin/permission/update.jsp
......@@ -28,11 +28,11 @@
<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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/permission/index">返回上一级</a>
</div>
......@@ -131,9 +131,9 @@
<label class="layui-form-label">父级权限</label>
<div class="layui-input-block">
<input type="text" name="pidName" id="pidName"
class="layui-input">
class="layui-input code-icon" onclick="checkTree('mytree');">
<input type="text" id="pid" Name="pid" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('mytree');" style="left: 440px">选择父级</span>
<%--<span class="layui-btn" id="checkPer" onclick="checkTree('mytree');" style="">选择父级</span>--%>
<div id="mytree" style="display: none">
<ul id="tree" class="ztree"></ul>
</div>
......@@ -143,9 +143,9 @@
<label class="layui-form-label">关联角色</label>
<div class="layui-input-block">
<input type="text" name="roleName" id="roleName"
class="layui-input">
class="layui-input code-icon" onclick="checkTree('myRoleTree');">
<input type="text" id="roleId" Name="roleId" style="display: none;">
<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');" style="left: 440px;">选择角色</span>
<%--<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');" style="">选择角色</span>--%>
<div id="myRoleTree" style="display: none">
<ul id="roleTree" class="ztree"></ul>
</div>
......@@ -153,7 +153,7 @@
</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>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/role/add.jsp
......@@ -26,11 +26,11 @@
<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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/role/index">返回上一级</a>
</div>
......@@ -60,29 +60,41 @@
</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 code-icon" lay-verify="required" onclick="checkTree('myRoleTree');">
<input type="text" id="pid" Name="pid" style="display: none;">
<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');">选择父级</span>
<%--<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');">选择父级</span>--%>
<div id="myRoleTree" style="display: none">
<ul id="roleTree" class="ztree"></ul>
</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 code-icon" onclick="checkTree('myPermissionTree');">
<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">
......@@ -92,7 +104,7 @@
</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>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......@@ -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/inc.jsp
......@@ -3,6 +3,7 @@
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/common/css/common.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"/>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/h-ui/css/new-wrap.css" media="all">
<script src="${pageContext.request.contextPath}/resources/jquery-3.1.0.min.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.core.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.excheck.js"></script>
......
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:-4px;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>
......@@ -52,8 +52,8 @@
</div>
</div>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-danger layui-btn-mini lineheight28" lay-event="update">修改</a>
<a class="layui-btn layui-btn-warm layui-btn-mini lineheight28" lay-event="delete">删除</a>
<a class="color1 lineheight28" lay-event="update">修改</a>
<a class="color2 lineheight28" lay-event="delete">删除</a>
</script>
<!--推送规则模板-->
<script type="text/html" id="permissionTpl">
......
src/main/webapp/WEB-INF/jsp/admin/role/update.jsp
......@@ -27,11 +27,11 @@
<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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/role/index">返回上一级</a>
</div>
......@@ -64,29 +64,40 @@
</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 code-icon" onclick="checkTree('myRoleTree');">
<input type="text" id="pid" Name="pid" style="display: none;">
<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');">选择父级</span>
<%--<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');">选择父级</span>--%>
<div id="myRoleTree" style="display: none">
<ul id="roleTree" class="ztree"></ul>
</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 code-icon" onclick="checkTree('myPermissionTree');">
<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">
......@@ -96,7 +107,7 @@
</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>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......@@ -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,11 +26,11 @@
<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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/user/index">返回上一级</a>
</div>
......@@ -54,7 +54,7 @@
class="layui-input">
</div>
</div>
<div class="layui-upload">
<div class="layui-upload" style="display: none;">
<div class="layui-upload-list">
<img class="layui-upload-img" src="${pageContext.request.contextPath}/resources/image/upload.jpg" id="imgPer">
<p id="demoText"></p>
......@@ -133,9 +133,9 @@
<label class="layui-form-label">所属单位</label>
<div class="layui-input-block">
<input type="text" name="unitname" id="unitname" lay-verify="required"
class="layui-input">
class="layui-input code-icon" onclick="checkTree('myUnitTree');">
<input type="text" id="unitcode" Name="unitcode" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');" style="left: 440px;">选择单位</span>
<%--<span class="layui-btn" id="checkPer" >选择单位</span>--%>
<div id="myUnitTree" style="display: none">
<ul id="unit" class="ztree"></ul>
</div>
......@@ -146,9 +146,9 @@
<label class="layui-form-label">用户角色</label>
<div class="layui-input-block">
<input type="text" name="roleName" id="roleName" lay-verify="required"
class="layui-input">
class="layui-input code-icon" onclick="checkTree('myRoleTree');">
<input type="text" id="roleId" Name="roleId" style="display: none;">
<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');" style="left: 440px;">选择角色</span>
<%--<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');">选择角色</span>--%>
<div id="myRoleTree" style="display: none">
<ul id="roleTree" class="ztree"></ul>
</div>
......@@ -232,7 +232,7 @@
<div class="layui-form-item" style="text-align: center">
<div class="layui-form-item">
<button class="layui-btn" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/admin/user/inc.jsp
<%@ page contentType="text/html;charset=UTF-8" language="java"%>
<%@ 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"/>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/h-ui/css/new-wrap.css" media="all">
<script src="${pageContext.request.contextPath}/resources/jquery-3.1.0.min.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.core.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.excheck.js"></script>
<script src="${pageContext.request.contextPath}/resources/common/common.js"></script>
<script src="${pageContext.request.contextPath}/resources/layui/laydate/laydate.js"></script>
<style>
body {
margin: 10px;
}
.demo-carousel {
height: 200px;
line-height: 200px;
text-align: center;
}
.layui-btn{padding:0 12px;}
body {
margin: 10px;
}
.demo-carousel {
height: 200px;
line-height: 200px;
text-align: center;
}
.layui-btn {
padding: 0 12px;
}
</style>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
......@@ -26,11 +26,11 @@
<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-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>
<a class="layui-btn layui-btn-danger" role="button"
<a class="layui-btn layui-btn-normal" role="button"
style="margin-right: 10px;float: right"
href="${pageContext.request.contextPath}/admin/user/index">返回上一级</a>
</div>
......@@ -56,7 +56,7 @@
</div>
</div>
<div class="layui-upload">
<div class="layui-upload" style="display: none;">
<div class="layui-upload-list">
<c:if test="${user.hasZp==0}">
<img class="layui-upload-img" src="${pageContext.request.contextPath}/resources/image/upload.jpg" id="imgPer">
......@@ -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">
......@@ -134,9 +134,9 @@
<label class="layui-form-label">所属单位</label>
<div class="layui-input-block">
<input type="text" name="unitname" id="unitname" lay-verify="required"
class="layui-input">
class="layui-input code-icon" onclick="checkTree('myUnitTree');">
<input type="text" id="unitcode" Name="unitcode" style="display: none;">
<span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');" style="left: 440px;">选择单位</span>
<%-- <span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');">选择单位</span>--%>
<div id="myUnitTree" style="display: none">
<ul id="unit" class="ztree"></ul>
</div>
......@@ -147,21 +147,21 @@
<label class="layui-form-label">用户角色</label>
<div class="layui-input-block">
<input type="text" name="roleName" id="roleName" lay-verify="required"
class="layui-input">
class="layui-input code-icon" onclick="checkTree('myRoleTree');">
<input type="text" id="roleId" Name="roleId" style="display: none;">
<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');" style="left: 440px;">选择角色</span>
<%--<span class="layui-btn" id="checkRolePid" onclick="checkTree('myRoleTree');">选择角色</span>--%>
<div id="myRoleTree" style="display: none">
<ul id="roleTree" class="ztree"></ul>
</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,10 +226,10 @@
<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>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="rulesSubmit">提交</button>
<button class="layui-btn layui-btn-primary" type="reset">重置</button>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/error/err.jsp
......@@ -31,11 +31,11 @@
margin-top: -257px;}
</style>
</head>
<body class="skin-blue" style="width: 100%;text-align: center;background: #fff;overflow: hidden;">
<body class="skin-blue" style="width: 100%;text-align: center;overflow: hidden;">
<div class="con-box">
<img src="${base}/resources/image/ren.jpg" style="display: inline-block;vertical-align: bottom;height:513px;"/>
<img src="${base}/resources/image/ren.png" style="display: inline-block;vertical-align: bottom;height:513px;"/>
<div class="rb">
<img src="${base}/resources/image/text.jpg" class="text-img"/>
<img src="${base}/resources/image/text.png" class="text-img"/>
<a class="cxdl" onclick="{top.location.href='${base}/login'}"><img src="${base}/resources/image/button.png"/></a>
</div>
<%--<img src="${base}/image/error.jpg">
......
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,25 @@
}
.btx>label{
color: red;
}
\ No newline at end of file
}
.layui-elem-quote{
line-height: 14px;
}
.searchDiv .layui-btn,.layui-btn-mini,.demoTable .layui-btn{height:30px;line-height: 30px;}
.searchDiv .layui-input {
height: 30px;
}
.searchDiv #checkPer,.searchDiv #checkRolePid{ position: absolute; top: 0px;left: 100%;}
#openFlag{
height: 30px;
line-height: 1.3;
line-height: 38px\9;
border-width: 1px;
border-style: solid;
border-color: #e6e6e6;
background-color: #fff;
border-radius: 6px;
display: block;
width: 100%;
padding-left: 10px;
}
src/main/webapp/resources/h-ui/css/H-ui.admin.css
......@@ -18,7 +18,7 @@ h4{line-height:30px}
/*页面框架*/
.Hui-header{position:absolute;top:0; right:0; left:0;height:44px;z-index:999; padding:0 15px}
.Hui-aside{position: absolute;top:81px;bottom:0;left:0;padding-top:10px;width:199px;z-index:99;overflow:auto; background-color:rgba(238,238,238,0.98);_background-color:rgb(238,238,238);border-right: 1px solid #e5e5e5}
.Hui-aside{position: absolute;top:81px;bottom:0;left:0;padding-top:19px;width:199px;z-index:99;overflow:auto; background: #32C2CD url(../../image/bg-img.jpg) !important;_background-color:rgb(238,238,238);border-right: 1px solid #e5e5e5}
.Hui-article-box{position: absolute;top:81px;right:0;bottom: 0;left:199px; overflow:hidden; z-index:1; background-color:#fff}
.Hui-article{position: absolute;top:34px;bottom:0;left:0; right:0;overflow:auto;z-index:1}
.Hui-container{ padding:45px 0 0}
......@@ -46,7 +46,7 @@ h4{line-height:30px}
#Hui-msg .badge{ position:absolute; left:19px; top:4px; font-size:12px; font-weight:normal; padding:1px 5px}
/*左侧菜单*/
.Hui-aside .menu_dropdown dl{ margin-bottom:0}
.Hui-aside .menu_dropdown dt{display:block;line-height:35px;padding-left:15px;cursor:pointer;position:relative;border-bottom: 1px solid #e5e5e5;font-weight:normal}
.Hui-aside .menu_dropdown dt{display:block;line-height:54px;padding-left:15px;cursor:pointer;position:relative; border-bottom: 1px solid rgba(107, 108, 109, 0.19);font-weight:normal}
.Hui-aside .menu_dropdown dt .menu_dropdown-arrow{ position:absolute;overflow: hidden; top:0; right:15px;transition-duration:0.3s ;transition-property:all}
.Hui-aside .menu_dropdown dd{ display:none}
.Hui-aside .menu_dropdown dt.selected .menu_dropdown-arrow{transform: rotate(180deg)}
......@@ -55,11 +55,12 @@ h4{line-height:30px}
.Hui-aside .menu_dropdown li{line-height:35px;overflow:hidden;zoom:1}
.Hui-aside .menu_dropdown li a{padding-left:15px; display:block;font-weight: bold; margin:0}
.Hui-aside .menu_dropdown li a i{ font-weight: normal}
.Hui-aside .menu_dropdown dd ul{padding:3px 8px}
.Hui-aside .menu_dropdown dd li{line-height:32px}
.Hui-aside .menu_dropdown dd li a{line-height:32px;padding-left:26px; border-bottom:none; font-weight:normal}
.Hui-aside .menu_dropdown dd ul{padding:3px 8px;background: #096E75;}
.Hui-aside .menu_dropdown dd li{line-height:40px}
.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}
......@@ -76,8 +77,8 @@ h4{line-height:30px}
.Hui-tabNav .acrossTab{ position:absolute; height:26px; line-height:26px; background:none; top:8px; left:0;padding-top:0}
.Hui-tabNav .acrossTab li{height:26px;line-height:26px;}
.Hui-tabNav .acrossTab li em{ right:-16px; height: 26px; width: 16px}
.loading {background:url(../images/loading.gif) no-repeat center; height:100px}
.show_iframe{ position:absolute; top:0; right:0; left:0; bottom:0;}
.loading {background:url(../../layui/css/modules/layer/default/loading-2.gif) no-repeat left center; height:15px;position: absolute;top:50%;left:50%;margin-left:-60px;margin-top:-20px;width:120px;height:40px;line-height:40px;color:#fff;padding-left:46px;}
.show_iframe{ position:absolute; top:0; right:0; left:0; bottom:0;width:100%;height:100%;background: rgba(0,0,0,0.3);}
.show_iframe iframe {position: absolute;bottom: 0;height: 100%;width: 100%}
.Hui-tabNav-more {position: absolute;right:0px;width:70px;top:4px;display: none}
......
src/main/webapp/resources/h-ui/css/H-ui.min.css
......@@ -7815,13 +7815,14 @@ a.logo:hover {
.navbar .logo {
height: 44px;
line-height: 44px;
line-height: 80px;
margin-right: 10px;
float: left
}
.navbar-logo, .navbar-logo-m {
font-size: 16px
font-size: 29px;
font-weight:600;
}
.navbar-slogan {
......
src/main/webapp/resources/h-ui/css/new-wrap.css 0 → 100644
@charset "utf-8";
body#main-body{
background-image: url(../../common/css/images/body/yellow.jpg);
background-size: 100% 100%;
background-attachment: fixed;
color:#fff !important;
}
body{background-color: transparent;}
body,span,a,li{color:#fff !important;}
body .navbar,body .Hui-aside,body .Hui-article-box{background: none !important;}
body .navbar,body .layui-elem-quote{background: rgba(0, 0, 0, 0.3) !important;}
body .Hui-aside{background: rgba(0, 0, 0, 0.3) !important;}
body .Hui-aside .menu_dropdown dd ul{background: rgba(0, 0, 0, 0.06) !important;}
body .Hui-aside .menu_dropdown dd ul li:hover{background: rgba(0, 0, 0, 0.16) !important;}
body .Hui-tabNav{background: rgba(0, 0, 0, 0.3) !important;}
body .acrossTab li{color:#fff;}
body .layui-breadcrumb a cite{color:#fff;}
body .layui-breadcrumb a{color:#fff !important;}
body .layui-breadcrumb a:hover{color:#FFD600 !important;}
body .layui-elem-quote{border-left: 5px solid #151515;}
body .layui-input, .layui-textarea{background: rgba(0, 0, 0, 0.3);color:#e5e2e2;}
.layui-table tbody tr:hover, .layui-table thead tr, .layui-table-click, .layui-table-header, .layui-table-hover, .layui-table-mend, .layui-table-patch, .layui-table-tool, .layui-table[lay-even] tr:nth-child(even){
background: rgba(0, 0, 0, 0.3) !important;
color:#fff;
}
body .layui-table{background: none;color:#fff;}
.layui-table td, .layui-table th, .layui-table-fixed-r, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row]{
border-color:#000
}
body .layui-laypage button,body .layui-laypage input,body select{background: rgba(0, 0, 0, 0.3) !important;color:#fff;}
input::-webkit-input-placeholder { /* placeholder颜色 */ color: #fff;}
body .Hui-aside{border-right:1px solid #fff;border-color: rgba(255,255,255,0.55);}
body .layui-form-pane .layui-form-label{background: rgba(0, 0, 0, 0.3);}
.settings{position: fixed;right:0;white-space: nowrap;top:110px;background: #fff;color:#666 !important;width:34px;height:30px;line-height: 30px;z-index: 100000;cursor: pointer; box-shadow: 0 0 10px rgba(0, 0, 0, 0.22); font-family: open-sans-regular; border-radius: 5px 0px 0px 5px !important;transition: width 300ms;}
.fa-f{font-size: 24px;margin:0 7px;line-height: 30px;float: left;}
.settings>span{font-size: 12px;line-height: 30px;color:#666 !important;display: inline-block;height:30px;white-space: nowrap;}
.settings:hover{width:94px;}
#pifu .l-btn-text{color:#666!important;}
body .window,body .panel-body,body .dialog-button{background: rgba(0, 0, 0, 0.48);
border: 0;
color: #fff;}
body .window .window-header .panel-title{color:#fff;}
.template-skins [class*="col-"] img {
border: 3px solid rgba(0,0,0,0.5);
}
.template-skins [class*="col-"] img:hover {
opacity: 0.8;
}
.template-skins [class*="col-"] {
margin-bottom: 10px;
}
.template-skins img {
max-width: 100%;
}
body .window-mask{background: rgba(0, 0, 0, 0.5);}
.dialog-button .l-btn{background: rgba(0, 0, 0, 0.3);border: 1px solid #000;}
body .layui-form-onswitch{border-color: #1E9FFF; background-color: #1E9FFF;}
body .layui-laypage .layui-laypage-curr .layui-laypage-em{background-color:#1E9FFF;}
body .x-nav .layui-btn{background-color:#1E9FFF;}
.layui-layer-shade{background: rgba(0, 0, 0, 0.3)!important;}
body input.code-icon{ background: rgba(0,0,0,0.3) url(../../image/code.gif) no-repeat right center;cursor: pointer;}
body .layui-anim-upbit>dd,body option{color:#000 !important;background: #fff !important;}
/*个人资料*/
.grzl-mp{width:400px;border:1px solid #ccc;box-shadow: 2px 2px 12px rgba(0,0,0,0.4);float: left}
.mp-photo{width:100%;height:150px;background: rgba(0,0,0,0.3);position: relative;margin-bottom: 40px;}
.grzl-mp p{line-height: 40px;}
.photo-img{width:120px;position: absolute;left:50%;margin-left:-60px;bottom:-39px;}
.mp-name{ display:inline-block; width:120px;text-align: right;}
.layui-layer-page span{color:#666!important;}
.color1{color:red !important;margin:0 15px;cursor: pointer;}
.color2{color:#feb305 !important;margin:0 5px;cursor: pointer;}
body .layui-layer-dialog{color:#666;}
body .layui-layer-btn1{color:#666 !important;}
.mp-value{}
.photo-img:hover { -webkit-animation-name: tada; animation-name: tada;}
/****个人资料权限*****/
.flowChart {
background-color: rgba(0, 0, 0,0.3);
width:540px;
float: left;
padding: 12px;
display: flex;
}
.flowChart-left {
width: 50px;
flex-shrink: 0;
}
.flowChart .dashed {
width: 0px;
height: 100%;
margin-left: 50%;
border-left-style: dashed;
border-left-color: darkgray;
border-left-width: 2px;
}
.flowChart-right {
flex-grow: 1;
}
.flowChart .oneNode {
display: flex;
align-items: center;
width: 100%;
margin-bottom: 14px;
}
.flowChart .check {
width: 40px;
height: 40px;
border-radius: 50px;
line-height: 40px;
color: white;
font-size: 12px;
text-align: center;
position: relative;
left: -49px;
flex-shrink: 0;
background-color: rgb(125, 122, 117);
border: 4px solid rgb(173,168,163);
}
.flowChart .check-success {
background-color: rgb(87, 194, 64);
border: 4px solid rgba(198, 228, 177,0.9);
}
.flowChart .check-danger {
background-color: rgb(228,108,35);
border: 4px solid rgb(250, 166, 122);
}
.flowChart .check-prime {
background-color: rgb(0, 136, 165);
border: 4px solid rgb(88, 191, 243);
}
.flowChart .check-warning {
background-color: rgb(248, 144,2);
border: 4px solid rgba(255, 208, 122,1);
}
.flowChart .NodeDetail {
background-color: white;
margin-left: -60px;
flex-grow: 1;
border: 1px solid gainsboro;
border-radius: 3px;
padding: 14px;
display: flex;
flex-direction: column;
box-shadow: 1px 1px 3px gainsboro;
}
.flowChart img {
width: 40px;
height: 40px;
border-radius: 20px;
}
.NodeDetail .details {
flex-grow: 1;
padding-left: 8px;
margin-left: 8px;
border-left: 4px solid rgb(72, 108, 160);
}
.details p {
color: rgb(154, 154, 154);
font-size: 14px;
font-weight: 100;
}
.NodeDetail-title {
display: flex;
margin-bottom: 10px;
}
.NodeDetail-content {
flex-grow: 1;
}
.NodeDetail-content p {
text-indent: 2em;
text-align: justify;
font-size: 14px;
}
.NodeDetail-footer {
margin-top: 10px;
}
.NodeDetail-footer span {
font-size: 12px;
font-weight: 100;
color: rgb(104, 104, 104);
float: right;
}
.badge {
padding: 2px 5px;
font-size: 12px;
background-color: rgb(72, 108, 160);
border-radius: 10px;
font-weight: 100;
color: white;
letter-spacing: 2px;
box-shadow: 1px 1px 1px gainsboro;
}
.BadgeGray {
background-color: rgb(104, 108, 104);
}
.tag {
width: 0;
height: 0;
border: 14px solid;
border-style: dashed;
border-color: transparent white transparent transparent;
position: absolute;
left: -13px;
top: -14px;
}
.tag-boder {
width: 0;
height: 0;
border: 12px solid;
border-style: dashed;
border-color: transparent gainsboro transparent transparent;
position: relative;
left: -59px;
}
.NodeDetail-content p{
margin-top: 7px;
}
src/main/webapp/resources/h-ui/css/style.css
@charset "utf-8";
/* 你自己的样式 */
.mg{margin: 0 5px;font-size: 16px;}
.navbar{background:none;
background: #2d6dcc url(../images/banner.jpg);height:80px;}
.navbar{/*background:none;
background: #2d6dcc url(../images/banner.jpg);*/height:80px;}
.jh-img{height:79px;}
.navbar-nav > ul > li{line-height: 80px;}
.navbar-nav > ul > li > a{height:80px;line-height: 80px;}
src/main/webapp/resources/h-ui/js/H-ui.admin.js
......@@ -137,7 +137,7 @@ function creatIframe(href,titleName){
$tabNav.css({left:0})
}
iframeBox.hide();
iframe_box.append('<div class="show_iframe"><div class="loading"></div><iframe frameborder="0" src='+href+'></iframe></div>');
iframe_box.append('<div class="show_iframe"><div class="loading">数据加载中...</div><iframe frameborder="0" src='+href+'></iframe></div>');
var showBox=iframe_box.find('.show_iframe:visible');
showBox.find('iframe').load(function(){
showBox.find('.loading').hide();
......
src/main/webapp/resources/h-ui/skin/default/skin.css
......@@ -2,7 +2,7 @@
/* 蓝色 */
/*全站默认字体颜色*/
a{color:#333}a:hover,a:focus,.maincolor,.maincolor a{color:#06c}
.navbar{ background:#2d6dcc}/*顶部导航*/
.navbar{ background:#4A4A4A}/*顶部导航*/
.navbar-logo,.navbar-logo-m,.navbar-slogan,.navbar-userbar{color:#fff}/*logo 及 用户信息文字颜色*/
.navbar-logo:hover,.navbar-logo-m:hover{color:#fff;text-decoration: none}
......@@ -10,14 +10,14 @@ a{color:#333}a:hover,a:focus,.maincolor,.maincolor a{color:#06c}
.navbar-userbar > ul> > li,.navbar-userbar > ul> > li > a{ color:#fff}
.Hui-aside{}/*侧边栏*/
.Hui-aside .menu_dropdown dt{color:#333}/*左侧二级导航菜单*/
.Hui-aside .menu_dropdown dt:hover{color:#148cf1}
.Hui-aside .menu_dropdown dt{color:#fff}/*左侧二级导航菜单*/
.Hui-aside .menu_dropdown dt:hover{/*color:#148cf1*/}
.Hui-aside .menu_dropdown dt:hover [class^="icon-"]{ color:#7e8795}
.Hui-aside .menu_dropdown li a{color:#666;border-bottom: 1px solid #e5e5e5}
.Hui-aside .menu_dropdown li a:hover{color:#148cf1;background-color:#fafafa}
.Hui-aside .menu_dropdown li a{color:#fff;border-bottom: 1px solid #e5e5e5}
/*.Hui-aside .menu_dropdown li a:hover{color:#148cf1;background-color:#fafafa}*/
.Hui-aside .menu_dropdown li.current a,.menu_dropdown li.current a:hover{color:#148cf1}
.Hui-aside .menu_dropdown dt .Hui-iconfont{ color:#a0a7b1}
.Hui-aside .menu_dropdown dt .menu_dropdown-arrow{ color:#b6b7b8}
.Hui-aside .menu_dropdown dt .menu_dropdown-arrow{ color:#fff}
.dislpayArrow a{background:url(icon_arrow.png) no-repeat 0 0}
.tabBar {border-bottom: 2px solid #2d6dcc}
.tabBar span.current{background-color:#2d6dcc}
\ No newline at end of file
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.
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