Skip to content

X
xzxt-shiro
Commit 3c91b073 by liulianglang
Options

用户信息样式修改

parent 841b3dc5
Showing with 460 additions and 238 deletions
src/main/java/com/xzxtshiro/controller/AccessController.java
...@@ -42,16 +42,17 @@ public class AccessController { ...@@ -42,16 +42,17 @@ public class AccessController {
try { try {
//用户登录 //用户登录
user = TokenUtil.login(user, rememberMe); user = TokenUtil.login(user, rememberMe);
System.out.println("登录成功");
} catch (Exception e) { } catch (Exception e) {
msg = "用户名或密码不正确"; msg = "用户名或密码不正确";
} finally { } finally {
if (msg == null) { if (msg == null) {
SysUser user1 = TokenUtil.getUser(); SysUser user1 = TokenUtil.getUser();
List<List<SysPermissionNew>> oldlist= userService.selectMenusByUserId(user1); List<List<SysPermissionNew>> oldlist= userService.selectMenusByUserId(user1);
//System.out.println(list); System.out.println("11+"+oldlist.toString());
model.addAttribute("list", oldlist); model.addAttribute("list", oldlist);
List<SysPermissionNew> list=userService.selectSysPermissionNewByUserId(user.getId()); List<SysPermissionNew> list=userService.selectSysPermissionNewByUserId(user.getId());
System.out.println("12uid+"+user.getId()+"-22-"+list.toString());
StringBuffer perList = new StringBuffer(); StringBuffer perList = new StringBuffer();
for (SysPermissionNew per:list) { for (SysPermissionNew per:list) {
if (per.getId()!=null){ if (per.getId()!=null){
...@@ -59,10 +60,12 @@ public class AccessController { ...@@ -59,10 +60,12 @@ public class AccessController {
} }
} }
res = perList.toString(); res = perList.toString();
//res="================Login shiro success=============="; //res="================Login shiro success==============";
}else{ }else{
res="================Login shiro error================"; res="================Login shiro error================";
} }
return res; return res;
} }
} }
......
src/main/java/com/xzxtshiro/controller/admin/DictController.java
...@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
...@@ -24,9 +25,10 @@ public class DictController { ...@@ -24,9 +25,10 @@ public class DictController {
@Autowired @Autowired
private SysDictitemService dictitemService; private SysDictitemService dictitemService;
//获取所属单位（CODE_UNIT）的字典并写到unit.json文件中，存放到resources.common.json下 //获取所属单位（CODE_UNIT）的字典并写到unit.json文件中，存放到resources.common.json下
@GetMapping("refreshCodeUnitDict") @GetMapping("refreshCodeUnitDict")
public void refreshCodeUnitDict() { public void refreshCodeUnitDict(HttpServletRequest request) {
List<SysDictitem> list = dictitemService.refreshCodeUnitDict(); List<SysDictitem> list = dictitemService.refreshCodeUnitDict();
list.stream() list.stream()
.map(item -> { .map(item -> {
...@@ -37,12 +39,13 @@ public class DictController { ...@@ -37,12 +39,13 @@ public class DictController {
Map map = new HashMap(); Map map = new HashMap();
map.put("data", list); map.put("data", list);
String jsonString = JSON.toJSONString(map); String jsonString = JSON.toJSONString(map);
uploadFile(jsonString); uploadFile(jsonString, request);
} }
private void uploadFile(String jsonString) { private void uploadFile(String jsonString,HttpServletRequest request) {
// 根据指定路径创建文件对象 // 根据指定路径创建文件对象
File file = new File("webapps/xzxt_shiro/resources/common/json/unit.json"); String dir213 = request.getSession().getServletContext().getRealPath("/resources/common/json/unit.json");
File file = new File(dir213);
try { try {
if (!file.exists()) { //文件不存在则创建文件，先创建目录 if (!file.exists()) { //文件不存在则创建文件，先创建目录
File dir = new File(file.getParent()); File dir = new File(file.getParent());
......
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
...@@ -74,8 +74,8 @@ public class SysUserController { ...@@ -74,8 +74,8 @@ public class SysUserController {
@ResponseBody @ResponseBody
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
public BaseModel list(SysUser user,HttpServletRequest request) { public BaseModel list(SysUser user,HttpServletRequest request) {
SysUser sysUser = (SysUser) request.getSession().getAttribute("user"); // SysUser sysUser = (SysUser) request.getSession().getAttribute("user");
user.setUnitcode2(sysUser.getUnitcode2()); // user.setUnitcode2(sysUser.getUnitcode2());
user = setQueryParam(user); user = setQueryParam(user);
return userService.selectSysUserPage(user); return userService.selectSysUserPage(user);
} }
...@@ -222,6 +222,7 @@ public class SysUserController { ...@@ -222,6 +222,7 @@ public class SysUserController {
@RequestMapping(value = "/add") @RequestMapping(value = "/add")
public String add(SysUser user, Model model,HttpServletRequest request) { public String add(SysUser user, Model model,HttpServletRequest request) {
// user.setOpenFlag("1"); // user.setOpenFlag("1");
user.setUnitname(dictitemService.selectDwNameBydwid(user.getUnitcode()));
SysUser add = userService.add(user); SysUser add = userService.add(user);
String msg = ""; String msg = "";
String reStr = ""; String reStr = "";
...@@ -238,7 +239,7 @@ public class SysUserController { ...@@ -238,7 +239,7 @@ public class SysUserController {
tbJZuserxx(user); tbJZuserxx(user);
} }
//添加时空权限 //添加时空权限
userService.insertUserSkPress(user.getIdentitycard()); //userService.insertUserSkPress(user.getIdentitycard());
System.out.println("redirect:/admin/user/index?msg=success"); System.out.println("redirect:/admin/user/index?msg=success");
return "redirect:/admin/user/index?msg=success"; return "redirect:/admin/user/index?msg=success";
}else{ }else{
...@@ -332,10 +333,11 @@ public class SysUserController { ...@@ -332,10 +333,11 @@ public class SysUserController {
@RequestMapping(value = "/update", method = RequestMethod.POST) @RequestMapping(value = "/update", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public String update(SysUser user,Model model,HttpServletRequest request) { public String update(SysUser user,Model model,HttpServletRequest request) {
user.setUnitname(dictitemService.selectDwNameBydwid(user.getUnitcode()));
SysUser update = userService.update(user); SysUser update = userService.update(user);
if(update!=null){ if(update!=null){
//添加时空权限 //添加时空权限
userService.insertUserSkPress(user.getIdentitycard()); // userService.insertUserSkPress(user.getIdentitycard());
model.addAttribute("msg", "用户修改成功!"); model.addAttribute("msg", "用户修改成功!");
// return "redirect:/admin/user/index?msg=success"; // return "redirect:/admin/user/index?msg=success";
return "success"; return "success";
......
src/main/java/com/xzxtshiro/dao/SysDictitemDao.java
package com.xzxtshiro.dao; package com.xzxtshiro.dao;
import com.xzxtshiro.pojo.SysDictitem; import com.xzxtshiro.pojo.SysDictitem;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -23,5 +24,5 @@ public interface SysDictitemDao { ...@@ -23,5 +24,5 @@ public interface SysDictitemDao {
List<SysDictitem> selectDictitemByXzUnit(SysDictitem dictitem); List<SysDictitem> selectDictitemByXzUnit(SysDictitem dictitem);
List<SysDictitem> refreshCodeUnitDict(); List<SysDictitem> refreshCodeUnitDict();
List<String> selectDwNameBydwid(@Param("id") String id);
} }
src/main/java/com/xzxtshiro/mapper/SysDictitemMapper.xml
...@@ -366,4 +366,13 @@ ...@@ -366,4 +366,13 @@
where where
GROUPID = 'CODE_UNIT' AND SCBZ = '0' GROUPID = 'CODE_UNIT' AND SCBZ = '0'
</select> </select>
<select id="selectDwNameBydwid" parameterType="String" resultType="String">
select
NAME
from
SYS_DICTITEM
where
GROUPID = 'CODE_UNIT' AND SCBZ = '0' AND CODE=#{id}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/java/com/xzxtshiro/service/SysDictitemService.java
...@@ -26,5 +26,6 @@ public interface SysDictitemService { ...@@ -26,5 +26,6 @@ public interface SysDictitemService {
JSONArray selectDictitemByXzUnit(SysDictitem dictitem); JSONArray selectDictitemByXzUnit(SysDictitem dictitem);
List<SysDictitem> refreshCodeUnitDict(); List<SysDictitem> refreshCodeUnitDict();
String selectDwNameBydwid(String id);
} }
src/main/java/com/xzxtshiro/service/imp/SysDictitemImpl.java
...@@ -39,5 +39,16 @@ public class SysDictitemImpl implements SysDictitemService { ...@@ -39,5 +39,16 @@ public class SysDictitemImpl implements SysDictitemService {
return sysDictitemDao.refreshCodeUnitDict(); return sysDictitemDao.refreshCodeUnitDict();
} }
@Override
public String selectDwNameBydwid(String id) {
List<String> ss=sysDictitemDao.selectDwNameBydwid(id);
if(ss!=null && !ss.isEmpty()){
return ss.get(0);
}else {
return null;
}
}
} }
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
...@@ -84,6 +84,15 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -84,6 +84,15 @@ public class SysUserServiceImpl implements SysUserService {
} }
@Override @Override
public Integer updateStatusById(SysUser user) {
SysUser dlUser = TokenUtil.getUser();
user.setGxr(dlUser.getUsername());
user.setGxsj(new Date());
int i = userDao.updateSysUserById(user);
return i;
}
@Override
public BaseModel selectSysUserPage(SysUser user) { public BaseModel selectSysUserPage(SysUser user) {
String dw = user.getUnitcode(); String dw = user.getUnitcode();
List<SysUser> data = null; List<SysUser> data = null;
...@@ -106,15 +115,6 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -106,15 +115,6 @@ public class SysUserServiceImpl implements SysUserService {
} }
@Override @Override
public Integer updateStatusById(SysUser user) {
SysUser dlUser = TokenUtil.getUser();
user.setGxr(dlUser.getUsername());
user.setGxsj(new Date());
int i = userDao.updateSysUserById(user);
return i;
}
@Override
public SysUser selectSysUserDetailById(String userId) { public SysUser selectSysUserDetailById(String userId) {
SysUser sysUser = userDao.selectSysUserDetailById(userId); SysUser sysUser = userDao.selectSysUserDetailById(userId);
return sysUser; return sysUser;
......
src/main/java/com/xzxtshiro/util/ZtreeDataUtil.java
...@@ -15,6 +15,7 @@ import org.springframework.util.StringUtils; ...@@ -15,6 +15,7 @@ import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @author liuys * @author liuys
...@@ -57,30 +58,40 @@ public class ZtreeDataUtil { ...@@ -57,30 +58,40 @@ public class ZtreeDataUtil {
dictitem.setGroupid("SHIRO_UNIT"); dictitem.setGroupid("SHIRO_UNIT");
dictitem.setCodeStr(unitStr.substring(0,2)+"%"); dictitem.setCodeStr(unitStr.substring(0,2)+"%");
XzxtRestResult xzxtRestResult=new XzxtRestResult(); XzxtRestResult xzxtRestResult=new XzxtRestResult();
// List<SysDictitem> list = dictitemService.refreshCodeUnitDict();
// list.stream()
// .map(item -> {
// item.setName(item.getName() + "[" + item.getCodeStr() + "]");
// return item;
// })
// .collect(Collectors.toList());
// //String ss=HttpClientUtil.doGet("http://127.0.0.1:9200/queryTypeCode?type=CODE_UNIT");
// model.addAttribute("unit", list);
//从缓存中取内容 //从缓存中取内容
try { // try {
xzxtRestResult=RedisUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid()); // xzxtRestResult=RedisUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid());
String result=""; // String result="";
if(xzxtRestResult.getStatus()==202) { // if(xzxtRestResult.getStatus()==202) {
result= (String) xzxtRestResult.getData(); // result= (String) xzxtRestResult.getData();
model.addAttribute("unit", result); //
} // model.addAttribute("unit", result);
//向缓存中添加内容 // }
else{ // //向缓存中添加内容
try { // else{
//先存储 // try {
RedisUtil.UpdateRedisRest(unitStr.substring(0,2),dictitem.getGroupid()); // //先存储
//读取 // RedisUtil.UpdateRedisRest(unitStr.substring(0,2),dictitem.getGroupid());
xzxtRestResult=RedisUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid()); // //读取
result= (String) xzxtRestResult.getData(); // xzxtRestResult=RedisUtil.ReadRedisRest(unitStr.substring(0,2)+"_"+dictitem.getGroupid());
model.addAttribute("unit", result); // result= (String) xzxtRestResult.getData();
} catch (Exception e) { // model.addAttribute("unit", result);
e.printStackTrace(); // } catch (Exception e) {
} // e.printStackTrace();
} // }
} catch (Exception e) { // }
e.printStackTrace(); // } catch (Exception e) {
} // e.printStackTrace();
// }
} }
/** /**
......
src/main/webapp/WEB-INF/jsp/admin/member/detail.jsp
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
<p><span class="mp-name">所属单位：</span><span class="mp-value">${user.unitname}</span></p> <p><span class="mp-name">所属单位：</span><span class="mp-value">${user.unitname}</span></p>
</div> </div>
<!--事件轴--> <!--事件轴-->
<div class="flowChart" style="display: none;"> <div class="flowChart" style="display: none;
height: 320px;">
<!--左侧轴--> <!--左侧轴-->
<div class="flowChart-left"> <div class="flowChart-left">
<!--虚线--> <!--虚线-->
...@@ -117,35 +118,35 @@ ...@@ -117,35 +118,35 @@
</div> </div>
</div> </div>
</div> </div>
<div class="oneNode"> <%-- <div class="oneNode">--%>
<!--左侧小球--> <%-- <!--左侧小球-->--%>
<div class="check check-success"> <%-- <div class="check check-success">--%>
人员身份 <%-- 人员身份--%>
</div> <%-- </div>--%>
<div class="tag-boder"> <%-- <div class="tag-boder">--%>
<div class="tag"> <%-- <div class="tag">--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
<!--右侧内容--> <%-- <!--右侧内容-->--%>
<div class="NodeDetail"> <%-- <div class="NodeDetail">--%>
<!--上--> <%-- <!--上-->--%>
<%--<div class="NodeDetail-title">--%> <%-- &lt;%&ndash;<div class="NodeDetail-title">&ndash;%&gt;--%>
<%--<!--内容-->--%> <%-- &lt;%&ndash;<!--内容-->&ndash;%&gt;--%>
<%--&lt;%&ndash;<div class="details">--%> <%-- &lt;%&ndash;&lt;%&ndash;<div class="details">&ndash;%&gt;--%>
<%--<h4>${user.username}</h4>--%> <%-- &lt;%&ndash;<h4>${user.username}</h4>&ndash;%&gt;--%>
<%--</div>&ndash;%&gt;--%> <%-- &lt;%&ndash;</div>&ndash;%&gt;&ndash;%&gt;--%>
<%--</div>--%> <%-- &lt;%&ndash;</div>&ndash;%&gt;--%>
<%--<!--中-->--%> <%-- &lt;%&ndash;<!--中-->&ndash;%&gt;--%>
<div class="NodeDetail-content" id = "gzzmplay"> <%-- <div class="NodeDetail-content" id = "gzzmplay">--%>
<%--<span class="badge">侦查员</span>--%> <%-- &lt;%&ndash;<span class="badge">侦查员</span>&ndash;%&gt;--%>
<%--<span class="badge">指挥员</span>--%> <%-- &lt;%&ndash;<span class="badge">指挥员</span>&ndash;%&gt;--%>
<%--<span class="badge">研判员</span>--%> <%-- &lt;%&ndash;<span class="badge">研判员</span>&ndash;%&gt;--%>
<%--<span class="badge">刑事技术负责人</span>--%> <%-- &lt;%&ndash;<span class="badge">刑事技术负责人</span>&ndash;%&gt;--%>
<%--<span class="badge">电诈预警员</span>--%> <%-- &lt;%&ndash;<span class="badge">电诈预警员</span>&ndash;%&gt;--%>
<%--<span class="badge">刑事技术员</span>--%> <%-- &lt;%&ndash;<span class="badge">刑事技术员</span>&ndash;%&gt;--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
<div class="oneNode"> <div class="oneNode">
<!--左侧小球--> <!--左侧小球-->
<div class="check check-warning"> <div class="check check-warning">
......
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
...@@ -8,6 +8,14 @@ ...@@ -8,6 +8,14 @@
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>添加用户</title> <title>添加用户</title>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/easyui-window/css/easyui.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/easyui-window/css/icon.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/demo.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/ajgl.css">
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/ajgl/js/jquery.min.js"></script>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/easyui.css">
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/common/common.js"></script>
</head> </head>
<body> <body>
...@@ -38,14 +46,14 @@ ...@@ -38,14 +46,14 @@
<form class="layui-form layui-form-pane" <form class="layui-form layui-form-pane"
action="${pageContext.request.contextPath}/admin/user/add" action="${pageContext.request.contextPath}/admin/user/add"
method="post" enctype="multipart/form-data"> method="post" enctype="multipart/form-data">
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户姓名</label> <label class="layui-form-label">用户姓名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="trueName" lay-verify="required" placeholder="请输入用户姓名" <input type="text" name="trueName" lay-verify="required" placeholder="请输入用户姓名"
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户账号</label> <label class="layui-form-label">用户账号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="username" lay-verify="required" placeholder="请输入警号" <input type="text" name="username" lay-verify="required" placeholder="请输入警号"
...@@ -61,21 +69,21 @@ ...@@ -61,21 +69,21 @@
<input type="hidden" id="yhzpPath" name="yhzpPath" value=""/> <input type="hidden" id="yhzpPath" name="yhzpPath" value=""/>
<button type="button" class="layui-btn" id="yhzpBtn"><i class="layui-icon"></i>上传照片</button> <button type="button" class="layui-btn" id="yhzpBtn"><i class="layui-icon"></i>上传照片</button>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">登录密码</label> <label class="layui-form-label">登录密码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="password" name="password" id="password" lay-verify="required" placeholder="请输入密码" <input type="password" name="password" id="password" lay-verify="required" placeholder="请输入密码"
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">密码确认</label> <label class="layui-form-label">密码确认</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="password" name="repassword" lay-verify="repwd" placeholder="请输入确认密码" <input type="password" name="repassword" lay-verify="repwd" placeholder="请输入确认密码"
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">身份证号码</label> <label class="layui-form-label">身份证号码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="identitycard" lay-verify="identitycard" placeholder="请输入身份证号" <input type="text" name="identitycard" lay-verify="identitycard" placeholder="请输入身份证号"
...@@ -89,7 +97,7 @@ ...@@ -89,7 +97,7 @@
class="layui-input"> class="layui-input">
</div> </div>
</div>--%> </div>--%>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">联系电话</label> <label class="layui-form-label">联系电话</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="telephone" lay-verify="phone" placeholder="请输入联系电话" <input type="text" name="telephone" lay-verify="phone" placeholder="请输入联系电话"
...@@ -103,7 +111,7 @@ ...@@ -103,7 +111,7 @@
class="layui-input"> class="layui-input">
</div> </div>
</div>--%> </div>--%>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户等级</label> <label class="layui-form-label">用户等级</label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id="grade" name="grade" lay-verify="required" lay-filter="type"> <select id="grade" name="grade" lay-verify="required" lay-filter="type">
...@@ -123,46 +131,61 @@ ...@@ -123,46 +131,61 @@
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<div class="layui-form-item btx"> <%-- <div class="layui-form-item btx">--%>
<label class="layui-form-label">所属单位</label> <%-- <label class="layui-form-label">所属单位</label>--%>
<div class="layui-input-block"> <%-- <div class="layui-input-block">--%>
<input type="text" name="unitname" autocomplete="off" id="unitname" lay-verify="required" <%-- <input type="text" name="unitname" autocomplete="off" id="unitname" lay-verify="required"--%>
class="layui-input code-icon" onclick="checkTree('myUnitTree');"> <%-- class="layui-input code-icon" onclick="checkTree('myUnitTree');">--%>
<input type="text" id="unitcode" autocomplete="off" Name="unitcode" style="display: none;"> <%-- <input type="text" id="unitcode" autocomplete="off" Name="unitcode" style="display: none;">--%>
<%--<span class="layui-btn" id="checkPer" >选择单位</span>--%> <%-- &lt;%&ndash;<span class="layui-btn" id="checkPer" >选择单位</span>&ndash;%&gt;--%>
<div id="myUnitTree" style="display: none"> <%-- <div id="myUnitTree" style="display: none">--%>
<div class="ISearch"> <%-- <div class="ISearch">--%>
<input type="text" autocomplete="off"> <%-- <input type="text" autocomplete="off">--%>
<span class="layui-btn layui-btn-normal inpSearch">搜索</span> <%-- <span class="layui-btn layui-btn-normal inpSearch">搜索</span>--%>
<span class="layui-btn layui-btn-normal clearSer">清空</span> <%-- <span class="layui-btn layui-btn-normal clearSer">清空</span>--%>
<span class="layui-btn layui-btn-normal entSelect">确定</span> <%-- <span class="layui-btn layui-btn-normal entSelect">确定</span>--%>
</div> <%-- </div>--%>
<ul id="unit" class="ztree"></ul> <%-- <ul id="unit" class="ztree"></ul>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
<%-- <div class="layui-form-item ">--%>
<%-- <label class="layui-form-label">借调单位</label>--%>
<%-- <div class="layui-input-block">--%>
<%-- <input type="text" name="jddwname" autocomplete="off" id="jddwname"--%>
<%-- class="layui-input code-icon" onclick="checkTree('jddwTree');">--%>
<%-- <input type="text" id="jddwcode" autocomplete="off" Name="jddwcode" style="display: none;">--%>
<%-- &lt;%&ndash;<span class="layui-btn" id="checkPer" >选择单位</span>&ndash;%&gt;--%>
<%-- <div id="jddwTree" style="display: none">--%>
<%-- <div class="ISearch">--%>
<%-- <input type="text" autocomplete="off">--%>
<%-- <span class="layui-btn layui-btn-normal inpSearch">搜索</span>--%>
<%-- <span class="layui-btn layui-btn-normal clearSer">清空</span>--%>
<%-- <span class="layui-btn layui-btn-normal entSelect">确定</span>--%>
<%-- </div>--%>
<%-- <ul id="jddw" class="ztree"></ul>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label" style="float: left;display: block;">所属单位</label>
<div class="layui-input-block" style="height: 35px;">
<input type="text" id="unitcode" style="height: 37px; width:692px " lay-verify="unitcode" name="unitcode" class="val easyui-combotree" data-options="url: 'http://127.0.0.1:9100/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
<div class="layui-form-item ">
<label class="layui-form-label">借调单位</label>
<div class="layui-input-block">
<input type="text" name="jddwname" autocomplete="off" id="jddwname"
class="layui-input code-icon" onclick="checkTree('jddwTree');">
<input type="text" id="jddwcode" autocomplete="off" Name="jddwcode" style="display: none;">
<%--<span class="layui-btn" id="checkPer" >选择单位</span>--%>
<div id="jddwTree" style="display: none">
<div class="ISearch">
<input type="text" autocomplete="off">
<span class="layui-btn layui-btn-normal inpSearch">搜索</span>
<span class="layui-btn layui-btn-normal clearSer">清空</span>
<span class="layui-btn layui-btn-normal entSelect">确定</span>
</div>
<ul id="jddw" class="ztree"></ul>
</div>
</div> </div>
</div> </div>
<%-- <div class="layui-form-mid ">--%>
<%-- <label class="layui-form-label" style="float: left;display: block;">借调单位</label>--%>
<%-- <div class="layui-input-block" style="height: 35px;" >--%>
<%-- <input type="text" id="jddwcode" autocomplete="off" style="height: 37px; width:680px " name="jddwcode" class="val easyui-combotree layui-input code-icon " data-options="url: 'http://127.0.0.1:9100/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>--%>
<%-- </div>--%>
<div class="layui-form-item btx"> <%-- </div>--%>
<div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户角色</label> <label class="layui-form-label">用户角色</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="roleName" id="roleName" autocomplete="off" lay-verify="required" <input type="text" name="roleName" id="roleName" autocomplete="off" lay-verify="required"
...@@ -180,7 +203,7 @@ ...@@ -180,7 +203,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-mid" style="width: 800px;">
<label class="layui-form-label">备注</label> <label class="layui-form-label">备注</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="remark" placeholder="请输入备注" <input type="text" name="remark" placeholder="请输入备注"
...@@ -216,12 +239,23 @@ ...@@ -216,12 +239,23 @@
</div> </div>
</div> </div>
<span hidden id="msg">${msg}</span> <span hidden id="msg">${msg}</span>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/ajgl/js/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zlcc/easyui-window/js/function-zdy.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/zljc.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/qlayertips.js"></script>
<script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script> <script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script>
<script> <script>
//加载日期插件 //加载日期插件
laydate.render({ laydate.render({
elem: '#birthday' //指定元素 elem: '#birthday' //指定元素
}); });
openCombotree('unitcode');
//openCombotree('jddwcode');
layui.use(['element', 'form', 'jquery'], function () { layui.use(['element', 'form', 'jquery'], function () {
var form = layui.form, var form = layui.form,
layer = layui.layer, layer = layui.layer,
...@@ -262,24 +296,24 @@ ...@@ -262,24 +296,24 @@
form.render(); form.render();
$.ajax({ <%--$.ajax({--%>
url: '${pageContext.request.contextPath}/resources/common/json/unit.json', <%-- url: '${pageContext.request.contextPath}/resources/common/json/unit.json',--%>
type:'get', <%-- type:'get',--%>
dataType: 'json', <%-- dataType: 'json',--%>
success: function (data) { <%-- success: function (data) {--%>
var data =data.data; <%-- var data =data.data;--%>
var zNodes =[]; <%-- var zNodes =[];--%>
for (var i=0;i<data.length;i++){ <%-- for (var i=0;i<data.length;i++){--%>
zNodes.push({id:data[i].codeStr,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"}); <%-- zNodes.push({id:data[i].codeStr,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"});--%>
} <%-- }--%>
setTree(zNodes,"unit","nocheck","unitcode","unitname",""); <%-- setTree(zNodes,"unit","nocheck","unitcode","unitname","");--%>
setTree(zNodes,"jddw","nocheck","jddwcode","jddwname",""); <%-- setTree(zNodes,"jddw","nocheck","jddwcode","jddwname","");--%>
}, <%-- },--%>
error: function (data) { <%-- error: function (data) {--%>
debugger; <%-- debugger;--%>
} <%-- }--%>
}); <%--});--%>
data = ${role}; data = ${role};
console.log(data) console.log(data)
......
src/main/webapp/WEB-INF/jsp/admin/user/list.jsp
...@@ -11,6 +11,22 @@ ...@@ -11,6 +11,22 @@
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>用户列表</title> <title>用户列表</title>
<%-- <script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/easyui-window/js/jquery.min.js"></script>--%>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/easyui-window/css/easyui.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/easyui-window/css/icon.css">
<%-- <script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/easyui-window/js/jquery.easyui.min.js"></script>--%>
<%-- <script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/easyui-window/js/function.js"></script>--%>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/ajgl/js/jquery.min.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/ajgl/js/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/common/common.js"></script>
<%-- <script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/easyui-window/js/jquery-1.11.3.js"></script>--%>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/easyui.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/icon.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/demo.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/ajgl.css">
<style> <style>
.layui-form-item{ .layui-form-item{
display: inline; display: inline;
...@@ -83,24 +99,45 @@ ...@@ -83,24 +99,45 @@
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-mid"> <%-- <div class="layui-form-mid">--%>
<label class="layui-form-label">所属单位</label> <%-- <label class="layui-form-label">所属单位</label>--%>
<div class="layui-input-block"> <%-- <div class="layui-input-block">--%>
<input type="text" name="unitname" autocomplete="off" id="unitname" lay-verify="required" <%-- <input type="text" name="unitname" autocomplete="off" id="unitname" lay-verify="required"--%>
class="layui-input code-icon" onclick="checkTree('myUnitTree');"> <%-- class="layui-input code-icon" onclick="checkTree('myUnitTree');">--%>
<input type="text" id="unitcode" Name="unitcode" style="display: none;"> <%-- <input type="text" id="unitcode" Name="unitcode" style="display: none;">--%>
<%--<span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');">选择单位</span>--%> <%-- &lt;%&ndash;<span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');">选择单位</span>&ndash;%&gt;--%>
<div id="myUnitTree" style="display: none"> <%-- <div id="myUnitTree" style="display: none">--%>
<div class="ISearch"> <%-- <div class="ISearch">--%>
<input type="text" autocomplete="off"> <%-- <input type="text" autocomplete="off">--%>
<span class="layui-btn layui-btn-normal inpSearch">搜索</span> <%-- <span class="layui-btn layui-btn-normal inpSearch">搜索</span>--%>
<span class="layui-btn layui-btn-normal clearSer">清空</span> <%-- <span class="layui-btn layui-btn-normal clearSer">清空</span>--%>
<span class="layui-btn layui-btn-normal entSelect">确定</span> <%-- <span class="layui-btn layui-btn-normal entSelect">确定</span>--%>
</div> <%-- </div>--%>
<ul id="unit" class="ztree"></ul> <%-- <ul id="unit" class="ztree"></ul>--%>
</div> <%-- </div>--%>
</div>
<%-- </div>--%>
<%-- </div>--%>
<div class="layui-form-mid">
<label class="layui-form-label">所属单位</label>
<div class="layui-input-block">
<input type="text" id="unitcode" style="height: 30px;" name="unitcode" class="val easyui-combotree" data-options="url: 'http://65.26.10.49:80/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
</div> </div>
</div>
<div class="layui-form-mid"> <div class="layui-form-mid">
<label class="layui-form-label">角色</label> <label class="layui-form-label">角色</label>
<div class="layui-input-block"> <div class="layui-input-block">
...@@ -135,7 +172,15 @@ ...@@ -135,7 +172,15 @@
</div> </div>
</div> </div>
</div> </div>
<%--<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/jquery-1.11.3.js"></script>--%>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zlcc/easyui-window/js/function-zdy.js"></script>
<!--<script type="text/javascript" src="static/ajgl/js/jquery.easyui.min.js"></script>-->
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/zljc.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/qlayertips.js"></script>
<%--<script src="${pageContext.request.contextPath}/resources/static/xtba/zljc/layer/layer.js"></script>--%>
<script type="text/html" id="toolBar"> <script type="text/html" id="toolBar">
<a class="color1 lineheight28" role="button" lay-event="update">修改</a> <a class="color1 lineheight28" role="button" lay-event="update">修改</a>
<a class="color2 lineheight28" role="button" lay-event="delete">删除</a> <a class="color2 lineheight28" role="button" lay-event="delete">删除</a>
...@@ -151,7 +196,7 @@ ...@@ -151,7 +196,7 @@
</script> </script>
<script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script> <script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script>
<script> <script>
openCombotree('unitcode');
$(function () { $(function () {
var url = "<%=perurl%>"; var url = "<%=perurl%>";
$("#openFlag").width($("#username").width()); $("#openFlag").width($("#username").width());
...@@ -214,25 +259,32 @@ ...@@ -214,25 +259,32 @@
layer.msg(msg, {icon: 6}); layer.msg(msg, {icon: 6});
$("#msg").text(""); $("#msg").text("");
} }
$.ajax({ // $.ajax({
url: '${pageContext.request.contextPath}/resources/common/json/unit.json', // url: 'http://127.0.0.1:9200/queryTypeCode?type=CODE_UNIT',
type:'get', // type:'get',
dataType: 'json', // dataType: 'json',
success: function (data) { // success: function (data) {
var data =data.data; // var data =data.data;
var zNodes =[]; // console.log(data)
for (var i=0;i<data.length;i++){ // var zNodes =[];
zNodes.push({id:data[i].codeStr,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"}); // for (var i=0;i<data.length;i++){
} // zNodes.push({id:data[i].id,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"});
setTree(zNodes,"unit","nocheck","unitcode","unitname",""); // }
}, // setTree(zNodes,"unit","nocheck","unitcode","unitname","");
error: function (data) { // },
debugger; // error: function (data) {
} // debugger;
}); // }
// });
<%--var data2 = ${unit};--%>
<%--var zNodes2 =[];--%>
<%--for (var i=0;i<data2.length;i++){--%>
<%-- zNodes2.push({id:data2[i].codeStr,pId:data2[i].pid,name:data2[i].name,open:false,file:"core/simpleData"});--%>
<%--}--%>
<%--setTree(zNodes2,"unit","nocheck","unitcode","unitname","");--%>
var data = ${role};
data = ${role};
console.log(data)
var zNodes =[]; var zNodes =[];
for (var i=0;i<data.length;i++){ for (var i=0;i<data.length;i++){
zNodes.push({id:data[i].id,pId:data[i].pid,name:data[i].rolename,open:false,file:"core/simpleData"}); zNodes.push({id:data[i].id,pId:data[i].pid,name:data[i].rolename,open:false,file:"core/simpleData"});
......
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
...@@ -8,6 +8,16 @@ ...@@ -8,6 +8,16 @@
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>修改用户</title> <title>修改用户</title>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/easyui-window/css/easyui.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/easyui-window/css/icon.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/demo.css">
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/ajgl.css">
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/ajgl/js/jquery.min.js"></script>
<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/static/ajgl/css/easyui.css">
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/common/common.js"></script>
</head> </head>
<body> <body>
...@@ -37,7 +47,7 @@ ...@@ -37,7 +47,7 @@
<div class="layui-col-xs12 layui-col-sm8 layui-col-md6"> <div class="layui-col-xs12 layui-col-sm8 layui-col-md6">
<form class="layui-form layui-form-pane"> <form class="layui-form layui-form-pane">
<input type="text" name="id" placeholder="用户ID" value="${user.id}" hidden> <input type="text" name="id" placeholder="用户ID" value="${user.id}" hidden>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">登录名</label> <label class="layui-form-label">登录名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="username" lay-verify="required" placeholder="请输入员工工号" <input type="text" name="username" lay-verify="required" placeholder="请输入员工工号"
...@@ -45,7 +55,7 @@ ...@@ -45,7 +55,7 @@
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户姓名</label> <label class="layui-form-label">用户姓名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="trueName" lay-verify="required" placeholder="请输入用户姓名" <input type="text" name="trueName" lay-verify="required" placeholder="请输入用户姓名"
...@@ -69,7 +79,7 @@ ...@@ -69,7 +79,7 @@
<input type="hidden" id="yhzpPath" name="yhzpPath" value=""/> <input type="hidden" id="yhzpPath" name="yhzpPath" value=""/>
<button type="button" class="layui-btn" id="yhzpBtn"><i class="layui-icon"></i>上传照片</button> <button type="button" class="layui-btn" id="yhzpBtn"><i class="layui-icon"></i>上传照片</button>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">登录密码</label> <label class="layui-form-label">登录密码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="password" name="password" lay-verify="required" placeholder="" value="${user.password}" <input type="password" name="password" lay-verify="required" placeholder="" value="${user.password}"
...@@ -77,7 +87,7 @@ ...@@ -77,7 +87,7 @@
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">身份证号码</label> <label class="layui-form-label">身份证号码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="identitycard" lay-verify="identitycard" placeholder="请输入身份证号" <input type="text" name="identitycard" lay-verify="identitycard" placeholder="请输入身份证号"
...@@ -91,21 +101,21 @@ ...@@ -91,21 +101,21 @@
class="layui-input"> class="layui-input">
</div> </div>
</div>--%> </div>--%>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">联系电话</label> <label class="layui-form-label">联系电话</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="telephone" lay-verify="phone" placeholder="请输入联系电话" <input type="text" name="telephone" lay-verify="phone" placeholder="请输入联系电话"
value="${user.telephone}" class="layui-input"> value="${user.telephone}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户警号</label> <label class="layui-form-label">用户警号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="policemanid" lay-verify="required" placeholder="请输入警号" <input type="text" name="policemanid" lay-verify="required" placeholder="请输入警号"
value="${user.policemanid}" class="layui-input"> value="${user.policemanid}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户等级</label> <label class="layui-form-label">用户等级</label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id="grade" name="grade" lay-verify="required" lay-filter="grade"> <select id="grade" name="grade" lay-verify="required" lay-filter="grade">
...@@ -130,47 +140,61 @@ ...@@ -130,47 +140,61 @@
<%--<input type="checkbox" value="06" name="gzzmPlay" title="&ensp;&ensp;刑事技术员&ensp;&ensp;">--%> <%--<input type="checkbox" value="06" name="gzzmPlay" title="&ensp;&ensp;刑事技术员&ensp;&ensp;">--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<div class="layui-form-item btx"> <%-- <div class="layui-form-item btx">--%>
<label class="layui-form-label">所属单位</label> <%-- <label class="layui-form-label">所属单位</label>--%>
<div class="layui-input-block"> <%-- <div class="layui-input-block">--%>
<input type="text" name="unitname" autocomplete="off" id="unitname" lay-verify="required" <%-- <input type="text" name="unitname" autocomplete="off" id="unitname" lay-verify="required"--%>
class="layui-input code-icon" onclick="checkTree('myUnitTree');"> <%-- class="layui-input code-icon" onclick="checkTree('myUnitTree');">--%>
<input type="text" id="unitcode" autocomplete="off" Name="unitcode" style="display: none;"> <%-- <input type="text" id="unitcode" autocomplete="off" Name="unitcode" style="display: none;">--%>
<%-- &lt;%&ndash; <span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');">选择单位</span>&ndash;%&gt;--%>
<%-- <div id="myUnitTree" style="display: none">--%>
<%-- <div class="ISearch">--%>
<%-- <input type="text" autocomplete="off">--%>
<%-- <span class="layui-btn layui-btn-normal inpSearch">搜索</span>--%>
<%-- <span class="layui-btn layui-btn-normal clearSer">清空</span>--%>
<%-- <span class="layui-btn layui-btn-normal entSelect">确定</span>--%>
<%-- </div>--%>
<%-- <ul id="unit" class="ztree"></ul>--%>
<%-- </div>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label" style="float: left;display: block;">所属单位</label>
<div class="layui-input-block" style="height: 35px;">
<input type="text" id="unitcode" style="height: 37px; width:692px " lay-verify="unitcode" name="unitcode" class="val easyui-combotree" data-options="url: 'http://127.0.0.1:9100/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
<%-- <span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');">选择单位</span>--%>
<div id="myUnitTree" style="display: none">
<div class="ISearch">
<input type="text" autocomplete="off">
<span class="layui-btn layui-btn-normal inpSearch">搜索</span>
<span class="layui-btn layui-btn-normal clearSer">清空</span>
<span class="layui-btn layui-btn-normal entSelect">确定</span>
</div>
<ul id="unit" class="ztree"></ul>
</div>
</div> </div>
</div> </div>
<%-- <div class="layui-form-mid ">--%>
<%-- <label class="layui-form-label" style="float: left;display: block;">借调单位</label>--%>
<%-- <div class="layui-input-block" style="height: 35px;" >--%>
<%-- <input type="text" id="jddwcode" autocomplete="off" style="height: 37px; width:680px " name="jddwcode" class="val easyui-combotree layui-input code-icon " data-options="url: 'http://127.0.0.1:9100/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>--%>
<%-- </div>--%>
<div class="layui-form-item"> <%-- </div>--%>
<label class="layui-form-label">借调单位</label> <%-- <div class="layui-form-item">--%>
<div class="layui-input-block"> <%-- <label class="layui-form-label">借调单位</label>--%>
<input type="text" name="jddwname" autocomplete="off" id="jddwname" <%-- <div class="layui-input-block">--%>
class="layui-input code-icon" onclick="checkTree('jddwTree');"> <%-- <input type="text" name="jddwname" autocomplete="off" id="jddwname"--%>
<input type="text" id="jddwcode" autocomplete="off" Name="jddwcode" style="display: none;"> <%-- class="layui-input code-icon" onclick="checkTree('jddwTree');">--%>
<%--<span class="layui-btn" id="checkPer" >选择单位</span>--%> <%-- <input type="text" id="jddwcode" autocomplete="off" Name="jddwcode" style="display: none;">--%>
<div id="jddwTree" style="display: none"> <%-- &lt;%&ndash;<span class="layui-btn" id="checkPer" >选择单位</span>&ndash;%&gt;--%>
<div class="ISearch"> <%-- <div id="jddwTree" style="display: none">--%>
<input type="text" autocomplete="off"> <%-- <div class="ISearch">--%>
<span class="layui-btn layui-btn-normal inpSearch">搜索</span> <%-- <input type="text" autocomplete="off">--%>
<span class="layui-btn layui-btn-normal clearSer">清空</span> <%-- <span class="layui-btn layui-btn-normal inpSearch">搜索</span>--%>
<span class="layui-btn layui-btn-normal entSelect">确定</span> <%-- <span class="layui-btn layui-btn-normal clearSer">清空</span>--%>
</div> <%-- <span class="layui-btn layui-btn-normal entSelect">确定</span>--%>
<ul id="jddw" class="ztree"></ul> <%-- </div>--%>
</div> <%-- <ul id="jddw" class="ztree"></ul>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
<%-- </div>--%>
<div class="layui-form-item btx"> <div class="layui-form-mid btx" style="width: 800px;">
<label class="layui-form-label">用户角色</label> <label class="layui-form-label">用户角色</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="roleName" id="roleName" autocomplete="off" lay-verify="required" <input type="text" name="roleName" id="roleName" autocomplete="off" lay-verify="required"
...@@ -271,12 +295,24 @@ ...@@ -271,12 +295,24 @@
</div> </div>
</div> </div>
<span hidden id="msg">${msg}</span> <span hidden id="msg">${msg}</span>
<%--<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/easyui-window/js/jquery.easyui.min.js"></script>--%>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/ajgl/js/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zlcc/easyui-window/js/function-zdy.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/zljc.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/resources/static/xtba/zljc/js/qlayertips.js"></script>
<script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script> <script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script>
<script> <script>
//加载日期插件 //加载日期插件
laydate.render({ laydate.render({
elem: '#birthday' //指定元素 elem: '#birthday' //指定元素
}); });
openCombotree('unitcode');
// openCombotree('jddwcode');
layui.use(['element', 'form', 'jquery'], function () { layui.use(['element', 'form', 'jquery'], function () {
var form = layui.form, var form = layui.form,
layer = layui.layer, layer = layui.layer,
...@@ -320,14 +356,26 @@ ...@@ -320,14 +356,26 @@
//验证表单数据 //验证表单数据
chechFormData(form); chechFormData(form);
//设置原有单位回显 //设置原有单位回显
var unitname = "${user.unitname}"; <%--var tInterval= window.setInterval(function () {--%>
var unitcode = "${user.unitcode}"; <%-- if($("#unitcode").combobox().length>0) {--%>
$("#unitname").val(unitname); <%-- var unitcode = "${user.unitcode}";--%>
$("#unitcode").val(unitcode); <%-- $("#unitcode").combobox("setValue",unitcode);--%>
var jddwname = "${user.jddwname}"; <%-- window.clearInterval(tInterval);--%>
var jddwcode = "${user.jddwcode}" <%-- }--%>
$("#jddwname").val(jddwname);
$("#jddwcode").val(jddwcode); <%--},300);--%>
<%--window.setTimeout(function(){--%>
<%--var unitname = "${user.unitname}";--%>
<%--var unitcode = "${user.unitcode}";--%>
<%--$("#unitname").val(unitname);--%>
<%--// $("#unitcode").val(unitcode);--%>
<%--$("#unitcode").combobox("setValue",unitcode);--%>
<%--var jddwname = "${user.jddwname}";--%>
<%--var jddwcode = "${user.jddwcode}";--%>
<%--$("#jddwname").val(jddwname);--%>
<%--// $("#jddwcode").val(jddwcode);--%>
<%--$("#jddwcode").combobox("setValue",jddwcode);--%>
<%--},700);--%>
//设置用户等级回显 //设置用户等级回显
var grade = "${user.grade}"; var grade = "${user.grade}";
$("#grade").val(grade); $("#grade").val(grade);
...@@ -356,23 +404,23 @@ ...@@ -356,23 +404,23 @@
zNodes.push({id:data[i].codeStr,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"}); zNodes.push({id:data[i].codeStr,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"});
} }
setTree(zNodes,"unit","nocheck","unitcode","unitname","");*/ setTree(zNodes,"unit","nocheck","unitcode","unitname","");*/
$.ajax({ <%--$.ajax({--%>
url: '${pageContext.request.contextPath}/resources/common/json/unit.json', <%-- url: '${pageContext.request.contextPath}/resources/common/json/unit.json',--%>
type:'get', <%-- type:'get',--%>
dataType: 'json', <%-- dataType: 'json',--%>
success: function (data) { <%-- success: function (data) {--%>
var data =data.data; <%-- var data =data.data;--%>
var zNodes =[]; <%-- var zNodes =[];--%>
for (var i=0;i<data.length;i++){ <%-- for (var i=0;i<data.length;i++){--%>
zNodes.push({id:data[i].codeStr,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"}); <%-- zNodes.push({id:data[i].codeStr,pId:data[i].pid,name:data[i].name,open:false,file:"core/simpleData"});--%>
} <%-- }--%>
setTree(zNodes,"unit","nocheck","unitcode","unitname",""); <%-- setTree(zNodes,"unit","nocheck","unitcode","unitname","");--%>
setTree(zNodes,"jddw","nocheck","jddwcode","jddwname",""); <%-- setTree(zNodes,"jddw","nocheck","jddwcode","jddwname","");--%>
}, <%-- },--%>
error: function (data) { <%-- error: function (data) {--%>
debugger; <%-- debugger;--%>
} <%-- }--%>
}); <%--});--%>
var data = ${role}; var data = ${role};
var checkData = ${oldRole}; var checkData = ${oldRole};
var oldPerStr = "",oldPerIdStr=""; var oldPerStr = "",oldPerIdStr="";
...@@ -432,6 +480,44 @@ ...@@ -432,6 +480,44 @@
}); });
}); });
$(function () {
<%--var tInterval= window.setInterval(function () {--%>
<%-- if($("#unitcode").combobox().length>0) {--%>
<%-- var unitcode = "${user.unitcode}";--%>
<%-- $("#unitcode").combobox("setValue",unitcode);--%>
<%-- window.clearInterval(tInterval);--%>
<%-- }--%>
<%--},300);--%>
<%--var tInterval= window.setInterval(function () {--%>
<%-- if($("#unitcode").combotree().length>0) {--%>
<%-- var unitcode = "${user.unitcode}";--%>
<%-- $("#unitcode").combotree("setValue",unitcode);--%>
<%-- window.clearInterval(tInterval);--%>
<%-- }--%>
<%--},300);--%>
<%--});--%>
<%--$(function () {--%>
<%--var unitcode = "${user.unitcode}";--%>
<%--$("#unitcode").combobox("setValue",unitcode);--%>
<%--});--%>
$("#unitcode").combotree({
<%--onLoadSuccess:function(){--%>
<%-- &lt;%&ndash;var data = $('#unitcode').combotree('getData');&ndash;%&gt;--%>
<%-- &lt;%&ndash;if(data.length>0){&ndash;%&gt;--%>
<%-- &lt;%&ndash; var unitcode22 = "${user.unitcode}";&ndash;%&gt;--%>
<%-- &lt;%&ndash; $('#unitcode').combotree('setValue',unitcode22);&ndash;%&gt;--%>
<%-- &lt;%&ndash;}&ndash;%&gt;--%>
<%--}--%>
onLoadSuccess:function(node,data) {
$("#unitcode").combotree('setValue', ${user.unitcode});
}
});
});
</script> </script>
</body> </body>
......
src/main/webapp/resources/common/common.js
...@@ -323,7 +323,14 @@ function chechFormData(form) { ...@@ -323,7 +323,14 @@ function chechFormData(form) {
if (pwd != value) { if (pwd != value) {
return '两次输入的密码不一致'; return '两次输入的密码不一致';
} }
}/*, },
unitcode: function (value) {
//获取密码
if (value.length < 0 || value==null || value=="") {
return '所属单位不能为空';
}
}
/*,
gzzmRole: function (value) { gzzmRole: function (value) {
//获取复选框选中的值 //获取复选框选中的值
var groupCheckbox=$("input[name='gzzmPlay']"),j=0; var groupCheckbox=$("input[name='gzzmPlay']"),j=0;
......
src/main/webapp/resources/h-ui/css/new-wrap.css
...@@ -115,7 +115,7 @@ body .layui-layer-btn1{color:#666 !important;} ...@@ -115,7 +115,7 @@ body .layui-layer-btn1{color:#666 !important;}
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
margin-top: 26px; margin-top: 63px;
margin-bottom: 14px; margin-bottom: 14px;
} }
.flowChart .check { .flowChart .check {
......
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