Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

@@ -27,7 +27,6 @@ const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
 const {Option} = Select;
-
 //学生老师页面
 class Studentshavecompletedthelist extends Component {
 	// http://localhost:3007/courses/1309/exercises/722/exercises/student_exercise_list?debug=s
@@ -317,6 +316,26 @@ class Studentshavecompletedthelist extends Component {
 									</a>
 								</Tooltip>
 								:
+								record.commit_method===5?
+									<Tooltip  placement="bottom" title={
+										<div>
+											<div>最终调整成绩：{record.efficiencyscore}分</div>
+										</div>}>
+									<span style={parseInt(record.efficiencyscore) > 90 ? {
+										color: '#DD1717',
+										textAlign: "center"
+									} : parseInt(record.efficiencyscore) <= 90 ? {
+										color: '#FF6800',
+										textAlign: "center"
+									} : parseInt(record.efficiencyscore) <= 60 ? {
+										color: '#747A7F',
+										textAlign: "center",
+									} : {
+										color: '#747A7F',
+										textAlign: "center"
+									}}>{record.efficiencyscore}</span>
+									</Tooltip>
+									:
 								<span style={parseInt(record.efficiencyscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center"
@@ -587,6 +606,30 @@ class Studentshavecompletedthelist extends Component {
 										}}>--</a>
 									</Tooltip>
 									:
+									record.commit_method===5?
+										<Tooltip  placement="bottom" title={
+											<div>
+												<div>最终调整成绩：{record.efficiencyscore}分</div>
+											</div>}>
+										<span style={parseInt(record.efficiencyscore) > 90 ? {
+											color: '#DD1717',
+											textAlign: "center",
+											width:"199px"
+										} : parseInt(record.efficiencyscore) <= 90 ? {
+											color: '#FF6800',
+											textAlign: "center",
+											width:"199px"
+										} : parseInt(record.efficiencyscore) <= 60 ? {
+											color: '#747A7F',
+											textAlign: "center",
+											width:"199px"
+										} : {
+											color: '#747A7F',
+											textAlign: "center",
+											width:"199px"
+										}}>{record.efficiencyscore}</span>
+										</Tooltip>
+										:
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center",
@@ -845,6 +888,26 @@ class Studentshavecompletedthelist extends Component {
 																	}}>--</a>
 																</Tooltip>
 																:
+																record.commit_method===5?
+																	<Tooltip  placement="bottom" title={
+																		<div>
+																		<div>最终调整成绩：{record.efficiencyscore}分</div>
+																	  </div>}>
+																	<span style={parseInt(record.efficiencyscore) > 90 ? {
+																		color: '#DD1717',
+																		textAlign: "center",
+																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																		color: '#FF6800',
+																		textAlign: "center",
+																	} : parseInt(record.efficiencyscore) <= 60 ? {
+																		color: '#747A7F',
+																		textAlign: "center",
+																	} : {
+																		color: '#747A7F',
+																		textAlign: "center",
+																	}}>{record.efficiencyscore}</span>
+																	</Tooltip>
+																	:
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
@@ -1048,6 +1111,26 @@ class Studentshavecompletedthelist extends Component {
 																		textAlign: "center",}}>--</a>
 																</Tooltip>
 																:
+																record.commit_method===5?
+																	<Tooltip  placement="bottom" title={
+																		<div>
+																			<div>最终调整成绩：{record.efficiencyscore}分</div>
+																		</div>}>
+																	<span style={parseInt(record.efficiencyscore) > 90 ? {
+																		color: '#DD1717',
+																		textAlign: "center",
+																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																		color: '#FF6800',
+																		textAlign: "center",
+																	} : parseInt(record.efficiencyscore) <= 60 ? {
+																		color: '#747A7F',
+																		textAlign: "center",
+																	} : {
+																		color: '#747A7F',
+																		textAlign: "center",
+																	}}>{record.efficiencyscore}</span>
+																	</Tooltip>
+																	:
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
@@ -1246,6 +1329,26 @@ class Studentshavecompletedthelist extends Component {
 																		textAlign: "center",}}>--</a>
 																</Tooltip>
 																:
+																record.commit_method===5?
+																	<Tooltip  placement="bottom" title={
+																		<div>
+																			<div>最终调整成绩：{record.efficiencyscore}分</div>
+																		</div>}>
+																	<span style={parseInt(record.efficiencyscore) > 90 ? {
+																		color: '#DD1717',
+																		textAlign: "center",
+																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																		color: '#FF6800',
+																		textAlign: "center",
+																	} : parseInt(record.efficiencyscore) <= 60 ? {
+																		color: '#747A7F',
+																		textAlign: "center",
+																	} : {
+																		color: '#747A7F',
+																		textAlign: "center",
+																	}}>{record.efficiencyscore}</span>
+																	</Tooltip>
+																	:
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
@@ -1401,7 +1504,9 @@ class Studentshavecompletedthelist extends Component {
 					// //console.log("试卷学生未截止");
 					this.Generatenewdatas(response.data.exercise_users);
 					if (response.data.exercise_types.subjective === 0) {
+
 						if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) {
+							console.log("4");
 							var arr =[];
 							for(var i=0;i<this.state.columnss.length;i++){
 								var item = this.state.columnss[i];
@@ -1423,12 +1528,15 @@ class Studentshavecompletedthelist extends Component {
 							})
 
 						} else {
+							console.log("5");
+							debugger
 							var arr =[];
 							for(var i=0;i<this.state.columnss.length;i++){
 								var item = this.state.columnss[i];
 								if(item.title==="客观题得分"){
+
 								}
-								if(item.title==="主观题得分"){
+								else if(item.title==="主观题得分"){
 								}
 								else if(this.props.isNotMember()===true&&item.title==="学号") {
 
@@ -1613,6 +1721,8 @@ class Studentshavecompletedthelist extends Component {
 				completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
 				levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
 				score_open:exercise_types.score_open,
+				commit_method:current_answer_user.commit_method
+
 			})
 
 
@@ -2718,6 +2828,8 @@ class Studentshavecompletedthelist extends Component {
 		// //console.log("this.props.Commonheadofthetestpaper.exercise_status");
 		// //console.log(this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status);
 		// //console.log(exercise_status);
+		console.log("Studentshavecompletedthelis123123t");
+		console.log(columnss);
 		return (
 			isAdmin === true ?
 				(

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

@@ -460,7 +460,7 @@ class Testpapersettinghomepage extends Component{
                     />
                     {
                         // 教师列表
-                        parseInt(tab[0])==0 ? <Studentshavecompletedthelist {...this.props} {...this.state}  triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper}></Studentshavecompletedthelist>:""
+                        parseInt(tab[0])==0 ? <Studentshavecompletedthelist {...this.props} {...this.state}  triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} yslstustate={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}></Studentshavecompletedthelist>:""
                     }
 
                     {/*统计结果*/}