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

Merge branch '250220-pre-126-177-gx' into master_1202

Browse Source 
# Conflicts:
#	src/views/portal/case/Index.vue
#	src/views/study/Courses.vue
This commit is contained in:
joshen
2025-03-11 17:12:30 +08:00
parent d33e27b3d0 def3892edc
commit 713f258c14
8 changed files with 89 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/Study/manager.vue
View File

@@ -13,7 +13,7 @@
</div>
<!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
<div>
<el-tabs v-model="tabName" @tab-click="handleTabClick">
<el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
<el-tab-pane label="报名管理" name="second">
<!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
<el-row style="margin: 20px 0;" :gutter="20">
@@ -863,4 +863,19 @@ export default {
height: 400px;
overflow: auto;
}
.el-tabs__nav-wrap::after {
display: none; /* 隐藏滚动条轨道 */
}
.el-tabs__nav-scroll {
overflow: hidden; /* 隐藏滚动条滑块 */
}
/* 隐藏垂直滚动条 */
.el-table .el-table__body-wrapper::-webkit-scrollbar {
display: none; /* Chrome, Safari, Opera*/
}
</style>

39
src/components/VideoPlayer/index.vue
View File

@@ -18,7 +18,6 @@
@keydown.right.prevent="forwardCurrentTime"
@keydown.up.prevent="increaseVolume"
@keydown.down.prevent="lowerVolume"
@keydown.esc.prevent="toggleFullScreen"
tabindex="0"
width="100%"
height="100%"
@@ -385,9 +384,26 @@ export default {
console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
})
// 监听全屏事件的变化，保存数据
window.addEventListener("fullscreenchange", () => {
window.addEventListener("F", () => {
this.isFullscreen = this.isFullScreen();
});
document.addEventListener('fullscreenchange',this.handleFullscreenChange);
document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
// this.videoDom.addEventListener('keydown', function(e){
// //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
// console.log("video is exit");
// if(e.key === "Escape"){
// console.log("按键 退出全屏 执行")
// }
// })
// this.videoDom.addEventListener("keydown", (e) => {
// console.log("是否监听到");
// if(e.keyCode == 27){
// console.log("是否监听到 esc");
// this.toggleFullScreen();
// }
// });
},
methods: {
//当视频由于需要缓冲下一帧而停止，解决一直计时的问题
@@ -540,6 +556,7 @@ export default {
/* 切换“全屏”和“非全屏”模式
*/
toggleFullScreen() {
console.log("toggleFullScreen 执行 ",this.isFullScreen())
let element = this.$refs.area;
if (!this.isFullScreen()) {
if (element.requestFullscreen) {
@@ -596,6 +613,24 @@ export default {
const currentTime = this.$refs.video.currentTime;
this.$emit('onTimeUpdate', currentTime);
},
/**
* 监听全屏变化
*/
handleFullscreenChange() {
console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
if(this.isFullscreen){
this.isFullscreen = !!document.fullscreenElement;
if (!this.isFullscreen) {
// 退出全屏后的逻辑（如暂停视频、更新 UI 等）
console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
this.$emit('onFullscreen',false);//全屏
}
}
}
},
watch: {
currentVolume: function () {

6
src/components/VideoPlayer/progress-bar.vue
View File

@@ -92,7 +92,7 @@ export default {
this.$emit("updateProgress", current);
// }
},
move(e) {
if (this.is_mousedown_progress) {
@@ -124,7 +124,7 @@ export default {
// 禁止拖动
if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current);
}
},
},
@@ -176,4 +176,4 @@ export default {
.progress-bar:hover .progress-current::after {
opacity: 1;
}
</style>
</style>

14
src/views/course/ManageList.vue
View File

@@ -195,7 +195,15 @@
</template>
</el-dialog>
<!--课程管理-->
<el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
<el-dialog
custom-class="g-dialog"
title="课程学习管理"
width="900px"
height="900px"
:visible.sync="manageStudy.dlgShow"
:close-on-click-modal="false"
>
<manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
<template #footer>
<el-button @click="manageStudy.dlgShow = false">关闭</el-button>
@@ -939,4 +947,8 @@ export default {
}
}
}
.el-dialog__body {
overflow: hidden;
}
</style>

6
src/views/portal/case/Index.vue
View File

@@ -1507,7 +1507,7 @@ export default {
};
});
res.result.list.forEach(item=>{
item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
})
this.caseList.list = res.result.list
this.getCaseUserData(res.result.list);
@@ -1562,7 +1562,7 @@ export default {
};
});
res.result.list.forEach(item=>{
item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
})
this.caseList.list = res.result.list
this.getCaseUserData(res.result.list);
@@ -1605,7 +1605,7 @@ export default {
}
console.log(res?.result?.list ,'有没有数据1');
res.result.list.forEach(item=>{
item.viewRankTags = (item.viewRankTags||[]).slice(0,2)||[]
item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
})
console.log(res?.result?.list ,'有没有数据2');
this.caseList.list = res.result.list

2
src/views/study/Courses.vue
View File

@@ -254,7 +254,7 @@ export default {
let localCourseIds=[];//本地在线课程的id集合
res.result.list.forEach(item=>{
if(item.courseImage?.startsWith('/upload')){
item.courseImage=$this.fileUrl+item.courseImage.substring(7)
item.courseImage=$this.fileUrl+item.courseImage?.substring(7)
}
if(item.source==2){
localCourseIds.push(item.id);

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

@@ -167,7 +167,6 @@
</div>
<!-- 课程单元 -->
<div class="course-units" v-if="tab == 1">
<div :style="`height: ${controlHeight}px;overflow-y: auto;`">
<div class="catalog" v-if="courseInfo.type == 20">
<div v-for="(item, index) in catalogTree" :key="index" :name="index">
@@ -755,7 +754,7 @@
if (this.contentData.status < 2) {
// this.contentData.status = 2; //进行中
if(r.contentType != 61&&r.contentType != 20 && r.contentType != 10){
setTimeout(() => {
setTimeout(() => {
this.isContentTypeTwo = r.contentType
$this.isShowTime()
}, 2000);
@@ -817,7 +816,7 @@
//console.log(h,$this.controlHeight,'$this.controlHeight');
})
//console.log('this.contentData11:',this.contentData,this.curriculumData)
// 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
if(this.contentData.progressVideo ===1){
@@ -1140,6 +1139,8 @@
// }
// }
this.playerBoxShow = false;
// this.onPlayerPlayFullscreen()
// this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
let $this = this;
//这里有些不准备，如果文件未能加载，这个事件就是错误的
this.isAppendTime=true;
@@ -1157,6 +1158,7 @@
// }
// }
},
onFullscreen(full) {
let divId = 'videowatermark';
var div = document.getElementById('myVideoPlayer')
@@ -1176,9 +1178,12 @@
"position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
div.appendChild(div3);
} else {
console.log("去除水印 ---- gx ----");
var markDiv = div.querySelector("#" + divId);
console.log("去除水印 ---- gx markDiv ----",markDiv);
if (markDiv) {
div.removeChild(markDiv);
console.log("执行去除水印 ---- gx markDiv ----",markDiv);
div.removeChild(markDiv);
}
}
},
@@ -1546,7 +1551,7 @@
}
}
},
progress(val) {
progress(val) {
const progressValue = parseFloat(val) * 100;
this.sendEventProgress = Number(progressValue.toFixed(2));
},