Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-shiro
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
xzxt-shiro
Commits
3c91b073
Commit
3c91b073
authored
Jul 15, 2021
by
liulianglang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户信息样式修改
parent
841b3dc5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
213 additions
and
111 deletions
+213
-111
src/main/java/com/xzxtshiro/controller/AccessController.java
+5
-2
src/main/java/com/xzxtshiro/controller/admin/DictController.java
+7
-4
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
+6
-4
src/main/java/com/xzxtshiro/dao/SysDictitemDao.java
+2
-1
src/main/java/com/xzxtshiro/mapper/SysDictitemMapper.xml
+10
-0
src/main/java/com/xzxtshiro/service/SysDictitemService.java
+1
-0
src/main/java/com/xzxtshiro/service/imp/SysDictitemImpl.java
+11
-0
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
+9
-9
src/main/java/com/xzxtshiro/util/ZtreeDataUtil.java
+34
-23
src/main/webapp/WEB-INF/jsp/admin/member/detail.jsp
+31
-30
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
+0
-0
src/main/webapp/WEB-INF/jsp/admin/user/list.jsp
+88
-36
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
+0
-0
src/main/webapp/resources/common/common.js
+8
-1
src/main/webapp/resources/h-ui/css/new-wrap.css
+1
-1
No files found.
src/main/java/com/xzxtshiro/controller/AccessController.java
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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
View file @
3c91b073
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
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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"
>
–
%
>
--%>
<
%
--
<!
--
内容
--
>
--%>
<
%
--
&
lt
;%&
ndash
;<!
--
内容
--
>
–
%
>
--%>
<
%
--
&
lt
;%&
ndash
;<
div
class=
"details"
>
--%>
<
%
--
&
lt
;%&
ndash
;&
lt
;%&
ndash
;<
div
class=
"details"
>
–
%
>
--%>
<
%
--
<
h4
>
${user.username}
</h4>
--%>
<
%
--
&
lt
;%&
ndash
;<
h4
>
${user.username}
</h4>
–
%
>
--%>
<
%
--
</
div
>
–
%
>
--%>
<
%
--
&
lt
;%&
ndash
;</
div
>
–
%
>
–
%
>
--%>
<
%
--
</
div
>
--%>
<
%
--
&
lt
;%&
ndash
;</
div
>
–
%
>
--%>
<
%
--
<!
--
中
--
>
--%>
<
%
--
&
lt
;%&
ndash
;<!
--
中
--
>
–
%
>
--%>
<div
class=
"NodeDetail-content"
id =
"gzzmplay"
>
<
%
--
<
div
class=
"NodeDetail-content"
id =
"gzzmplay"
>
--%
>
<
%
--
<
span
class=
"badge"
>
侦查员
</span>
--%>
<
%
--
&
lt
;%&
ndash
;<
span
class=
"badge"
>
侦查员
</span>
–
%
>
--%>
<
%
--
<
span
class=
"badge"
>
指挥员
</span>
--%>
<
%
--
&
lt
;%&
ndash
;<
span
class=
"badge"
>
指挥员
</span>
–
%
>
--%>
<
%
--
<
span
class=
"badge"
>
研判员
</span>
--%>
<
%
--
&
lt
;%&
ndash
;<
span
class=
"badge"
>
研判员
</span>
–
%
>
--%>
<
%
--
<
span
class=
"badge"
>
刑事技术负责人
</span>
--%>
<
%
--
&
lt
;%&
ndash
;<
span
class=
"badge"
>
刑事技术负责人
</span>
–
%
>
--%>
<
%
--
<
span
class=
"badge"
>
电诈预警员
</span>
--%>
<
%
--
&
lt
;%&
ndash
;<
span
class=
"badge"
>
电诈预警员
</span>
–
%
>
--%>
<
%
--
<
span
class=
"badge"
>
刑事技术员
</span>
--%>
<
%
--
&
lt
;%&
ndash
;<
span
class=
"badge"
>
刑事技术员
</span>
–
%
>
--%>
</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
View file @
3c91b073
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/jsp/admin/user/list.jsp
View file @
3c91b073
...
@@ -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>
–
%
>
--%>
<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
View file @
3c91b073
This diff is collapsed.
Click to expand it.
src/main/webapp/resources/common/common.js
View file @
3c91b073
...
@@ -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
View file @
3c91b073
...
@@ -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
:
26
px
;
margin-top
:
63
px
;
margin-bottom
:
14px
;
margin-bottom
:
14px
;
}
}
.flowChart
.check
{
.flowChart
.check
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment