diff --git a/src/components/VideoPlayer/index.vue b/src/components/VideoPlayer/index.vue index a8c94147..bf7b6f2f 100644 --- a/src/components/VideoPlayer/index.vue +++ b/src/components/VideoPlayer/index.vue @@ -576,6 +576,7 @@ export default { // 进度条到终点时修改播放状态 this.isShowPlayer = false this.$emit('onPlayerPlaying', this.videoDom.currentTime,this.videoDom.duration) + this.$emit('progress',this.currentProgress) if (this.currentProgress === 1) { this.isPlaying = false; this.$emit('onPlayerEnded', {}) @@ -591,6 +592,7 @@ export default { src: function () { // 当视频地址变更时,重载视频 this.videoDom.load(); + this.isPlaying = false }, }, }; diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index dde6954c..ac56a6d0 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -58,8 +58,20 @@ export default { this.status.reviewResult=data.reviewResult } } - }else if(data.onlineLearning==2){ + }else if(data.onlineLearning==2 && data.offlineTutoring==1){ this.status.onlineLearning=2 + }else if (data.onlineLearning==2 && data.offlineTutoring==0){ + this.status.onlineLearning=0 + if (data.offlineTutoring==0){ + this.status.offlineTutoring=0 + if (data.endStatus==0){ + this.status.endStatus=0 + this.status.reviewResult=data.reviewResult + }else if (data.endStatus==2){ + this.status.endStatus=2 + this.status.reviewResult=data.reviewResult + } + } } }else if (data.draftStatus==2){ this.status.draftStatus=2 @@ -75,8 +87,20 @@ export default { this.status.reviewResult=data.reviewResult } } - }else if(data.onlineLearning==2){ + }else if(data.onlineLearning==2 && data.offlineTutoring==1){ this.status.onlineLearning=2 + }else if (data.onlineLearning==2 && data.offlineTutoring==0){ + this.status.onlineLearning=0 + if (data.offlineTutoring==0){ + this.status.offlineTutoring=0 + if (data.endStatus==0){ + this.status.endStatus=0 + this.status.reviewResult=data.reviewResult + }else if (data.endStatus==2){ + this.status.endStatus=2 + this.status.reviewResult=data.reviewResult + } + } } } diff --git a/src/views/lecturer/CoachingPage.vue b/src/views/lecturer/CoachingPage.vue index 35c806a1..b5754bc4 100644 --- a/src/views/lecturer/CoachingPage.vue +++ b/src/views/lecturer/CoachingPage.vue @@ -28,8 +28,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(){ @@ -71,7 +75,7 @@ export default { remote reserve-keyword placeholder="请输入辅导老师姓名" - @change="getCoachingTeacher" + :remote-method="getCoachingTeacher" > diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index 9a624824..533de371 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -15,6 +15,7 @@ export default { }, progressData: {}, fileBaseUrl: process.env.VUE_APP_BOE_MOBILE_URL, + uploadUrl:process.env.VUE_APP_FILE_BASE_URL, disabled: false, statusInfo: '', teacherInfo:'' @@ -166,7 +167,8 @@ export default {
- + +
{{ item.courseName }}
diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue index 86d083d6..bfc4125f 100644 --- a/src/views/lecturer/FinalDraft.vue +++ b/src/views/lecturer/FinalDraft.vue @@ -230,7 +230,7 @@ export default { multiple>
将文件拖到此处,或点击上传
-
请上传解密后的文件,仅支持上传ppt,pptx,pdf格式文件
+
请上传解密后的文件,仅支持上传ppt、pptx、pdf格式文件
diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 83eb494a..ed958a6c 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -21,6 +21,7 @@ export default { }, progressData: {}, fileBaseUrl: process.env.VUE_APP_BOE_MOBILE_URL, + uploadUrl:process.env.VUE_APP_FILE_BASE_URL, disabled: false, statusInfo: '', result: '', @@ -207,7 +208,8 @@ export default {
- + +
{{ item.courseName }}
diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 152614da..e8ed2bca 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -236,7 +236,7 @@ export default { multiple>
将文件拖到此处,或点击上传
-
请上传解密后的文件,仅支持上传ppt,pptx,pdf格式文件
+
请上传解密后的文件,仅支持上传ppt、pptx、pdf格式文件
diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 95f42701..6a2a66bb 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -16,7 +16,8 @@ export default { }, progressData:{}, fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, - disabled:false, + uploadUrl:process.env.VUE_APP_FILE_BASE_URL, + disabled:true, statusInfo:'', teacherInfo:'', pid:'' @@ -62,16 +63,18 @@ export default { getProgress(id){ getProgress({teacherId:id}).then(res=>{ this.progressData=res.data - if (res.data.length==0){ - this.disabled=true - return + if ( res.data.length>=1 ){ + res.data.forEach((item,index)=>{ + if (item.progress==100 && index==res.data.length-1){ + this.disabled=false + }else if (item.progress==100) { + }else { + this.disabled=true + return + } + }) + } - res.data.forEach((item,index)=>{ - if (item.progress!=100){ - this.disabled=true - return - } - }) }) }, getJump(){ @@ -162,7 +165,8 @@ export default {
- + +
{{ item.courseName }}
diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index 9a2cd7f6..236960d4 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -21,6 +21,7 @@ export default { }, progressData:{}, fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, + uploadUrl:process.env.VUE_APP_FILE_BASE_URL, disabled:false, statusInfo:'', result:'', @@ -194,7 +195,8 @@ export default {
- + +
{{ item.courseName }}
diff --git a/src/views/lecturer/TwoCoaching.vue b/src/views/lecturer/TwoCoaching.vue index 4ea3211f..77a13b35 100644 --- a/src/views/lecturer/TwoCoaching.vue +++ b/src/views/lecturer/TwoCoaching.vue @@ -88,7 +88,7 @@ export default { diff --git a/src/views/lecturer/TwoCos.vue b/src/views/lecturer/TwoCos.vue index 26a8a927..26222577 100644 --- a/src/views/lecturer/TwoCos.vue +++ b/src/views/lecturer/TwoCos.vue @@ -21,6 +21,7 @@ export default { }, progressData:{}, fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, + uploadUrl:process.env.VUE_APP_FILE_BASE_URL, disabled:false, statusInfo:'', result:'', @@ -197,7 +198,8 @@ export default {
- + +
{{ item.courseName }}
diff --git a/src/views/lecturer/TwoFinal.vue b/src/views/lecturer/TwoFinal.vue index 2599f8f0..06666aa6 100644 --- a/src/views/lecturer/TwoFinal.vue +++ b/src/views/lecturer/TwoFinal.vue @@ -232,7 +232,7 @@ export default { multiple>
将文件拖到此处,或点击上传
-
请上传解密后的文件,仅支持上传ppt,pptx,pdf格式文件
+
请上传解密后的文件,仅支持上传ppt、pptx、pdf格式文件
diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue index d321b3ab..7558ef9a 100644 --- a/src/views/lecturer/TwoFinals.vue +++ b/src/views/lecturer/TwoFinals.vue @@ -21,6 +21,7 @@ export default { }, progressData:{}, fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, + uploadUrl:process.env.VUE_APP_FILE_BASE_URL, disabled:false, statusInfo:'', statusInfo1:'', @@ -203,7 +204,8 @@ export default {
- + +
{{ item.courseName }}
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 23d9a375..ab0689d2 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -27,7 +27,7 @@
- @@ -320,6 +320,7 @@ }, data() { return { + sendEventProgress: 0, trueFalse: true, audiences:'', isCrowd:false, @@ -1390,6 +1391,9 @@ } }); }, + progress(val) { + this.sendEventProgress = val + }, saveStudyDuration(duration) { //保存本地存储的学习时长 if (duration > 0) { //发送用户学习事件 @@ -1405,7 +1409,9 @@ "objInfo": ""+this.courseInfo.name, "aid":this.userInfo.aid, //当前登录人的id "aname":this.userInfo.name,//当前人的姓名 - "status": 1 //状态 + "status": 1, //状态 + "contentId": this.contentData.id, + "progress": this.sendEventProgress, } //静默处理 apiStat.sendEvent(postData).then(rs=>{