hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-11 20:06:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into develop

Browse Source
This commit is contained in:
caozc
2023-03-07 01:24:49 +08:00
parent 4b9ab0191d f4f45e58b6
commit ccb15d6700
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/api.js
View File

@@ -88,7 +88,7 @@ export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussS
export const EvaluationToLearn = '/evaluation/evaluationToLearn post' export const EvaluationToLearn = '/evaluation/evaluationToLearn post'
// 个人/小组完成度排行 // 个人/小组完成度排行
export const CompletionList = `/stu/project/rank_list/completion_list` export const CompletionList = `/stu/project/rank_list/project_rank_list`
// 积分排行榜 // 积分排行榜
export const PointList = `/stu/project/rank_list/point_list` export const PointList = `/stu/project/rank_list/point_list`

2
src/views/project/ProjectDetails.vue
View File

@@ -229,7 +229,7 @@
<!-- <div style="font-size: 14px;color: rgba(51, 51, 51, 1);font-weight: 600;">完成度排行榜</div> --> <!-- <div style="font-size: 14px;color: rgba(51, 51, 51, 1);font-weight: 600;">完成度排行榜</div> -->
<el-select @change="choiceStatus" v-model="stateValue" class="m-2" mode="tags" placeholder="完成度排行榜" <el-select @change="choiceStatus" v-model="stateValue" class="m-2" mode="tags" placeholder="完成度排行榜"
style="width: 130px;border: 0px solid red !important; box-shadow:none !important; "> style="width: 130px;border: 0px solid red !important; box-shadow:none !important; ">
<el-option v-for="item in studyProgress" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in studyProgress" :key="item.value" :label="item.label" :value="item.value" :disabled="item.label.includes('小组') && data.groupId==null?true:false" :title="item.label.includes('小组') && data.groupId==null?'当前学员无小组':''"/>
</el-select> </el-select>
</div> </div>
<!-- line --> <!-- line -->

11
src/views/roadmap/PathDetails.vue
View File

@@ -219,7 +219,7 @@
<div class="progress"> <div class="progress">
<div style="width: 291px"> <div style="width: 291px">
<el-progress <el-progress
:percentage="parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)" :percentage="parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100))"
:show-text="false" :stroke-width="8" :color=" :show-text="false" :stroke-width="8" :color="
{ {
0: 'rgba(238, 112, 108, 1)', 0: 'rgba(238, 112, 108, 1)',
@@ -231,12 +231,9 @@
}[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)] }[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)]
"/> "/>
</div> </div>
<div style=" <div
font-size: 14px; style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;"
font-weight: 500; :style="{
color: #277aff;
margin-left: 10px;
" :style="{
color: { color: {
0: 'rgba(238, 112, 108, 1)', 0: 'rgba(238, 112, 108, 1)',
1: 'rgba(255, 151, 38, 1)', 1: 'rgba(255, 151, 38, 1)',