mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git
synced 2025-12-07 01:46:46 +08:00
Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop
This commit is contained in:
@@ -74,7 +74,7 @@
|
||||
<div>当前进度</div>
|
||||
<div class="progress">
|
||||
<div style="width: 291px">
|
||||
<el-progress :percentage="value.currentRatio * 100" :show-text="false" :stroke-width="8" :color="
|
||||
<el-progress :percentage="value.currentRatio" :show-text="false" :stroke-width="8" :color="
|
||||
{
|
||||
0: 'rgba(238, 112, 108, 1)',
|
||||
1: 'rgba(255, 151, 38, 1)',
|
||||
@@ -82,7 +82,7 @@
|
||||
3: 'rgba(59, 94, 251, 1)',
|
||||
4: 'rgba(57, 219, 183, 1)',
|
||||
5: 'rgba(57, 219, 183, 1)',
|
||||
}[parseInt(value.currentRatio * 100 / 20)]
|
||||
}[parseInt(value.currentRatio / 20)]
|
||||
" />
|
||||
</div>
|
||||
<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;"
|
||||
@@ -94,9 +94,9 @@
|
||||
3: 'rgba(59, 94, 251, 1)',
|
||||
4: 'rgba(57, 219, 183, 1)',
|
||||
5: 'rgba(57, 219, 183, 1)',
|
||||
}[parseInt(value.currentRatio * 100 / 20)],
|
||||
}[parseInt(value.currentRatio / 20)],
|
||||
}">
|
||||
{{ value.currentRatio}}%
|
||||
{{ value.currentRatio }}%
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -446,7 +446,7 @@ function toFinish(d) {
|
||||
}
|
||||
}
|
||||
if (d.type === 3 || d.type === 7) {
|
||||
request(STUDY_RECORD, {
|
||||
d.status || request(STUDY_RECORD, {
|
||||
studentId: userInfo.value.id,
|
||||
targetId: data.value.routerId,
|
||||
logo: 1,
|
||||
@@ -463,8 +463,8 @@ function toFinish(d) {
|
||||
router.push({
|
||||
path: types.value.path[d.type],
|
||||
query: {
|
||||
// id: d.routerTaskId,
|
||||
id: routerId,
|
||||
id: d.routerTaskId,
|
||||
// id: routerId,
|
||||
type: 1,
|
||||
taskId: routerId,
|
||||
taskIds: routerId,
|
||||
|
||||
Reference in New Issue
Block a user