Merge branch 'pingcode-20240615' into dev0515

This commit is contained in:
zhangsir
2024-06-21 16:39:55 +08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -645,7 +645,7 @@ export default {
this.params.sysType2 = this.sysTypeList[1]; this.params.sysType2 = this.sysTypeList[1];
this.params.sysType3 = this.sysTypeList[2]; this.params.sysType3 = this.sysTypeList[2];
if(this.$route.query.courseIds) this.params.courseIds = this.$route.query.courseIds.split(','); if(this.$route.query.courseIds) this.params.courseIds = this.$route.query.courseIds.split(',');
if(this.$route.query.isSystemAdmin) this.params.isSystemAdmin = this.$route.query.isSystemAdmin; if(this.$route.query.projectId) this.params.projectId = this.$route.query.projectId;
apiCourse.pageList(this.params).then(rs=>{ apiCourse.pageList(this.params).then(rs=>{
if(rs.status==200){ if(rs.status==200){
this.pageData = rs.result.list; this.pageData = rs.result.list;

View File

@@ -858,7 +858,7 @@
} }
this.changePlayRes(r,item); this.changePlayRes(r,item);
console.log('r, i, index,item::',r, i, index,item) console.log('r, i, index,item::',r, i, index,item)
this.videoIndex = i this.videoIndex = i
this.blobId = r.id this.blobId = r.id
}, },
loadScorePraiseAndTrample() { loadScorePraiseAndTrample() {
@@ -1157,7 +1157,7 @@
postData.progressVideo = arr[this.blobId] postData.progressVideo = arr[this.blobId]
postData.contentId = this.contentList[this.videoIndex].id postData.contentId = this.contentList[this.videoIndex].id
postData.courseId = this.contentList[this.videoIndex].courseId postData.courseId = this.contentList[this.videoIndex].courseId
} }
} }
apiStudy.studyVideoTime(postData).then(rs => { apiStudy.studyVideoTime(postData).then(rs => {
if (rs.status != 200) { if (rs.status != 200) {