diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 5afd7adf0..b7945ee60 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -61,6 +61,9 @@ class Listofworksstudentone extends Component {
 		//要提交的分班状态checkedValuesineinfo
 		//searchtext 输入的姓名和学号
 		//order 排序时间
+		//当前成绩work_score
+		//关卡得分final_score
+
 		this.state = {
 			jobsettingsdata: undefined,
 			endTime: "2018/11/10 17:10:00",
@@ -394,19 +397,19 @@ class Listofworksstudentone extends Component {
 						<span style={{
 							width: '99px',
 						}}>
-       	<span style={parseInt(record.levelscore) <= 60 ? {
+       	<span style={parseInt(record.final_score) <= 60 ? {
 					color: '#747A7F',
 					textAlign: "center",
 					width: '99px',
-				} : parseInt(record.levelscore) < 90 ? {
+				} : parseInt(record.final_score) < 90 ? {
 					color: '#FF6800',
 					textAlign: "center",
 					width: '99px',
-				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
+				} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
 					color: '#747A7F',
 					textAlign: "center",
 					width: '99px',
-				}}>{record.levelscore}</span>
+				}}>{record.final_score}</span>
         </span>
 					)
 				},
@@ -460,26 +463,26 @@ class Listofworksstudentone extends Component {
 				},
 				{
 					title: '当前成绩',
-					dataIndex: 'levelscore',
-					key: 'levelscore',
+					dataIndex: 'work_score',
+					key: 'work_score',
 					align: "center",
 					className: 'font-14',
 					width: '99px',
 					render: (text, record) => (
 						<span style={{width: '99px',}}>
 						{
-							record.levelscore && record.levelscore === "--" ?
-								<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
+							record.work_score && record.work_score === "--" ?
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.work_score}</span>
 								:
-								<span style={parseInt(record.levelscore) >= 90 ? {
+								<span style={parseInt(record.work_score) >= 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
 									width: '99px',
-								} : parseInt(record.levelscore) <= 60 ? {
+								} : parseInt(record.work_score) <= 60 ? {
 									color: '#FF6800',
 									textAlign: "center",
 									width: '99px',
-								} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
+								} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score}</span>
 						}
 
         </span>
@@ -787,19 +790,19 @@ class Listofworksstudentone extends Component {
 						<span style={{
 							width: '99px',
 						}}>
-       	<span style={parseInt(record.levelscore) <= 60 ? {
+       	<span style={parseInt(record.final_score) <= 60 ? {
 					color: '#747A7F',
 					textAlign: "center",
 					width: '99px',
-				} : parseInt(record.levelscore) < 90 ? {
+				} : parseInt(record.final_score) < 90 ? {
 					color: '#FF6800',
 					textAlign: "center",
 					width: '99px',
-				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
+				} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
 					color: '#747A7F',
 					textAlign: "center",
 					width: '99px',
-				}}>{record.levelscore}</span>
+				}}>{record.final_score}</span>
         </span>
 					)
 				},
@@ -853,26 +856,26 @@ class Listofworksstudentone extends Component {
 				},
 				{
 					title: '当前成绩',
-					dataIndex: 'levelscore',
-					key: 'levelscore',
+					dataIndex: 'work_score',
+					key: 'work_score',
 					align: "center",
 					className: 'font-14',
 					width: '99px',
 					render: (text, record) => (
 						<span style={{width: '99px',}}>
 						{
-							record.levelscore && record.levelscore === "--" ?
-								<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
+							record.work_score && record.work_score === "--" ?
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.work_score}</span>
 								:
-								<span style={parseInt(record.levelscore) >= 90 ? {
+								<span style={parseInt(record.work_score) >= 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
 									width: '99px',
-								} : parseInt(record.levelscore) <= 60 ? {
+								} : parseInt(record.work_score) <= 60 ? {
 									color: '#FF6800',
 									textAlign: "center",
 									width: '99px',
-								} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
+								} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score}</span>
 						}
 
         </span>
@@ -1131,16 +1134,16 @@ class Listofworksstudentone extends Component {
 					className: 'font-14',
 					render: (text, record) => (
 						<span>
-       	<span style={parseInt(record.levelscore) <= 60 ? {
+       	<span style={parseInt(record.final_score) <= 60 ? {
 					color: '#747A7F',
 					"text-align": "center"
-				} : parseInt(record.levelscore) < 90 ? {
+				} : parseInt(record.final_score) < 90 ? {
 					color: '#FF6800',
 					"text-align": "center"
-				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
+				} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
 					color: '#747A7F',
 					"text-align": "center"
-				}}>{record.levelscore}</span>
+				}}>{record.final_score}</span>
         </span>
 					)
 				},
