diff --git a/src/api/boe/boeAjax.js b/src/api/boe/boeAjax.js index 728435d2..c575e8e7 100644 --- a/src/api/boe/boeAjax.js +++ b/src/api/boe/boeAjax.js @@ -47,7 +47,7 @@ const formRequest=axios.create({ Promise.reject(error) }); formRequest.interceptors.response.use(res => { - console.log(res); + //console.log(res); const code = res.data.status || 200; if(code===200){ return res.data diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 3882fdab..a84bbd49 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -79,6 +79,10 @@ export default { type: Number, default: 1024, }, + scorm:{ + type:String, + default:'' + }, // 文件类型, 例如['png', 'jpg', 'jpeg'] fileType: { type: Array, @@ -156,6 +160,13 @@ export default { //this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`); return false; } + + //console.log(this.scorm,fileExtension,'upload'); + if(this.scorm && this.scorm==fileExtension){ + this.data.dir="scorm"; + } + //console.log(this.data,'this.data'); + } // 校检文件大小 if (this.fileSize) { @@ -166,6 +177,7 @@ export default { return false; } } + if(this.loading) { this.isLoading = true; } diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue index db6d7ff5..3429676f 100644 --- a/src/views/course/Courseware.vue +++ b/src/views/course/Courseware.vue @@ -146,7 +146,7 @@
- +
@@ -687,9 +687,10 @@ export default { //console.log(scorm,'scorm') if(scorm.index){ //这里需要提取的到配置文件中,实际中只需要传 rowId就可以了 - this.scormUrl='http://localhost:9083/scorm-player?scormId='+row.id;//播放的首页 + this.scormUrl='http://localhost:9083/scorm-player?mode=preview&courseId='+row.courseId+'scormId='+row.id+'&sco='+scorm.index;//播放的首页 }else{ - this.scormUrl='http://localhost:9083/scorm-player?scormId='+row.id;//播放的首页 + //这种情况代表无播放页 + //this.scormUrl='http://localhost:9083/scorm-player?scormId='+row.id;//播放的首页 } }