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

Merge branch '20251212-fix-1130' of http://10.251.129.121/boeu/learning-system-portal into master-20251210

Browse Source
This commit is contained in:
joshen
2025-12-12 15:24:29 +08:00
parent 983693f82a 44239beec1
commit 17fe8b5d2d
1 changed files with 221 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/study/coursenew.vue
View File

@@ -29,6 +29,7 @@
--></div> --></div>
</div> </div>
</div> </div>
</div>
<div class="course-content xcontent"> <div class="course-content xcontent">
<div <div
class="course-playbox" class="course-playbox"
@@ -69,9 +70,7 @@
<img <img
class="icon-small" class="icon-small"
v-if="isPraise" v-if="isPraise"
:src=" :src="require('@/assets/images/icon/praise-active.png')"
require('@/assets/images/icon/praise-active.png')
"
/> />
<img <img
class="icon-small" class="icon-small"
@@ -172,10 +171,12 @@
<div v-if="resType == 41"> <div v-if="resType == 41">
<div style="padding: 20px" v-html="contentData.content"></div> <div style="padding: 20px" v-html="contentData.content"></div>
</div> </div>
<div v-if="resType == 50" style="min-height: 500px"> <div
v-if="resType == 50 || isLoadIframe"
style="min-height: 500px"
>
<iframe <iframe
id="iframeId" v-if="scormUrl || isLoadIframe"
v-if="scormUrl"
:src="scormUrl" :src="scormUrl"
frameborder="0" frameborder="0"
border="0px" border="0px"
@@ -256,11 +257,7 @@
<div class="score" style="display: flex"> <div class="score" style="display: flex">
<div <div
v-if="!scoreInfo.has" v-if="!scoreInfo.has"
style=" style="margin-left: 10px; cursor: pointer; padding-top: 18px"
margin-left: 10px;
cursor: pointer;
padding-top: 18px;
"
> >
<!-- <el-popover placement="top" width="300" trigger="hover"> --> <!-- <el-popover placement="top" width="300" trigger="hover"> -->
<!-- <div style="text-align:center;line-height:50px;padding:20px 0px"> <!-- <div style="text-align:center;line-height:50px;padding:20px 0px">
@@ -1080,7 +1077,7 @@ export default {
warnTitle: "测试标题", warnTitle: "测试标题",
isFinishingStudyItem: false, // 防止重复调用完成状态更新接口 isFinishingStudyItem: false, // 防止重复调用完成状态更新接口
// // 全局状态：是否正在等待接口完成 // // 全局状态：是否正在等待接口完成
// isWaitingForApis: false, isLoadIframe: false,
// // 待执行的切换操作（存储点击的目标课程） // // 待执行的切换操作（存储点击的目标课程）
// pendingSwitchAction: null, // pendingSwitchAction: null,
}; };
@@ -1097,8 +1094,6 @@ export default {
this.stopStudyTime(); //先关闭 this.stopStudyTime(); //先关闭
this.cleanAppendTime(); // this.cleanAppendTime(); //
this.loadData(); this.loadData();
// // 监听iframe接口
// this.checkAllApisCompleted();
}, },
computed: { computed: {
// ai播放器相关 // ai播放器相关
@@ -1349,6 +1344,13 @@ export default {
this.$refs.mynote.showVideoTimeBtn(false); this.$refs.mynote.showVideoTimeBtn(false);
let $this = this; let $this = this;
this.resType = r.contentType; this.resType = r.contentType;
if (this.resType == 50) {
this.isLoadIframe = true;
} else {
setTimeout(() => {
this.isLoadIframe = false;
}, 10000);
}
this.contentData = r; this.contentData = r;
this.activeId = this.contentData.id; this.activeId = this.contentData.id;
if (item) { if (item) {
@@ -1603,9 +1605,7 @@ export default {
} }
} }
} }
setTimeout(() => {
this.changePlayRes(r, item); this.changePlayRes(r, item);
}, 10000);
}, },
loadScorePraiseAndTrample() { loadScorePraiseAndTrample() {
//加载是否请过分 //加载是否请过分