@@ -1198,8 +1201,8 @@ class Listofworksstudentone extends Component {
 				},
 				{
 					title: '当前成绩',
-					dataIndex: 'finalscore',
-					key: 'finalscore',
+					dataIndex: 'work_score',
+					key: 'work_score',
 					align: 'center',
 					className: 'font-14',
 					sorter: true,
@@ -1211,35 +1214,35 @@ class Listofworksstudentone extends Component {
 										record.ultimate_score === true ?
 											<Tooltip placement="bottom" title={<div>
 												{/*<div>{record.user_name}{record.user_login}</div>*/}
-												<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
-													<span>最终调整成绩：{record.finalscore}分</span>}</div>
+												<div>{record.work_score === "--" ? <span>最终调整成绩：0分</span> :
+													<span>最终调整成绩：{record.work_score}分</span>}</div>
 											</div>}>
 												{
-													record.finalscore && record.finalscore === "--" ?
+													record.work_score && record.work_score === "--" ?
 														<span style=
 																		{{
 																			color: '#9A9A9A',
 																			"text-align": "center"
-																		}}>{record.finalscore}</span>
+																		}}>{record.work_score}</span>
 														:
-														<span style={parseInt(record.finalscore) <= 60 ? {
+														<span style={parseInt(record.work_score) <= 60 ? {
 															color: '#747A7F',
 															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
+														} : parseInt(record.work_score) < 90 ? {
 															color: '#FF6800',
 															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
+														} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
 															color: '#747A7F',
 															"text-align": "center"
-														}}>{record.finalscore}</span>
+														}}>{record.work_score}</span>
 												}
 											</Tooltip>
 											:
 											<Tooltip placement="bottom" title={<div>
 												{/*<div>{record.user_name}{record.user_login}</div>*/}
 
-												<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
-													<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.final_score === "--" ? <span>关卡得分：0分</span> :
+													<span>关卡得分：{record.final_score}分</span>}</div>
 
 												<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
 													<span>效率评分：{record.efficiencyscore}分</span>}</div>
@@ -1249,27 +1252,27 @@ class Listofworksstudentone extends Component {
 
 												{answer_open_evaluation===true?"":<div>查看参考答案：{record.view_answer_count}关</div>}
 
-												<div>{record.finalscore === "--" ? <span>最终成绩：0分</span> :
-													<span>最终成绩：{record.finalscore}分</span>}</div>
+												<div>{record.work_score === "--" ? <span>最终成绩：0分</span> :
+													<span>最终成绩：{record.work_score}分</span>}</div>
 											</div>}>
 												{
-													record.finalscore && record.finalscore === "--" ?
+													record.work_score && record.work_score === "--" ?
 														<span style=
 																		{{
 																			color: '#9A9A9A',
 																			"text-align": "center"
-																		}}>{record.finalscore}</span>
+																		}}>{record.work_score}</span>
 														:
-														<span style={parseInt(record.finalscore) <= 60 ? {
+														<span style={parseInt(record.work_score) <= 60 ? {
 															color: '#747A7F',
 															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
+														} : parseInt(record.work_score) < 90 ? {
 															color: '#FF6800',
 															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
+														} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
 															color: '#747A7F',
 															"text-align": "center"
-														}}>{record.finalscore}</span>
+														}}>{record.work_score}</span>
 												}
 											</Tooltip>
 
@@ -1486,22 +1489,22 @@ class Listofworksstudentone extends Component {
 						  计算规则:<br/>
               截止前学员完成的关卡才有成绩<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
-					dataIndex: 'levelscore',
-					key: 'levelscore',
+					dataIndex: 'final_score',
+					key: 'final_score',
 					align: 'center',
 					className: 'font-14',
 					render: (text, record) => (
 						<span>
-       	<span style={parseInt(record.levelscore) <= 60 ? {
+       	<span style={parseInt(record.final_score) <= 60 ? {
 					color: '#747A7F',
 					textAlign: "center"
-				} : parseInt(record.levelscore) < 90 ? {
+				} : parseInt(record.final_score) < 90 ? {
 					color: '#FF6800',
 					textAlign: "center"
-				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+				} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
 					color: '#747A7F',
 					textAlign: "center"
-				}}>{record.levelscore}</span>
+				}}>{record.final_score}</span>
         </span>
 					)
 				},
