Merge branch 'zcwy0417-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/learning-system-portal into zcwy0417-out

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},

src/views/lecturer/CoachingSuccess.vue

@@ -134,7 +134,7 @@ export default {
     <div class="progress">
       <div v-for="(item,index) in progressData" :key="item">
         <div class="uc-course-img" style="width: 212px;height:119px">
-          <img :src="fileBaseUrl +item.courseImage">
+          <img :src="item.courseImage">
         </div>
         <div class="courseName">{{item.courseName}}</div>
         <div class="smallTitle">当前进度</div>

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,
+                courseName:this.form.courseNameOne==this.form.courseName?null:this.form.courseName,
-                courseContent:this.form.courseContent,
+                courseContent:this.form.courseContent_2==this.form.courseContent?null:this.form.courseContent,
-                courseIntroduction:this.form.courseIntroduction,
+                courseIntroduction:this.form.courseIntroductionOne==this.form.courseIntroduction?null:this.form.courseIntroduction,
                 coursewareUrl:this.form.coursewareUrl,
                 coursewareName:this.form.coursewareName,
                 version:1

src/views/lecturer/FinalSuccess.vue

@@ -161,7 +161,7 @@ export default {
     <div class="progress">
       <div v-for="(item,index) in progressData" :key="item">
         <div class="uc-course-img" style="width: 212px;height:119px">
-          <img :src="fileBaseUrl +item.courseImage">
+          <img :src="item.courseImage">
         </div>
         <div class="courseName">{{item.courseName}}</div>
         <div class="smallTitle">当前进度</div>

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'])
   },

src/views/lecturer/Index.vue

@@ -135,7 +135,7 @@ export default {
       <div class="uc-course" v-for="(item, idx) in couresList" :key="idx" >
         <div class="uc-course-img" style="width: 212px;height:119px">
 <!--          <course-image :course="item"></course-image>-->
-           <img :src="item.cover.split('elearning')[1]">
+           <img :src="item.cover">
         </div>
         <div class="uc-course-info">
           <div class="uc-course-name">

src/views/lecturer/OnlineLearning.vue

@@ -125,7 +125,7 @@ export default {
     <div class="progress">
       <div v-for="(item,index) in progressData" :key="item">
         <div class="uc-course-img" style="width: 212px;height:119px">
-          <img :src="fileBaseUrl +item.courseImage">
+          <img :src="item.courseImage">
         </div>
         <div class="courseName">{{item.courseName}}</div>
         <div class="smallTitle">当前进度</div>

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()
       })
@@ -159,7 +160,7 @@ export default {
     <div class="progress">
       <div v-for="(item,index) in progressData" :key="item">
         <div class="uc-course-img" style="width: 212px;height:119px">
-          <img :src="fileBaseUrl +item.courseImage">
+          <img :src="item.courseImage">
         </div>
         <div class="courseName">{{item.courseName}}</div>
         <div class="smallTitle">当前进度</div>

src/views/lecturer/TwoFinals.vue

@@ -169,7 +169,7 @@ export default {
     <div class="progress">
       <div v-for="(item,index) in progressData" :key="item">
         <div class="uc-course-img" style="width: 212px;height:119px">
-          <img :src="fileBaseUrl +item.courseImage">
+          <img :src="item.courseImage">
         </div>
         <div class="courseName">{{item.courseName}}</div>
         <div class="smallTitle">当前进度</div>