hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-09 10:56:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
daihh
2022-06-02 14:44:32 +08:00
parent b75b7f814e 263a8eabf1
commit a56370314f
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Course/auditCourse1.vue
View File

@@ -236,7 +236,7 @@ import WxEditor from "@/components/Editor/index.vue";
import apiTag from "../../api/modules/tag.js";
import videoPlayer from "@/components/VideoPlayer/index.vue";
import audioPlayer from "@/components/AudioPlayer/index.vue";
import apiCourseFile from '../../api/modules/courseFile.js';
import apiCourseFile from '@/api/modules/courseFile.js';
import { mapGetters, mapActions } from "vuex";
// import hyperLink from '@/components/Course/hyperLink.vue';
export default {

3
src/components/Course/weikeContent.vue
View File

@@ -741,6 +741,7 @@
this.converStatus = rs.result.converStatus;
this.courseFileShow = false;
this.cware.content.pdfPath=rs.result.previewFilePath;
this.cware.content.content=rs.result.previewFilePath;
this.$forceUpdate();
}
});
@@ -816,7 +817,7 @@
chooseHasCWare(row){
this.cware.content.contentRefId=row.id;
this.cware.content.contentName=row.name;
// this.cware.content.content=row.filePath;
this.cware.content.content=row.filePath;
this.cware.curriculumData.url = row.filePath;
this.cware.content.duration=row.duration;//时长
this.cware.findShow=false;

11
src/views/portal/course/Micro.vue
View File

@@ -20,7 +20,7 @@
</div>
<div class="courseware-div" v-else>
<div v-if="coursewareInfo.content.contentType == 10" style="position: relative;">
<videoPlayer id="myVideoPlayer" :src="fileBaseUrl+curriculumData.url" style="width: 100%;"
<videoPlayer id="myVideoPlayer" :src="blobUrl" style="width: 100%;"
@onPlayerPlaying="onPlayerPlaying"
@onPlayerPlay="onPlayerPlay"
:initTime="videoPlayingTime"
@@ -77,7 +77,7 @@
<img :src="fileBaseUrl+coursewareInfo.content.content" alt="图片">
</div>
<div v-if="coursewareInfo.content.contentType == 40">
<pdfPreview :autoScroll="true" v-if="coursewareInfo.content.contentType == 40" :filePath="fileBaseUrl+coursewareInfo.content.content"></pdfPreview>
<pdfPreview :autoScroll="true" v-if="coursewareInfo.content.contentType == 40 && coursewareInfo.content.content" :filePath="fileBaseUrl+coursewareInfo.content.content"></pdfPreview>
</div>
<div v-if="coursewareInfo.content.contentType == 41">
<div class="couretitle" style="padding: 20px;text-align: left;" v-html="coursewareInfo.content.content"></div>
@@ -433,7 +433,7 @@ export default {
this.curriculumData.url=con.content;
}
//对url进行加密处理
$this.createPlayUrl(this.curriculumData.url);
$this.createPlayUrl(con.contentRefId,this.curriculumData.url);
} else if (con.contentType == 40) {
//需要读取pdf的路径
@@ -483,7 +483,7 @@ export default {
});
},
methods: {
createPlayUrl(u){
createPlayUrl(fid,u){
let nowDate=new Date();
let ctime=parseInt(nowDate.getTime()/1000);
let beforeUrl=parseInt(nowDate.getTime()/1000)+u;
@@ -491,7 +491,8 @@ export default {
let urlSign=encodeURIComponent(encrypt(beforeUrl));
//console.log(urlSign,'urlSign');
cookies.set('PLAYSIGN_TIME', ctime);//写客户端的cookie保存
this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/play/resource?sign='+urlSign;
//this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/play/resource?sign='+urlSign;
this.blobUrl='http://localhost:9090/xboe/course/resource?fid='+fid;
},
createVideoBlob(url){