@@ -1559,8 +1562,8 @@ class Listofworksstudentone extends Component {
 				},
 				{
 					title: '当前成绩',
-					dataIndex: 'finalscore',
-					key: 'finalscore',
+					dataIndex: 'work_score',
+					key: 'work_score',
 					align: 'center',
 					className: 'font-14',
 					sorter: true,
@@ -1572,35 +1575,35 @@ class Listofworksstudentone extends Component {
 										record.ultimate_score === true ?
 											<Tooltip placement="bottom" title={<div>
 												{/*<div>{record.user_name}{record.user_login}</div>*/}
-												<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
-													<span>最终调整成绩：{record.finalscore}分</span>}</div>
+												<div>{record.work_score === "--" ? <span>最终调整成绩：0分</span> :
+													<span>最终调整成绩：{record.work_score}分</span>}</div>
 											</div>}>
 												{
-													record.finalscore && record.finalscore === "--" ?
+													record.work_score && record.work_score === "--" ?
 														<span style=
 																		{{
 																			color: '#9A9A9A',
 																			textAlign: "center"
-																		}}>{record.finalscore}</span>
+																		}}>{record.work_score}</span>
 														:
-														<span style={parseInt(record.finalscore) <= 60 ? {
+														<span style={parseInt(record.work_score) <= 60 ? {
 															color: '#747A7F',
 															textAlign: "center"
-														} : parseInt(record.finalscore) < 90 ? {
+														} : parseInt(record.work_score) < 90 ? {
 															color: '#FF6800',
 															textAlign: "center"
-														} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+														} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
 															color: '#747A7F',
 															textAlign: "center"
-														}}>{record.finalscore}</span>
+														}}>{record.work_score}</span>
 												}
 											</Tooltip>
 											:
 											<Tooltip placement="bottom" title={<div>
 												{/*<div>{record.user_name}{record.user_login}</div>*/}
 
-												<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
-													<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.final_score === "--" ? <span>关卡得分：0分</span> :
+													<span>关卡得分：{record.final_score}分</span>}</div>
 
 												<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
 													<span>效率评分：{record.efficiencyscore}分</span>}</div>
@@ -1610,27 +1613,27 @@ class Listofworksstudentone extends Component {
 
 												{answer_open_evaluation===true?"":<div>查看参考答案：{record.view_answer_count}关</div>}
 
-												<div>{record.finalscore === "--" ? <span>最终成绩：0分</span> :
-													<span>最终成绩：{record.finalscore}分</span>}</div>
+												<div>{record.work_score === "--" ? <span>最终成绩：0分</span> :
+													<span>最终成绩：{record.work_score}分</span>}</div>
 											</div>}>
 												{
-													record.finalscore && record.finalscore === "--" ?
+													record.work_score && record.work_score === "--" ?
 														<span style=
 																		{{
 																			color: '#9A9A9A',
 																			textAlign: "center"
-																		}}>{record.finalscore}</span>
+																		}}>{record.work_score}</span>
 														:
-														<span style={parseInt(record.finalscore) <= 60 ? {
+														<span style={parseInt(record.work_score) <= 60 ? {
 															color: '#747A7F',
 															textAlign: "center"
-														} : parseInt(record.finalscore) < 90 ? {
+														} : parseInt(record.work_score) < 90 ? {
 															color: '#FF6800',
 															textAlign: "center"
-														} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+														} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
 															color: '#747A7F',
 															textAlign: "center"
-														}}>{record.finalscore}</span>
+														}}>{record.work_score}</span>
 												}
 											</Tooltip>
 
@@ -2082,7 +2085,8 @@ class Listofworksstudentone extends Component {
 						levelscore: teacherdata.final_score,
 						view_answer_count: teacherdata.view_answer_count,
 						efficiencyscore: teacherdata.eff_score,
-						finalscore: teacherdata.work_score,
+						final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score,
+						work_score: teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score,
 						operating: "查看",
 						late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty,
 						ultimate_score: teacherdata.ultimate_score,
@@ -2123,8 +2127,9 @@ 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,
+					final_score: student_works[i].final_score=== null ||student_works[i].final_score=== undefined||student_works[i].final_score=== ""?"--":student_works[i].final_score,
+					work_score: student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_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,
 					view_answer_count: student_works[i].view_answer_count,
 					operating: "查看",
 					late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty,
@@ -2285,7 +2290,8 @@ class Listofworksstudentone extends Component {
 					levelscore: teacherdata.final_score,
 					efficiencyscore: teacherdata.eff_score,
 					view_answer_count: teacherdata.view_answer_count,
-					finalscore: teacherdata.work_score,
+					final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score,
+					work_score:teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score,
 					operating: "查看",
 					late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty,
 					ultimate_score: teacherdata.ultimate_score,
@@ -2645,7 +2651,8 @@ class Listofworksstudentone extends Component {
 					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 === "0.0" ? "--" : student_works[i].eff_score === "0" ? "--" : student_works[i].eff_score,
-					finalscore: student_works[i].work_score,
+					final_score: student_works[i].final_score===null||student_works[i].final_score===undefined||student_works[i].final_score===""?"--":student_works[i].final_score,
+					work_score:student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_score,
 					view_answer_count: student_works[i].view_answer_count,
 					operating: "查看",
 					late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty,