mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-17 14:56:46 +08:00
Merge branch 'zcwy_0827_pingcode817' into dev_master
This commit is contained in:
@@ -1334,8 +1334,8 @@
|
|||||||
<span style="color: #ffb751"
|
<span style="color: #ffb751"
|
||||||
>已开课
|
>已开课
|
||||||
{{
|
{{
|
||||||
currentPlanItem.courseScore !== -1
|
(currentPlanItem?.score !== 0&& currentPlanItem?.score!==-1)
|
||||||
? currentPlanItem.courseScore.toFixed(2)
|
? currentPlanItem.score?.toFixed(2)
|
||||||
: "-"
|
: "-"
|
||||||
}}</span>
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -2057,9 +2057,9 @@ const columns6 = [
|
|||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
customRender: ( text ) => {
|
customRender: ( text ) => {
|
||||||
return(
|
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;">
|
<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 class="daochu" onClick={()=>downPin(text.record)} title="导出评估信息"></div>
|
||||||
</div>
|
</div>
|
||||||
: '-'
|
: '-'
|
||||||
@@ -4238,7 +4238,7 @@ function onFocusEnd(){
|
|||||||
customRender: ({ record }) => {
|
customRender: ({ record }) => {
|
||||||
return (
|
return (
|
||||||
<div class="racona">
|
<div class="racona">
|
||||||
{record.assessmentScore || "-"}
|
{record.assessmentScore && record.assessmentScore!=0 && record.assessmentScore!=-1 ? record.assessmentScore?.toFixed(2) : "-"}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
// switch (String(record.status)) {
|
// switch (String(record.status)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user