From 5d9e4966f97b639f2d14c48153d9ab073e098dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 5 Nov 2019 17:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                          |  2 +-
 .../modules/courses/coursesPublic/ModulationModal.js   | 10 ++++++++--
 .../courses/exercise/Studentshavecompletedthelist.js   |  9 +++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index c0dbc6687..bd25f6977 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -243,4 +243,4 @@ function initOnlineOfflineListener() {
             '网络异常，请检测网络后重试。',
         })
     });
-}
\ No newline at end of file
+}
diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index b11aa4df7..d203470c0 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -81,11 +81,16 @@ class ModulationModal extends Component{
 							display: "flex",
 							flexDirection: "initial",
 						}}>
+
              <span style={{
 							 width: "70px",
 							 textAlign: "center",
 							 lineHeight: " 40px",
-						 }}>*调分：</span>
+						 }}><span style={{
+							 textAlign: "center",
+							 lineHeight: " 40px",
+							 color: " #f5222d",
+						 }}>*</span>调分：</span>
 							<Input style={{
 								width: "335px",
 								height: "40px",
@@ -130,7 +135,8 @@ class ModulationModal extends Component{
 						<div style={{
 							marginTop: "27px",
 							width: " 336px",
-							marginLeft: " 70px",
+							marginLeft: "70px",
+							marginBottom: "29px",
 						}}>
 							<a className="task-btn color-white mr30" style={{width: "72px",}}
 								 onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 08c95af6a..e997b834a 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -1242,6 +1242,7 @@ class Studentshavecompletedthelist extends Component {
 			],//columnsystwo 也会被columnsys当作参数接收
 			exercise_status:0,
 			order_type: "desc",
+			exeuserid: 0,
 		}
 		// //console.log("Studentshavecompletedthelist");
 		// //console.log(props.current_status);
@@ -1732,7 +1733,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 === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
-						finalscore: "评阅"
+						finalscore: "评阅",
+						user_id: exercise_users[i].user_id
 					})
 				} else {
 					datalist.push({
@@ -1747,7 +1749,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 === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
-						finalscore: "--"
+						finalscore: "--",
+						user_id: exercise_users[i].user_id
 					})
 					indexi++;
 				}
@@ -2563,8 +2566,6 @@ class Studentshavecompletedthelist extends Component {
 	}
 	// 调分
 	Adjustment = (e) => {
-		// console.log("Adjustment");
-		// console.log(e.myid);
 		this.setState({
 			testpapergradingboll: true,
 			exeuserid: e.user_id,