修改地址

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 {
       <img src="../assets/images/E-learning2.png" alt="" v-if="status.onlineLearning==2">
       <div :class="status.onlineLearning==1?'tim1':status.onlineLearning==2?'tim3':'tim'">{{status.onlineLearning==1?'线上学习未完成':status.onlineLearning==2?'线上学习进行中':'线上学习已完成'}}</div>
     </div>
-    <div :class="status.onlineLearning==1?'line1':'line'"></div>
+    <div :class="status.onlineLearning==1?'line1':status.onlineLearning==2?'line2':'line'"></div>
     <div class="process">
       <img src="../assets/images/tutoring1.png" alt="" v-if="status.offlineTutoring==0">
       <img src="../assets/images/tutoring.png" alt="" v-if="status.offlineTutoring==1">
@@ -114,13 +113,13 @@ export default {
     <div :class="status.endStatus==1?'line1':'line'"></div>
     <div class="process">
       <img src="../assets/images/certification.png" alt="" v-if="status.reviewResult==3">
-      <img src="../assets/images/certification2.png" alt="" v-if="status.reviewResult==2">
+      <img src="../assets/images/certification.png" alt="" v-if="status.reviewResult==2">
       <img src="../assets/images/certification3.png" alt="" v-if="status.reviewResult==1">
-      <img src="../assets/images/certification1.png" alt="" v-if="status.reviewResult==0">
+      <img src="../assets/images/certification4.png" alt="" v-if="status.reviewResult==0">
-      <div :class="status.reviewResult==3?'tim1':status.reviewResult==2?'tim3':status.reviewResult==1?'tim2':'tim'">
+      <div :class="status.reviewResult==3?'tim1':status.reviewResult==2?'tim1':status.reviewResult==1?'tim2':'tim4'">
-        {{status.reviewResult==3?'未认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}</div>
+        {{status.reviewResult==3?'认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}</div>
     </div>
-    <div :class="status.reviewResult==3?'line1':status.reviewResult==2?'line':status.reviewResult==1?'line':'line'" v-if="status.secondResult==0"></div>
+    <div :class="status.reviewResult==3?'line1':status.reviewResult==2?'line1':status.reviewResult==1?'line':'line'" v-if="status.secondResult==0"></div>
     <div class="process" v-if="status.secondResult==0">
       <img src="../assets/images/tutoring1.png" alt="" v-if="status.offlineTutoring1==0">
       <img src="../assets/images/tutoring.png" alt="" v-if="status.offlineTutoring1==1">
@@ -135,11 +134,11 @@ export default {
     <div :class="status.endStatus1==1?'line1':'line'" v-if="status.secondResult==0"></div>
     <div class="process" v-if="status.secondResult==0">
       <img src="../assets/images/certification.png" alt="" v-if="status.reviewResult1==3">
-      <img src="../assets/images/certification2.png" alt="" v-if="status.reviewResult1==2">
+      <img src="../assets/images/certification.png" alt="" v-if="status.reviewResult1==2">
       <img src="../assets/images/certification3.png" alt="" v-if="status.reviewResult1==1">
-      <img src="../assets/images/certification1.png" alt="" v-if="status.reviewResult1==0">
+      <img src="../assets/images/certification4.png" alt="" v-if="status.reviewResult1==0">
-      <div :class="status.reviewResult1==3?'tim1':status.reviewResult1==2?'tim3':status.reviewResult1==1?'tim2':'tim'">
+      <div :class="status.reviewResult1==3?'tim1':status.reviewResult1==2?'tim1':status.reviewResult1==1?'tim2':'tim4'">
-        {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}</div>
+        {{status.reviewResult1==3?'认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}</div>
     </div>
   </div>
 </template>
@@ -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 {

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

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
         //获取初始值

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

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){
+        if (this.statusInfo.offlineTutoring==0){
-          this.disabled=true
+          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({
+                this.getStatus()
-                  path:'/need/onlinelearning',
-                  query:{teacherId:this.teacherId}
-                })
               }else {
                 this.$message({
                   message:res.msg,

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.draftStatus==2){
-          if (data.endStatus==0){
+          this.$router.push({
-            this.$router.push({
+            path:'/need/draft',
-              path:'/need/twofinals',
+            query:{teacherId:item.teacherId}
-              query:{teacherId:item.teacherId}
+          })
-            })
+        }else if ((data.onlineLearning==1 || data.onlineLearning==0 || data.offlineTutoring==1) && data.secondResult==1){
-          }else if (data.offlineTutoring==0){
+          this.$router.push({
-            this.$router.push({
+            path:'/need/onlinelearning',
-              path:'/need/twocoachingsuccess',
+            query:{teacherId:item.teacherId}
-              query:{teacherId:item.teacherId}
+          })
-            })
+        }else if (data.endStatus==1 && data.secondResult==1){
-          }else if (data.offlineTutoring==1){
+          this.$router.push({
-            this.$router.push({
+            path:'/need/coachingsuccess',
-              path:'/need/twocoaching',
+            query:{teacherId:item.teacherId}
-              query:{teacherId:item.teacherId}
+          })
-            })
+        }else if (data.endStatus==2 && data.secondResult==1){
-          }
+          this.$router.push({
-        }else if (data.secondResult==1){
+            path:'/need/final',
-          if (data.endStatus==0){
+            query:{teacherId:item.teacherId}
-            this.$router.push({
+          })
-              path:'/need/finalsuccess',
+        }else if (data.secondResult==1 && (data.reviewResult==2 || data.reviewResult==1)){
-              query:{teacherId:item.teacherId}
+          this.$router.push({
-            })
+            path:'/need/finalsuccess',
-          }else if (data.offlineTutoring==0 && data.endStatus==1){
+            query:{teacherId:item.teacherId}
-            this.$router.push({
+          })
-              path:'/need/coachingsuccess',
+        }else if (data.secondResult==0 && data.offlineTutoring==1){
-              query:{teacherId:item.teacherId}
+          this.$router.push({
-            })
+            path:'/need/twoathentication',
-          }else if (data.offlineTutoring==1 && data.onlineLearning==0){
+            query:{teacherId:item.teacherId}
-            this.$router.push({
+          })
-              path:'/need/onlinelearning',
+        }else if (data.secondResult==0 && data.endStatus==1){
-              query:{teacherId:item.teacherId}
+          this.$router.push({
-            })
+            path:'/need/twocoachingsuccess',
-          }else if (data.onlineLearning==2 || data.onlineLearning==1){
+            query:{teacherId:item.teacherId}
-            this.$router.push({
+          })
-              path:'/need/onlinelearning',
+        }else if (data.secondResult==0 && data.endStatus==2){
-              query:{teacherId:item.teacherId}
+          this.$router.push({
-            })
+            path:'/need/twofinal',
-          }
+            query:{teacherId:item.teacherId}
+          })
+        }else {
+          this.$router.push({
+            path:'/need/twofinals',
+            query:{teacherId:item.teacherId}
+          })
         }
+
       })
     },
     //查看认证记录

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

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

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

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

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