Merge branch 'master' into stat

src/components/UcHeader/Index.vue

@@ -78,9 +78,9 @@
         </div>
 
         <div class="learning-info">
-          <!--
+          
             <div @click="jumrank" style="cursor: pointer;" class="ranking-link"> BOE 排行榜 >></div>
-            -->
+            
         </div>
 
       </div>

src/views/ucurrency/Index.vue

@@ -31,16 +31,23 @@
         </div>
       </div>
     </div>
+
+
+
+
     <div class="experience">
       <div class="exp-hear">
         <div class="exp-hear-text">
-          经验值排行榜
+          学习天数排行榜
           <el-tooltip placement="top"  effect="light">
             <div slot="content" style="line-height:13px;">
+              <!--
               所有用户经验值TOP排行榜单，通过学习、贡献等行为可以获得经验值 。</br>
               系统已经根据您在4月23日新系统上线之后产生的学习数据对经验值进行</br>
               <span  style="line-height:15px;">了初始化，更早的数据以及老系统中产生的数据，将在2022年底一次性</span></br>
               补充到您的经验值中，请您耐心等待。
+              -->
+              所有用户学习天数TOP排行榜单，每活跃学习1天可累计学习天数
             </div>
             <svg-icon style="margin-left: 5px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
           </el-tooltip>
@@ -65,7 +72,7 @@
           累计排名 : <span> {{currentUserRankingTotalData.rankNo}}</span>
         </div>
         <div class="myexperience">
-          累计经验值 : <span>{{currentUserRankingTotalData.rankValue}}</span>
+          累计学习天数 : <span>{{currentUserRankingTotalData.rankValue}}</span>
         </div>
       </div>
 
@@ -87,7 +94,7 @@
           <div style="margin-left:5px">排名</div>
           <div style="margin-left:5px">姓名</div>
           <div class="bm">部门</div>
-          <div class="jy">经验值</div>
+          <div class="jy">学习天数</div>
         </div>
         <div>
           <div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px"
@@ -141,6 +148,15 @@
 
       </div>
     </div>
+
+
+
+
+
+
+
+
+
     <el-dialog :visible.sync="dialogVisible" :show-close="false" width="716px" top="13%">
       <div class="dialog-box">
         <div class="box-top">
@@ -334,7 +350,7 @@
       getRanking() {
         let data = {
           aid: this.userInfo.aid, // #用户id
-          statType: 20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+          statType: 11, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
           field: this.cycle, // #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
           num: 5, //  #显示的条数
         }
@@ -351,10 +367,10 @@
               this.getUserData([res.result.currentUserRankingData.aid], [res.result.currentUserRankingData])
               this.currentUserRankingData = res.result.currentUserRankingData;
               if(this.cycle == 'total'){
-                this.current = this.experienceValue(res.result.currentUserRankingData.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.currentUserRankingTotalData.endValue = this.current.endValue;
               }
             }
 

src/views/user/ranking.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="page-ranking">
+    <!-- 
     <div class="page-ranking-col experience">
           <div class="exp-hear">
            <div class="exp-hear-text">
@@ -22,9 +23,9 @@
                     </span>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item command="total">累计</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="years">本年</el-dropdown-item> -->
+                        <el-dropdown-item command="years">本年</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -38,18 +39,6 @@
              </div>
           </div>
 
-          <!--
-          <div class="exp-bar">
-            <h6> {{currentUserRankingTotalData.rankValue}}/{{currentUserRankingTotalData.endValue}}</h6>
-            <div class="exp-barbox">
-                <el-progress :percentage="currentUserRankingTotalData.rankValue*100/currentUserRankingTotalData.endValue" color="#387DF7"></el-progress>
-            </div>
-            <div class="exp-barname">
-                <span>{{current.start}}</span>
-                <span>{{current.end}}</span>
-            </div>
-          </div>
-          -->
 
           <div class="exp-table" style="margin-top:20px;">
              <div class="table-hear">
@@ -127,9 +116,9 @@
                     </span>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item command="total">累计</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="years">本年</el-dropdown-item> -->
+                        <el-dropdown-item command="years">本年</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -196,6 +185,7 @@
              </div>
           </div>
       </div>
+      -->
 
     <div class="page-ranking-col Duration">
            <div class="exp-hear study-info">