From c7267a0acdd63792c2a1ac543fb6aa2d3b0247c4 Mon Sep 17 00:00:00 2001
From: joshen <445497689@qq.com>
Date: Tue, 21 May 2024 16:54:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=86=E9=A1=B5=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/Index.vue | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue
index 2b743dd8..657de43a 100644
--- a/src/views/lecturer/Index.vue
+++ b/src/views/lecturer/Index.vue
@@ -28,7 +28,7 @@ export default {
         query:{teacherId:teacherId}
       })
     },
-    //列表
+    // 列表
     getList(){
       this.params.teacherNo=this.userInfo.userNo
       pageList(this.params).then(res=>{
@@ -36,7 +36,12 @@ export default {
         this.total=res.data.page.total
       })
     },
-    //重置
+    // 搜索
+    searchList(){
+      this.params.pageNo = 1;
+      this.getList();
+    },
+    // 重置
     closePageFind(){
       this.params.courseName = '';
       this.params.pageNo = 1;
@@ -50,7 +55,7 @@ export default {
       this.params.pageNo = val;
       this.getList();
     },
-    //根据认证状态跳转页面
+    // 根据认证状态跳转页面
     getView(item){
       getCertificationProcess({teacherId:item.teacherId}).then(res=>{
         var data = res.data
@@ -129,15 +134,10 @@ export default {
 
 <template>
   <div>
-    <div v-if="this.couresList.length==0">
-      <div>
-        <div class="zan-wu">暂无数据</div>
-      </div>
-    </div>
     <div style="display: flex;justify-content:space-between;position: relative;">
       <div style="display: flex;justify-content: flex-start;  padding: 12px 32px 10px 12px;">
         <div style="margin-left:10px"><el-input v-model="params.courseName" placeholder="请输入认证课程名称" clearable ></el-input></div>
-        <div style="padding-left: 10px;"><el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button></div>
+        <div style="padding-left: 10px;"><el-button type="primary" icon="el-icon-search" @click="searchList">搜索</el-button></div>
         <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" @click="closePageFind">重置</el-button></div>
       </div>
     </div>
@@ -166,6 +166,11 @@ export default {
         </div>
       </div>
     </div>
+    <div v-if="this.couresList.length==0">
+      <div>
+        <div class="zan-wu">暂无数据</div>
+      </div>
+    </div>
     <div v-if="couresList.length > 0" style="text-align: center; margin-top:57px;">
       <el-pagination
         background

From 958a93c9353445ed0a3b2deb0120a3cb62256aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=8F=91?= <2577324884@qq.com>
Date: Wed, 22 May 2024 12:20:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/E-learning2.png       | Bin 0 -> 3299 bytes
 src/components/processStatus.vue        | 213 +++++++-----------------
 src/views/lecturer/CoachingPage.vue     |   4 +-
 src/views/lecturer/CoachingSuccess.vue  |  11 +-
 src/views/lecturer/FinalDraft.vue       |  10 ++
 src/views/lecturer/FinalSuccess.vue     |  45 +++--
 src/views/lecturer/FirstDraft.vue       |  10 ++
 src/views/lecturer/Index.vue            |   6 +-
 src/views/lecturer/OnlineLearning.vue   |  24 ++-
 src/views/lecturer/TwoAthentication.vue |  37 +++-
 src/views/lecturer/TwoCoaching.vue      |  14 +-
 src/views/lecturer/TwoCos.vue           | 202 +++++++++++-----------
 src/views/lecturer/TwoFinal.vue         |  14 +-
 src/views/lecturer/TwoFinals.vue        |  84 ++++++----
 14 files changed, 354 insertions(+), 320 deletions(-)
 create mode 100644 src/assets/images/E-learning2.png

diff --git a/src/assets/images/E-learning2.png b/src/assets/images/E-learning2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf969a1491fc790c501a39e683d1c56cbe83ab
GIT binary patch
literal 3299
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

literal 0
HcmV?d00001

diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue
index 71d0b3b0..7b35004a 100644
--- a/src/components/processStatus.vue
+++ b/src/components/processStatus.vue
@@ -2,7 +2,10 @@
 import {getCertificationProcess} from "@/api/modules/lecturer";
 
 export default {
-  props: ['teacherId'],
+  props: {
+    teacherId:String,
+    pid:String
+  },
   data(){
     return{
       status:{
@@ -11,167 +14,72 @@ export default {
         onlineLearning:1,
         offlineTutoring:1,
         endStatus:1,
-        reviewResult:2,
+        reviewResult:3,
         offlineTutoring1:1,
         endStatus1:1,
-        reviewResult1:2,
+        reviewResult1:3,
       }
     }
   },
-  mounted() {
-    this.getCertificationProcess()
+  created() {
+    if (this.pid==null || this.pid==''){
+      this.getCertificationProcess()
+    }else {
+      this.getCertificationProcess()
+      this.getCertificationProcess1()
+    }
+  },
+  watch: {
+    teacherId: {
+      handler(newVal) {
+        if (newVal) {
+          console.log(newVal)
+          this.getCertificationProcess()
+        }
+      }
+    },
+
   },
   methods:{
     getCertificationProcess(){
       getCertificationProcess({teacherId:this.teacherId}).then(res=>{
         let data=res.data
-        if (data.secondResult==0 && data.reviewResult==0){
-          this.status={
-            secondResult:0,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:1,
-            offlineTutoring1:0,
-            endStatus1:0,
-            reviewResult1:0,
-          }
-        }else if (data.secondResult==0 && data.reviewResult==1){
-          this.status={
-            secondResult:0,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:1,
-            offlineTutoring1:0,
-            endStatus1:0,
-            reviewResult1:1,
-          }
-        }else if (data.secondResult==0 && data.endStatus==0){
-          this.status={
-            secondResult:0,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:1,
-            offlineTutoring1:0,
-            endStatus1:0,
-            reviewResult1:2,
-          }
-        }else if (data.secondResult==0 && data.offlineTutoring==0){
-          this.status={
-            secondResult:0,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:1,
-            offlineTutoring1:0,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        }else if (data.secondResult==0 && data.reviewResult==2){
-          this.status={
-            secondResult:0,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:1,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        } else if (data.secondResult==1 && data.reviewResult==0){
-          this.status={
-            secondResult:1,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:0,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        }else if (data.secondResult==1 && data.reviewResult==1){
-          this.status={
-            secondResult:1,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:1,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        }else if (data.secondResult==1 && data.endStatus==0){
-          this.status={
-            secondResult:1,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:0,
-            reviewResult:2,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        }else if (data.secondResult==1 && data.offlineTutoring==0){
-          this.status={
-            secondResult:1,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:0,
-            endStatus:1,
-            reviewResult:2,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        }else if (data.secondResult==1 && data.onlineLearning==0){
-          this.status={
-            secondResult:1,
-            draftStatus:0,
-            onlineLearning:0,
-            offlineTutoring:1,
-            endStatus:1,
-            reviewResult:2,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        }else if (data.secondResult==1 && data.draftStatus==0){
-          this.status={
-            secondResult:1,
-            draftStatus:0,
-            onlineLearning:1,
-            offlineTutoring:1,
-            endStatus:1,
-            reviewResult:2,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:2,
-          }
-        }else{
-          this.status={
-            secondResult:1,
-            draftStatus:1,
-            onlineLearning:1,
-            offlineTutoring:1,
-            endStatus:1,
-            reviewResult:2,
-            offlineTutoring1:1,
-            endStatus1:1,
-            reviewResult1:3,
+        if(data.draftStatus==0){
+          this.status.draftStatus=0
+          if (data.onlineLearning==0){
+            this.status.onlineLearning=0
+            if (data.offlineTutoring==0){
+              this.status.offlineTutoring=0
+              if (data.endStatus==0){
+                console.log(22222)
+                this.status.endStatus=0
+                this.status.reviewResult=data.reviewResult
+              }
+            }
+          }else if(data.onlineLearning==2){
+            this.status.onlineLearning=2
           }
+        }else if (data.draftStatus==2){
+          this.status.draftStatus=2
         }
 
       })
+    },
+    getCertificationProcess1(){
+      getCertificationProcess({teacherId:this.pid}).then(res=>{
+        console.log(res)
+        let data=res.data
+        if(data.secondResult==0){
+          this.status.secondResult=0
+          if (data.offlineTutoring==0){
+            this.status.offlineTutoring1=0
+            if (data.endStatus==0){
+              this.status.endStatus1=0
+              this.status.reviewResult1=data.reviewResult
+            }
+          }
+        }
+      })
     }
   }
 };
@@ -188,7 +96,8 @@ export default {
     <div class="process">
       <img src="../assets/images/E-learning1.png" alt="" v-if="status.onlineLearning==0">
       <img src="../assets/images/E-learning.png" alt="" v-if="status.onlineLearning==1">
-      <div :class="status.onlineLearning==1?'tim1':'tim'">{{status.onlineLearning==1?'线上学习未完成':'线上学习已完成'}}</div>
+      <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="process">
@@ -209,9 +118,9 @@ export default {
       <img src="../assets/images/certification3.png" alt="" v-if="status.reviewResult==1">
       <img src="../assets/images/certification1.png" alt="" v-if="status.reviewResult==0">
       <div :class="status.reviewResult==3?'tim1':status.reviewResult==2?'tim3':status.reviewResult==1?'tim2':'tim'">
-        {{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?'line3':status.reviewResult==1?'line2':'line'" v-if="status.secondResult==0"></div>
+    <div :class="status.reviewResult==3?'line1':status.reviewResult==2?'line':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">
@@ -230,7 +139,7 @@ export default {
       <img src="../assets/images/certification3.png" alt="" v-if="status.reviewResult1==1">
       <img src="../assets/images/certification1.png" alt="" v-if="status.reviewResult1==0">
       <div :class="status.reviewResult1==3?'tim1':status.reviewResult1==2?'tim3':status.reviewResult1==1?'tim2':'tim'">
-        {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证中':status.reviewResult1==1?'认证未通过':'认证通过'}}</div>
+        {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}</div>
     </div>
   </div>
 </template>
diff --git a/src/views/lecturer/CoachingPage.vue b/src/views/lecturer/CoachingPage.vue
index c3bf7e21..35c806a1 100644
--- a/src/views/lecturer/CoachingPage.vue
+++ b/src/views/lecturer/CoachingPage.vue
@@ -84,9 +84,9 @@ export default {
           <el-form-item required label="辅导时间：">
             <el-date-picker
               v-model="value2"
-              type="date"
+              type="datetime"
               placeholder="选择日期"
-              format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm"
               value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue
index ed29b975..b999e1df 100644
--- a/src/views/lecturer/CoachingSuccess.vue
+++ b/src/views/lecturer/CoachingSuccess.vue
@@ -137,7 +137,9 @@ export default {
           <div>
             <el-col :span="11">
               <el-form-item label="认证课程名称：" prop="courseName">
-                {{ form.courseName }}
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
+                  {{ form.courseName }}
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="11" :offset="2">
@@ -162,7 +164,7 @@ export default {
           <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
           <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
         </div>
-        <div class="courseName">{{ item.courseName }}</div>
+        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
         <div class="smallTitle">当前进度</div>
         <el-progress :percentage="parseInt(item.progress)" :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
       </div>
@@ -220,6 +222,11 @@ export default {
   color: #333333;
   font-size: 14px;
   margin-top: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  width: 100%;
 }
 
 .smallTitle {
diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue
index 6c8db5e4..22bf4405 100644
--- a/src/views/lecturer/FinalDraft.vue
+++ b/src/views/lecturer/FinalDraft.vue
@@ -2,6 +2,7 @@
 import {mapActions, mapGetters} from "vuex";
 import {getCertificationProcess, getTeacherInfo, setOfflineTutoring, treeList} from "@/api/modules/lecturer"
 import processStatus from "@/components/processStatus.vue";
+import axios from "axios";
 export default {
   name: "FinalDraft",
   components: {processStatus},
@@ -143,6 +144,14 @@ export default {
         message: '上传失败',
         type: 'error'
       });
+    },
+    beforeUpload(file) {
+      axios.defaults.timeout = 30000;
+      const isLt2M = file.size / 1024 / 1024 <= 500;
+      if (!isLt2M) {
+        this.$message.error('文件大小超出500M，请重新上传');
+      }
+      return isLt2M;
     }
   },
   created() {
@@ -209,6 +218,7 @@ export default {
               :on-success="handlSuccess"
               :on-error="handlError"
               :limit="1"
+              :before-upload="beforeUpload"
               :on-remove="handRemove"
               multiple>
               <i class="el-icon-upload"></i>
diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue
index 21d071a3..9de96824 100644
--- a/src/views/lecturer/FinalSuccess.vue
+++ b/src/views/lecturer/FinalSuccess.vue
@@ -49,9 +49,9 @@ export default {
               query: {teacherId: this.newTeacherId}
             })
           } else {
-            this.isFalse = false
+            this.$router.push('/need/lecturer')
           }
-        }else {
+        } else {
           this.$message({
             message: res.msg,
             type: 'error'
@@ -135,7 +135,7 @@ export default {
         }
       })
     },
-    getJumplist(){
+    getJumplist() {
       this.$router.push('/need/lecturer')
     }
   }
@@ -176,7 +176,9 @@ export default {
           <div>
             <el-col :span="11">
               <el-form-item label="认证课程名称：" prop="courseName">
-                {{ form.courseName }}
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
+                  {{ form.courseName }}
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="11" :offset="2">
@@ -203,7 +205,7 @@ export default {
           <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
           <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
         </div>
-        <div class="courseName">{{ item.courseName }}</div>
+        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
         <div class="smallTitle">当前进度</div>
         <el-progress :percentage="parseInt(item.progress)"
                      :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
@@ -235,11 +237,11 @@ export default {
         很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！
       </div>
     </div>
-    <div class="twoFactorAuthentication" v-if="statusInfo.reviewResult==1&&isFalse&&statusInfo.second!=2">
+    <div class="twoFactorAuthentication" v-if="statusInfo.reviewResult==1&&statusInfo.second==0">
       <img src="../../assets/images/rightImg.png" alt="">
       <div class="titleAuthentication">是否进行二次认证？</div>
       <div class="yes" @click="getoFactor(1)">是</div>
-      <div class="no" @click="getJumplist">否</div>
+      <div class="no" @click="getoFactor(2)">否</div>
     </div>
   </div>
 </template>
@@ -274,6 +276,11 @@ export default {
   color: #333333;
   font-size: 14px;
   margin-top: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  width: 100%;
 }
 
 .smallTitle {
@@ -298,7 +305,7 @@ export default {
 
 .score {
   margin-top: 28px;
-  font-size: 14px;
+  font-size: 18px;
   color: #333333;
   font-weight: 400;
 }
@@ -311,18 +318,21 @@ export default {
   border-radius: 6px;
   display: flex;
   align-items: center;
-  img{
+
+  img {
     width: 20px;
     height: 20px;
     margin-left: 23px;
   }
-  .titleAuthentication{
+
+  .titleAuthentication {
     font-weight: 500;
     font-size: 16px;
     color: #333333;
     margin-left: 16px;
   }
-  .yes{
+
+  .yes {
     width: 64px;
     height: 24px;
     background: #409EFF;
@@ -337,10 +347,11 @@ export default {
     margin-left: 20px;
     cursor: pointer;
   }
-  .no{
+
+  .no {
     width: 64px;
     height: 24px;
-    background:rgba(64,158,255,0.1);
+    background: rgba(64, 158, 255, 0.1);
     border: 1px solid #409EFF;
     font-weight: 400;
     font-size: 14px;
@@ -377,4 +388,12 @@ export default {
   color: #333333;
   line-height: 40px;
 }
+
+.over {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  width: 580px;
+}
 </style>
diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue
index 626bc36d..e63b5e49 100644
--- a/src/views/lecturer/FirstDraft.vue
+++ b/src/views/lecturer/FirstDraft.vue
@@ -2,6 +2,7 @@
 import {mapActions, mapGetters} from "vuex";
 import {getCertificationProcess, getTeacherInfo, setOfflineTutoring, treeList} from "@/api/modules/lecturer"
 import processStatus from '@/components/processStatus.vue';
+import axios from "axios";
 export default {
   name: "FirstDraft",
   computed: {
@@ -146,6 +147,14 @@ export default {
         message: '上传失败',
         type: 'error'
       });
+    },
+    beforeUpload(file) {
+      axios.defaults.timeout = 30000;
+      const isLt2M = file.size / 1024 / 1024 <= 500;
+      if (!isLt2M) {
+        this.$message.error('文件大小超出500M，请重新上传');
+      }
+      return isLt2M;
     }
   },
 
@@ -202,6 +211,7 @@ export default {
                 action="/activityApi/certification/uploadCourseware"
                 accept=".ppt,.pptx,.pdf"
                 :on-success="handlSuccess"
+                :before-upload="beforeUpload"
                 :on-error="handlError"
                 :limit="1"
                 :on-remove="handRemove"
diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue
index 657de43a..f32863cc 100644
--- a/src/views/lecturer/Index.vue
+++ b/src/views/lecturer/Index.vue
@@ -84,12 +84,12 @@ export default {
             })
           }else if (data.offlineTutoring==0 && data.endStatus==1){
             this.$router.push({
-              path:'/need/final',
+              path:'/need/coachingsuccess',
               query:{teacherId:item.teacherId}
             })
           }else if (data.offlineTutoring==1 && data.onlineLearning==0){
             this.$router.push({
-              path:'/need/coaching',
+              path:'/need/onlinelearning',
               query:{teacherId:item.teacherId}
             })
           }else if (data.onlineLearning==2 || data.onlineLearning==1){
@@ -155,7 +155,7 @@ export default {
             <span style="font-size:18px;color:#333">{{ item.draftStatus==1?item.examineName:item.courseName }}</span>
           </div>
           <div class="summary-item">
-            <div>{{ item.draftStatus==1?item.description:item.courseIntroduction  }}</div>
+            <div>{{ item.reviewResult==3?item.description:item.courseIntroduction  }}</div>
           </div>
           <div class="uc-course-text">
             {{ item.reviewResult==3||item.reviewResult==2?'报名时间':'认证时间' }}：{{ item.reviewResult==3||item.reviewResult==2?item.createTime:item.reviewTime }}
diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue
index f2c4c9a7..5d2c76ea 100644
--- a/src/views/lecturer/OnlineLearning.vue
+++ b/src/views/lecturer/OnlineLearning.vue
@@ -18,7 +18,8 @@ export default {
       fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
       disabled:false,
       statusInfo:'',
-      teacherInfo:''
+      teacherInfo:'',
+      pid:''
     }
   },
   created() {
@@ -56,6 +57,10 @@ export default {
     getProgress(id){
       getProgress({teacherId:id}).then(res=>{
         this.progressData=res.data
+        if (res.data.length==0){
+          this.disabled=true
+          return
+        }
         res.data.forEach((item,index)=>{
           if (item.progress!=100){
             this.disabled=true
@@ -96,7 +101,7 @@ export default {
 
 <template>
   <div>
-    <process-status :teacherId="teacherId"></process-status>
+    <process-status :teacherId="teacherId.toString()" :pid="pid.toString()"></process-status>
     <div class="title">基本信息</div>
     <el-container>
       <div class="form-table">
@@ -127,8 +132,10 @@ export default {
           </div>
           <div>
             <el-col :span="11">
-              <el-form-item label="认证课程名称："  prop="courseName">
-                {{form.courseName}}
+              <el-form-item label="认证课程名称：" prop="courseName">
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
+                  {{ form.courseName }}
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="11" :offset="2">
@@ -153,7 +160,7 @@ export default {
           <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
           <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
         </div>
-        <div class="courseName">{{ item.courseName }}</div>
+        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
         <div class="smallTitle">当前进度</div>
         <el-progress :percentage="parseInt(item.progress)" :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
       </div>
@@ -190,11 +197,16 @@ export default {
   width: 300px;
   margin-right: 30px;
 }
-.courseName{
+.courseName {
   font-weight: 650;
   color: #333333;
   font-size: 14px;
   margin-top: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  width: 100%;
 }
 .smallTitle{
   color:#134054;
diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue
index 865c49e8..6c04a0ab 100644
--- a/src/views/lecturer/TwoAthentication.vue
+++ b/src/views/lecturer/TwoAthentication.vue
@@ -67,6 +67,8 @@ export default {
           this.form.courseContent=resquest.data[0].courseContent
           this.form.courseIntroduction=resquest.data[0].courseIntroduction
           this.form.coursewareName=resquest.data[0].examineCourseware.coursewareName
+          this.form.tutor = resquest.data[0].tutor.split(',')
+          this.form.tutorTime = resquest.data[0].tutorTime
           //获取学习进度
           this.getReviewResult()
           this.addTeacher()
@@ -129,7 +131,7 @@ export default {
 
 <template>
   <div>
-    <process-status :teacherId="teacherId"></process-status>
+    <process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
     <div class="title">基本信息</div>
     <el-container>
       <div class="form-table">
@@ -161,7 +163,9 @@ export default {
           <div>
             <el-col :span="11">
               <el-form-item label="认证课程名称：" prop="courseName">
-                {{ form.courseName }}
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
+                  {{ form.courseName }}
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="11" :offset="2">
@@ -188,12 +192,28 @@ export default {
           <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
           <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
         </div>
-        <div class="courseName">{{ item.courseName }}</div>
+        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
         <div class="smallTitle">当前进度</div>
         <el-progress :percentage="parseInt(item.progress)"
                      :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
       </div>
     </div>
+    <div>
+      <div class="title" style="margin-top: 20px">线下辅导</div>
+      <el-container>
+        <div class="form-table">
+          <el-form>
+            <el-form-item label="辅导老师：">
+              <span v-for="(item,index) in form.tutor" :key="item"
+                    style="display: inline-block;margin-right: 20px">{{ item }}</span>
+            </el-form-item>
+            <el-form-item label="辅导时间：">
+              {{ form.tutorTime }}
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-container>
+    </div>
     <div>
       <div class="title" style="margin-top: 20px">认证结果</div>
       <div v-if="statusInfo1.reviewResult==2" class="score">请您耐心等待线下认证安排！</div>
@@ -201,7 +221,7 @@ export default {
       <div v-if="statusInfo1.reviewResult==1" class="score" style="color: #ff0000">很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！</div>
     </div>
     <div>
-      <div class="title" style="margin-top: 20px">线下辅导</div>
+      <div class="title" style="margin-top: 20px">二次线下辅导</div>
       <div class="tip">提示：您的线上课程已经学习完毕，快去进行下一步吧！</div>
     </div>
     <el-button type="primary" style="margin-top: 20px;margin-left: 80px" @click="getJump()">下一步</el-button>
@@ -228,11 +248,16 @@ export default {
   width: 300px;
   margin-right: 30px;
 }
-.courseName{
+.courseName {
   font-weight: 650;
   color: #333333;
   font-size: 14px;
   margin-top: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  width: 100%;
 }
 .smallTitle{
   color:#134054;
@@ -252,7 +277,7 @@ export default {
 }
 .score {
   margin-top: 28px;
-  font-size: 14px;
+  font-size: 18px;
   color: #333333;
   font-weight: 400;
 }
diff --git a/src/views/lecturer/TwoCoaching.vue b/src/views/lecturer/TwoCoaching.vue
index b336eece..4ea3211f 100644
--- a/src/views/lecturer/TwoCoaching.vue
+++ b/src/views/lecturer/TwoCoaching.vue
@@ -1,5 +1,5 @@
 <script>
-import {addTeacher, getCertificationProcess, setOfflineTutoring} from "@/api/modules/lecturer";
+import {addTeacher, getCertificationProcess, getTeacherInfo, setOfflineTutoring} from "@/api/modules/lecturer";
 import processStatus from "@/components/processStatus.vue";
 
 export default {
@@ -10,7 +10,8 @@ export default {
       options: [],
       value: '',
       value2:'',
-      teacherId:''
+      teacherId:'',
+      pid:''
     }
   },
   created() {
@@ -18,6 +19,9 @@ export default {
     this.teacherId=this.$route.query.teacherId
     //获取老师列表
     this.getTeacherList()
+    getTeacherInfo({teacherId:this.teacherId}).then(res=> {
+      this.pid = res.data[0].pid
+    })
   },
   methods:{
     getTeacherList() {
@@ -56,7 +60,7 @@ export default {
 
 <template>
   <div>
-    <process-status :teacherId="teacherId"></process-status>
+    <process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
     <div class="title">二次线下辅导</div>
     <el-container>
       <div class="form-table">
@@ -83,9 +87,9 @@ export default {
           <el-form-item required label="辅导时间：">
             <el-date-picker
               v-model="value2"
-              type="date"
+              type="datetime"
               placeholder="选择日期"
-              format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm"
               value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
diff --git a/src/views/lecturer/TwoCos.vue b/src/views/lecturer/TwoCos.vue
index f06c8360..159cb7e8 100644
--- a/src/views/lecturer/TwoCos.vue
+++ b/src/views/lecturer/TwoCos.vue
@@ -11,91 +11,89 @@ import processStatus from "@/components/processStatus.vue";
 export default {
   name: "TwoCos",
   components: {processStatus},
-  data() {
-    return {
-      teacherId: '',
-      form: {
-        teacherName: '',
-        teacherNo: '',
-        orgName: ''
+  data(){
+    return{
+      teacherId:'',
+      form:{
+        teacherName:'',
+        teacherNo:'',
+        orgName:''
       },
-      progressData: {},
-      fileBaseUrl: process.env.VUE_APP_BOE_MOBILE_URL,
-      disabled: false,
-      statusInfo: '',
-      statusInfo1: '',
-      result: '',
-      newTeacherId: '',
-      pid: '',
-      teacherInfo: ''
+      progressData:{},
+      fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
+      disabled:false,
+      statusInfo:'',
+      result:'',
+      newTeacherId:'',
+      pid:'',
+      statusInfo1:'',
+      teacherInfo:'',
+      form1:{}
     }
   },
   created() {
     //读取路由参数
-    this.teacherId = this.$route.query.teacherId
+    this.teacherId=this.$route.query.teacherId
     //获取教师基本信息
     this.baseInfo()
+    // this.getReviewResult()
   },
-  methods: {
+  methods:{
     //获取认证结果
-    getReviewResult() {
-      getReviewResult({teacherId: this.pid}).then(res => {
-        this.result = res.data
+    getReviewResult(){
+      getReviewResult({teacherId:this.pid}).then(res=>{
+        this.result=res.data
       })
     },
     //获取教师认证状态
-    getStatus() {
-      getCertificationProcess({teacherId: this.teacherId}).then(res => {
-        this.statusInfo = res.data
+    getStatus(){
+      getCertificationProcess({teacherId:this.teacherId}).then(res=>{
+        this.statusInfo=res.data
       })
-      getCertificationProcess({teacherId: this.pid}).then(res => {
-        this.statusInfo1 = res.data
+      getCertificationProcess({teacherId:this.pid}).then(res=>{
+        this.statusInfo1=res.data
       })
     },
-    baseInfo() {
-      getTeacherInfo({teacherId: this.teacherId}).then(res => {
-        this.pid = res.data[0].pid
-        this.form.tutor = res.data[0].tutor.split(',')
-        this.form.tutorTime = res.data[0].tutorTime
-        getTeacherInfo({teacherId: res.data[0].pid}).then(resquest => {
+    baseInfo(){
+      getTeacherInfo({teacherId:this.teacherId}).then(res=>{
+        this.pid=res.data[0].pid
+        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
-          this.form.courseContent = resquest.data[0].courseContent
-          this.form.courseIntroduction = resquest.data[0].courseIntroduction
-          if (res.data[0].examineCourseware == '' || resquest.data[0].examineCourseware == null) {
-
-          } else {
-            this.form.coursewareName = resquest.data[0].examineCourseware.coursewareName
-          }
-
+          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
+          this.form.courseContent=resquest.data[0].courseContent
+          this.form.courseIntroduction=resquest.data[0].courseIntroduction
+          this.form.coursewareName=resquest.data[0].examineCourseware.coursewareName
+          this.form.tutor = resquest.data[0].tutor.split(',')
+          this.form.tutorTime = resquest.data[0].tutorTime
           //获取学习进度
+          this.getReviewResult()
           this.addTeacher()
           this.getStatus()
-          this.getReviewResult()
         })
         /*
         * teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类
         * courseIntroduction:课程简介
         * */
-
       })
     },
-    addTeacher() {
-      addTeacher({pageNo: 1, pageSize: 10, keyword: this.form.teacherNo}).then(res => {
+    addTeacher(){
+      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },
-    getProgress(id) {
-      getProgress({teacherId: id}).then(res => {
-        this.progressData = res.data
-        res.data.forEach((item, index) => {
-          if (item.progress != 100) {
-            this.disabled = true
+    getProgress(id){
+      getProgress({teacherId:id}).then(res=>{
+        this.progressData=res.data
+        res.data.forEach((item,index)=>{
+          if (item.progress!=100){
+            this.disabled=true
             return
           }
         })
@@ -104,13 +102,13 @@ export default {
     format(percentage) {
       return percentage === 100 ? '满' : `${percentage}%`;
     },
-    getJump() {
+    getJump(){
       this.$router.push({
-        path: '/need/twofinal',
-        query: {teacherId: this.teacherId}
+        path:'/need/twofinal',
+        query:{teacherId:this.teacherId}
       })
     },
-    toCaseData(courseId) {
+    toCaseData(courseId){
       this.$router.push("/course/studyindex?id=" + courseId);
     },
     downloadFile() {
@@ -136,7 +134,7 @@ export default {
 
 <template>
   <div>
-    <process-status :teacherId="teacherId"></process-status>
+    <process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
     <div class="title">基本信息</div>
     <el-container>
       <div class="form-table">
@@ -168,7 +166,9 @@ export default {
           <div>
             <el-col :span="11">
               <el-form-item label="认证课程名称：" prop="courseName">
-                {{ form.courseName }}
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
+                  {{ form.courseName }}
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="11" :offset="2">
@@ -195,26 +195,14 @@ export default {
           <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
           <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
         </div>
-        <div class="courseName">{{ item.courseName }}</div>
+        <div class="courseName" :title="item.courseName">{{ item.courseName }}</div>
         <div class="smallTitle">当前进度</div>
         <el-progress :percentage="parseInt(item.progress)"
                      :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
       </div>
     </div>
     <div>
-      <div class="title" style="margin-top: 20px">认证结果</div>
-      <div v-if="result.reviewResult==2" class="score" style="color: #797979">请您耐心等待线下认证安排！</div>
-      <div v-if="result.reviewResult==0" class="score" style="color: #4b7900;">恭喜您，您的认证分数为{{
-          result.avgScore
-        }}分，已经通过认证！
-      </div>
-      <div v-if="result.reviewResult==1" class="score" style="color: #ff0000">很遗憾，您的认证分数为{{
-          result.avgScore
-        }}分，没有通过认证！
-      </div>
-    </div>
-    <div>
-      <div class="title" style="margin-top: 20px">二次线下辅导</div>
+      <div class="title" style="margin-top: 20px">线下辅导</div>
       <el-container>
         <div class="form-table">
           <el-form>
@@ -229,73 +217,86 @@ export default {
         </div>
       </el-container>
     </div>
-
-    <div class="tip">
-      提示：您已完成线下辅导，快去进行下一步吧！
+    <div>
+      <div class="title" style="margin-top: 20px">认证结果</div>
+      <div v-if="statusInfo1.reviewResult==2" class="score">请您耐心等待线下认证安排！</div>
+      <div v-if="statusInfo1.reviewResult==0" class="score" style="color: #4b7900;">恭喜您，您的认证分数为{{ result.avgScore }}分，已经通过认证！</div>
+      <div v-if="statusInfo1.reviewResult==1" class="score" style="color: #ff0000">很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！</div>
     </div>
-    <el-button type="primary" style="margin-top: 20px;" @click="getJump()">下一步</el-button>
+    <div>
+      <div class="title" style="margin-top: 20px">二次线下辅导</div>
+      <el-container>
+        <div class="form-table">
+          <el-form>
+            <el-form-item label="辅导老师：">
+              <span v-for="(item,index) in form1.tutor" :key="item"
+                    style="display: inline-block;margin-right: 20px">{{ item }}</span>
+            </el-form-item>
+            <el-form-item label="辅导时间：">
+              {{ form1.tutorTime }}
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-container>
+    </div>
+    <el-button type="primary" style="margin-top: 20px;margin-left: 80px" @click="getJump()">下一步</el-button>
   </div>
 </template>
 
 <style scoped lang="scss">
-.title {
+.title{
   font-size: 16px;
   font-weight: 800;
   border-bottom: 1px solid rgba(153, 153, 153, 0.2);
   padding: 2px 2px 20px 2px;
 }
-
-.form-table {
+.form-table{
   width: 100%;
   margin-top: 20px;
 }
-
 .progress {
   display: flex;
   align-items: center;
   margin-top: 20px;
 }
-
 .progress > div {
   width: 300px;
   margin-right: 30px;
 }
-
 .courseName {
   font-weight: 650;
   color: #333333;
   font-size: 14px;
   margin-top: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  width: 100%;
 }
-
-.smallTitle {
-  color: #134054;
-  font-size: 12px;
+.smallTitle{
+  color:#134054;
+  font-size:12px;
   margin-top: 7px;
 }
-
-::v-deep .el-form-item__content {
+::v-deep .el-form-item__content{
   font-weight: 500;
 }
-
-::v-deep .el-form-item {
+::v-deep .el-form-item{
   margin-bottom: 0px;
 }
-
-.tip {
+.tip{
   color: #333333;
   font-size: 14px;
   margin-top: 20px;
 }
-
 .score {
   margin-top: 28px;
-  font-size: 14px;
+  font-size: 18px;
   color: #333333;
   font-weight: 400;
 }
-
-.twoFactorAuthentication {
+.twoFactorAuthentication{
   width: 344px;
   height: 135px;
   padding: 2px 2px 2px 2px;
@@ -308,7 +309,6 @@ export default {
   justify-content: center;
   align-items: center;
 }
-
 .remind {
   margin-bottom: 20px;
   box-sizing: border-box;
diff --git a/src/views/lecturer/TwoFinal.vue b/src/views/lecturer/TwoFinal.vue
index 4de199b3..da036c8f 100644
--- a/src/views/lecturer/TwoFinal.vue
+++ b/src/views/lecturer/TwoFinal.vue
@@ -2,6 +2,7 @@
 import {mapActions, mapGetters} from "vuex";
 import {getCertificationProcess, getTeacherInfo, setOfflineTutoring, treeList} from "@/api/modules/lecturer"
 import processStatus from "@/components/processStatus.vue";
+import axios from "axios";
 export default {
   name: "TwoFinal",
   components: {processStatus},
@@ -35,6 +36,7 @@ export default {
         coursewareUrl:'',
         courseContent_1:''
       },
+      pid:'',
       rules: {
         courseName: [
           {required: true, message: '请输入认证课程名称', trigger: 'change'},
@@ -68,6 +70,7 @@ export default {
     },
     baseInfo(){
       getTeacherInfo({teacherId:this.teacherId}).then(res=>{
+        this.pid=res.data[0].pid
         this.form.teacherName=res.data[0].teacherName
         this.form.teacherNo=res.data[0].teacherNo
         this.form.orgName=res.data[0].orgName
@@ -143,6 +146,14 @@ export default {
         message: '上传失败',
         type: 'error'
       });
+    },
+    beforeUpload(file) {
+      axios.defaults.timeout = 30000;
+      const isLt2M = file.size / 1024 / 1024 <= 500;
+      if (!isLt2M) {
+        this.$message.error('文件大小超出500M，请重新上传');
+      }
+      return isLt2M;
     }
   },
   created() {
@@ -159,7 +170,7 @@ export default {
 
 <template>
   <div>
-    <process-status :teacherId="teacherId"></process-status>
+    <process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
     <div class="title">二次认证-上传终稿</div>
     <el-container>
       <div class="form-table">
@@ -210,6 +221,7 @@ export default {
               :on-error="handlError"
               :limit="1"
               :on-remove="handRemove"
+              :before-upload="beforeUpload"
               multiple>
               <i class="el-icon-upload"></i>
               <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue
index c0cd9208..da237775 100644
--- a/src/views/lecturer/TwoFinals.vue
+++ b/src/views/lecturer/TwoFinals.vue
@@ -28,7 +28,10 @@ export default {
       result1:'',
       newTeacherId:'',
       pid:'',
-      teacherInfo:''
+      teacherInfo:'',
+      form1:{
+
+      }
     }
   },
   created() {
@@ -58,31 +61,31 @@ export default {
     },
     baseInfo(){
       getTeacherInfo({teacherId:this.teacherId}).then(res=>{
-        this.teacherInfo = res.data[0]
+        this.pid=res.data[0].pid
+        this.form1.tutor = res.data[0].tutor.split(',')
+        this.form1.tutorTime = res.data[0].tutorTime
+        this.form.courseName=res.data[0].courseName
+        this.form.courseContent=res.data[0].courseContent
+        this.form.courseIntroduction=res.data[0].courseIntroduction
+        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.coursewareName=resquest.data[0].examineCourseware.coursewareName
+          this.form.tutor = resquest.data[0].tutor.split(',')
+          this.form.tutorTime = resquest.data[0].tutorTime
+          //获取学习进度
+          this.getReviewResult()
+          this.addTeacher()
+          this.getStatus()
+        })
         /*
         * 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
-        this.form.courseContent=res.data[0].courseContent
-        this.form.courseIntroduction=res.data[0].courseIntroduction
-        if (res.data[0].examineCourseware==''||res.data[0].examineCourseware==null){
-
-        }else {
-          this.form.coursewareName=res.data[0].examineCourseware.coursewareName
-        }
-        this.form.tutor=res.data[0].tutor.split(',')
-        this.form.tutorTime=res.data[0].tutorTime
-        this.pid=res.data[0].pid
-        //获取学习进度
-        this.addTeacher()
-        this.getStatus()
-        this.getReviewResult()
       })
     },
     addTeacher(){
@@ -137,7 +140,7 @@ export default {
 
 <template>
   <div>
-    <process-status :teacherId="teacherId"></process-status>
+    <process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
     <div class="title">基本信息</div>
     <el-container>
       <div class="form-table">
@@ -169,7 +172,9 @@ export default {
           <div>
             <el-col :span="11">
               <el-form-item label="认证课程名称：" prop="courseName">
-                {{ form.courseName }}
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
+                  {{ form.courseName }}
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="11" :offset="2">
@@ -196,12 +201,28 @@ export default {
           <img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
           <img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
         </div>
-        <div class="courseName">{{ item.courseName }}</div>
+        <div class="courseName" :title="item.courseName ">{{ item.courseName }}</div>
         <div class="smallTitle">当前进度</div>
         <el-progress :percentage="parseInt(item.progress)"
                      :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
       </div>
     </div>
+    <div>
+      <div class="title" style="margin-top: 20px">线下辅导</div>
+      <el-container>
+        <div class="form-table">
+          <el-form>
+            <el-form-item label="辅导老师：">
+              <span v-for="(item,index) in form.tutor" :key="item"
+                    style="display: inline-block;margin-right: 20px">{{ item }}</span>
+            </el-form-item>
+            <el-form-item label="辅导时间：">
+              {{ form.tutorTime }}
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-container>
+    </div>
     <div>
       <div class="title" style="margin-top: 20px">认证结果</div>
       <div v-if="result1.reviewResult==2" class="score">请您耐心等待线下认证安排！</div>
@@ -214,10 +235,10 @@ export default {
         <div class="form-table">
           <el-form>
             <el-form-item label="辅导老师：">
-              <span v-for="(item,index) in form.tutor" :key="item" style="display: inline-block;margin-right: 20px">{{item}}</span>
+              <span v-for="(item,index) in form1.tutor" :key="item" style="display: inline-block;margin-right: 20px">{{item}}</span>
             </el-form-item>
             <el-form-item label="辅导时间：">
-              {{form.tutorTime}}
+              {{form1.tutorTime}}
             </el-form-item>
           </el-form>
         </div>
@@ -252,11 +273,16 @@ export default {
   width: 300px;
   margin-right: 30px;
 }
-.courseName{
+.courseName {
   font-weight: 650;
   color: #333333;
   font-size: 14px;
   margin-top: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  width: 100%;
 }
 .smallTitle{
   color:#134054;
@@ -276,7 +302,7 @@ export default {
 }
 .score {
   margin-top: 28px;
-  font-size: 14px;
+  font-size: 18px;
   color: #333333;
   font-weight: 400;
 }

From d23b22165cc4d28b350bf7f96667116d9ce44d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=8F=91?= <2577324884@qq.com>
Date: Wed, 22 May 2024 12:22:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 74db0448..f6590f49 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -126,8 +126,8 @@ module.exports = {
     proxy: {
       '/manageApi': {
         // 目标代理服务器地址
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -137,8 +137,8 @@ module.exports = {
       '/systemapi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9090',
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -148,8 +148,8 @@ module.exports = {
       },
       '/uboeApi': {
         // 目标代理服务器地址
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -158,8 +158,8 @@ module.exports = {
       },
       '/userbasic': {
         // 目标代理服务器地址
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -169,8 +169,8 @@ module.exports = {
       '/statApi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9080',
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -181,8 +181,8 @@ module.exports = {
       '/socialApi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9081',
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -192,8 +192,8 @@ module.exports = {
       },
       '/report': {
         // 目标代理服务器地址
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -202,15 +202,15 @@ module.exports = {
       },
       '/infrasApi': {
         // 目标代理服务器地址
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         secure: false,
       },
       '/activityApi': {
         // 目标代理服务器地址
-        target: 'https://pretest.zcwytd.com',
-        // target: 'https://u-pre.boe.com',
+        // target: 'https://pretest.zcwytd.com',
+        target: 'https://u-pre.boe.com',
         changeOrigin: true,
         secure: false,
       },