hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

若依开源1.1.2发布

Browse Source
This commit is contained in:
RuoYi
2018-05-06 12:43:07 +08:00
parent 6f6a9c8ca0
commit 9d18d298e7
33 changed files with 419 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/main/resources/templates/system/user/profile/edit.html Normal file
View File

@@ -0,0 +1,90 @@
<!DOCTYPE html>
<html xmlns:th="http://www.w3.org/1999/xhtml">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-user-edit">
<input name="userId" type="hidden" th:value="${user.userId}" />
<div class="form-group">
<label class="col-sm-3 control-label ">登录名称：</label>
<div class="col-sm-8">
<input class="form-control" type="text" readonly="true" th:value="${user.loginName}"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门名称：</label>
<div class="col-sm-8">
<input class="form-control" type="text" readonly="true" th:value="${user.dept.deptName}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用户名称：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="userName" id="userName" th:value="${user.userName}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">邮箱：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="email" th:value="${user.email}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">手机：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="phonenumber" id="phonenumber" th:value="${user.phonenumber}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<div class="radio radio-info radio-inline">
<input type="radio" id="radio1" th:field="*{user.sex}" name="sex" value="0">
<label for="radio1">男</label>
</div>
<div class="radio radio-danger radio-inline">
<input type="radio" id="radio2" th:field="*{user.sex}" name="sex" value="1">
<label for="radio2">女</label>
</div>
</div>
</div>
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
<button th:onclick="'javascript:layer_close()'" class="btn btn-danger" type="button">关闭</button>
</div>
</div>
</form>
</div>
<div th:include="include::footer"></div>
<script>
$("#form-user-edit").validate({
rules:{
userName:{
required:true,
},
password:{
required:true,
minlength: 6
},
email:{
required:true,
email:true
},
phonenumber:{
required:true,
},
},
submitHandler:function(form){
update();
}
});
function update() {
_ajax_save(ctx + "system/user/profile/update", $("#form-user-edit").serialize());
}
</script>
</body>
</html>

73
src/main/resources/templates/system/user/profile/profile.html Normal file
View File

@@ -0,0 +1,73 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!--360浏览器优先以webkit内核解析-->
<title>个人信息</title>
<link rel="shortcut icon" href="favicon.ico">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.css}" rel="stylesheet"/>
<link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
<link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet"/>
</head>
<body class="gray-bg">
<div class="wrapper wrapper-content">
<div class="row animated fadeInRight">
<div class="col-sm-6">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>个人信息</h5>
<div class="ibox-tools">
<a class="dropdown-toggle" data-toggle="dropdown" href="profile.html#">
<i class="fa fa-edit"></i>
</a>
<ul class="dropdown-menu dropdown-user">
<li><a href="javascript:edit()">修改信息</a></li>
<li><a href="javascript:resetPwd()">修改密码</a></li>
</ul>
</div>
</div>
<div class="contact-box">
<div class="col-sm-4">
<div class="text-center">
<img alt="image" class="img-circle m-t-xs img-responsive" src="/img/profilel.jpg">
<div class="m-t-xs font-bold">CEO</div>
</div>
</div>
<div class="col-sm-8">
<h3><strong>[[${user.loginName}]]</strong></h3>
<p><i class="fa fa-user"></i> [[${user.userName}]] / [[${#strings.defaultString(roleGroup,'无角色')}]]
<p><i class="fa fa-phone"></i> [[${user.phonenumber}]]</p>
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${user.createTime}]]</p>
</div>
<div class="clearfix"></div>
</a>
</div>
</div>
</div>
</div>
</div>
<div th:include="include::footer"></div>
<script>
var userId = [[${user.userId}]];
/*用户信息-修改*/
function edit() {
var url = ctx + "system/user/profile/edit/" + userId;
layer_showAuto("修改用户", url);
}
/*用户管理-重置密码*/
function resetPwd() {
var url = ctx + 'system/user/profile/resetPwd/' + userId;
layer_show("重置密码", url, '800', '500');
}
</script>
</body>
</html>

113
src/main/resources/templates/system/user/profile/resetPwd.html Normal file
View File

@@ -0,0 +1,113 @@
<!DOCTYPE html>
<html xmlns:th="http://www.w3.org/1999/xhtml">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-user-resetPwd">
<input name="userId" type="hidden" th:value="${user.userId}" />
<div class="form-group">
<label class="col-sm-3 control-label ">登录名称：</label>
<div class="col-sm-8">
<input class="form-control" type="text" readonly="true" name="loginName" th:value="${user.loginName}"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">旧密码：</label>
<div class="col-sm-8">
<input class="form-control" type="password" name="oldPassword" id="oldPassword">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">新密码：</label>
<div class="col-sm-8">
<input class="form-control" type="password" name="password" id="password">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">再次确认：</label>
<div class="col-sm-8">
<input class="form-control" type="password" name="confirm" id="confirm">
</div>
</div>
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
<button th:onclick="'javascript:layer_close()'" class="btn btn-danger" type="button">关闭</button>
</div>
</div>
</form>
</div>
<div th:include="include :: footer"></div>
<script>
$("#form-user-resetPwd").validate({
rules:{
oldPassword:{
required:true,
minlength: 6,
remote: {
url: ctx + "system/user/profile/checkPassword",
type: "get",
dataType: "json",
data: {
password: function() {
return $("input[name='oldPassword']").val();
}
}
}
},
password: {
required: true,
minlength: 6
},
confirm: {
required: true,
equalTo: "#password"
}
},
messages: {
oldPassword: {
required: "请输入原密码",
remote: "原密码错误"
},
password: {
required: "请输入新密码",
minlength: "密码不能小于6个字符"
},
confirm: {
required: "请再次输入新密码",
equalTo: "两次密码输入不一致"
}
},
submitHandler:function(form){
resetPwd();
}
});
function resetPwd() {
$.ajax({
cache : true,
type : "post",
url : ctx + "system/user/profile/resetPwd",
data : $('#form-user-resetPwd').serialize(),
async : false,
error : function(request) {
parent.layer.alert("系统错误");
},
success : function(data) {
if (data.code == 0) {
parent.layer.msg("修改成功,正在刷新数据请稍后……",{icon:1,time: 500,shade: [0.1,'#fff']},function(){
window.parent.location.reload();
});
} else {
parent.layer.alert(data.m , {icon: 2,title:"系统提示"});
}
}
});
}
</script>
</body>
</html>