From 097be86314cf1d37ecdb41e3ad7a30cb0c49e92f Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Tue, 18 Oct 2022 15:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E7=BB=8F=E9=AA=8C=E5=80=BC?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/ranking.vue | 105 ++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 55 deletions(-)

diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue
index e5d6a5f1..a045d817 100644
--- a/src/views/user/ranking.vue
+++ b/src/views/user/ranking.vue
@@ -26,19 +26,16 @@
           </div>
           <div class="myselftext">
              <div class="myranking">
-                 我的排名 :  <span> {{experience.data.rankingNo}}</span>
+                 我的排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
              </div>
              <div class="myexperience">
-                 我的经验值 :  <span>{{experience.data.total || experience.data.months || experience.data.years || experience.data.weeks}}</span>
+                 我的经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
              </div>
           </div>
           <div class="exp-bar">
-            <h6> {{experience.data.total || experience.data.months || experience.data.years || experience.data.weeks}}/{{current.endValue}}</h6>
+            <h6> {{currentUserRankingTotalData.rankValue}}/{{currentUserRankingTotalData.endValue}}</h6>
             <div class="exp-barbox">
-                <el-progress :percentage="experience.data.total*100/current.endValue
-                  || experience.data.months*100/current.endValue
-                  || experience.data.years*100/current.endValue
-                  || experience.data.weeks*100/current.endValue" color="#387DF7"></el-progress>
+                <el-progress :percentage="currentUserRankingTotalData.rankValue*100/currentUserRankingTotalData.endValue" color="#387DF7"></el-progress>
             </div>
             <div class="exp-barname">
                 <span>{{current.start}}</span>
@@ -289,6 +286,11 @@ export default {
       return{
         experienceValue,
         current:{},
+        currentUserRankingTotalData:{
+          rankNo:0, // 经验值累计排名
+          rankValue:0 ,// 经验值累计,
+          endValue:0 // 累计经验值进度条最大值
+        },
         translate,
         experience:{
             field:'total',
@@ -345,54 +347,47 @@ export default {
         this.getDays();
     },
     getExperience() {//经验值
-                let data = {
-                    aid:this.userInfo.aid,// #用户id
-                    statType:20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
-                    field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
-                    num:4,//  #显示的条数
-                }
-                apiStat.getRanking(data).then(res=>{
-                    if(res.status==200){
-                        if(res.result.currentUserRankingData) {
-                            res.result.currentUserRankingData.authorInfo={
-                                aid: "",
-                                name: "",
-                                orgInfo: "",
-                                avatar: "",
-                                sex: null
-                            }
-                            this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
-                            if(res.result.currentUserRankingData.weeks == undefined){res.result.currentUserRankingData.weeks = 0;}
-                            if(res.result.currentUserRankingData.months == undefined){res.result.currentUserRankingData.months = 0;}
-                            if(res.result.currentUserRankingData.years == undefined){res.result.currentUserRankingData.years = 0;}
-                            this.experience.data = res.result.currentUserRankingData;
-
-                            if(res.result.currentUserRankingData.total>=0) {
-                              this.current = this.experienceValue(res.result.currentUserRankingData.total);
-                            }else if(
-                              res.result.currentUserRankingData.weeks>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.weeks);
-                            }else if(res.result.currentUserRankingData.months>=0) {
-                              this.current = this.experienceValue(res.result.currentUserRankingData.months);
-                            }else if(res.result.currentUserRankingData.years>=0) {
-                              this.current = this.experienceValue(res.result.currentUserRankingData.years);
-                            }
-                        }
-                        this.current.total=res.result.currentUserRankingData.total;//当前用户的经验值是固定的
-                       const ids= [];
-                       res.result.rankingData.forEach(item=>{
-                        ids.push(item.aid)
-                        item.authorInfo = {
-                            aid: "",
-                            name: "",
-                            orgInfo: "",
-                            avatar: "",
-                            sex: null
-                        }
-                       })
-                       this.getUserData(ids,res.result.rankingData)
-                       this.experience.list = res.result.rankingData;
-                    }
-                })
+  let data = {
+      aid:this.userInfo.aid,// #用户id
+      statType:20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+      field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
+      num:4,//  #显示的条数
+  }
+  apiStat.getRanking(data).then(res=>{
+      if(res.status==200){
+          if(res.result.currentUserRankingData) {
+              res.result.currentUserRankingData.authorInfo={
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+              }
+              this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
+              this.experience.data = res.result.currentUserRankingData;
+              if(this.experience.field == 'total') {
+                this.current = this.experienceValue(res.result.currentUserRankingData.total);
+                this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
+                this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.total;
+                this.currentUserRankingTotalData.endValue = this.current.endValue;
+              }
+          }
+          this.current.total=res.result.currentUserRankingData.total;//当前用户的经验值是固定的
+         const ids= [];
+         res.result.rankingData.forEach(item=>{
+          ids.push(item.aid)
+          item.authorInfo = {
+              aid: "",
+              name: "",
+              orgInfo: "",
+              avatar: "",
+              sex: null
+          }
+         })
+         this.getUserData(ids,res.result.rankingData)
+         this.experience.list = res.result.rankingData;
+      }
+  })
     },
     getDuration() {//学习时长
                 let data = {