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

Merge branch 'dev'

Browse Source 
# Conflicts:
#	src/components/Course/auditCourse2.vue
This commit is contained in:
daihh
2022-06-03 11:23:58 +08:00
parent 85fc23b761 cee51f3aba
commit 48e0fa4060
6 changed files with 57 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/Course/auditCourse2.vue
View File

@@ -175,11 +175,11 @@
</audio> -->
</div>
<div v-if="contentData.contentType == 40">
<div style="padding: 10px;color: #767676; " v-if="converStatus < 2">
<div style="padding: 10px;color: #767676; " v-if="converStatus < 2 && !contentData.content">
<div>文档文件转化中，还未转化完成，</div>
<div>上传时间：{{curCFile.sysCreateTime}}</div>
</div>
<div style="padding: 10px;color: #767676;color: #ff0000;" v-if="converStatus == 3">
<div style="padding: 10px;color: #767676;color: #ff0000;" v-if="converStatus == 3 && !contentData.content">
文件转化失败，请重新上传（不要上传加密的文件）或联系管理员
</div>
<pdfPreview v-if="contentData.content" :filePath="fileBaseUrl+contentData.content"></pdfPreview>
@@ -654,11 +654,16 @@ export default {
if (cfrs.status == 200) {
this.curCFile=cfrs.result;
this.contentData.content = cfrs.result.previewFilePath;
this.converStatus = cfrs.result.converStatus;
//下面是为了兼容老数据
if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) {
this.contentData.content = cfrs.result.filePath;
} else {
this.converStatus = cfrs.result.converStatus;
}
//设置状态
if(this.contentData.content && this.contentData.content.indexOf('pdf') > -1){
if(!this.converStatus || this.converStatus<2){
this.converStatus=2;
}
}
//console.log(r.content);
}else {