Merge branch 'zcwy_0827_pingcode817' into dev_master

This commit is contained in:
nisen
2024-11-07 18:42:36 +08:00

View File

@@ -1334,8 +1334,8 @@
<span style="color: #ffb751"
>已开课
{{
currentPlanItem.courseScore !== -1
? currentPlanItem.courseScore.toFixed(2)
(currentPlanItem?.score !== 0&& currentPlanItem?.score!==-1)
? currentPlanItem.score?.toFixed(2)
: "-"
}}</span>
</div>
@@ -2057,9 +2057,9 @@ const columns6 = [
ellipsis: true,
customRender: ( text ) => {
return(
text.record && text.record.courseScore != -1 ?
text.record && text.record?.score != 0 && text.record?.score != -1 ?
<div style="display:flex;justify-content:center;align-items:center;">
<span>{(text.record.courseScore.toFixed(2) || '0.00')}</span>
<span>{(text.record.score?.toFixed(2) || '0.00')}</span>
<div class="daochu" onClick={()=>downPin(text.record)} title="导出评估信息"></div>
</div>
: '-'
@@ -4238,7 +4238,7 @@ function onFocusEnd(){
customRender: ({ record }) => {
return (
<div class="racona">
{record.assessmentScore || "-"}
{record.assessmentScore && record.assessmentScore!=0 && record.assessmentScore!=-1 ? record.assessmentScore?.toFixed(2) : "-"}
</div>
);
// switch (String(record.status)) {