Merge branch 'zcwy-master' into dev0515

src/views/lecturer/TwoCoaching.vue

@@ -31,8 +31,12 @@ export default {
         });
       })
     },
-    getCoachingTeacher(){
-      console.log(this.value)
+    getCoachingTeacher(val){
+      addTeacher({pageNo:1,pageSize:20,keyword:val}).then(res=>{
+        this.options = res.data.map(item => {
+          return { value: item.realName, label: item.realName };
+        });
+      })
     },
 
     getJump(){
@@ -74,7 +78,7 @@ export default {
               remote
               reserve-keyword
               placeholder="请输入辅导老师姓名"
-              @change="getCoachingTeacher"
+              :remote-method="getCoachingTeacher"
             >
               <el-option
                 v-for="item in options"

src/views/study/coursenew.vue

@@ -1392,7 +1392,8 @@
         });
       },
       progress(val) { 
-        this.sendEventProgress = val
+        const progressValue = parseFloat(val) * 100;
+        this.sendEventProgress = Number(progressValue.toFixed(2));
        },
       saveStudyDuration(duration) { //保存本地存储的学习时长
         if (duration > 0) {
@@ -1411,7 +1412,9 @@
               "aname":this.userInfo.name,//当前人的姓名
               "status": 1, //状态
               "contentId": this.contentData.id,
-              "progress": this.sendEventProgress,
+            }
+            if(this.resType == 10){
+              postData.progress = this.sendEventProgress;
             }
             //静默处理
             apiStat.sendEvent(postData).then(rs=>{