Merge branch 'master-20250403-lyc' into test20250220

This commit is contained in:
joshen
2025-04-09 14:31:45 +08:00

View File

@@ -387,8 +387,12 @@ export default {
if(data.field == 'now'){ if(data.field == 'now'){
data.statType = 20 data.statType = 20
data.field = 'years' data.field = 'years'
this.experience.field = 'total' this.experience.field = 'years'
this.isNow = true this.isNow = true
}else{
data.statType = 20
data.field = 'total'
this.experience.field = 'total'
} }
apiStat.getRanking(data).then(res=>{ apiStat.getRanking(data).then(res=>{
if(res.status==200){ if(res.status==200){
@@ -437,9 +441,15 @@ export default {
} }
}); });
}); });
if(data.field == 'total') {
this.experience.list = listData.sort((a,b)=>{ this.experience.list = listData.sort((a,b)=>{
return b.total-a.total return b.total-a.total
}).slice(0,5); }).slice(0,5);
}else if(data.field == 'years'){
this.experience.list = listData.sort((a,b)=>{
return b.years-a.years
}).slice(0,5);
}
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
@@ -455,10 +465,14 @@ export default {
num:10,// #显示的条数 num:10,// #显示的条数
} }
if(data.field == 'now'){ if(data.field == 'now'){
data.statType = 10 data.statType = 10;
data.field = 'years' data.field = 'years';
this.learningDuration.field = 'total' this.learningDuration.field = 'years';
this.isStudyTime = true this.isStudyTime = true;
}else{
data.statType = 10;
data.field = 'total';
this.learningDuration.field = 'total';
} }
apiStat.getRanking(data).then(res=>{ apiStat.getRanking(data).then(res=>{
if(res.status==200){ if(res.status==200){
@@ -505,9 +519,16 @@ export default {
} }
}); });
}); });
if(data.field == 'total'){
this.learningDuration.list = listData.sort((a,b)=>{ this.learningDuration.list = listData.sort((a,b)=>{
return b.total-a.total return b.total-a.total
}).slice(0,5); }).slice(0,5)
} else if(data.field == 'years'){
this.learningDuration.list = listData.sort((a,b)=>{
return b.years-a.years
}).slice(0,5)
}
;
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }