Compare commits

...

8 Commits

Author SHA1 Message Date
joshen
77a3c2759e 取消日志 2025-07-23 11:14:08 +08:00
joshen
0830c53840 Merge remote-tracking branch 'yx/master-0720-lyc' into master-110 2025-07-23 11:02:35 +08:00
王卓煜
f91e2f12dd 修改前端进度条 2025-07-23 10:58:47 +08:00
王卓煜
b8858348c0 Revert "修改前端进度条"
This reverts commit 6208caf4ca.
2025-07-23 10:42:54 +08:00
joshen
7bcff6bc85 Merge remote-tracking branch 'yx/master-0720-lyc' into master-110
# Conflicts:
#	src/components/VideoPlayer/index.vue
2025-07-23 10:23:24 +08:00
王卓煜
6208caf4ca 修改前端进度条 2025-07-23 10:14:14 +08:00
王卓煜
18324458f3 内网环境判断,修改前端 2025-07-21 18:31:13 +08:00
joshen
ce23930a04 test 2025-07-11 17:46:17 +08:00
3 changed files with 16 additions and 17 deletions

View File

@@ -317,8 +317,8 @@ export default {
} }
setInterval(() => { setInterval(() => {
console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration) // console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.readyState)
// 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行 // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
if(!this.isDrag){ if(!this.isDrag){
var time = localStorage.getItem('videoProgressData') var time = localStorage.getItem('videoProgressData')
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}
@@ -364,10 +364,10 @@ export default {
} }
// 根据视频的readyState判断下一帧是否已加载并控制loading的显示 // 根据视频的readyState判断下一帧是否已加载并控制loading的显示
this.isShowLoading = this.videoDom.readyState < 3; this.isShowLoading = this.videoDom.readyState < 3;
console.log("当前缓存:"+this.videoDom.readyState) // console.log("当前缓存:"+this.videoDom.readyState)
if (this.videoDom.readyState < 3){ if (this.videoDom.readyState < 1){
console.log("详细信息",this.videoDom) // console.log("详细信息",this.videoDom)
console.log("卡了",this.videoDom.readyState) // console.log("卡了",this.videoDom.readyState)
} }
//if() //if()
//console.log(this.videoDom.readyState,'this.videoDom.readyState'); //console.log(this.videoDom.readyState,'this.videoDom.readyState');

View File

@@ -86,10 +86,9 @@ export default {
if(current<0) current = 0; if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData'); var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}
//console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
// 禁止拖动 // 禁止拖动 true:禁止拖动false:允许拖动
if(!this.isDrag && time && arr[this.blobId] < current) return; if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current); this.$emit("updateProgress", current);
// } // }
@@ -103,7 +102,7 @@ export default {
if(current<0) current = 0; if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData'); var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}
//console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
// 禁止拖动 // 禁止拖动
if(!this.isDrag && time && arr[this.blobId] < current) return; if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current); this.$emit("updateProgress", current);
@@ -119,12 +118,12 @@ export default {
if(current<0) current = 0; if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData'); var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}
//console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
this.$emit("getMouseDownStatus", false); this.$emit("getMouseDownStatus", false);
// 禁止拖动 // 禁止拖动
if(!this.isDrag && time && arr[this.blobId] < current) return; if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current); this.$emit("updateProgress", current);
this.$emit("getMouseDownStatus", false);
} }
}, },
}, },

View File

@@ -22,7 +22,7 @@
<div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box"> <div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
<div class="course-player" ref="coursePlayer" id="id_course_player"> <div class="course-player" ref="coursePlayer" id="id_course_player">
<div> <div>
<div v-if="Internet != 2"> <div v-if="false">
<div v-if="resType == null || resType == 0"> <div v-if="resType == null || resType == 0">
<!--先显示视频图片--> <!--先显示视频图片-->
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image> <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
@@ -110,11 +110,11 @@
</assess> </assess>
</div> </div>
</div> </div>
<div v-if="Internet == 2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview"> <div v-if="true" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
<div style="margin-top:40px"> <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
<span>十分抱歉您当前的网络环境不符合观看要求为了保障案例信息的安全您需要接入公司内网才能观看</span> <span>十分抱歉您当前的网络环境不符合观看要求为了保障案例信息的安全您需要接入公司内网才能观看</span>
</div> </div>
<div style="margin-top:20px" @click="getInternet"> <div style="margin-top:20px;text-align:center" @click="getInternet" >
<el-button type="primary">重新检测</el-button> <el-button type="primary">重新检测</el-button>
</div> </div>
</div> </div>
@@ -1790,7 +1790,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.course-player{ //内容播放区域 .course-player{ //内容播放区域
background-color: #f5f7fa; background-color: rgb(238, 238, 238);
flex:1; flex:1;
min-width: 700px; min-width: 700px;
min-height: 400px; min-height: 400px;