From 9232180c2dc3548b678bc12963e6122c7834de80 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 16 May 2024 11:21:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/FinalDraft.vue | 13 ++++++++++--- src/views/lecturer/FirstDraft.vue | 2 +- src/views/lecturer/Index.vue | 2 +- src/views/lecturer/TwoAthentication.vue | 5 +++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue index ddae4691..ba34a909 100644 --- a/src/views/lecturer/FinalDraft.vue +++ b/src/views/lecturer/FinalDraft.vue @@ -68,9 +68,16 @@ export default { getTeacherInfo({teacherId:this.teacherId}).then(res=>{ 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 + //获取初始值 + this.form.courseNameOne=res.data[0].courseName + this.form.courseIntroductionOne=res.data[0].courseIntroduction + this.form.courseContent_2=res.data[0].courseContent }) }, onSubmit(formName){ @@ -86,9 +93,9 @@ export default { this.form.courseContent = this.form.courseContent_1.join('/'); setOfflineTutoring( {teacherId:this.teacherId, - courseName:this.form.courseName, - courseContent:this.form.courseContent, - courseIntroduction:this.form.courseIntroduction, + courseName:this.form.courseNameOne==this.form.courseName?null:this.form.courseName, + courseContent:this.form.courseContent_2==this.form.courseContent?null:this.form.courseContent, + courseIntroduction:this.form.courseIntroductionOne==this.form.courseIntroduction?null:this.form.courseIntroduction, coursewareUrl:this.form.coursewareUrl, coursewareName:this.form.coursewareName, version:1 diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 6b93b86e..e75cfbd6 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -2,7 +2,7 @@ import {mapActions, mapGetters} from "vuex"; import {getCertificationProcess, getTeacherInfo, setOfflineTutoring, treeList} from "@/api/modules/lecturer" export default { - name: "FirstDraftTwo", + name: "FirstDraft", computed: { ...mapGetters(['userInfo']) }, diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue index 805c1ee5..e407c751 100644 --- a/src/views/lecturer/Index.vue +++ b/src/views/lecturer/Index.vue @@ -135,7 +135,7 @@ export default {
- +
diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index 0a34aeac..534ebb69 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -32,7 +32,7 @@ export default { this.teacherId=this.$route.query.teacherId //获取教师基本信息 this.baseInfo() - this.getReviewResult() + // this.getReviewResult() }, methods:{ //前往二次认证 @@ -43,7 +43,7 @@ export default { }, //获取认证结果 getReviewResult(){ - getReviewResult({teacherId:this.teacherId}).then(res=>{ + getReviewResult({teacherId:this.pid}).then(res=>{ this.result=res.data }) }, @@ -73,6 +73,7 @@ export default { this.form.coursewareName=res.data[0].examineCourseware.coursewareName this.pid=res.data[0].pid //获取学习进度 + this.getReviewResult() this.addTeacher() this.getStatus() }) From 6feaf47ad8109a467fdc069a210b059ba76e31f4 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 16 May 2024 11:56:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/pages.js | 2 +- src/views/lecturer/CoachingSuccess.vue | 2 +- src/views/lecturer/FinalSuccess.vue | 2 +- src/views/lecturer/OnlineLearning.vue | 2 +- src/views/lecturer/TwoAthentication.vue | 2 +- src/views/lecturer/TwoFinals.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data/pages.js b/src/data/pages.js index 066ee8b9..2fec358b 100644 --- a/src/data/pages.js +++ b/src/data/pages.js @@ -66,7 +66,7 @@ export const pages=[ {title:'线下辅导完成',path:'coachingsuccess',component:'lecturer/CoachingSuccess',hidden:true}, {title:'上传终稿',path:'final',component:'lecturer/FinalDraft',hidden:true}, {title:'终稿成功',path:'finalsuccess',component:'lecturer/FinalSuccess',hidden:true}, - {title:'二次认证',path:'twoauthentication',component:'lecturer/TwoAthentication',hidden:true}, + {title:'二次认证',path:'twoathentication',component:'lecturer/TwoAthentication',hidden:true}, {title:'二次辅导',path:'twocoaching',component:'lecturer/TwoCoaching',hidden:true}, {title:'二次辅导成功',path:'twocoachingsuccess',component:'lecturer/TwoCos',hidden:true}, {title:'二次终稿',path:'twofinal',component:'lecturer/TwoFinal',hidden:true}, diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index fe9276b3..6b883d93 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -134,7 +134,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 504af570..29109f81 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -161,7 +161,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 428595e2..8ecd5116 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -125,7 +125,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index 534ebb69..9e07fd19 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -160,7 +160,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue index 973f330c..57f8c664 100644 --- a/src/views/lecturer/TwoFinals.vue +++ b/src/views/lecturer/TwoFinals.vue @@ -169,7 +169,7 @@ export default {
- +
{{item.courseName}}
当前进度