From efb24a6c4ec7dbe1e8149554e5548a8486162468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 14 Nov 2019 10:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exercise/Studentshavecompletedthelist.js | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 7c0c74f33..6d94178eb 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -1030,15 +1030,17 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14", render: (text, record) => ( - {record.finalscore==="--"? - this.Adjustment(record.user_id)}>评阅 - : - {record.finalscore} + { + record.submitstate === "未提交"||record.commit_method===5? + this.Adjustment(record.user_id)}>评阅 + :record.submitstate === "已提交"? + {record.finalscore} + : + -- } - ) }, @@ -1226,15 +1228,17 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14", render: (text, record) => ( - {record.finalscore==="--"? - this.Adjustment(record.user_id)}>评阅 - : - {record.finalscore} + { + record.submitstate === "未提交"||record.commit_method===5? + this.Adjustment(record.user_id)}>评阅 + :record.submitstate === "已提交"? + {record.finalscore} + : + -- } - ) }, @@ -1521,7 +1525,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, - operating: "评阅" + operating: "评阅", + commit_method:exercise_users[i].commit_method }) } else { datalist.push({ @@ -1536,7 +1541,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, - operating: "--" + operating: "--", + commit_method:exercise_users[i].commit_method }) } @@ -1599,7 +1605,8 @@ class Studentshavecompletedthelist extends Component { completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, - operating: "查看" + operating: "查看", + commit_method:exercise_users[i].commit_method, }) noclassroom = exercise_users[i].user_group_name; } @@ -1744,7 +1751,8 @@ class Studentshavecompletedthelist extends Component { levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, finalscore: "评阅", - user_id: exercise_users[i].user_id + user_id: exercise_users[i].user_id, + commit_method:exercise_users[i].commit_method }) } else { datalist.push({ @@ -1760,7 +1768,8 @@ class Studentshavecompletedthelist extends Component { levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, finalscore: "--", - user_id: exercise_users[i].user_id + user_id: exercise_users[i].user_id, + commit_method:exercise_users[i].commit_method }) indexi++; } @@ -2032,7 +2041,8 @@ class Studentshavecompletedthelist extends Component { columnsys: arr, subjective: response.data.exercise_types.subjective, objective_score: response.data.exercise_types.objective_score, - subjective_score: response.data.exercise_types.subjective_score, + subjective_score: response.data.exercise_types.subjective_score + }) }