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

Merge remote-tracking branch '104/master' into dev_master

Browse Source
This commit is contained in:
nisen
2024-10-17 17:42:47 +08:00
parent 78e75db403 61cdd7c821
commit 493ebfa05b
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/PortalHeader.vue
View File

@@ -209,7 +209,7 @@ export default {
this.sex = this.userInfo.sex; this.sex = this.userInfo.sex;
this.$store.dispatch('refrashMsg'); this.$store.dispatch('refrashMsg');
this.loadBoeData(); this.loadBoeData();
console.log('this.userInfo::',this.userInfo) // console.log('this.userInfo::',this.userInfo)
//this.loadPopupConfig(); //this.loadPopupConfig();
}, },
methods: { methods: {

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

@@ -318,7 +318,7 @@ export default {
} }
setInterval(() => { setInterval(() => {
console.log('this.currentProgress::',this.currentProgress,this.isDrag) //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
// 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行 // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
if(!this.isDrag){ if(!this.isDrag){
var time = localStorage.getItem('videoProgressData') var time = localStorage.getItem('videoProgressData')

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

@@ -86,7 +86,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('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) //console.log('down 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;
@@ -103,7 +103,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,11 +119,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);
// 禁止拖动 // 禁止拖动
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);
} }
}, },
}, },

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

@@ -501,7 +501,7 @@
} }
treeList.push(treeNode); treeList.push(treeNode);
}); });
console.log(treeList,'treeList') // console.log(treeList,'treeList')
return treeList; return treeList;
} }
}, },
@@ -652,7 +652,7 @@
} else { } else {
this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign; this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign;
} }
console.log('this.contentData.id:',this.contentData.id) // console.log('this.contentData.id:',this.contentData.id)
this.blobId = this.contentData.id this.blobId = this.contentData.id
//console.log(this.blobUrl,'this.blobUrl'); //console.log(this.blobUrl,'this.blobUrl');
}, },
@@ -818,7 +818,7 @@
}) })
console.log('this.contentData11:',this.contentData,this.curriculumData) //console.log('this.contentData11:',this.contentData,this.curriculumData)
// 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据 // 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
if(this.contentData.progressVideo ===1){ if(this.contentData.progressVideo ===1){
var obj = JSON.parse(this.contentData.content) var obj = JSON.parse(this.contentData.content)
@@ -1229,7 +1229,7 @@
itemId: this.contentData.studyItemId, itemId: this.contentData.studyItemId,
videoTime: intTime videoTime: intTime
}; };
console.log('this.courseInfo:',this.contentData) //console.log('this.courseInfo:',this.contentData)
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){ if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
var time = localStorage.getItem('videoProgressData') var time = localStorage.getItem('videoProgressData')
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}
@@ -1281,7 +1281,7 @@
itemId: this.contentData.studyItemId, itemId: this.contentData.studyItemId,
videoTime: intTime videoTime: intTime
}; };
console.log('this.courseInfo:',this.contentData) //console.log('this.courseInfo:',this.contentData)
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){ if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
var time = localStorage.getItem('videoProgressData') var time = localStorage.getItem('videoProgressData')
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}