Skip to content

X
xzxt-shiro
Commit bdd84d55 by liuyongshuai
Options

提交赵少楠修改界面样式；修改根据用户单位查询的bug；添加徐世洪的用户个人中心；修改session时间问题

parent 1cef045c
Showing with 122 additions and 51 deletions
src/main/java/com/xzxtshiro/controller/admin/SysMemberController.java
package com.xzxtshiro.controller.admin;
import com.xzxtshiro.pojo.BaseModel;
import com.xzxtshiro.pojo.SysUser;
import com.xzxtshiro.service.SysRoleService;
import com.xzxtshiro.service.SysUserService;
......@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
/**
* @author liuys
* @desc
......@@ -69,6 +72,18 @@ public class SysMemberController {
return "admin/member/detail";
}
/**
* 获取当前用户的信息
* @return
*/
@ResponseBody
@RequestMapping(value = "/getRole", method = RequestMethod.GET)
public SysUser getDetailRole(){
SysUser user = TokenUtil.getUser();
user = userService.selectSysUserDetailById(user.getId());
return user;
}
}
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
......@@ -131,7 +131,12 @@ public class SysUserController {
//unitcode不为空，则根据unitcode+countycode双层查询
if (usergrade!=null&&!"".equals(usergrade)){
dw = subUnitCode(usergrade, dlUser.getUnitcode(), dw);
user.setCountycode(getDwLike(user.getUnitcode(),0));
String unitStr = user.getUnitcode();
if(dw!=null&&dw.equals(unitStr.substring(0,dw.length()))){
user.setCountycode(getDwLike(user.getUnitcode(),0));
}else {
user.setCountycode(user.getUnitcode());
}
}
}
......
src/main/java/com/xzxtshiro/dao/SysUserDao.java
......@@ -47,4 +47,6 @@ public interface SysUserDao {
Integer deleteUserZpByUserId(@Param("userId")String userId);
Integer deleteUserById(@Param("userId")String userId);
SysUser selectSysUserDetailById(@Param("userId")String userId);
}
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
......@@ -608,4 +608,18 @@
<delete id="deleteUserById">
DELETE from sys_user where id = #{userId,jdbcType=VARCHAR}
</delete>
<!--查询当前用户信息-->
<select id="selectSysUserDetailById" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />,ROLENAME
from SYS_USER t
left join
(select u.user_id ,
xmlagg(xmlparse(content roleName||',' wellformed) order by u.user_id).getclobval() 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="userId !=null"> and ID = #{userId} </if>
</select>
</mapper>
\ No newline at end of file
src/main/java/com/xzxtshiro/service/SysUserService.java
......@@ -27,6 +27,8 @@ public interface SysUserService {
BaseModel selectSysUserPage(SysUser user);
SysUser selectSysUserDetailById(String userId);
Integer updateStatusById(SysUser user);
SysUser add(SysUser user);
......
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
......@@ -99,6 +99,12 @@ public class SysUserServiceImpl implements SysUserService {
return i;
}
@Override
public SysUser selectSysUserDetailById(String userId) {
SysUser sysUser = userDao.selectSysUserDetailById(userId);
return sysUser;
}
public boolean addUserZp(SysUser user){
SysUser dlUser = TokenUtil.getUser();
SysUserZp sysUserZp = new SysUserZp();
......
src/main/webapp/WEB-INF/jsp/admin/role/add.jsp
......@@ -133,7 +133,7 @@
});
form.on('select(isParent)', function(data){
if(data.value=="01"){
if(data.value=="0"){
//如果是父级角色，权限选择框去掉，父级角色去掉
$("#hasPermission").removeClass("btx");
$("#isParentRole").removeClass("btx");
......@@ -144,7 +144,7 @@
$("#pidName").val("");
$("#pid").val("");
}
if(data.value=="02"){
if(data.value=="1"){
//如果是子级角色，权限选择为必填，父级角色为必填
$("#hasPermission").attr("class","layui-form-item btx");
$("#isParentRole").attr("class","layui-form-item btx");
......
src/main/webapp/WEB-INF/jsp/admin/role/update.jsp
......@@ -137,7 +137,7 @@
});
form.on('select(isParent)', function(data){
if(data.value=="01"){
if(data.value=="0"){
//如果是父级角色，权限选择框去掉，父级角色去掉
$("#hasPermission").removeClass("btx");
$("#isParentRole").removeClass("btx");
......@@ -148,7 +148,7 @@
$("#pidName").val("");
$("#pid").val("");
}
if(data.value=="02"){
if(data.value=="1"){
//如果是子级角色，权限选择为必填，父级角色为必填
$("#hasPermission").attr("class","layui-form-item btx");
$("#isParentRole").attr("class","layui-form-item btx");
......
src/main/webapp/WEB-INF/jsp/index.jsp
......@@ -26,7 +26,9 @@
</head>
<body id="main-body">
<%--
<a class="settings"><i class="fa fa-gear fa-f"></i><span>切换皮肤</span></a>
--%>
<header class="navbar-wrapper">
<div class="navbar navbar-fixed-top">
<div class="container-fluid cl">
......@@ -299,21 +301,21 @@
onClose: function () {
$(document).unbind("scroll");
}
});
$('#pifu').show().dialog('open');
$("#pifu").window('center');
var tops = $(document).scrollTop();//当页面滚动时，把当前距离赋值给页面，这样保持页面滚动条不动
$(document).bind("scroll", function () {
$(document).scrollTop(tops);
});
});
$('#pifu').show().dialog('open');
$("#pifu").window('center');
var tops = $(document).scrollTop();//当页面滚动时，把当前距离赋值给页面，这样保持页面滚动条不动
$(document).bind("scroll", function () {
$(document).scrollTop(tops);
});
});
//判断当前登录用户
var username = "${sessionScope.user.username }";
console.log(username);
if (username == '8888') {
//判断当前登录用户
var username = "${sessionScope.user.username }";
console.log(username);
setTimeout(displaynavbar($(".pngfix").get(0).tagName, 0));
}
if (username == '8888') {
console.log(username);
setTimeout(displaynavbar($(".pngfix").get(0).tagName, 0));
}
});
</script>
</body>
......
src/main/webapp/WEB-INF/web.xml
......@@ -59,6 +59,8 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
<!-- initServlet end -->
<!-- <servlet>
<servlet-name>initServlet</servlet-name>
......@@ -84,4 +86,7 @@
<location>/WEB-INF/jsp/error/err.jsp</location>
</error-page>
<session-config>
<session-timeout>0</session-timeout>
</session-config>
</web-app>
\ No newline at end of file
src/main/webapp/resources/h-ui/css/new-wrap.css
@charset "utf-8";
body#main-body{
background-image: url(../../common/css/images/body/yellow.jpg);
background-image: url(../../common/css/images/body/ocean.jpg);
background-size: 100% 100%;
background-attachment: fixed;
color:#fff !important;
/*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;}
.navbar span,.navbar a,.navbar li,.Hui-aside span,.Hui-aside a,.Hui-aside li{color:#fff !important;}
body .navbar,body .Hui-aside,body .Hui-article-box{background: none !important;}
body .layui-elem-quote{/*background: rgba(0, 0, 0, 0.3) !important;*/border: 1px solid #ccc;}
/*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 .Hui-tabNav{background: rgba(0, 0, 0, 0.1) !important;}
.show_iframe{background:#fff;}
.Hui-article span,.layui-breadcrumb a{color:#666 !important;}
body .acrossTab li{color:#fff !important;}
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-elem-quote{border-left: 5px solid #391790;}
#openFlag,.layui-badge-rim, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea{
border-color: #b3b3b3 !important;
}
body .layui-table{background: none;color:#fff;}
/*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;}
.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);}
body .layui-laypage button,body .layui-laypage input{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-top: 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;}
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);
......@@ -60,12 +65,13 @@ body .window-mask{background: rgba(0, 0, 0, 0.5);}
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.6)!important;}
body input.code-icon{ background: rgba(0,0,0,0.3) url(../../image/code.gif) no-repeat right center;cursor: pointer;}
.layui-layer-shade{/*background: rgba(0, 0, 0, 0.6)!important;*/}
body input.code-icon{ background: url(../../image/code.gif) no-repeat right center;cursor: pointer;}
body .layui-anim-upbit>dd,body option{color:#000 !important;background: #fff !important;}
.layui-layer-content{color:#fff;}
/*个人资料*/
.grzl-mp{width:400px;border:1px solid #666;box-shadow: 2px 2px 12px rgba(0,0,0,0.4);float: left;margin: 20px 0 0 83px;}
.mp-photo{width:100%;height:150px;background: rgba(0,0,0,0.3);position: relative;margin-bottom: 40px;}
.grzl-mp{width:400px;border:1px solid #b5b5b5;box-shadow: 2px 2px 12px rgba(0,0,0,0.4);float: left;margin: 20px 0 0 83px;}
.mp-photo{width:100%;height:150px;background: rgb(89, 172, 214);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;}
......@@ -78,14 +84,14 @@ body .layui-layer-btn1{color:#666 !important;}
.photo-img:hover { -webkit-animation-name: tada; animation-name: tada;}
/****个人资料权限*****/
.flowChart {
background-color: rgba(0, 0, 0,0.3);
background-color: rgba(89, 152, 196,0.8);
width:540px;
position: relative;
float: left;
margin-top:20px;
margin-left:80px;
padding: 12px;
/* display: flex;*/
/* display: flex;*/
}
.flowChart-left {
width: 50px;
......@@ -98,7 +104,7 @@ body .layui-layer-btn1{color:#666 !important;}
height: 100%;
margin-left: 50%;
border-left-style: dashed;
border-left-color: darkgray;
border-left-color: #888686;
border-left-width: 2px;
}
.flowChart-right {
......@@ -144,12 +150,13 @@ body .layui-layer-btn1{color:#666 !important;}
border: 4px solid rgba(255, 208, 122,1);
}
.flowChart .NodeDetail {
background-color: rgba(0, 0, 0,0.3);
background-color: rgba(255, 255, 255, 0.7);
margin-left: -60px;
position: relative;
z-index: 10000;
min-height: 27px;
flex-grow: 1;
border: 1px solid #010101;
border: 1px solid #ada9a9;
border-radius: 3px;
padding: 14px;
display: flex;
......@@ -213,7 +220,7 @@ body .layui-layer-btn1{color:#666 !important;}
height: 0;
border: 14px solid;
border-style: dashed;
border-color: transparent rgba(0, 0, 0,0.44) transparent transparent;
border-color: transparent rgba(255, 255, 255, 0.74) transparent transparent;
position: absolute;
left: -15px;
top: -14px;
......@@ -232,3 +239,14 @@ body .layui-layer-btn1{color:#666 !important;}
margin-top: 7px;
}
.layui-laydate span{color:#000 !important;}
.show_iframe .loading{color:#666 !important;}
@media screen and (min-width: 1200px) and (max-width: 1400px) {
.grzl-mp{width:380px;margin: 20px 0 0 60px;}
.flowChart{width: 580px; margin-left: 80px}
}
@media screen and (min-width: 1000px) and (max-width: 1200px) {
.grzl-mp{width:370px;margin: 20px 0 0 20px;}
.mp-name{width:100px;}
.flowChart{width: 538px;margin-left: 60px;}
}
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