mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-11 03:46:44 +08:00
Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat
This commit is contained in:
@@ -118,11 +118,10 @@
|
||||
<div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank">
|
||||
{{currentUserRankingData.rankingNo}}</div>
|
||||
<div class="tab-name">
|
||||
<author-img :avatar="userInfo.avatar" :aid="currentUserRankingData.authorInfo.aid"
|
||||
:sex="currentUserRankingData.authorInfo.sex"></author-img> <span
|
||||
style="color: #0059FF;">{{currentUserRankingData.authorInfo.name}}</span>
|
||||
<author-img :avatar="userInfo.avatar" :aid="userInfo.aid"
|
||||
:sex="userInfo.sex"></author-img> <span style="color: #0059FF;">{{userInfo.name}}</span>
|
||||
</div>
|
||||
<div class="bm tab-bm" style="margin-left:30px;color: #0059FF;">{{cutOrgNamePath(currentUserRankingData.authorInfo.orgInfo)}}
|
||||
<div class="bm tab-bm" style="margin-left:30px;color: #0059FF;">{{cutOrgNamePath(userInfo.orgInfo)}}
|
||||
</div>
|
||||
<div class="jy tab-jy">
|
||||
<div v-if="cycle == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.total}}</div>
|
||||
|
||||
@@ -169,8 +169,8 @@
|
||||
<div class="tab-name" v-if="userInfo.aid">
|
||||
<author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
|
||||
<div>
|
||||
<span style="color: #0059FF;">{{learningDuration.data.authorInfo.name}}</span>
|
||||
<div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(learningDuration.data.authorInfo.orgInfo)}}</div>
|
||||
<span style="color: #0059FF;">{{userInfo.name}}</span>
|
||||
<div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(userInfo.orgInfo)}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="jy tab-jy">
|
||||
@@ -250,11 +250,11 @@
|
||||
</div>
|
||||
<div v-if="learningDays.data.rankingNo>5" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
|
||||
<div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank" >{{learningDays.data.rankingNo}}</div>
|
||||
<div class="tab-name" v-if="learningDays.data.authorInfo && learningDays.data.authorInfo.aid">
|
||||
<author-img :avatar="userInfo.avatar" :aid="learningDays.data.authorInfo.aid" :sex="learningDays.data.authorInfo.sex"></author-img>
|
||||
<div class="tab-name" v-if="userInfo.aid">
|
||||
<author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
|
||||
<div>
|
||||
<span style="color: #0059FF;">{{learningDays.data.authorInfo.name}}</span>
|
||||
<div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(learningDays.data.authorInfo.orgInfo)}}</div>
|
||||
<span style="color: #0059FF;">{{userInfo.name}}</span>
|
||||
<div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(userInfo.orgInfo)}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user