diff --git a/src/assets/images/certification4.png b/src/assets/images/certification4.png new file mode 100644 index 00000000..ade227ae Binary files /dev/null and b/src/assets/images/certification4.png differ diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index 7b35004a..94a2f9c5 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -51,7 +51,6 @@ export default { if (data.offlineTutoring==0){ this.status.offlineTutoring=0 if (data.endStatus==0){ - console.log(22222) this.status.endStatus=0 this.status.reviewResult=data.reviewResult } @@ -99,7 +98,7 @@ export default {
{{status.onlineLearning==1?'线上学习未完成':status.onlineLearning==2?'线上学习进行中':'线上学习已完成'}}
-
+
@@ -114,13 +113,13 @@ export default {
- + - -
- {{status.reviewResult==3?'未认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}
+ +
+ {{status.reviewResult==3?'认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}
-
+
@@ -135,11 +134,11 @@ export default {
- + - -
- {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}
+ +
+ {{status.reviewResult1==3?'认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}
@@ -190,6 +189,13 @@ export default { line-height: 20px; margin-top: 12px; } + .tim4 { + font-weight: 400; + font-size: 14px; + color: #31AF0D ; + line-height: 20px; + margin-top: 12px; + } } .line { diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index b999e1df..ffd9116b 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -37,6 +37,12 @@ export default { baseInfo() { getTeacherInfo({teacherId: this.teacherId}).then(res => { this.teacherInfo=res.data[0] + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } /* * teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类 @@ -44,7 +50,6 @@ export default { * */ this.form.teacherName = res.data[0].teacherName this.form.teacherNo = res.data[0].teacherNo - this.form.orgName = res.data[0].orgName this.form.positionName = res.data[0].positionName this.form.bandCode = res.data[0].bandCode this.form.courseName = res.data[0].courseName diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue index 22bf4405..fa966331 100644 --- a/src/views/lecturer/FinalDraft.vue +++ b/src/views/lecturer/FinalDraft.vue @@ -69,12 +69,17 @@ export default { }, baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo this.form.courseContent_1=res.data[0].courseContent.split('/') this.form.courseIntroduction=res.data[0].courseIntroduction this.form.courseName=res.data[0].courseName - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode //获取初始值 diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 9de96824..990da8e3 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -74,13 +74,18 @@ export default { baseInfo() { getTeacherInfo({teacherId: this.teacherId}).then(res => { this.teacherInfo = res.data[0] + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } /* * teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类 * courseIntroduction:课程简介 * */ this.form.teacherName = res.data[0].teacherName this.form.teacherNo = res.data[0].teacherNo - this.form.orgName = res.data[0].orgName this.form.positionName = res.data[0].positionName this.form.bandCode = res.data[0].bandCode this.form.courseName = res.data[0].courseName diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index e63b5e49..59be006f 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -56,7 +56,6 @@ export default { //获取基本信息 this.teacherId=this.$route.query.teacherId this.baseInfo() - this.getStatus() this.getSysTypeTree().then(rs=>{ this.sysTypeListMap=rs; }) @@ -72,16 +71,29 @@ export default { getStatus(){ getCertificationProcess({teacherId:this.teacherId}).then(res=>{ this.statusInfo=res.data - if (this.statusInfo.draftStatus==0){ - this.disabled=true + if (this.statusInfo.offlineTutoring==0){ + this.$router.push({ + path:'/need/coachingsuccess', + query:{teacherId:this.teacherId} + }) + }else { + this.$router.push({ + path:'/need/onlinelearning', + query:{teacherId:this.teacherId} + }) } }) }, baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode }) @@ -111,10 +123,7 @@ export default { message: '设置成功', type: 'success' }); - this.$router.push({ - path:'/need/onlinelearning', - query:{teacherId:this.teacherId} - }) + this.getStatus() }else { this.$message({ message:res.msg, diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue index f32863cc..2cd17c04 100644 --- a/src/views/lecturer/Index.vue +++ b/src/views/lecturer/Index.vue @@ -59,46 +59,53 @@ export default { getView(item){ getCertificationProcess({teacherId:item.teacherId}).then(res=>{ var data = res.data - if(data.secondResult==0){ - if (data.endStatus==0){ - this.$router.push({ - path:'/need/twofinals', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==0){ - this.$router.push({ - path:'/need/twocoachingsuccess', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==1){ - this.$router.push({ - path:'/need/twocoaching', - query:{teacherId:item.teacherId} - }) - } - }else if (data.secondResult==1){ - if (data.endStatus==0){ - this.$router.push({ - path:'/need/finalsuccess', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==0 && data.endStatus==1){ - this.$router.push({ - path:'/need/coachingsuccess', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==1 && data.onlineLearning==0){ - this.$router.push({ - path:'/need/onlinelearning', - query:{teacherId:item.teacherId} - }) - }else if (data.onlineLearning==2 || data.onlineLearning==1){ - this.$router.push({ - path:'/need/onlinelearning', - query:{teacherId:item.teacherId} - }) - } + if (data.draftStatus==2){ + this.$router.push({ + path:'/need/draft', + query:{teacherId:item.teacherId} + }) + }else if ((data.onlineLearning==1 || data.onlineLearning==0 || data.offlineTutoring==1) && data.secondResult==1){ + this.$router.push({ + path:'/need/onlinelearning', + query:{teacherId:item.teacherId} + }) + }else if (data.endStatus==1 && data.secondResult==1){ + this.$router.push({ + path:'/need/coachingsuccess', + query:{teacherId:item.teacherId} + }) + }else if (data.endStatus==2 && data.secondResult==1){ + this.$router.push({ + path:'/need/final', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==1 && (data.reviewResult==2 || data.reviewResult==1)){ + this.$router.push({ + path:'/need/finalsuccess', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==0 && data.offlineTutoring==1){ + this.$router.push({ + path:'/need/twoathentication', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==0 && data.endStatus==1){ + this.$router.push({ + path:'/need/twocoachingsuccess', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==0 && data.endStatus==2){ + this.$router.push({ + path:'/need/twofinal', + query:{teacherId:item.teacherId} + }) + }else { + this.$router.push({ + path:'/need/twofinals', + query:{teacherId:item.teacherId} + }) } + }) }, //查看认证记录 diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 5d2c76ea..956daf13 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -32,13 +32,18 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.teacherInfo=res.data[0] + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } /* * teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类 * courseIntroduction:课程简介 * */ this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode this.form.courseName=res.data[0].courseName diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index 6c04a0ab..169f1ea9 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -55,12 +55,17 @@ export default { }, baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.pid=res.data[0].pid getTeacherInfo({teacherId:res.data[0].pid}).then(resquest=>{ this.teacherInfo = resquest.data[0] this.form.teacherName=resquest.data[0].teacherName this.form.teacherNo=resquest.data[0].teacherNo - this.form.orgName=resquest.data[0].orgName this.form.positionName=resquest.data[0].positionName this.form.bandCode=resquest.data[0].bandCode this.form.courseName=resquest.data[0].courseName diff --git a/src/views/lecturer/TwoCos.vue b/src/views/lecturer/TwoCos.vue index 159cb7e8..4c9a8074 100644 --- a/src/views/lecturer/TwoCos.vue +++ b/src/views/lecturer/TwoCos.vue @@ -57,13 +57,18 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.pid=res.data[0].pid + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form1.tutor = res.data[0].tutor.split(',') this.form1.tutorTime = res.data[0].tutorTime getTeacherInfo({teacherId:res.data[0].pid}).then(resquest=>{ this.teacherInfo = resquest.data[0] this.form.teacherName=resquest.data[0].teacherName this.form.teacherNo=resquest.data[0].teacherNo - this.form.orgName=resquest.data[0].orgName this.form.positionName=resquest.data[0].positionName this.form.bandCode=resquest.data[0].bandCode this.form.courseName=resquest.data[0].courseName diff --git a/src/views/lecturer/TwoFinal.vue b/src/views/lecturer/TwoFinal.vue index da036c8f..63a70d20 100644 --- a/src/views/lecturer/TwoFinal.vue +++ b/src/views/lecturer/TwoFinal.vue @@ -71,9 +71,14 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.pid=res.data[0].pid + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode this.form.courseIntroduction=res.data[0].courseIntroduction diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue index da237775..5b89c3ca 100644 --- a/src/views/lecturer/TwoFinals.vue +++ b/src/views/lecturer/TwoFinals.vue @@ -62,6 +62,12 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.pid=res.data[0].pid + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form1.tutor = res.data[0].tutor.split(',') this.form1.tutorTime = res.data[0].tutorTime this.form.courseName=res.data[0].courseName @@ -71,7 +77,6 @@ export default { this.teacherInfo = resquest.data[0] this.form.teacherName=resquest.data[0].teacherName this.form.teacherNo=resquest.data[0].teacherNo - this.form.orgName=resquest.data[0].orgName this.form.positionName=resquest.data[0].positionName this.form.bandCode=resquest.data[0].bandCode this.form.coursewareName=resquest.data[0].examineCourseware.coursewareName