Merge branches 'dev_aliyun' and 'issues25489' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -1031,10 +1031,8 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.finalscore==="--"?
-
-
-								<span style={{textAlign: "center", color: '#999999'}}
-								>--</span>
+								<a style={{textAlign: "center"}} className="color-blue" target="_blank"
+									 onClick={() => this.Adjustment(record.user_id)}>评阅</a>
 								:
 									<a style={{textAlign: "center"}} className="color-blue"
 										 target="_blank"
@@ -1229,8 +1227,8 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.finalscore==="--"?
-								<span style={{textAlign: "center", color: '#999999'}}
-								>--</span>
+								<a style={{textAlign: "center"}} className="color-blue" target="_blank"
+									 onClick={() => this.Adjustment(record.user_id)}>评阅</a>
 									:
 									<a style={{textAlign: "center"}} className="color-blue"
 										 target="_blank"
@@ -1248,11 +1246,10 @@ class Studentshavecompletedthelist extends Component {
 			objective_score: 0,
 			subjective_score: 0,
 		}
-		{/*<a style={{textAlign: "center"}} className="color-blue"*/
-		}
-		{/*	 target="_blank"*/
+
+		{/*<span style={{textAlign: "center", color: '#999999'}}*/
 		}
-		{/*	 onClick={() => this.Adjustment(record.user_id)}>评阅</a>*/
+		{/*>--</span>*/
 		}
 		// //console.log("Studentshavecompletedthelist");
 		// //console.log(props.current_status);
@@ -1299,6 +1296,9 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 	componentDidMount() {
+
+		console.log("componentDidMount");
+		console.log(this.props);
 		// if(this.props.isAdmin() === true){
 		//     this.Teacherliststudentlistsy();
 		//     //console.log("1111111111111111");
@@ -2668,18 +2668,18 @@ class Studentshavecompletedthelist extends Component {
 								</div>
 								:
 								<div>
-									{testpapergradingboll === true ? <ModulationModal
-										visible={testpapergradingboll}
-										Cancel={() => this.Adjustments()}
-										Saves={(value, num) => this.Testpapergrading(value, num)}
-									/> : ""}
-									{/*{*/}
-									{/*	testpapergradingboll === true ? <ModulationModal_exercise*/}
+									{/*{testpapergradingboll === true ? <ModulationModal*/}
 									{/*	visible={testpapergradingboll}*/}
 									{/*	Cancel={() => this.Adjustments()}*/}
 									{/*	Saves={(value, num) => this.Testpapergrading(value, num)}*/}
-									{/*	/> : ""*/}
-									{/*}*/}
+									{/*/> : ""}*/}
+									{
+										testpapergradingboll === true ? <ModulationModal_exercise
+											visible={testpapergradingboll}
+											Cancel={() => this.Adjustments()}
+											Saves={(value, num) => this.Testpapergrading(value, num)}
+										/> : ""
+									}
 									<div className="edu-back-white" >
 										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>