From c16057ba7d188286f98dc26f409c072c93043954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 11 Mar 2020 20:43:41 +0800
Subject: [PATCH 1/2] =?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  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 755537798..5944e9c6f 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -1162,6 +1162,9 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															<a style={{textAlign: "center"}} className="color-blue"
@@ -1169,8 +1172,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
@@ -1181,6 +1182,10 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank"
+														 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															<a style={{textAlign: "center"}} className="color-blue"
@@ -1189,8 +1194,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
@@ -1413,6 +1416,9 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															<a style={{textAlign: "center"}} className="color-blue"
@@ -1420,8 +1426,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
@@ -1432,6 +1436,10 @@ class Studentshavecompletedthelist extends Component {
 										this.props.isAssistant()&&this.props.isAssistant()===true?
 											(//助教是否有权限
 												this.props.assistant_auth&&this.props.assistant_auth===true?
+													<a style={{textAlign: "center"}} className="color-blue"
+														 target="_blank"
+														 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+													:
 													(//是否截止
 														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
 															//是助教就是评阅
@@ -1441,8 +1449,6 @@ class Studentshavecompletedthelist extends Component {
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
-													:
-													<span style={{textAlign: "center", color: '#999999'}}>--</span>
 											)
 											:
 											//是老师就是评阅

From 01d8a87c3903a8b1ec9539657e2cc1e6377a80db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 11 Mar 2020 20:54:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/exercise/Exercisesetting.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index 2a43f42fb..0bd596c35 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -890,7 +890,7 @@ class Exercisesetting extends Component{
 																		<Checkbox disabled={this.props.isAdmin()===true?!flagPageEdit:true} className="mr15 font-16 color-grey-6" checked={this.state.assistant_auth} onChange={this.assistantauthority}>助教权限</Checkbox>
 																	)}
 																</Form.Item>
-																<span className="color-grey-c">(勾选则允许助教查看答案)</span>
+																<span className="color-grey-c">(选中，则允许助教查看答案)</span>
 															</p>
                             </div>
                         </div>