Merge branch 'zcwy_0806_paihangb' into dev0515

This commit is contained in:
zhangsir
2024-09-18 10:04:53 +08:00

View File

@@ -206,7 +206,7 @@
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="total">累计</el-dropdown-item> <el-dropdown-item command="total">累计</el-dropdown-item>
<el-dropdown-item command="now">当前</el-dropdown-item> <!-- <el-dropdown-item command="now">当前</el-dropdown-item> -->
<!-- <el-dropdown-item command="weeks">本周</el-dropdown-item> <!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
<el-dropdown-item command="months">本月</el-dropdown-item> <el-dropdown-item command="months">本月</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item> --> <el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -429,14 +429,14 @@ export default {
getDuration() {//学习时长 getDuration() {//学习时长
let data = { let data = {
aid:this.userInfo.aid,// #用户id aid:this.userInfo.aid,// #用户id
statType:10, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数 statType:12, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
field:this.learningDuration.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计 field:this.learningDuration.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
num:5,// #显示的条数 num:5,// #显示的条数
} }
if(data.field == 'now'){ if(data.field == 'now'){
data.statType = 12 data.statType = 10
data.field = 'total' data.field = 'total'
this.experience.field = 'total' this.learningDuration.field = 'total'
this.isStudyTime = true this.isStudyTime = true
} }
apiStat.getRanking(data).then(res=>{ apiStat.getRanking(data).then(res=>{
@@ -485,7 +485,7 @@ export default {
if(data.field == 'now'){ if(data.field == 'now'){
data.statType = 13 data.statType = 13
data.field = 'total' data.field = 'total'
this.experience.field = 'total' this.learningDays.field = 'total'
this.isStudyDay = true this.isStudyDay = true
} }
apiStat.getRanking(data).then(res=>{ apiStat.getRanking(data).then(res=>{