Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into test20250220

This commit is contained in:
joshen
2025-02-26 21:08:27 +08:00

View File

@@ -45,9 +45,7 @@
<div class="progress-content"> <div class="progress-content">
<div class="f-j-b" style="margin-bottom: 10px"> <div class="f-j-b" style="margin-bottom: 10px">
<div class="f-a-c"> <div class="f-a-c">
<div style=" font-size: 16px; color: #333333"> <div style="font-size: 16px; color: #333333">必修进度</div>
必修进度
</div>
<div style="font-size: 18px; color: #999999; margin-left: 12px"> <div style="font-size: 18px; color: #999999; margin-left: 12px">
{{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }} {{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }}
</div> </div>
@@ -63,12 +61,11 @@
color="#0077EC" color="#0077EC"
></el-progress> ></el-progress>
</div> </div>
<template v-if="item.electiveTaskNum !== 0">
<div class="progress-content"> <div class="progress-content">
<div class="f-j-b" style="margin-bottom: 10px"> <div class="f-j-b" style="margin-bottom: 10px">
<div class="f-a-c"> <div class="f-a-c">
<div style="font-size: 16px; color: #333333"> <div style="font-size: 16px; color: #333333">选修进度</div>
选修进度
</div>
<div style="font-size: 18px; color: #999999; margin-left: 12px"> <div style="font-size: 18px; color: #999999; margin-left: 12px">
{{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }} {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
</div> </div>
@@ -92,12 +89,11 @@
:percentage="electiveTaskCompletionRate(item)" :percentage="electiveTaskCompletionRate(item)"
></el-progress> ></el-progress>
</div> </div>
</template>
<div class="progress-content"> <div class="progress-content">
<div class="f-j-b" style="margin-bottom: 10px"> <div class="f-j-b" style="margin-bottom: 10px">
<div class="f-a-c"> <div class="f-a-c">
<div style=" font-size: 16px; color: #333333"> <div style="font-size: 16px; color: #333333">总进度</div>
总进度
</div>
<div style="font-size: 18px; color: #999999; margin-left: 12px"> <div style="font-size: 18px; color: #999999; margin-left: 12px">
{{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }} {{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }}
</div> </div>
@@ -174,6 +170,8 @@ export default {
num = num * 100; num = num * 100;
num = num.toFixed(0); num = num.toFixed(0);
return Number(num); return Number(num);
} else if (item.electiveTaskNum == 0) {
return 100;
} else { } else {
return 0; return 0;
} }