From 071d2df64523229d29678ab1ab11edfc9e54d525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 20 Mar 2020 20:11:24 +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 | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 070ceeed2..b8880c6f2 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -1244,19 +1244,19 @@ class Studentshavecompletedthelist extends Component { (//助教是否有权限 this.props.assistant_auth&&this.props.assistant_auth===true? this.Adjustment(record.user_id)}>评阅 + target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} : (//是否截止 this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3? this.Adjustment(record.user_id)}>评阅 + target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} : -- ) ) : this.Adjustment(record.user_id)}>评阅 + target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} ) :record.submitstate === "已提交"? (//是否助教 @@ -1581,8 +1581,9 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - operating: "评阅", + operating:exercise_users[i].has_comment===true?"已评阅":"评阅", commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) } else { datalist.push({ @@ -1599,8 +1600,9 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - operating: "--", - commit_method:exercise_users[i].commit_method + operating:exercise_users[i].has_comment===true?"已评阅":"--", + commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) } @@ -1670,8 +1672,9 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - operating: "查看", + operating:exercise_users[i].has_comment===true?"已评阅":"查看", commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) noclassroom = exercise_users[i].user_group_name; } @@ -1817,9 +1820,10 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - finalscore: "评阅", + finalscore:exercise_users[i].has_comment===true?"已评阅":"评阅", user_id: exercise_users[i].user_id, - commit_method:exercise_users[i].commit_method + commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) } else { datalist.push({ @@ -1836,9 +1840,10 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - finalscore: "--", + finalscore:exercise_users[i].has_comment===true?"已评阅":"--", user_id: exercise_users[i].user_id, - commit_method:exercise_users[i].commit_method + commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) indexi++; }