From f62484aecd6a03f24fd4a42a0db1838c59c600ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 26 Jun 2019 18:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/GraduationTaskssettinglist.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 21672ba65..5cd7527ad 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -734,13 +734,6 @@ class GraduationTaskssettinglist extends Component{ ), }, { - // finalscore: {work_score:worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score, - // teacher_comment_score:worklists[i].teacher_comment_score, - // cross_comment_score:worklists[i].cross_comment_score, - // late_penalty:worklists[i].late_penalty - // }, - - title: '最终成绩', key: 'finalscore', dataIndex: 'finalscore', @@ -748,11 +741,11 @@ class GraduationTaskssettinglist extends Component{ render: (text, record) => ( - {record.final_score.username}{(record.final_score.login)}
- {record.ultimate_score===true?"":"教师评分:"+record.final_score.teacher_comment_score+"分"}
- {taskslistdata.cross_comment===true?"":"交叉评分:"+record.final_score.cross_comment_score+"分"}
- {record.final_score.late_penalty===undefined?"":"迟交扣分:"+record.final_score.late_penalty+"分"}
- 最终成绩:{record.final_score.work_score}分
+ {record.finalscore.final_score.username}{(record.finalscore.final_score.login)}
+ {record.finalscore.ultimate_score===true?"":"教师评分:"+record.finalscore.teacher_comment_score+"分"}
+ {taskslistdata.cross_comment===true?"":"交叉评分:"+record.finalscore.cross_comment_score+"分"+
} + {record.finalscore.late_penalty===undefined?"":"迟交扣分:"+record.finalscore.late_penalty+"分"+
} + 最终成绩:{record.finalscore.work_score}分
}> 90?'#DD1717':parseInt(record.finalscore.work_score)>60&&parseInt(record.finalscore.work_score)<90?"#FF6800":'#747A7F'}}>{record.finalscore.work_score==="--"?"--":record.finalscore.work_score}