diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 60065f43e..6fdde6aeb 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -22,7 +22,7 @@ import 'moment/locale/zh-cn';
 import './yslexercisetable.css';
 import {getImageUrl, toPath} from 'educoder';
 import CheckBoxGroup from "../../page/component/CheckBoxGroup";
-
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
@@ -1217,6 +1217,7 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 			],
+			exercise_status:0,
 		}
 		// console.log("Studentshavecompletedthelist");
 		// console.log(props.current_status);
@@ -1277,6 +1278,20 @@ class Studentshavecompletedthelist extends Component {
 		}catch (e) {
 
 		}
+		try {
+			if(this.props.Commonheadofthetestpaper.exercise_status !== undefined){
+				this.setState({
+					exercise_status:this.props.Commonheadofthetestpaper.exercise_status,
+				})
+			}else{
+				this.setState({
+					exercise_status:0,
+				})
+			}
+		}catch (e) {
+
+		}
+
 	}
 
 	componentWillReceiveProps = (nextProps) => {
@@ -2065,11 +2080,11 @@ class Studentshavecompletedthelist extends Component {
 			this.setState({
 				loadingstate: false,
 			})
-			console.log(response);
-			console.log(1997);
+			// console.log(response);
+			// console.log(1997);
 			this.Generatenewdatasy(response.data.exercise_users, response);
 		}).catch((error) => {
-			console.log(error)
+			// console.log(error)
 			this.setState({
 				loadingstate: false,
 			})
@@ -2472,7 +2487,7 @@ class Studentshavecompletedthelist extends Component {
 	render() {
 		const isAdmin = this.props.isAdmin();
 
-		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
+		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable,exercise_status, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
 		// console.log("Studentshavecompletedthelist");
 		// console.log(this.props.current_status);
 		return (
@@ -2483,202 +2498,211 @@ class Studentshavecompletedthelist extends Component {
 						" min-width": " 1200px",
 					}}>
 						{/*老师*/}
-						<div className="edu-back-white" >
-							<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
+						{
+							exercise_status===0 || exercise_status===1 ?
+								<div className="edu-back-white">
+								<NoneData></NoneData>
+								</div>
+								:
+								<div>
+									<div className="edu-back-white" >
+										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
-								{/*你的评阅：*/}
-								{
-									Teacherliststudentlist === undefined || Teacherliststudentlist.exercise_types.subjective === 0 ?
-										<li className="clearfix mt10">
-											<span className="fl  mr10 color-grey-8 ">作品状态：</span>
-											<span className="fl "><a id="graduation_comment_no_limit"
-																							 className={unlimiteds === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
-																							 onClick={() => this.notlimiteds()}>不限</a></span>
-											<CheckboxGroup value={course_groupyslstwo}
-																		 onChange={(e) => this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}>
-												{
-													course_groupyslstwodata.map((item, key) => {
-														return (
-															<span key={key}><Checkbox className="fl mt5"
-																												key={item.id}
-																												value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
-														)
-													})
-												}
-											</CheckboxGroup>
-											<div className="fr mr5 search-new" style={{marginBottom: '1px'}}>
-												<Search
-													placeholder="请输入姓名或学号搜索"
-													id="subject_search_input"
-													autoComplete="off"
-													value={searchtext}
-													onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
-													onInput={this.inputSearchValues}
-													onSearch={this.searchValues}
-												></Search>
-											</div>
-										</li>
-										:
-										<div>
-											<li className="clearfix  mt10">
-												<span className="fl  mr10 color-grey-8 ">你的评阅：</span>
-												<span className="fl "><a id="graduation_comment_no_limit"
-																								 className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
-																								 onClick={() => this.notlimited()}>不限</a></span>
-
-												<CheckboxGroup value={course_groupyslsthree}
-																			 onChange={(e) => this.checkeboxs(e, course_groupyslstwodata && course_groupyslstwodata)}>
-													{
-														course_groupyslstwodatas.map((item, key) => {
-															return (
-																<span key={key}><Checkbox className="fl mt5"
-																													key={item.id}
-																													value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts})</span></Checkbox></span>
-															)
-														})
-													}
-												</CheckboxGroup>
-												<div className="fr mr5 search-new" style={{marginBottom: '1px'}}>
-													<Search
-														placeholder="请输入姓名或学号搜索"
-														id="subject_search_input"
-														autoComplete="off"
-														value={searchtext}
-														onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
-														onInput={this.inputSearchValues}
-														onSearch={this.searchValues}
-													></Search>
-												</div>
-											</li>
-											{/*作品状态*/}
-											<li className="clearfix mt10">
-												<span className="fl  mr10 color-grey-8 ">作品状态：</span>
-												<span className="fl "><a id="graduation_comment_no_limit"
-																								 className={unlimiteds === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
-																								 onClick={() => this.notlimiteds()}>不限</a></span>
-												<CheckboxGroup value={course_groupyslstwo}
-																			 onChange={(e) => this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}>
-													{
-														course_groupyslstwodata.map((item, key) => {
-															return (
-																<span key={key}><Checkbox className="fl mt5"
-																													key={item.id}
-																													value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
-															)
-														})
-													}
-												</CheckboxGroup>
-											</li>
-										</div>
+											{/*你的评阅：*/}
+											{
+												Teacherliststudentlist === undefined || Teacherliststudentlist.exercise_types.subjective === 0 ?
+													<li className="clearfix mt10">
+														<span className="fl  mr10 color-grey-8 ">作品状态：</span>
+														<span className="fl "><a id="graduation_comment_no_limit"
+																										 className={unlimiteds === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
+																										 onClick={() => this.notlimiteds()}>不限</a></span>
+														<CheckboxGroup value={course_groupyslstwo}
+																					 onChange={(e) => this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}>
+															{
+																course_groupyslstwodata.map((item, key) => {
+																	return (
+																		<span key={key}><Checkbox className="fl mt5"
+																															key={item.id}
+																															value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
+																	)
+																})
+															}
+														</CheckboxGroup>
+														<div className="fr mr5 search-new" style={{marginBottom: '1px'}}>
+															<Search
+																placeholder="请输入姓名或学号搜索"
+																id="subject_search_input"
+																autoComplete="off"
+																value={searchtext}
+																onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
+																onInput={this.inputSearchValues}
+																onSearch={this.searchValues}
+															></Search>
+														</div>
+													</li>
+													:
+													<div>
+														<li className="clearfix  mt10">
+															<span className="fl  mr10 color-grey-8 ">你的评阅：</span>
+															<span className="fl "><a id="graduation_comment_no_limit"
+																											 className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
+																											 onClick={() => this.notlimited()}>不限</a></span>
+
+															<CheckboxGroup value={course_groupyslsthree}
+																						 onChange={(e) => this.checkeboxs(e, course_groupyslstwodata && course_groupyslstwodata)}>
+																{
+																	course_groupyslstwodatas.map((item, key) => {
+																		return (
+																			<span key={key}><Checkbox className="fl mt5"
+																																key={item.id}
+																																value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts})</span></Checkbox></span>
+																		)
+																	})
+																}
+															</CheckboxGroup>
+															<div className="fr mr5 search-new" style={{marginBottom: '1px'}}>
+																<Search
+																	placeholder="请输入姓名或学号搜索"
+																	id="subject_search_input"
+																	autoComplete="off"
+																	value={searchtext}
+																	onKeyUp={(e) => this.onSearchKeywordKeyUp(e)}
+																	onInput={this.inputSearchValues}
+																	onSearch={this.searchValues}
+																></Search>
+															</div>
+														</li>
+														{/*作品状态*/}
+														<li className="clearfix mt10">
+															<span className="fl  mr10 color-grey-8 ">作品状态：</span>
+															<span className="fl "><a id="graduation_comment_no_limit"
+																											 className={unlimiteds === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
+																											 onClick={() => this.notlimiteds()}>不限</a></span>
+															<CheckboxGroup value={course_groupyslstwo}
+																						 onChange={(e) => this.checkeboxstwo(e, course_groupyslstwodata && course_groupyslstwodata)}>
+																{
+																	course_groupyslstwodata.map((item, key) => {
+																		return (
+																			<span key={key}><Checkbox className="fl mt5"
+																																key={item.id}
+																																value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
+																		)
+																	})
+																}
+															</CheckboxGroup>
+														</li>
+													</div>
 
-								}
-								{/*分班情况*/}
-								{course_groups === undefined ? "" : course_groups === null ? "" : course_groups.length < 2 ? "" : JSON.stringify(course_groups) === "[]" ? "" :
-									<li className="clearfix  mt10">
-										<tr>
-											<td className="w80" style={{"vertical-align": "top"}}><span
-												className=" mr10 color-grey-8 ">分班情况：</span></td>
-											<td className="w70" style={{"vertical-align": "top"}}><span><a
-												id="graduation_comment_no_limit"
-												className={unlimitedtwo === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
-												onClick={() => this.funtaskstatustwos()}>不限</a></span>
-											</td>
-											<td>
-												<CheckboxGroup value={course_groupysls}
-																			 onChange={(e) => this.funtaskstatustwo(e, course_groups && course_groups)}
-																			 style={{paddingTop: '4px', display: "inline"}}>
-													{
-														course_groups.map((item, key) => {
-															return (
-																<span key={key}><Checkbox className="fl mt5"
-																													key={item.exercise_group_id}
-																													value={item.exercise_group_id}>{item.exercise_group_name}<span>({item.exercise_group_students})</span></Checkbox></span>
-															)
-														})
-													}
-												</CheckboxGroup>
+											}
+											{/*分班情况*/}
+											{course_groups === undefined ? "" : course_groups === null ? "" : course_groups.length < 2 ? "" : JSON.stringify(course_groups) === "[]" ? "" :
+												<li className="clearfix  mt10">
+													<tr>
+														<td className="w80" style={{"vertical-align": "top"}}><span
+															className=" mr10 color-grey-8 ">分班情况：</span></td>
+														<td className="w70" style={{"vertical-align": "top"}}><span><a
+															id="graduation_comment_no_limit"
+															className={unlimitedtwo === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
+															onClick={() => this.funtaskstatustwos()}>不限</a></span>
+														</td>
+														<td>
+															<CheckboxGroup value={course_groupysls}
+																						 onChange={(e) => this.funtaskstatustwo(e, course_groups && course_groups)}
+																						 style={{paddingTop: '4px', display: "inline"}}>
+																{
+																	course_groups.map((item, key) => {
+																		return (
+																			<span key={key}><Checkbox className="fl mt5"
+																																key={item.exercise_group_id}
+																																value={item.exercise_group_id}>{item.exercise_group_name}<span>({item.exercise_group_students})</span></Checkbox></span>
+																		)
+																	})
+																}
+															</CheckboxGroup>
 
 
-											</td>
-										</tr>
+														</td>
+													</tr>
 
-									</li>
-								}
+												</li>
+											}
 
-							</ul>
+										</ul>
 
 
-							<div id="graduation_work_list" style={{padding: '0px 30px 10px 30px'}}>
-								<div className="clearfix">
+										<div id="graduation_work_list" style={{padding: '0px 30px 10px 30px'}}>
+											<div className="clearfix">
                                 <span
 																	className="fl color-grey-6 font-12"><span
 																	style={{color: '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.total_users}</span><span
 																	className="color-orange-tip"></span>个检索结果（{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_all_users}学生） </span>
 
-									<div className="fr color-grey-6 edu-menu-panel">
-										<ul>
-											<li className="edu-position edu-position-hidebox">
-												<a className="font-12">
-													{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
-												<i className="iconfont icon-xiajiantou ml5 font-12"></i>
-												<ul className="edu-position-hide undis mt10">
-													<li><a onClick={(e) => this.funordersy("end_at")} data-remote="true"
-																 className=" font-12" style={{textAlign: "center "}}>提交时间</a></li>
-													<li><a onClick={(e) => this.funordersy("score")} data-remote="true"
-																 className=" font-12" style={{textAlign: "center "}}>最终成绩</a></li>
-													<li><a onClick={(e) => this.funordersy("student_id")} data-remote="true"
-																 className=" font-12" style={{textAlign: "center "}}>学生学号</a></li>
-												</ul>
-											</li>
-										</ul>
-									</div>
+												<div className="fr color-grey-6 edu-menu-panel">
+													<ul>
+														<li className="edu-position edu-position-hidebox">
+															<a className="font-12">
+																{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
+															<i className="iconfont icon-xiajiantou ml5 font-12"></i>
+															<ul className="edu-position-hide undis mt10">
+																<li><a onClick={(e) => this.funordersy("end_at")} data-remote="true"
+																			 className=" font-12" style={{textAlign: "center "}}>提交时间</a></li>
+																<li><a onClick={(e) => this.funordersy("score")} data-remote="true"
+																			 className=" font-12" style={{textAlign: "center "}}>最终成绩</a></li>
+																<li><a onClick={(e) => this.funordersy("student_id")} data-remote="true"
+																			 className=" font-12" style={{textAlign: "center "}}>学生学号</a></li>
+															</ul>
+														</li>
+													</ul>
+												</div>
 
-								</div>
-							</div>
+											</div>
+										</div>
 
-							{JSON.stringify(data) !== "[]" ?
-								<div className={"justify break_full_word new_li edu-back-white"}
-										 style={{minHeight: "480px"}}>
-									<style>{`
+										{JSON.stringify(data) !== "[]" ?
+											<div className={"justify break_full_word new_li edu-back-white"}
+													 style={{minHeight: "480px"}}>
+												<style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
 						              `}</style>
-									<div className="edu-table  edu-back-white">
-										{data === undefined ? "" : <Table
-											dataSource={data}
-											columns={columnsys}
-											className="mysjysltable1"
-											pagination={false}
-											loading={loadingstate}
-											// onChange={this.TablePaginationsy}
-										/>}
-									</div>
-								</div>
+												<div className="edu-table  edu-back-white">
+													{data === undefined ? "" : <Table
+														dataSource={data}
+														columns={columnsys}
+														className="mysjysltable1"
+														pagination={false}
+														loading={loadingstate}
+														// onChange={this.TablePaginationsy}
+													/>}
+												</div>
+											</div>
 
-								:
-								<div id="forum_list" className="forum_table">
-									<div className="minH-560 edu-back-white">
-										<div className="edu-tab-con-box clearfix edu-txt-center">
-											<img className="edu-nodata-img mb20"
-													 src={getImageUrl("images/educoder/nodata.png")}/>
-											<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
-										</div>
-									</div>
+											:
+											<div id="forum_list" className="forum_table">
+												<div className="minH-560 edu-back-white">
+													<div className="edu-tab-con-box clearfix edu-txt-center">
+														<img className="edu-nodata-img mb20"
+																 src={getImageUrl("images/educoder/nodata.png")}/>
+														<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+													</div>
+												</div>
 
-								</div>
-							}
+											</div>
+										}
 
 
-						</div>
-						{
-							Teacherliststudentlist && Teacherliststudentlist.exercise_types.total_users && Teacherliststudentlist.exercise_types.total_users > limit ?
-								<div className="edu-txt-center mt30 mb50">
-									<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
-															pageSize={limit}
-															total={Teacherliststudentlist.exercise_types.total_users}></Pagination>
+									</div>
+									{
+										Teacherliststudentlist && Teacherliststudentlist.exercise_types.total_users && Teacherliststudentlist.exercise_types.total_users > limit ?
+											<div className="edu-txt-center mt30 mb50">
+												<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
+																		pageSize={limit}
+																		total={Teacherliststudentlist.exercise_types.total_users}></Pagination>
+											</div>
+											: ""
+									}
 								</div>
-								: ""
 						}
 
 					</div>
@@ -2691,16 +2715,22 @@ class Studentshavecompletedthelist extends Component {
 						<div>
 							<div className=" clearfix "
 									 style={{"margin": "0 auto", "padding-bottom": "100px", " min-width": " 1200px"}}>
-								<div className={"educontent mb20"}>
+								{
+									exercise_status === 0 || exercise_status === 1 ?
+										<div className="edu-back-white">
+										<NoneData></NoneData>
+										</div>
+										:
+										<div className={"educontent mb20"}>
 
-									<div className="edu-back-white" id="graduation_work_list"
-											 style={{
-												 padding: '0px 30px 10px 30px',
-												 "height": "50px",
-												 "margin-bottom": "10px"
-											 }}>
+											<div className="edu-back-white" id="graduation_work_list"
+													 style={{
+														 padding: '0px 30px 10px 30px',
+														 "height": "50px",
+														 "margin-bottom": "10px"
+													 }}>
 
-										<div className="clearfix ">
+												<div className="clearfix ">
                               <span className="fl color-grey-6 font-12 mt10">
                                   <span className="color-orange-tip"
 																				style={{color: '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users}</span><span
@@ -2716,45 +2746,45 @@ class Studentshavecompletedthelist extends Component {
 																	</span>}
                                </span>
 
-										</div>
+												</div>
 
-									</div>
+											</div>
 
 
-									{JSON.stringify(datas) === "[]" ?
-										<div id="forum_list" className="forum_table">
-											<div className="mh650 edu-back-white">
-												<div className="edu-tab-con-box clearfix edu-txt-center">
-													<img className="edu-nodata-img mb20"
-															 src={getImageUrl("images/educoder/nodata.png")}/>
-													<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
-												</div>
-											</div>
+											{JSON.stringify(datas) === "[]" ?
+												<div id="forum_list" className="forum_table">
+													<div className="mh650 edu-back-white">
+														<div className="edu-tab-con-box clearfix edu-txt-center">
+															<img className="edu-nodata-img mb20"
+																	 src={getImageUrl("images/educoder/nodata.png")}/>
+															<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+														</div>
+													</div>
 
-										</div>
-										:
-										<div className={"justify break_full_word new_li edu-back-white"}
-												 style={{minHeight: "480px"}}>
-											<style>{`
+												</div>
+												:
+												<div className={"justify break_full_word new_li edu-back-white"}
+														 style={{minHeight: "480px"}}>
+													<style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
 						              `}</style>
-											<div className="edu-table edu-back-white minH-560">
-												{datas === undefined ? "" : <Table
-													dataSource={datas}
-													columns={columnss}
-													className="mysjysltable2"
-													pagination={false}
-													loading={false}
-												/>}
-											</div>
-										</div>
-									}
-
+													<div className="edu-table edu-back-white minH-560">
+														{datas === undefined ? "" : <Table
+															dataSource={datas}
+															columns={columnss}
+															className="mysjysltable2"
+															pagination={false}
+															loading={false}
+														/>}
+													</div>
+												</div>
+											}
 
-								</div>
 
+										</div>
+								}
 
 							</div>
 						</div>
@@ -2766,10 +2796,17 @@ class Studentshavecompletedthelist extends Component {
 								"padding-bottom": "100px",
 								" min-width": " 1200px"
 							}}>
-								<div className={"educontent mb20 edu-back-white"}>
-									<style>
-										{
-											`
+								{
+									exercise_status === 0 || exercise_status === 1 ?
+										<div className="edu-back-white">
+										<NoneData></NoneData>
+										</div>
+										:
+										<div>
+											<div className={"educontent mb20 edu-back-white"}>
+												<style>
+													{
+														`
 												.edu-table .ant-table-tbody > tr > td {
 														height: 58px;
 															}
@@ -2786,40 +2823,40 @@ class Studentshavecompletedthelist extends Component {
 													 padding: 9px;
 															}
 												`
-										}
-									</style>
-									<div className={"justify break_full_word new_li edu-back-white ysltableows"}
-									>
-										{data === undefined ? "" : <Table
-											dataSource={data}
-											columns={columnstwo}
-											className="mysjysltable3"
-											pagination={false}
-											loading={false}
-											showHeader={false}
-										/>}
-									</div>
-									{JSON.stringify(datas) === "[]" ?
-
-										<div id="forum_list" className="forum_table ">
-											<div className="mh650 edu-back-white">
-												<div className="edu-tab-con-box clearfix edu-txt-center">
-													<img className="edu-nodata-img mb20"
-															 src={getImageUrl("images/educoder/nodata.png")}/>
-													<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+													}
+												</style>
+												<div className={"justify break_full_word new_li edu-back-white ysltableows"}
+												>
+													{data === undefined ? "" : <Table
+														dataSource={data}
+														columns={columnstwo}
+														className="mysjysltable3"
+														pagination={false}
+														loading={false}
+														showHeader={false}
+													/>}
 												</div>
-											</div>
+												{JSON.stringify(datas) === "[]" ?
 
-										</div>
-										:
-										<div className="edu-back-white">
-											< div id="graduation_work_list" style={{
-												padding: '0px 30px 10px 30px',
-												"margin-top": "20px",
-												"margin-bottom": "10px"
-											}}>
+													<div id="forum_list" className="forum_table ">
+														<div className="mh650 edu-back-white">
+															<div className="edu-tab-con-box clearfix edu-txt-center">
+																<img className="edu-nodata-img mb20"
+																		 src={getImageUrl("images/educoder/nodata.png")}/>
+																<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+															</div>
+														</div>
 
-												<div className="clearfix">
+													</div>
+													:
+													<div className="edu-back-white">
+														< div id="graduation_work_list" style={{
+															padding: '0px 30px 10px 30px',
+															"margin-top": "20px",
+															"margin-bottom": "10px"
+														}}>
+
+															<div className="clearfix">
                               <span className="fl color-grey-6 font-12"><span
 																className="color-orange-tip"
 																style={{color: '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users}</span><span
@@ -2832,32 +2869,32 @@ class Studentshavecompletedthelist extends Component {
 																	<span
 																		style={{color: '#FF6800'}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}</span>}
 																	</span>
-													<div className="fr color-grey-6 edu-menu-panel">
-														<ul>
-															<li className="edu-position edu-position-hidebox">
-																<a className="font-12 ">
-																	{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
-																<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
-																<ul className="edu-position-hide undis mt10">
-																	<li><a onClick={(e) => this.funorder("end_at")} data-remote="true"
-																				 className=" font-12" style={{textAlign: "center "}}>提交时间</a>
-																	</li>
-																	<li><a onClick={(e) => this.funorder("score")} data-remote="true"
-																				 className=" font-12" style={{textAlign: "center "}}>最终成绩</a>
-																	</li>
-																	<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
-																				 className=" font-12" style={{textAlign: "center "}}>学生学号</a>
-																	</li>
-																</ul>
-															</li>
-														</ul>
-													</div>
-												</div>
-
-											</div>
-											<div className={"justify break_full_word new_li edu-back-white"}
-													 style={{minHeight: "480px"}}>
-												<style>{`
+																<div className="fr color-grey-6 edu-menu-panel">
+																	<ul>
+																		<li className="edu-position edu-position-hidebox">
+																			<a className="font-12 ">
+																				{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
+																			<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
+																			<ul className="edu-position-hide undis mt10">
+																				<li><a onClick={(e) => this.funorder("end_at")} data-remote="true"
+																							 className=" font-12" style={{textAlign: "center "}}>提交时间</a>
+																				</li>
+																				<li><a onClick={(e) => this.funorder("score")} data-remote="true"
+																							 className=" font-12" style={{textAlign: "center "}}>最终成绩</a>
+																				</li>
+																				<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
+																							 className=" font-12" style={{textAlign: "center "}}>学生学号</a>
+																				</li>
+																			</ul>
+																		</li>
+																	</ul>
+																</div>
+															</div>
+
+														</div>
+														<div className={"justify break_full_word new_li edu-back-white"}
+																 style={{minHeight: "480px"}}>
+															<style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
@@ -2877,30 +2914,32 @@ class Studentshavecompletedthelist extends Component {
 													 padding: 9px;
 															}
 						              `}</style>
-												<div className="edu-table edu-back-white minH-560 ysltableowss">
-													{datas === undefined ? "" : <Table
-														dataSource={datas}
-														columns={columns}
-														pagination={false}
-														className="mysjysltable4"
-														loading={loadingstate}
-													/>}</div>
-											</div>
+															<div className="edu-table edu-back-white minH-560 ysltableowss">
+																{datas === undefined ? "" : <Table
+																	dataSource={datas}
+																	columns={columns}
+																	pagination={false}
+																	className="mysjysltable4"
+																	loading={loadingstate}
+																/>}</div>
+														</div>
 
 
-										</div>
+													</div>
 
-									}
-								</div>
+												}
+											</div>
 
-								{
-									mylistansum && mylistansum > limit ?
-										<div className="edu-txt-center mt30 mb20">
-											<Pagination showQuickJumper current={page}
-																	onChange={this.paginationonChanges} pageSize={limit}
-																	total={mylistansum}></Pagination>
+											{
+												mylistansum && mylistansum > limit ?
+													<div className="edu-txt-center mt30 mb20">
+														<Pagination showQuickJumper current={page}
+																				onChange={this.paginationonChanges} pageSize={limit}
+																				total={mylistansum}></Pagination>
+													</div>
+													: ""
+											}
 										</div>
-										: ""
 								}
 							</div>
 
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 5775bd240..ba3cee3d3 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -436,7 +436,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}></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}></Studentshavecompletedthelist>
                     }
 
                     {/*统计结果*/}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index ac2133aab..a5423b6e9 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -33,6 +33,8 @@ import Startshixuntask from "../coursesPublic/Startshixuntask";
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal";
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
+
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
@@ -1451,6 +1453,7 @@ class Listofworksstudentone extends Component {
 			],
 			yslpros:false,
 			datajs:[],
+			homework_status:[],
 
 		}
 	}
@@ -1569,7 +1572,8 @@ class Listofworksstudentone extends Component {
 				allow_late:result.data.allow_late,
 				loadingstate: false,
 				computeTimetype:true,
-			})
+				homework_status:result.data.homework_status,
+			});
 			this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
 
 			if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
@@ -1626,7 +1630,8 @@ class Listofworksstudentone extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 					view_report:result.data.view_report,
-				})
+					homework_status:result.data.homework_status,
+				});
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
 					this.seacthdata(result.data);
 				} else {
@@ -2129,7 +2134,8 @@ class Listofworksstudentone extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 					view_report:result.data.view_report,
-				})
+					homework_status:result.data.homework_status,
+				});
 				this.seacthdata(result.data);
 				this.props.Getdataback(result,result.data);
 			}
@@ -2242,7 +2248,8 @@ class Listofworksstudentone extends Component {
 					end_immediately: result.data.end_immediately,
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
-				})
+					homework_status:result.data.homework_status,
+				});
 				this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
 				this.props.Getdataback(result,result.data);
 				// }
@@ -3037,7 +3044,7 @@ class Listofworksstudentone extends Component {
 		})
 	}
 	render() {
-		let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
+		let {columns,course_groupysls,datajs,isAdmin,homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		// console.log(this.state.student_works);
@@ -3068,89 +3075,100 @@ class Listofworksstudentone extends Component {
 	 }
 
 		return (
+
 			this.props.isAdmin() === true ?
-				(
-				<div className=" clearfix " style={{margin:  "auto" , minWidth:"1200px"}}>
-					{visible === true ? <ModulationModal
-						visible={visible}
-						Cancel={this.cancelModulationModel}
-						Saves={(value, num) => this.saveModulationModal(value, num)}
-					/> : ""}
-
-					{this.state.showmodel === true ? <ShixunWorkModal
-						{...this.props}
-						visible={this.state.showmodel}
-						modalname={"代码查重"}
-						data={[]}
-						issCancel={() => this.hideshowmodel()}
-						updatas={() => this.isupdatas()}
-					/> : ""}
-
-					<DownloadMessageysl
-						{...this.props}
-						value={this.state.DownloadMessageval}
-						modalCancel={this.Downloadcal}
-						modalsType={this.state.DownloadType}
-
-					/>
-					{visibles === true ?
-						<div>
-							<style>
-								{
-									`
+							 <div className=" clearfix " style={{margin:  "auto" , minWidth:"1200px"}}>
+								 {visible === true ? <ModulationModal
+									 visible={visible}
+									 Cancel={this.cancelModulationModel}
+									 Saves={(value, num) => this.saveModulationModal(value, num)}
+								 /> : ""}
+
+								 {this.state.showmodel === true ? <ShixunWorkModal
+									 {...this.props}
+									 visible={this.state.showmodel}
+									 modalname={"代码查重"}
+									 data={[]}
+									 issCancel={() => this.hideshowmodel()}
+									 updatas={() => this.isupdatas()}
+								 /> : ""}
+
+								 <DownloadMessageysl
+									 {...this.props}
+									 value={this.state.DownloadMessageval}
+									 modalCancel={this.Downloadcal}
+									 modalsType={this.state.DownloadType}
+
+								 />
+								 {visibles === true ?
+									 <div>
+										 <style>
+											 {
+												 `
               body {
 							 overflow: hidden !important;
 						 }
               `
-								}
-							</style>
-							<TraineetraininginformationModal
-								{...this.props} {...this.state}
-								homeworkid={this.props.match.params.homeworkid}
-								coursesId={this.props.match.params.coursesId}
-								workid={teacherdata.id}
-								isAdmins={this.props.isAdmin()}
-								userids={this.state.userids}
-								viewtrainingdata={viewtrainingdata}
-								game_list={game_list}
-								visible={visibles}
-								experience={experience}
-								boolgalist={boolgalist}
-								Cancel={() => this.cancelModulationModels()}
-							/>
-
-						</div>
-						: ""
-					}
-
-					{/*立即发布*/}
-					<HomeworkModal
-						modaltype={this.state.modaltype}
-						modalname={this.state.modalname}
-						visible={this.state.svisible}
-						Topval={this.state.Topval}
-						Topvalright={this.state.Topvalright}
-						Botvalleft={this.state.Botvalleft}
-						Botval={this.state.Botval}
-						starttime={this.state.starttime}
-						endtime={this.state.endtime}
-						Cancelname={this.state.Cancelname}
-						Savesname={this.state.Savesname}
-						Cancel={this.state.Cancel}
-						Saves={this.state.Saves}
-						course_groups={this.state.course_groups}
-						getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
-						starttimes={this.state.starttimes}
-						typs={this.state.typs}
-					/>
-					<div className={"educontent "}>
-
-
-						<div className="edu-back-white">
-
-
-							<style>
-								{`
+											 }
+										 </style>
+										 <TraineetraininginformationModal
+											 {...this.props} {...this.state}
+											 homeworkid={this.props.match.params.homeworkid}
+											 coursesId={this.props.match.params.coursesId}
+											 workid={teacherdata.id}
+											 isAdmins={this.props.isAdmin()}
+											 userids={this.state.userids}
+											 viewtrainingdata={viewtrainingdata}
+											 game_list={game_list}
+											 visible={visibles}
+											 experience={experience}
+											 boolgalist={boolgalist}
+											 Cancel={() => this.cancelModulationModels()}
+										 />
+
+									 </div>
+									 : ""
+								 }
+
+								 {/*立即发布*/}
+								 <HomeworkModal
+									 modaltype={this.state.modaltype}
+									 modalname={this.state.modalname}
+									 visible={this.state.svisible}
+									 Topval={this.state.Topval}
+									 Topvalright={this.state.Topvalright}
+									 Botvalleft={this.state.Botvalleft}
+									 Botval={this.state.Botval}
+									 starttime={this.state.starttime}
+									 endtime={this.state.endtime}
+									 Cancelname={this.state.Cancelname}
+									 Savesname={this.state.Savesname}
+									 Cancel={this.state.Cancel}
+									 Saves={this.state.Saves}
+									 course_groups={this.state.course_groups}
+									 getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
+									 starttimes={this.state.starttimes}
+									 typs={this.state.typs}
+								 />
+								 {
+								 homework_status.length===0?
+									 <div className="edu-back-white">
+								 <NoneData></NoneData>
+									 </div>
+								 :
+								 homework_status.length>0 && homework_status[0]==="未发布"?
+									 <div className="edu-back-white">
+								 <NoneData></NoneData>
+									 </div>
+								 :
+								 <div className={"educontent "}>
+
+
+									 <div className="edu-back-white">
+
+
+										 <style>
+											 {`
 							.startbox{
 					    height: 48px;
 					    background: rgba(255,104,0,0.1);
@@ -3197,22 +3215,22 @@ class Listofworksstudentone extends Component {
 							  margin-right: 10px;
 							}
 							`}
-							</style>
-							{computeTimetype===false?<li className="clearfix startbox">
-							 <Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
-							<span className={"startfont"}>
+										 </style>
+										 {computeTimetype===false?<li className="clearfix startbox">
+											 <Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
+											 <span className={"startfont"}>
 			         	正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
 							</span>
-							</li>:""}
+										 </li>:""}
 
-							{/*作品状态GraduationTaskssettinglist*/}
-							<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
-								<li className="clearfix " >
-									<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+										 {/*作品状态GraduationTaskssettinglist*/}
+										 <ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
+											 <li className="clearfix " >
+												 <span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 
 
-									<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
-										{course_is_end===true?"":<span>
+												 <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
+													 {course_is_end===true?"":<span>
 										{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
 											(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>
 												查看最新成绩
@@ -3223,7 +3241,7 @@ class Listofworksstudentone extends Component {
 												</div>:"")
 										}
 						  	    </span>}
-										<span className="search-newyslw fr ml20">
+													 <span className="search-newyslw fr ml20">
 										<Search
 											placeholder="请输入姓名或学号搜索"
 											id="subject_search_input"
@@ -3234,22 +3252,22 @@ class Listofworksstudentone extends Component {
 											onSearch={this.searchValuest}
 										></Search>
 										</span>
-									</div>
-								</li>
-
-								<li className="clearfix mt10">
-
-									<span className="fl  mr10 color-grey-8 ">作品状态：</span>
-									<span className="fl "><a id="graduation_comment_no_limit"
-																					 className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
-																					 onClick={() => this.notlimiteds()}>不限</a></span>
-									<CheckboxGroup value={course_groupyslstwo}
-																 onChange={(e) => this.funtaskstatust(e, task_status && task_status)}
-																 style={{paddingTop: '4px'}}>
-
-										{task_status === undefined ? "" : task_status.map((item, key) => {
-											return (
-												<span key={key}>
+												 </div>
+											 </li>
+
+											 <li className="clearfix mt10">
+
+												 <span className="fl  mr10 color-grey-8 ">作品状态：</span>
+												 <span className="fl "><a id="graduation_comment_no_limit"
+																									className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
+																									onClick={() => this.notlimiteds()}>不限</a></span>
+												 <CheckboxGroup value={course_groupyslstwo}
+																				onChange={(e) => this.funtaskstatust(e, task_status && task_status)}
+																				style={{paddingTop: '4px'}}>
+
+													 {task_status === undefined ? "" : task_status.map((item, key) => {
+														 return (
+															 <span key={key}>
                                 <Checkbox value={item.id}
 																					key={item.id}
 																					className="fl ">{item.name}
@@ -3257,96 +3275,96 @@ class Listofworksstudentone extends Component {
                                 </Checkbox>
 
                             </span>
-											)
-										})}
-									</CheckboxGroup>
-									{/*请输入姓名或学号搜索*/}
-
-
-								</li>
-
-
-								{/*分班情况*/}
-
-								<li className="clearfix  mt10 ">
-									{JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" :
-										<div>
-											<span className="fl mr10 color-grey-8">分班情况：</span>
-											<span className="fl "><a id="graduation_comment_no_limit"
-																							 className={unlimitedtwo === 0 ? "pl10 pr10 mr20 " : "pl10 pr10 mr20 check_on"}
-																							 onClick={() => this.notlimitedst()}>不限</a></span>
-											<CheckboxGroup  value={course_groupysls}
-																			onChange={(e) => this.funtaskstatustwot(e, course_group_info && course_group_info)}
-																			style={{paddingTop: '4px',width:'1017px'}}>
-												{course_group_info === undefined ? "" :
-													course_group_info.map((item, key) => {
-														return (
-															<span key={key}>
+														 )
+													 })}
+												 </CheckboxGroup>
+												 {/*请输入姓名或学号搜索*/}
+
+
+											 </li>
+
+
+											 {/*分班情况*/}
+
+											 <li className="clearfix  mt10 ">
+												 {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" :
+													 <div>
+														 <span className="fl mr10 color-grey-8">分班情况：</span>
+														 <span className="fl "><a id="graduation_comment_no_limit"
+																											className={unlimitedtwo === 0 ? "pl10 pr10 mr20 " : "pl10 pr10 mr20 check_on"}
+																											onClick={() => this.notlimitedst()}>不限</a></span>
+														 <CheckboxGroup  value={course_groupysls}
+																						 onChange={(e) => this.funtaskstatustwot(e, course_group_info && course_group_info)}
+																						 style={{paddingTop: '4px',width:'1017px'}}>
+															 {course_group_info === undefined ? "" :
+																 course_group_info.map((item, key) => {
+																	 return (
+																		 <span key={key}>
                                 <Checkbox value={item.course_group_id}
 																					key={item.course_group_id}
 																					className="fl ">{item.group_group_name}
 																	<span>({item.count})</span>
                                             </Checkbox>
                             </span>
-														)
-													})
-												}
-											</CheckboxGroup>
-										</div>}
-								</li>
+																	 )
+																 })
+															 }
+														 </CheckboxGroup>
+													 </div>}
+											 </li>
 
-							</ul>
+										 </ul>
 
 
-							<div id="graduation_work_list" style={{padding: '0px 20px 10px 20px'}}>
+										 <div id="graduation_work_list" style={{padding: '0px 20px 10px 20px'}}>
 
-								<div className="clearfix">
+											 <div className="clearfix">
                                 <span className="fl color-grey-6 font-12"><span
 																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.all_member_count}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
-									<style>
-										{
-											`
+												 <style>
+													 {
+														 `
 										.edu-position-hide li a:hover {
 										  background: #F0F0F0;
 										}
 										`
-										}
-									</style>
-									<div className="fr  edu-menu-panel">
-										<ul>
-											<li className="edu-position edu-position-hidebox">
-												<a className="font-12">
-													{orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
-												<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
-												<ul className="edu-position-hide undis mt10">
-													{/*<li> <a  onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>*/}
-													<li> <a  onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩</a></li>
-													<li> <a  onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
-												</ul>
-											</li>
-										</ul>
-									</div>
-
-
-								</div>
-
-							</div>
-							{
-								JSON.stringify(datajs) === "[]" ?
-
-									<div id="forum_list" className="forum_table">
-										<div className="mh650 edu-back-white">
-											<div className="edu-tab-con-box clearfix edu-txt-center">
-												<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-												<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
-											</div>
-										</div>
-
-									</div>
-									:
-
-									<div className={"justify break_full_word new_li "} style={{minHeight: "480px"}}>
-										<style>{`
+													 }
+												 </style>
+												 <div className="fr  edu-menu-panel">
+													 <ul>
+														 <li className="edu-position edu-position-hidebox">
+															 <a className="font-12">
+																 {orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
+															 <i className="iconfont icon-xiajiantou ml5 font-12 "></i>
+															 <ul className="edu-position-hide undis mt10">
+																 {/*<li> <a  onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>*/}
+																 <li> <a  onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩</a></li>
+																 <li> <a  onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
+															 </ul>
+														 </li>
+													 </ul>
+												 </div>
+
+
+											 </div>
+
+										 </div>
+										 {
+											 JSON.stringify(datajs) === "[]" ?
+
+												 <div id="forum_list" className="forum_table">
+													 <div className="mh650 edu-back-white">
+														 <div className="edu-tab-con-box clearfix edu-txt-center">
+															 <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+															 <p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+														 </div>
+													 </div>
+
+												 </div>
+												 :
+
+												 <div className={"justify break_full_word new_li "} style={{minHeight: "480px"}}>
+													 <style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
@@ -3364,41 +3382,40 @@ class Listofworksstudentone extends Component {
 													 padding: 9px;
 															}
 						              `}</style>
-										<div className="edu-table edu-back-white ant-tables ysltableo table1">
-											{datajs === undefined ? "" : <Table
-												dataSource={datajs}
-												columns={columns}
-												pagination={false}
-												loading={loadingstate}
-											/>}
-										</div>
-									</div>
-							}
-
-
-						</div>
-						{
-							teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-								<div className="edu-txt-center mt30 ">
-									<Pagination showQuickJumper current={page}
-															onChange={this.paginationonChanges} pageSize={limit}
-															total={teacherdata.work_count}></Pagination>
-								</div>
-								: ""
-						}
-					</div>
-
-				</div>
-					)
+													 <div className="edu-table edu-back-white ant-tables ysltableo table1">
+														 {datajs === undefined ? "" : <Table
+															 dataSource={datajs}
+															 columns={columns}
+															 pagination={false}
+															 loading={loadingstate}
+														 />}
+													 </div>
+												 </div>
+										 }
+
+
+									 </div>
+									 {
+										 teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
+											 <div className="edu-txt-center mt30 ">
+												 <Pagination showQuickJumper current={page}
+																		 onChange={this.paginationonChanges} pageSize={limit}
+																		 total={teacherdata.work_count}></Pagination>
+											 </div>
+											 : ""
+									 }
+								 </div>
+								 }
+							 </div>
 				:
-				(
-				<div>
-					{
-						teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
-							// 学生不能查看别人的
-							<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
-								<style>
-									{`
+
+								<div>
+									{
+										teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
+											// 学生不能查看别人的
+											<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
+												<style>
+													{`
 							.startbox{
 					    height: 48px;
 					    background: rgba(255,104,0,0.1);
@@ -3440,71 +3457,84 @@ class Listofworksstudentone extends Component {
 											    	border-radius: 4px;
 													}
 							`}
-								</style>
-								{visibles === true ?
-									<div>
-										<DownloadMessageysl
-											{...this.props}
-											value={this.state.DownloadMessageval}
-											modalCancel={this.Downloadcal}
-											modalsType={this.state.DownloadType}
-										/>
-										<style>
-											{
-												`
+												</style>
+												{visibles === true ?
+													<div>
+														<DownloadMessageysl
+															{...this.props}
+															value={this.state.DownloadMessageval}
+															modalCancel={this.Downloadcal}
+															modalsType={this.state.DownloadType}
+														/>
+														<style>
+															{
+																`
 												body {
 												 overflow: hidden !important;
 											 }
 												`
-											}
-										</style>
-										<TraineetraininginformationModal
-											homeworkid={this.props.match.params.homeworkid}
-											coursesId={this.props.match.params.coursesId}
-											userids={this.state.userids}
-											viewtrainingdata={viewtrainingdata}
-											game_list={game_list}
-											visible={visibles}
-											experience={experience}
-											boolgalist={boolgalist}
-											Cancel={() => this.cancelModulationModels()}
-										/>
-									</div>
-									: ""
-								}
+															}
+														</style>
+														<TraineetraininginformationModal
+															homeworkid={this.props.match.params.homeworkid}
+															coursesId={this.props.match.params.coursesId}
+															userids={this.state.userids}
+															viewtrainingdata={viewtrainingdata}
+															game_list={game_list}
+															visible={visibles}
+															experience={experience}
+															boolgalist={boolgalist}
+															Cancel={() => this.cancelModulationModels()}
+														/>
+													</div>
+													: ""
+												}
+
+												{
+													homework_status.length===0?
+														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
+															<NoneData></NoneData>
+														</div>
+														:
+														homework_status.length>0 && homework_status[0]==="未发布"?
+															<div className=" clearfix edu-back-white "  style={{margin:  "auto" , minWidth:"1200px"}}>
+																<NoneData></NoneData>
+															</div>
+															:
 
-								<div className={"educontent "}>
-									<div className="edu-back-white" style={{width: "1200"}}>
 
-										<style>
-											{
-												`
+												<div className={"educontent "}>
+													<div className="edu-back-white" style={{width: "1200"}}>
+
+														<style>
+															{
+																`
 											.shixunSpin{
 												color:#FF6801;
 												margin-right: 10px;
 												}
 										`}
-										</style>
-										{computeTimetype===false?<li className="clearfix startbox mb20">
-											<Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
-									<span className={"startfont"}>
+														</style>
+														{computeTimetype===false?<li className="clearfix startbox mb20">
+															<Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
+															<span className={"startfont"}>
 					         	正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
 									</span>
-										</li>:""}
+														</li>:""}
 
 
-										{JSON.stringify(data) !== "[]" ?
-											<div>
-												<div id="graduation_work_list"
-														 style={{
-															 padding: '20px 20px 10px 20px',
-															 marginBottom: "10px"
-														 }}>
+														{JSON.stringify(data) !== "[]" ?
+															<div>
+																<div id="graduation_work_list"
+																		 style={{
+																			 padding: '20px 20px 10px 20px',
+																			 marginBottom: "10px"
+																		 }}>
 
-													<div className="clearfix" style={{
-														lineHeight: "31px !important;",
-														textAlign: "center;"
-													}}>
+																	<div className="clearfix" style={{
+																		lineHeight: "31px !important;",
+																		textAlign: "center;"
+																	}}>
 
 											<span className="fl color-grey-6 font-12">
 												<span
@@ -3519,10 +3549,10 @@ class Listofworksstudentone extends Component {
 												}
 											</span>
 
-														<div className="fr">
+																		<div className="fr">
 
-															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+																			<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+																			{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?
 														(this.props.isNotMember()===false?
 															<div className={"computeTime font-16"} onClick={this.setComputeTime}>
@@ -3539,14 +3569,14 @@ class Listofworksstudentone extends Component {
 													}
 												</span>}
 
-														</div>
+																		</div>
 
-													</div>
+																	</div>
 
-												</div>
-												<div className={"justify break_full_word new_li"}
-														 style={{minHeight: "480px"}}>
-													<style>{`
+																</div>
+																<div className={"justify break_full_word new_li"}
+																		 style={{minHeight: "480px"}}>
+																	<style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
@@ -3566,82 +3596,94 @@ class Listofworksstudentone extends Component {
 													 padding: 9px;
 															}
 						              `}</style>
-													<div className="edu-table edu-back-white  ysltableow table2">
-														{data === undefined ? "" : <Table
-															dataSource={data}
-															columns={columnsstu}
-															pagination={false}
-															loading={false}
-														/>}
-													</div>
-												</div>
-											</div>
+																	<div className="edu-table edu-back-white  ysltableow table2">
+																		{data === undefined ? "" : <Table
+																			dataSource={data}
+																			columns={columnsstu}
+																			pagination={false}
+																			loading={false}
+																		/>}
+																	</div>
+																</div>
+															</div>
 
-											:
-											<div id="forum_list" className="forum_table">
-												<div className="mh650 edu-back-white">
-													<div className="edu-tab-con-box clearfix edu-txt-center">
-														<img className="edu-nodata-img mb20"
-																 src={getImageUrl("images/educoder/nodata.png")}/>
-														<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
-													</div>
-												</div>
+															:
+															<div id="forum_list" className="forum_table">
+																<div className="mh650 edu-back-white">
+																	<div className="edu-tab-con-box clearfix edu-txt-center">
+																		<img className="edu-nodata-img mb20"
+																				 src={getImageUrl("images/educoder/nodata.png")}/>
+																		<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+																	</div>
+																</div>
 
-											</div>
-										}
+															</div>
+														}
 
-									</div>
+													</div>
 
-								</div>
+												</div>
+												}
+											</div>
+											:
+											// 学生能查看别人的
+											<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
+												{/*双层*/}
+												<DownloadMessageysl
+													{...this.props}
+													value={this.state.DownloadMessageval}
+													modalCancel={this.Downloadcal}
+													modalsType={this.state.DownloadType}
+												/>
+
+												{visibles === true ?
+													<TraineetraininginformationModal
+														homeworkid={this.props.match.params.homeworkid}
+														coursesId={this.props.match.params.coursesId}
+														userids={this.state.userids}
+														viewtrainingdata={viewtrainingdata}
+														game_list={game_list}
+														visible={visibles}
+														experience={experience}
+														boolgalist={boolgalist}
+														Cancel={() => this.cancelModulationModels()}
+													/> : ""
+												}
 
-							</div>
-							:
-							// 学生能查看别人的
-							<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
-								{/*双层*/}
-								<DownloadMessageysl
-									{...this.props}
-									value={this.state.DownloadMessageval}
-									modalCancel={this.Downloadcal}
-									modalsType={this.state.DownloadType}
-								/>
-
-								{visibles === true ?
-									<TraineetraininginformationModal
-										homeworkid={this.props.match.params.homeworkid}
-										coursesId={this.props.match.params.coursesId}
-										userids={this.state.userids}
-										viewtrainingdata={viewtrainingdata}
-										game_list={game_list}
-										visible={visibles}
-										experience={experience}
-										boolgalist={boolgalist}
-										Cancel={() => this.cancelModulationModels()}
-									/> : ""
-								}
-								<div className={"educontent mb20"}>
+												{
+													homework_status.length===0?
+														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
+															<NoneData></NoneData>
+														</div>
+														:
+														homework_status.length>0 && homework_status[0]==="未发布"?
+															<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
+																<NoneData></NoneData>
+															</div>
+															:
+														<div className={"educontent mb20"}>
 
-									<div >
-										<style>
-											{
-												`
+													<div >
+														<style>
+															{
+																`
 											.shixunSpin{
 												color:#FF6801;
 												margin-right: 10px;
 												}
 										`}
-										</style>
+														</style>
 
-										{computeTimetype===false?<li className="clearfix startbox mb20">
-											<Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
-									<span className={"startfont"}>
+														{computeTimetype===false?<li className="clearfix startbox mb20">
+															<Spin indicator={antIcon} spinning={!computeTimetype} className={"shixunSpin"}/>
+															<span className={"startfont"}>
 						         	正在执行成绩计算，完成后将为您自动刷新结果。温馨提示：执行时间因作品数量而异
 									</span>
-										</li>:""}
+														</li>:""}
 
-										<style>
-											{
-												`
+														<style>
+															{
+																`
 												.edu-table .ant-table-tbody > tr > td {
 														height: 58px;
 															}
@@ -3658,28 +3700,28 @@ class Listofworksstudentone extends Component {
 													 padding: 9px;
 															}
 												`
-											}
-										</style>
-										<div className="edu-table edu-back-white ysltableows table3">
-											{data === undefined ? "" : <Table
-												style={styletable}
-												dataSource={data}
-												columns={columnsstu2}
-												pagination={false}
-												showHeader={false}
-												loading={false}
-											/>}
-										</div>
-										{JSON.stringify(datas) !== "[]" ?
-											<div>
-												<div id="graduation_work_list" className="edu-back-white" style={{
-													padding: '20px 20px 10px 20px',
-													marginBottom: "10px"
-												}}>
-													<div className="clearfix" style={{
-														lineHeight: "31px !important;",
-														textAlign: "center;"
-													}}>
+															}
+														</style>
+														<div className="edu-table edu-back-white ysltableows table3">
+															{data === undefined ? "" : <Table
+																style={styletable}
+																dataSource={data}
+																columns={columnsstu2}
+																pagination={false}
+																showHeader={false}
+																loading={false}
+															/>}
+														</div>
+														{JSON.stringify(datas) !== "[]" ?
+															<div>
+																<div id="graduation_work_list" className="edu-back-white" style={{
+																	padding: '20px 20px 10px 20px',
+																	marginBottom: "10px"
+																}}>
+																	<div className="clearfix" style={{
+																		lineHeight: "31px !important;",
+																		textAlign: "center;"
+																	}}>
 											<span className="fl color-grey-6 font-12">
 												<span className="color-orange-tip">
 													{teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count}
@@ -3692,8 +3734,8 @@ class Listofworksstudentone extends Component {
 																style={{color: '#FF6800'}}>{teacherdata.left_time.time}</span>}
 
 											</span>
-														<style>
-															{`
+																		<style>
+																			{`
 													.startbox{
 													height: 48px;
 													background: rgba(255,104,0,0.1);
@@ -3735,11 +3777,11 @@ class Listofworksstudentone extends Component {
 											    	border-radius: 4px;
 													}
 													`}
-														</style>
-														<div className="fr">
+																		</style>
+																		<div className="fr">
 
-															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+																			<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
+																			{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 																{computeTimetype===true?
 																	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTime}>
 																		查看最新成绩
@@ -3750,12 +3792,12 @@ class Listofworksstudentone extends Component {
 																		</div>:"")
 																}
 												 			</span>}
-														</div>
-												</div>
-												</div>
-												<div className={"justify break_full_word new_li"}
-														 style={{minHeight: "480px"}}>
-													<style>{`
+																		</div>
+																	</div>
+																</div>
+																<div className={"justify break_full_word new_li"}
+																		 style={{minHeight: "480px"}}>
+																	<style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
@@ -3775,42 +3817,44 @@ class Listofworksstudentone extends Component {
 													 padding: 9px;
 															}
 						              `}</style>
-													<div className="edu-table edu-back-white ysltableowss table4">
-														{datas === undefined ? "" : <Table
-															dataSource={datas}
-															columns={columnsstu}
-															pagination={false}
-															loading={loadingstate}
-														/>}
+																	<div className="edu-table edu-back-white ysltableowss table4">
+																		{datas === undefined ? "" : <Table
+																			dataSource={datas}
+																			columns={columnsstu}
+																			pagination={false}
+																			loading={loadingstate}
+																		/>}
+																	</div>
+																</div>
+																{
+																	teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
+																		<div className="edu-txt-center ysyslxh mt30">
+																			<Pagination showQuickJumper current={page}
+																									onChange={this.paginationonChangestwo} pageSize={limit}
+																									total={teacherdata.work_count}></Pagination>
+																		</div>
+																		: ""
+																}
+															</div>
+															:
+															<div id="forum_list" className="forum_table">
+																<div className="mh650 edu-back-white">
+																	<div className="edu-tab-con-box clearfix edu-txt-center">
+																		<img className="edu-nodata-img mb20"
+																				 src={getImageUrl("images/educoder/nodata.png")}/>
+																		<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
+																	</div>
+																</div>
+															</div>
+														}
 													</div>
 												</div>
-												{
-													teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
-														<div className="edu-txt-center ysyslxh mt30">
-															<Pagination showQuickJumper current={page}
-																					onChange={this.paginationonChangestwo} pageSize={limit}
-																					total={teacherdata.work_count}></Pagination>
-														</div>
-														: ""
 												}
 											</div>
-											:
-											<div id="forum_list" className="forum_table">
-												<div className="mh650 edu-back-white">
-													<div className="edu-tab-con-box clearfix edu-txt-center">
-														<img className="edu-nodata-img mb20"
-																 src={getImageUrl("images/educoder/nodata.png")}/>
-														<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
-													</div>
-												</div>
-											</div>
-										}
-									</div>
-								</div>
-							</div>
+
 					}
 				</div>
-				)
+
 
 		)
 	}
diff --git a/public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js b/public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
index 312bfeecf..ead6e4c29 100644
--- a/public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
+++ b/public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
@@ -39,20 +39,20 @@ class EcStudentList extends Component {
         let major_id=this.props.match.params.major_id;
         let year_id=this.props.match.params.year_id;
 
-        const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data';
-            axios.get(url, {
-                withCredentials: true,
-            }).then((response) => {
-                if(response.status===200){
-                  this.setState({
-                      majorschoollist:response.data,
-                      ismanager:response.data.ismanager,
-                  })
-                }
-            })
-            .catch(function (error) {
-                console.log(error);
-            });
+        // const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data';
+        //     axios.get(url, {
+        //         withCredentials: true,
+        //     }).then((response) => {
+        //         if(response.status===200){
+        //           this.setState({
+        //               majorschoollist:response.data,
+        //               ismanager:response.data.ismanager,
+        //           })
+        //         }
+        //     })
+        //     .catch(function (error) {
+        //         console.log(error);
+        //     });
             // let  majorschoollist={
             //         ec_students: [{index: 1, student_name: "同意", student_id: "s20111458"},
             //                         {index: 1, student_name: "同意", student_id: "s20111458"},