调整

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -214,6 +214,75 @@ class Listofworksstudentone extends Component {
         </span>
 					),
 				},
+				{
+					title: '完成情况',
+					dataIndex: 'completion',
+					key: 'completion',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+
+										<Tooltip  placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
+										</Tooltip>
+
+        </span>
+					)
+				},
+				{
+					title: '关卡得分',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+       	<span style={parseInt(record.levelscore) <= 60 ? {
+					"color": '#747A7F',
+					"text-align": "center"
+				} : parseInt(record.levelscore) < 90 ? {
+					"color": '#FF6800',
+					"text-align": "center"
+				} : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+					"color": '#747A7F',
+					"text-align": "center"
+				}}>{record.levelscore}</span>
+        </span>
+					)
+				},
+				{
+					title: '效率分',
+					dataIndex: 'efficiencyscore',
+					key: 'efficiencyscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+            {
+							record.efficiencyscore&& record.efficiencyscore=== "--"?(
+											<span style={{color:"#9A9A9A"}}>
+												--
+											</span>
+								)
+								:
+								<span style={parseInt(record.efficiencyscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) < 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) >= 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
+						}
+
+        </span>
+					)
+				},
 				{
 					title: '最终成绩',
 					dataIndex: 'levelscore',
@@ -398,7 +467,13 @@ class Listofworksstudentone extends Component {
 		var arr =[];
 		for(var i=0;i<this.state.columns.length;i++){
 			var item = this.state.columns[i];
-			if(this.props.isNotMember()===true&&item.title==="学号") {
+			if (work_efficiency === false) {
+			if(item.title==="关卡得分"){
+			}
+			else if(item.title==="效率分"){
+			}
+			}
+			else if(this.props.isNotMember()===true&&item.title==="学号") {
 
 			}else{
 				arr.push(item);
@@ -479,7 +554,7 @@ class Listofworksstudentone extends Component {
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
 					completion: student_works[i].complete_count === null ? "0" :student_works[i].complete_count === undefined ? "0":student_works[i].complete_count,
 					levelscore: student_works[i].final_score,
-					efficiencyscore: student_works[i].eff_score,
+					efficiencyscore: student_works[i].eff_score==="0.0"?"--":student_works[i].eff_score==="0"?"--":student_works[i].eff_score,
 					finalscore:student_works[i].work_score,
 					operating: "查看",
 					late_penalty: student_works[i].late_penalty=== null?"0":student_works[i].late_penalty === undefined?"0":student_works[i].late_penalty,
@@ -490,13 +565,6 @@ class Listofworksstudentone extends Component {
 
 			}
 
-			/*teacherlists = {  //分页
-				total: this.state.student_works.length, //数据总数量
-				pageSize: 10,  //一页显示几条
-				current: this.state.pages,
-			}*/
-
-
 		}
 
 
@@ -518,7 +586,14 @@ class Listofworksstudentone extends Component {
 		var arr =[];
 		for(var i=0;i<this.state.columns.length;i++){
 			var item = this.state.columns[i];
-			 if(this.props.isNotMember()===true&&item.title==="学号") {
+			if (work_efficiency === false) {
+				if (item.title === "关卡得分") {
+
+				} else if (item.title === "效率分") {
+
+				}
+			}
+			else if(this.props.isNotMember()===true&&item.title==="学号") {
 
 			}else{
 				arr.push(item);