From 609bf2a6c57abe607782c5a7666b6ac0b2b4f472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 8 Nov 2019 10:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/ModulationModal.js  | 32 +++++++++++++++++--
 .../exercise/Studentshavecompletedthelist.js  | 24 ++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index 8c3fcaa37..196dbfeac 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -58,7 +58,34 @@ class ModulationModal extends Component{
 
   setInputs=(e)=>{
 		console.log("setInputs");
+		console.log(e);
 		let value = undefined;
+		if (e === undefined) {
+			this.setState({
+				borredszf: "ml10  color-grey-9 bor-reds ",
+				Inputsval: "",
+				Inputsvaltype: true,
+				Inputsvaltest: "请输入分数",
+			})
+			return;
+		} else if (e === null) {
+			this.setState({
+				borredszf: "ml10  color-grey-9 bor-reds ",
+				Inputsval: "",
+				Inputsvaltype: true,
+				Inputsvaltest: "请输入分数",
+			})
+			return;
+		} else if (e === "") {
+			this.setState({
+				borredszf: "ml10  color-grey-9 bor-reds ",
+				Inputsval: "",
+				Inputsvaltype: true,
+				Inputsvaltest: "请输入分数",
+			})
+			return;
+		}
+
 		try {
 			value = parseFloat(e);
 		} catch (e) {
@@ -91,7 +118,6 @@ class ModulationModal extends Component{
 			})
 			return;
 		}
-		console.log(value);
 		this.setState({
 			Inputsval: value,
 			Inputsvaltype: false,
@@ -144,7 +170,7 @@ class ModulationModal extends Component{
 									`
 									.myinputnumbers .ant-input-number-input{
 									line-height: 40px;
-                   height: 40px;
+                   height: 35px;
 									}
 									`
 								}
@@ -157,7 +183,7 @@ class ModulationModal extends Component{
 													 }}
 													 step={0.1}
 
-													 onChange={this.setInputs}
+													 onChange={(e) => this.setInputs(e)}
 													 value={Inputsval === undefined || Inputsval === null ? 0 : Inputsval}/>
 							<span
 								style={{
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 61075de2e..b471454c0 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -1799,6 +1799,9 @@ class Studentshavecompletedthelist extends Component {
 						course_groups: response.data.course_groups,
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 						columnsys: arr,
 					})
 				} else {
@@ -1831,6 +1834,9 @@ class Studentshavecompletedthelist extends Component {
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 						columnsys: arr,
 					})
 				}
@@ -1868,6 +1874,9 @@ class Studentshavecompletedthelist extends Component {
 						course_groups: response.data.course_groups,
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 						columnsys:	arr,
 					})
 				} else {
@@ -1900,6 +1909,9 @@ class Studentshavecompletedthelist extends Component {
 						course_groups: response.data.course_groups,
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 						columnsys: arr,
 					})
 				}
@@ -1932,6 +1944,9 @@ class Studentshavecompletedthelist extends Component {
 						course_groups: response.data.course_groups,
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						columnsys: arr,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
 					var arr =[];
@@ -1957,6 +1972,9 @@ class Studentshavecompletedthelist extends Component {
 						course_groups: response.data.course_groups,
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						columnsys:arr,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				}
 			} else {
@@ -1973,6 +1991,9 @@ class Studentshavecompletedthelist extends Component {
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: this.state.columnsystwo,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
 					var arr =[];
@@ -1999,6 +2020,9 @@ class Studentshavecompletedthelist extends Component {
 						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: arr,
+						subjective: response.data.exercise_types.subjective,
+						objective_score: response.data.exercise_types.objective_score,
+						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				}