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 'zcwy_0806_paihangb' into dev0515

Browse Source
This commit is contained in:
zhangsir
2024-10-16 16:49:59 +08:00
parent 2d74778f33 14a94d1fb1
commit da4a563d03
2 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,6 +371,17 @@ export default {
this.isCursorStatic = false;
this.timeoutControlsHint = 2000;
});
this.videoDom.addEventListener('loadstart', function(){
console.log('\x1b[34m%s\x1b[0m','*****************视频加载中**************')
})
this.videoDom.addEventListener('loadeddata', function(){
console.log('\x1b[32m%s\x1b[0m','*****************加载完毕*************')
})
this.videoDom.addEventListener('error', function(){
console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
})
// 监听全屏事件的变化，保存数据
window.addEventListener("fullscreenchange", () => {
this.isFullscreen = this.isFullScreen();

48
src/views/user/ranking.vue
View File

@@ -382,7 +382,7 @@ export default {
aid:this.userInfo.aid,// #用户id
statType:21, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
num:5,// #显示的条数
num:10,// #显示的条数
}
if(data.field == 'now'){
data.statType = 20
@@ -421,8 +421,26 @@ export default {
sex: null
}
})
this.getUserData(ids,res.result.rankingData)
this.experience.list = res.result.rankingData;
// this.getUserData(ids,res.result.rankingData)
const noReapetIds = [...new Set(ids)];
apiUser.getByIds(noReapetIds).then(rs => {
if (rs.status == 200) {
const listData = []
rs.result.forEach((item, index) => {
res.result.rankingData.forEach(author => {
if (author.aid == item.aid) {
author.authorInfo = item;
listData.push(author)
}
});
});
this.experience.list = listData.sort((a,b)=>{
return b.total-a.total
}).slice(0,5);
} else {
this.$message.error(res.message);
}
});
}
})
},
@@ -431,7 +449,7 @@ export default {
aid:this.userInfo.aid,// #用户id
statType:12, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
field:this.learningDuration.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
num:5,// #显示的条数
num:10,// #显示的条数
}
if(data.field == 'now'){
data.statType = 10
@@ -469,8 +487,26 @@ export default {
sex: null
}
})
this.getUserData(ids,res.result.rankingData)
this.learningDuration.list = res.result.rankingData;
// this.getUserData(ids,res.result.rankingData)
const noReapetIds = [...new Set(ids)];
apiUser.getByIds(noReapetIds).then(rs => {
if (rs.status == 200) {
const listData = []
rs.result.forEach((item, index) => {
res.result.rankingData.forEach(author => {
if (author.aid == item.aid) {
author.authorInfo = item;
listData.push(author)
}
});
});
this.learningDuration.list = listData.sort((a,b)=>{
return b.total-a.total
}).slice(0,5);
} else {
this.$message.error(res.message);
}
});
}
})
},