feat:合并

This commit is contained in:
lixg
2023-01-28 16:46:37 +08:00
56 changed files with 646 additions and 643 deletions

View File

@@ -431,23 +431,13 @@
<a-progress
:showInfo="false"
:percent="
parseInt(
(item.finishStuNum / item.totalStuNum) * 100
)
parseInt((item.finishStuNum / item.totalStuNum) * 100)
"
strokeColor="#FFC067"
trailColor="rgba(253, 209, 98, 0.2)"
/>
<span class="progresstext" style="margin-left: 10px"
>{{
item.totalStuNum == 0
? 0
: item.finishStuNum == 0
? 0
: parseInt(
(item.finishStuNum / item.totalStuNum) * 100
)
}}%</span
>{{parseInt((item.finishStuNum / item.totalStuNum) * 100) || 0}}%</span
>
</div>
</div>
@@ -911,7 +901,6 @@
:options="statess"
@change="selectProjectName4"
allowClear
showSearch
></a-select>
</div>
<div class="btn">
@@ -1670,7 +1659,7 @@ export default {
className: "h",
customRender: ({ record }) => (
<div>
{record.finishTaskNum}/{record.totalTaskNum}
{record.finishTaskNum || 0}/{record.totalTaskNum || 0}
</div>
),
},