-
-
-
+
diff --git a/power-admin/target/power/WEB-INF/views/userDir/user1.jsp b/power-admin/target/power/WEB-INF/views/userDir/user1.jsp
index 2c2b0ef..c82d334 100644
--- a/power-admin/target/power/WEB-INF/views/userDir/user1.jsp
+++ b/power-admin/target/power/WEB-INF/views/userDir/user1.jsp
@@ -180,7 +180,7 @@
-
+
diff --git a/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js b/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
index e5aa9ea..3db866f 100644
--- a/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
+++ b/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
@@ -2010,7 +2010,7 @@
// Width attribute
oCol.sWidthOrig = th.attr('width') || null;
- //
+ // Style attribute
var t = (th.attr('style') || '').match(/width:\s*(\d+[pxem%]+)/);
if ( t ) {
oCol.sWidthOrig = t[1];
diff --git a/power-admin/target/power/static/js/role.js b/power-admin/target/power/static/js/role.js
index 4c02d01..8699ac7 100644
--- a/power-admin/target/power/static/js/role.js
+++ b/power-admin/target/power/static/js/role.js
@@ -120,7 +120,7 @@ $(function(){
}
}
],
- ess: function(){ //加载成功时执行
+ onLoadSuccess: function(){ //加载成功时执行
$(".page-list").show();
$("th").css({'text-align':'center','vertical-align':'middle'})
$("td").css({'text-align':'center','vertical-align':'middle'})
diff --git a/power-admin/target/power/static/js/updatePassword.js b/power-admin/target/power/static/js/updatePassword.js
index 0c7c0c9..d49486d 100644
--- a/power-admin/target/power/static/js/updatePassword.js
+++ b/power-admin/target/power/static/js/updatePassword.js
@@ -35,11 +35,19 @@ $(function() {
toastr.warning("重复密码长度小于6位！")
return false;
}
+ reg=/^(?=.*[a-z])(?=.*\d)[a-zA-Z\d]{6,}$/;
+ if (!reg.test($("#newUserPwd").val())) {
+ toastr.warning("密码格式必须包含数字和字母!")
+ return false;
+ }
+
+
if($("#newReUserPwd").val() != $("#newUserPwd").val() ){
toastr.warning("重复密码与密码不一致！")
return false;
}
+
$.ajax({
type: "post",
url: path+"/user/updatePassword",
@@ -58,6 +66,8 @@ $(function() {
});
});
+
+
/*//验证旧密码
$('#userPwd').blur(function () {
$.ajax({
diff --git a/power-admin/target/power/static/js/user1.js b/power-admin/target/power/static/js/user1.js
index 6a9dd7e..20667aa 100644
--- a/power-admin/target/power/static/js/user1.js
+++ b/power-admin/target/power/static/js/user1.js
@@ -306,7 +306,6 @@ function edit(id){
$("#re_userName").val(data.userName);
$("#name").val(data.name);
var deptIds = data.deptId;
- debugger
var deptArr = deptIds.split(",");
$('#deptId').selectpicker('val', deptArr);
if(data.userSex == 1){
diff --git a/power-api/power-api.iml b/power-api/power-api.iml
new file mode 100644
index 0000000..e3ea09e
--- /dev/null
+++ b/power-api/power-api.iml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-dao/power-dao.iml b/power-dao/power-dao.iml
new file mode 100644
index 0000000..6bdc60c
--- /dev/null
+++ b/power-dao/power-dao.iml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-foundaton/power-foundaton.iml b/power-foundaton/power-foundaton.iml
new file mode 100644
index 0000000..be8dc33
--- /dev/null
+++ b/power-foundaton/power-foundaton.iml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-service/power-service.iml b/power-service/power-service.iml
new file mode 100644
index 0000000..e308f7b
--- /dev/null
+++ b/power-service/power-service.iml
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file