fjy8018/cms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复个人中心不修改真实姓名则无法修改信息的问题

Browse Source
This commit is contained in:
F嘉阳
2018-03-14 13:26:46 +08:00
parent 564b3ce9e3
commit 82893a9959
3 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.fjy</groupId> <groupId>com.fjy</groupId>
<artifactId>spring</artifactId> <artifactId>spring</artifactId>
<version>V2.5.1</version> <version>V2.6.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring</name> <name>spring</name>

4
src/main/resources/application-prod.yml
View File

@@ -4,9 +4,9 @@ server:
context-path: /cms context-path: /cms
session: session:
timeout: 1440s timeout: 1440s
port: 8081 port: 8085
serverproperties: serverproperties:
port_num: 8081 port_num: 8085
filePath: /www/cmsfile/ filePath: /www/cmsfile/
spring: spring:
thymeleaf: thymeleaf:

57
src/main/resources/static/js/user.js
View File

@@ -1,40 +1,42 @@
var dt = new Date(); var dt = new Date();
let th = this; let th = this;
/*let username = this.ruleForm2.colname.value;*/ /*let username = this.ruleForm2.colname.value;*/
var month = dt.getMonth()+1; var month = dt.getMonth() + 1;
var day = dt.getDate(); var day = dt.getDate();
var year = dt.getFullYear(); var year = dt.getFullYear();
var cur = year + '-' + month + '-' + day; var cur = year + '-' + month + '-' + day;
function DateDiff(sDate1, sDate2){ //sDate1和sDate2是2002-12-18格式
function DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays var aDate, oDate1, oDate2, iDays
aDate = sDate1.split("-") aDate = sDate1.split("-")
oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]) //转换为12-18-2002格式 oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]) //转换为12-18-2002格式
aDate = sDate2.split("-") aDate = sDate2.split("-")
oDate2 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]) oDate2 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0])
iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 /24) //把相差的毫秒数转换为天数 iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24) //把相差的毫秒数转换为天数
return iDays return iDays
} }
var Main = { var Main = {
data() { data() {
var checkQuestion = (rule, value, callback) => { var checkQuestion = (rule, value, callback) => {
if (!value) { if (!value) {
return callback(new Error('问题不能为空')); return callback(new Error('问题不能为空'));
}else { } else {
callback() callback()
} }
}; };
var checkAnswer = (rule, value, callback) => { var checkAnswer = (rule, value, callback) => {
if (!value) { if (!value) {
return callback(new Error('答案不能为空')); return callback(new Error('答案不能为空'));
}else { } else {
callback() callback()
} }
}; };
var checkName = (rule, value, callback) => { var checkName = (rule, value, callback) => {
let that= this; let that = this;
if (!value) { if (!value) {
return callback(new Error('用户名不能为空')); return callback(new Error('用户名不能为空'));
}else { } else {
//判断用户名是否已存在 //判断用户名是否已存在
axios.get(getRootPath_web() + '/CheckUserName', { axios.get(getRootPath_web() + '/CheckUserName', {
params: { params: {
@@ -45,9 +47,9 @@ var Main = {
console.log(response.data); console.log(response.data);
if (response.data === true) { if (response.data === true) {
callback(); callback();
} else if(value!==that.ruleForm2.colname){ } else if (value !== that.ruleForm2.colname) {
return callback(new Error('用户名已存在')); return callback(new Error('用户名已存在'));
}else { } else {
callback(); callback();
} }
}) })
@@ -82,6 +84,7 @@ var Main = {
} }
}; };
var checkRealName = (rule, value, callback) => { var checkRealName = (rule, value, callback) => {
let that = this;
if (!value) { if (!value) {
return callback(new Error('真实姓名不能为空')); return callback(new Error('真实姓名不能为空'));
} else { } else {
@@ -94,7 +97,7 @@ var Main = {
}) })
.then(function (response) { .then(function (response) {
console.log(response.data); console.log(response.data);
if (response.data === false) { if (response.data === false && value !== that.ruleForm2.colrealname) {
return callback(new Error('姓名与学号不匹配或该用户已注册')); return callback(new Error('姓名与学号不匹配或该用户已注册'));
} else { } else {
callback() callback()
@@ -128,7 +131,7 @@ var Main = {
return { return {
activeIndex: '2', activeIndex: '2',
ruleForm2: { ruleForm2: {
coluserid:'', coluserid: '',
colname: '', colname: '',
colstudentno: '', colstudentno: '',
colrealname: '', colrealname: '',
@@ -137,24 +140,24 @@ var Main = {
checkPass: '', checkPass: '',
}, },
ruleForm3: { ruleForm3: {
coluserid:'', coluserid: '',
question: '', question: '',
answer: '' answer: ''
}, },
rules3: { rules3: {
question: [ question: [
{required: true,validator: checkQuestion, trigger: 'blur'} {required: true, validator: checkQuestion, trigger: 'blur'}
], ],
answer: [ answer: [
{required: true,validator: checkAnswer, trigger: 'blur'} {required: true, validator: checkAnswer, trigger: 'blur'}
] ]
}, },
rules2: { rules2: {
colpassword: [ colpassword: [
{required: true,validator: validatePass, trigger: 'blur'} {required: true, validator: validatePass, trigger: 'blur'}
], ],
checkPass: [ checkPass: [
{required: true,validator: validatePass2, trigger: 'blur'} {required: true, validator: validatePass2, trigger: 'blur'}
], ],
colstudentno: [ colstudentno: [
{ {
@@ -171,7 +174,7 @@ var Main = {
} }
], ],
colname: [ colname: [
{required: true,validator: checkName, trigger: 'blur'} {required: true, validator: checkName, trigger: 'blur'}
], ],
}, },
tableHomeworkData: [ tableHomeworkData: [
@@ -196,7 +199,7 @@ var Main = {
workfolder: "第一次作业" workfolder: "第一次作业"
} }
], ],
NoticeList:[ NoticeList: [
{ {
noticeid: 1, noticeid: 1,
adminid: 1, adminid: 1,
@@ -232,7 +235,7 @@ var Main = {
message: content message: content
}); });
}, },
limitTime(row){ limitTime(row) {
return DateDiff(row.worktime.replace(/([^\s]+)\s.*/, "$1"), cur); return DateDiff(row.worktime.replace(/([^\s]+)\s.*/, "$1"), cur);
}, },
submitForm(formName, url) { submitForm(formName, url) {
@@ -240,7 +243,7 @@ var Main = {
var that = this; var that = this;
if (valid) { if (valid) {
axios({ axios({
url: getRootPath_web()+'/home/userUpdate', url: getRootPath_web() + '/home/userUpdate',
method: 'post', method: 'post',
data: that.ruleForm2 data: that.ruleForm2
, ,
@@ -257,11 +260,11 @@ var Main = {
} }
}).then(function (response) { }).then(function (response) {
console.log(response.data); console.log(response.data);
if (response.data===true){ if (response.data === true) {
that.openNotiSuccess("成功", "修改成功，刷新页面即可查看新信息！"); that.openNotiSuccess("成功", "修改成功，刷新页面即可查看新信息！");
}else if (response.data===false){ } else if (response.data === false) {
that.openNotiError("失败", "修改失败！"); that.openNotiError("失败", "修改失败！");
}else { } else {
that.openNotiError("错误", response.data.message); that.openNotiError("错误", response.data.message);
} }
}).catch(function (error) { }).catch(function (error) {
@@ -334,7 +337,7 @@ var Main = {
console.log(tab, event); console.log(tab, event);
}, },
ClickToJump(targe) { ClickToJump(targe) {
window.location.href = getRootPath_web()+"/" + targe; window.location.href = getRootPath_web() + "/" + targe;
}, },
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
console.log(key, keyPath); console.log(key, keyPath);
@@ -346,7 +349,7 @@ var Main = {
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
var that = this; var that = this;
axios.get(getRootPath_web()+'/home/userinfo') axios.get(getRootPath_web() + '/home/userinfo')
.then(function (response) { .then(function (response) {
//console.log(response.data); //console.log(response.data);
that.ruleForm2 = response.data; that.ruleForm2 = response.data;
@@ -355,7 +358,7 @@ var Main = {
//console.log(error); //console.log(error);
that.openNotiError("错误", response.data.message); that.openNotiError("错误", response.data.message);
}); });
axios.get(getRootPath_web()+'/home/findAllHomework') axios.get(getRootPath_web() + '/home/findAllHomework')
.then(function (response) { .then(function (response) {
console.log(response.data); console.log(response.data);
that.tableHomeworkData = response.data; that.tableHomeworkData = response.data;
@@ -365,7 +368,7 @@ var Main = {
//console.log(error); //console.log(error);
that.openNotiError("错误", response.data.message); that.openNotiError("错误", response.data.message);
}); });
axios.get(getRootPath_web()+'/home/findAllNotice') axios.get(getRootPath_web() + '/home/findAllNotice')
.then(function (response) { .then(function (response) {
console.log(response.data); console.log(response.data);
that.NoticeList = response.data; that.NoticeList = response.data;