diff --git a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
index a001e6d86..ee19745c9 100644
--- a/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
+++ b/public/react/src/modules/courses/coursesPublic/HomeworkModal.js
@@ -46,10 +46,16 @@ class HomeworkModal extends Component{
 		}
 
 		if(this.props.starttimes!=undefined&&this.props.starttimes!=""){
+			if(this.props.starttimesend!=undefined&&this.props.starttimesend!=""){
+				this.setState({
+					endtime:this.props.starttimesend,
+				})
+			}else {
+				this.setState({
+					endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
+				})
+			}
 
-			this.setState({
-				endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
-			})
 		}
 	}
   componentDidUpdate=(prevProps)=>{
@@ -69,9 +75,16 @@ class HomeworkModal extends Component{
     if(prevProps.starttimes!=this.props.starttimes){
 
 			if(this.props.starttimes!=undefined&&this.props.starttimes!=""){
-        this.setState({
-					endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
-				})
+				if(this.props.starttimesend!=undefined&&this.props.starttimesend!=""){
+					this.setState({
+						endtime:this.props.starttimesend,
+					})
+				}else{
+					this.setState({
+						endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
+					})
+				}
+
 			}
 		}
   }
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 46e90befb..926e1b023 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -80,6 +80,7 @@ class Listofworksstudentone extends Component {
 			teacherdata: undefined,
 			task_status: [],
 			visibles: false,
+			starttimesend:undefined,
 			course_group_info: [],
 			styletable: {
 				"display": "none"
@@ -210,13 +211,13 @@ class Listofworksstudentone extends Component {
 											title={record.stduynumber}
 											className="maxnamewidth145"
 											style={{
-												color:'#9A9A9A',
+											  color:'#9A9A9A',
 												textAlign: "center",
 												width:'145px',
-											}}>{
+										}}>{
 											record.stduynumber
 										}
-										</a>
+									</a>
 
 							}
 
@@ -327,11 +328,11 @@ class Listofworksstudentone extends Component {
 				// 	className:'font-14',
 				// 	render: (text, record) => (
 				// 		<span>
-				//      <span style={{
+        //      <span style={{
 				// 			 color: '#9A9A9A',
 				// 			 "text-align": "center"
 				// 		 }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
-				// </span>
+        // </span>
 				// 	),
 				// },
 				{
@@ -451,8 +452,8 @@ class Listofworksstudentone extends Component {
 													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
 														:
 														<a style={{textAlign: "center"}}
-															 className="color-blue"
-															 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+																	className="color-blue"
+																	onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
 												}
 
         </span>
@@ -953,15 +954,15 @@ class Listofworksstudentone extends Component {
 								</a>
 							}
 						</span>
-						// 		<a style={
-						// 			{
-						// 				color: '#747A7F',
-						// 				"text-align": "center"
-						// 			}
-						// 		}
-						// 		title={record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
-						// 		>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
-						// </a>
+				// 		<a style={
+				// 			{
+				// 				color: '#747A7F',
+				// 				"text-align": "center"
+				// 			}
+				// 		}
+				// 		title={record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+				// 		>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
+        // </a>
 					)
 
 				},
@@ -1268,14 +1269,14 @@ class Listofworksstudentone extends Component {
 								<Tooltip  placement="bottom" title={<div>
 									学员在EduCoder做实训花费的时间
 								</div>}>
-									<a style={
-										{
-											color: '#747A7F',
-											textAlign: "center"
-										}
+								<a style={
+									{
+										color: '#747A7F',
+										textAlign: "center"
 									}
-									>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
-									</a>
+								}
+								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+								</a>
 								</Tooltip>
 							}
 						</span>
@@ -1535,7 +1536,7 @@ class Listofworksstudentone extends Component {
 		// console.log("获取作品列表");
 		// console.log("935");
 		// debugger
-		let searchtype=this.props.history.location.search;
+    let searchtype=this.props.history.location.search;
 		let urll = `/homework_commons/${homeworkid}/works_list.json`;
 		var datasysl = {
 			search: this.state.searchtext,
@@ -1589,12 +1590,12 @@ class Listofworksstudentone extends Component {
 					if(result.data.update_score===true){
 						if(bool===true){
 							if(searchtype==="?tab=0"){
-								try {
-									this.props.yslslowCheckresults();
-								}catch (e) {
+						  try {
+								this.props.yslslowCheckresults();
+							}catch (e) {
 
-								}
-								this.setComputeTimet();
+							}
+							  this.setComputeTimet();
 							}
 						}
 					}
@@ -2445,7 +2446,7 @@ class Listofworksstudentone extends Component {
 								if(item.title==="效率分"){
 									continue
 								}else {
-									columns2js.push(item);
+								columns2js.push(item);
 								}
 							}
 						}
@@ -2479,7 +2480,7 @@ class Listofworksstudentone extends Component {
 							if(item.title==="分班"){
 								continue
 							}else{
-								columns2js.push(item);
+												columns2js.push(item);
 							}
 						}
 					}
@@ -2789,6 +2790,7 @@ class Listofworksstudentone extends Component {
 		axios.get(url).then((response) => {
 
 			if (response.status === 200) {
+				const dataformat = 'YYYY-MM-DD HH:mm';
 				let starttime = this.props.getNowFormatDates(1);
 				let endtime = this.props.getNowFormatDates(2);
 				this.setState({
@@ -2801,6 +2803,7 @@ class Listofworksstudentone extends Component {
 					starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 					endtime: "截止时间：" + endtime,
 					starttimes:starttime,
+					starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
 					typs:"start",
 					Cancelname: "暂不发布",
 					Savesname: "立即发布",
@@ -2949,6 +2952,7 @@ class Listofworksstudentone extends Component {
 			course_groupyslstwo: undefined,
 			typs:undefined,
 			starttimes:undefined,
+			starttimesend:undefined,
 		})
 	}
 
@@ -2985,31 +2989,31 @@ class Listofworksstudentone extends Component {
 		let url = "/homework_commons/"+homeworkid+"/update_score.json";
 
 		axios.get(url).then((response) => {
-			if(response){
-				if(response.data.status===0){
-					// if(response.data.message!==undefined){
-					// 	return;
-					// }
+       if(response){
+       	if(response.data.status===0){
+			// if(response.data.message!==undefined){
+			// 	return;
+			// }
 					setTimeout(()=>{
 						this.setState({
 							loadingstate: true
 						})
 						this.Getalistofworks(homeworkid,false);
-						try {
-							this.props.showNotification(`${response.data.message}`);
-						}catch (e) {
+					   try {
+							 this.props.showNotification(`${response.data.message}`);
+						 }catch (e) {
 
-						}
-						try{
-							this.props.yslslowCheckresultsNo();
-						}catch (e) {
+						 }
+						 try{
+					   	this.props.yslslowCheckresultsNo();
+						 }catch (e) {
 
-						}
+						 }
 
 					}, 2500);
 				}
-				// this.props.history.replace( matchurl );
-			}
+		  // this.props.history.replace( matchurl );
+			 }
 		}).catch((error) => {
 			console.log(error)
 		});
@@ -3038,8 +3042,8 @@ class Listofworksstudentone extends Component {
 	// }
 
 	daochushixunbaogao=()=>{
-		let url =`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo===undefined ||this.state.course_groupyslstwo===null? "": this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null? "":this.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext===null?"":this.state.searchtext}`
-		this.confirmysl(url);
+    let url =`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo===undefined ||this.state.course_groupyslstwo===null? "": this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null? "":this.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext===null?"":this.state.searchtext}`
+    this.confirmysl(url);
 	}
 
 	daochuzuoye =() =>{
@@ -3092,105 +3096,106 @@ class Listofworksstudentone extends Component {
 		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 />;
-		let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
-		// console.log("Listofworksstudentone.js");
-		// console.log(orders);
+	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
+	 // console.log("Listofworksstudentone.js");
+	 // console.log(orders);
 
 		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}
-					/>
-					{
-						homework_status&&homework_status.length===0?
-							<div className="edu-back-white">
-								<NoneData></NoneData>
-							</div>
-							:
-							homework_status&&homework_status.length>0 && homework_status[0]==="未发布"?
-								<div className="edu-back-white">
-									<NoneData></NoneData>
-								</div>
-								:
-								<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}
+									 starttimesend={this.state.starttimesend}
+									 typs={this.state.typs}
+								 />
+								 {
+									 homework_status&&homework_status.length===0?
+									 <div className="edu-back-white">
+								 <NoneData></NoneData>
+									 </div>
+								 :
+									homework_status&&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);
@@ -3237,37 +3242,37 @@ 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>:""}
-
-										{/*作品状态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>*/}
-
-
-
-											</li>
-
-											<li className="clearfix mt10">
-												<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
-													{/*{course_is_end===true?"":<span>*/}
-													{/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
-													{/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
-													{/*		查看最新成绩*/}
-													{/*	</div>:""):*/}
-													{/*	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-													{/*		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
-													{/*			查看最新成绩*/}
-													{/*		</div>:"")*/}
-													{/*}*/}
-													{/*</span>}*/}
-													<span className="search-newyslw fr ml20">
+										 </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>*/}
+
+
+
+											 </li>
+
+											 <li className="clearfix mt10">
+												 <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
+													 {/*{course_is_end===true?"":<span>*/}
+													 {/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
+													 {/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
+													 {/*		查看最新成绩*/}
+													 {/*	</div>:""):*/}
+													 {/*	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
+													 {/*		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
+													 {/*			查看最新成绩*/}
+													 {/*		</div>:"")*/}
+													 {/*}*/}
+													 {/*</span>}*/}
+													 <span className="search-newyslw fr ml20">
 										<Search
 											placeholder="请输入姓名或学号搜索"
 											id="subject_search_input"
@@ -3278,18 +3283,18 @@ class Listofworksstudentone extends Component {
 											onSearch={this.searchValuest}
 										></Search>
 										</span>
-												</div>
-												<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>
+												 <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}
@@ -3297,97 +3302,97 @@ 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.work_count&&teacherdata.work_count}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count&&teacherdata.all_member_count}学生） </span>
-												<style>
-													{
-														`
+												 <style>
+													 {
+														 `
 										.edu-position-hide li a:hover {
 										  background: #F0F0F0;
 										  color: #05101A;
 										}
 										`
-													}
-												</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%;}
 						                }
@@ -3405,40 +3410,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);
@@ -3480,84 +3485,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&&homework_status.length&&homework_status.length===0?
-										<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
-											<NoneData></NoneData>
-										</div>
-										:
-										homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
-											<div className=" clearfix edu-back-white "  style={{margin:  "auto" , minWidth:"1200px"}}>
-												<NoneData></NoneData>
-											</div>
-											:
+												{
+													homework_status&&homework_status.length&&homework_status.length===0?
+														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
+															<NoneData></NoneData>
+														</div>
+														:
+														homework_status&&homework_status.length>0 && homework_status&&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"}}>
+												<div className={"educontent "}>
+													<div className="edu-back-white" style={{width: "1200"}}>
 
-													<style>
-														{
-															`
+														<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
@@ -3572,38 +3577,38 @@ class Listofworksstudentone extends Component {
 												}
 											</span>
 
-																	<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>*/}
-																		{/*	{computeTimetype===true?*/}
-																		{/*		(this.props.isNotMember()===false?*/}
-																		{/*			(*/}
-																		{/*				teacherdata&&teacherdata.update_score===true?*/}
-																		{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
-																		{/*						查看最新成绩*/}
-																		{/*					</div>*/}
-																		{/*					:""*/}
-																		{/*			)*/}
-																		{/*			:"")*/}
-																		{/*		:*/}
-																		{/*		(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-																		{/*			this.props.isNotMember()===false?*/}
-																		{/*				<div className={"computeTimes font-16"}>*/}
-																		{/*					查看最新成绩*/}
-																		{/*				</div>*/}
-																		{/*				:"")*/}
-																		{/*	}*/}
-																		{/*</span>}*/}
+																		<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>*/}
+												{/*	{computeTimetype===true?*/}
+												{/*		(this.props.isNotMember()===false?*/}
+												{/*			(*/}
+												{/*				teacherdata&&teacherdata.update_score===true?*/}
+												{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
+												{/*						查看最新成绩*/}
+												{/*					</div>*/}
+												{/*					:""*/}
+												{/*			)*/}
+												{/*			:"")*/}
+												{/*		:*/}
+												{/*		(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
+												{/*			this.props.isNotMember()===false?*/}
+												{/*				<div className={"computeTimes font-16"}>*/}
+												{/*					查看最新成绩*/}
+												{/*				</div>*/}
+												{/*				:"")*/}
+												{/*	}*/}
+												{/*</span>}*/}
+
+																		</div>
 
 																	</div>
 
 																</div>
-
-															</div>
-															<div className={"justify break_full_word new_li"}
-																	 style={{minHeight: "480px"}}>
-																<style>{`
+																<div className={"justify break_full_word new_li"}
+																		 style={{minHeight: "480px"}}>
+																	<style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
@@ -3623,94 +3628,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 className="edu-table edu-back-white  ysltableow table2">
+																		{data === undefined ? "" : <Table
+																			dataSource={data}
+																			columns={columnsstu}
+																			pagination={false}
+																			loading={false}
+																		/>}
+																	</div>
 																</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 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 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()}
-									/> : ""
-								}
-
-								{
-									homework_status&&homework_status.length===0?
-										<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
-											<NoneData></NoneData>
-										</div>
-										:
-										homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
-											<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
-												<NoneData></NoneData>
+												}
 											</div>
 											:
-											<div className={"educontent mb20"}>
+											// 学生能查看别人的
+											<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()}
+													/> : ""
+												}
+
+												{
+													homework_status&&homework_status.length===0?
+														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
+															<NoneData></NoneData>
+														</div>
+														:
+														homework_status&&homework_status.length>0 && homework_status&&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;
 															}
@@ -3727,28 +3732,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}
@@ -3761,8 +3766,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);
@@ -3804,33 +3809,33 @@ class Listofworksstudentone extends Component {
 											    	border-radius: 4px;
 													}
 													`}
-																	</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>*/}
-																		{/*	{computeTimetype===true?*/}
-
-																		{/*		(this.props.isNotMember()===false?*/}
-																		{/*			(*/}
-																		{/*				teacherdata&&teacherdata.update_score===true?*/}
-																		{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
-																		{/*						查看最新成绩*/}
-																		{/*					</div>:""*/}
-																		{/*			)*/}
-																		{/*			:""):*/}
-																		{/*		teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-																		{/*			(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
-																		{/*				查看最新成绩*/}
-																		{/*			</div>:"")*/}
-																		{/*	}*/}
-																		{/*</span>}*/}
+																		</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>*/}
+															{/*	{computeTimetype===true?*/}
+
+															{/*		(this.props.isNotMember()===false?*/}
+															{/*			(*/}
+															{/*				teacherdata&&teacherdata.update_score===true?*/}
+															{/*					<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
+															{/*						查看最新成绩*/}
+															{/*					</div>:""*/}
+															{/*			)*/}
+															{/*			:""):*/}
+															{/*		teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
+															{/*			(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
+															{/*				查看最新成绩*/}
+															{/*			</div>:"")*/}
+															{/*	}*/}
+												 			{/*</span>}*/}
+																		</div>
 																	</div>
 																</div>
-															</div>
-															<div className={"justify break_full_word new_li"}
-																	 style={{minHeight: "480px"}}>
-																<style>{`
+																<div className={"justify break_full_word new_li"}
+																		 style={{minHeight: "480px"}}>
+																	<style>{`
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
@@ -3850,40 +3855,40 @@ 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>
-															{
-																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 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>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 9b0353b9e..32dd3a4ee 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -61,9 +61,9 @@ class ShixunHomeworkPage extends Component {
 
 	}
 	Getdataback = (jobsettingsdata, teacherdata) => {
-		// console.log("56");
-		// console.log(jobsettingsdata);
-		// console.log(teacherdata);
+		console.log("ShixunHomeworkPage56");
+		console.log(jobsettingsdata);
+		console.log(teacherdata);
 
 		this.setState({
 			jobsettingsdatapage: jobsettingsdata.data.message===undefined?jobsettingsdata:undefined,
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 3caa63ac3..95de82445 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -74,6 +74,7 @@ class ShixunStudentWork extends Component {
 			DownloadType:false,
 			DownloadMessageval:undefined,
 			lunxun:true,
+			starttimesend:undefined,
 		}
 	}
 
@@ -415,6 +416,7 @@ class ShixunStudentWork extends Component {
 		axios.get(url).then((response) => {
 
 			if(response.status===200){
+				const dataformat = 'YYYY-MM-DD HH:mm';
 				let starttime= this.props.getNowFormatDates(1);
 				let endtime=this.props.getNowFormatDates(2);
 				this.setState({
@@ -432,6 +434,7 @@ class ShixunStudentWork extends Component {
 					Saves:this.homeworkstartend,
 					course_groups:response.data.course_groups,
 					starttimes:starttime,
+					starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
 					typs:"start",
 				})
 			}
@@ -754,6 +757,7 @@ class ShixunStudentWork extends Component {
 					course_groups={this.state.course_groups}
 					getcourse_groupslist={(id)=>this.getcourse_groupslist(id)}
 					starttimes={this.state.starttimes}
+					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
 				/>
 					<div className={"educontent "}>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index da1408d4a..5d2462ec0 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -120,7 +120,7 @@ class Trainingjobsetting extends Component {
             showmodel:false,
 					  code_review:false,
             testscripttiptype:false,
-
+            starttimesend:undefined,
             end_timebool:false,
             late_timesbool:false,
             work_efficiencys:false,
@@ -1525,6 +1525,7 @@ class Trainingjobsetting extends Component {
         axios.get(url).then((response) => {
 
             if (response.status === 200) {
+                const dataformat = 'YYYY-MM-DD HH:mm';
                 let starttime = this.props.getNowFormatDates(1);
                 let endtime = this.props.getNowFormatDates(2);
                 this.setState({
@@ -1536,7 +1537,8 @@ class Trainingjobsetting extends Component {
 										Botval:`本操作只对"未发布"的分班有效`,
                     starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 								   	starttimes:starttime,
-								  	typs:"start",
+                    starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
+                    typs:"start",
                     endtime: "截止时间：" + endtime,
                     Cancelname: "暂不发布",
                     Savesname: "立即发布",
@@ -1668,6 +1670,7 @@ class Trainingjobsetting extends Component {
             addnametab: undefined,
 				  	typs:undefined,
 				  	starttimes:undefined,
+            starttimesend:undefined,
         })
     }
     cancelBox=()=>{
@@ -2120,7 +2123,8 @@ class Trainingjobsetting extends Component {
                     course_groups={this.state.course_groups}
                     getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
 										starttimes={this.state.starttimes}
-										typs={this.state.typs}
+                    starttimesend={this.state.starttimesend}
+                    typs={this.state.typs}
                 />
                 <Modals
                     modalsType={modalsType}
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index ae8845bf5..34c484b83 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -77,7 +77,8 @@ class Workquestionandanswer extends Component {
 			polls_descriptiontest: "作业说明...",
 			jobdescriptiondisplay: "none",
 			score_open: false,
-			code_review: false
+			code_review: false,
+			starttimesend:undefined,
 		}
 	}
 
@@ -156,6 +157,7 @@ class Workquestionandanswer extends Component {
 		axios.get(url).then((response) => {
 
 			if (response.status === 200) {
+				const dataformat = 'YYYY-MM-DD HH:mm';
 				let starttime = this.props.getNowFormatDates(1);
 				let endtime = this.props.getNowFormatDates(2);
 				this.setState({
@@ -173,6 +175,7 @@ class Workquestionandanswer extends Component {
 					Saves: this.homeworkstartend,
 					course_groups: response.data.course_groups,
 					starttimes: starttime,
+					starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
 					typs: "start",
 				})
 			}
@@ -441,6 +444,7 @@ class Workquestionandanswer extends Component {
 					course_groups={this.state.course_groups}
 					getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
 					starttimes={this.state.starttimes}
+					starttimesend={this.state.starttimesend}
 					typs={this.state.typs}
 				/>
 				<div className={"educontent "}>
diff --git a/public/react/src/modules/login/EducoderInteresse.js b/public/react/src/modules/login/EducoderInteresse.js
index 073f188af..75f2c7059 100644
--- a/public/react/src/modules/login/EducoderInteresse.js
+++ b/public/react/src/modules/login/EducoderInteresse.js
@@ -21,6 +21,7 @@ var newContainer={
 	bottom: "0px",
 	minHeight: "100%",
 }
+//兴趣页面
 class EducoderInteresse extends Component {
 	constructor(props) {
 		super(props);
diff --git a/public/react/src/modules/modals/SendTopics.js b/public/react/src/modules/modals/SendTopics.js
index 265bcc7d7..94f134f3f 100644
--- a/public/react/src/modules/modals/SendTopics.js
+++ b/public/react/src/modules/modals/SendTopics.js
@@ -10,7 +10,8 @@ class SendTopics extends Component{
 			search:null,
 			Radiolist:undefined,
 			showcheck:false,
-			smallisSpin:false
+			smallisSpin:false,
+			yslbanksMenu:undefined
     }
   }
 
@@ -18,8 +19,13 @@ class SendTopics extends Component{
 
 
   componentDidMount(){
-   let{search}=this.state;
-   this.onupdatalist(search)
+		// console.log("SendTopicssssssssssss");
+		// console.log(this.props);
+		let{search}=this.state;
+    this.onupdatalist(search)
+		this.setState({
+			yslbanksMenu:this.props.banksMenu,
+		})
   }
 
   onupdatalist=(search)=>{
@@ -49,6 +55,8 @@ class SendTopics extends Component{
 
 
 	onChange=(e)=>{
+  	console.log("SendTopics");
+  	console.log(e);
   	 this.setState({
 			 Radiolist:e.target.value
 		 })
@@ -78,9 +86,60 @@ class SendTopics extends Component{
 					smallisSpin:false
 				})
 				if(result.data.status===0){
-					this.props.showNotification(result.data.message)
-					this.props.topicscancelmodel()
-					this.props.updataslist()
+					this.props.showNotification(result.data.message);
+					this.props.topicscancelmodel();
+					// result.data.task_ids;
+
+					try {
+						this.props.updataslist()
+					}catch (e) {
+
+					}
+debugger
+					if(this.props.mysendall===true){
+						//详情页面跳过来的
+					try {
+						var rurls="";
+						 if(this.state.yslbanksMenu.category==="normal"){
+						 	//普通作业
+							  rurls=`/courses/${this.state.Radiolist}/common_homeworks/${result.data.task_ids}/setting`;
+						 }else if(this.state.yslbanksMenu.category==="group"){
+						 	//分组作业
+							  rurls=`/courses/${this.state.Radiolist}/group_homeworks/${result.data.task_ids}/setting`;
+						 }else if(this.state.yslbanksMenu.category==="exercise"){
+						 	// 试卷
+						 	  rurls=`/courses/${this.state.Radiolist}/exercises/${result.data.task_ids}/student_exercise_list?tab=3`;
+						 }else if(this.state.yslbanksMenu.category==="poll") {
+						 	 //问卷
+							 rurls=`/courses/${this.state.Radiolist}/polls/${result.data.task_ids}/detail?tab=3`
+						 }
+						window.open(rurls,'_blank');
+					}catch (e) {
+
+					}
+					}else{
+						//外部多个列表页跳过来的
+						debugger
+						try {
+							var rurls="";
+							if(this.props.category==="normal"){
+								//普通作业
+								rurls=`/courses/${this.state.Radiolist}/common_homeworks/${result.data.category_id}`;
+							}else if(this.props.category==="group"){
+								//分组作业
+								rurls=`/courses/${this.state.Radiolist}/group_homeworks/${result.data.category_id}`;
+							}else if(this.props.category==="exercise"){
+								// 试卷
+								rurls=`/courses/${this.state.Radiolist}/exercises/${result.data.category_id}`;
+							}else if(this.props.category==="poll") {
+								//问卷
+								rurls=`/courses/${this.state.Radiolist}/polls/${result.data.category_id}`
+							}
+							window.open(rurls,'_blank');
+						}catch (e) {
+                 console.log(e);
+						}
+					}
 				}else{
 					this.props.showNotification(result.data.message)
 				}
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index 3b76bfa28..cd05d51ce 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -361,6 +361,7 @@ class InfosTopics extends Component{
 					<SendTopics
 						{...this.state}
 						{...this.props}
+						mysendall={false}
 						visible={visible}
 						updataslist={()=>this.updataslist()}
 						topicscancelmodel={()=>this.topicscancelmodel()}
diff --git a/public/react/src/modules/user/usersInfo/banks/banksMenu.js b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
index 1c753450b..aa2491ae8 100644
--- a/public/react/src/modules/user/usersInfo/banks/banksMenu.js
+++ b/public/react/src/modules/user/usersInfo/banks/banksMenu.js
@@ -25,7 +25,10 @@ class BanksMenu extends Component{
     })
   }
   componentDidMount() {
-    debugger
+    // var thestring=this.props;
+    // var yslarr=thestring.split("/");
+    // console.log(yslarr);
+
     try {
       const query = this.props.location.search;
       const type = query.split('?tab=');
@@ -80,9 +83,9 @@ class BanksMenu extends Component{
   }
 
   topicssavedelete=(id,type)=>{
-    console.log("删除了");
-    console.log(id);
-    console.log(type);
+    // console.log("删除了");
+    // console.log(id);
+    // console.log(type);
     const url = `/question_banks/multi_delete.json`;
     axios.delete(url, { data: {
           object_id: [id],
@@ -148,6 +151,7 @@ class BanksMenu extends Component{
             <SendTopics
               {...this.state}
               {...this.props}
+              mysendall={true}
               visible={visible}
               category={banksMenu&&banksMenu.category}
               checkBoxValues={[banksMenu&&banksMenu.id]}
@@ -160,8 +164,9 @@ class BanksMenu extends Component{
             <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
               {
                 banksMenu.menuArray && banksMenu.menuArray.map((item,key)=>{
-                  console.log("BanksMenu");
-                  console.log(item);
+                  // console.log("BanksMenussss");
+                  // console.log(this.props);
+                  // console.log(this.props.content);
                   return(
                     <Menu.Item key={key}><Link to={`${item.to}`}>{item.content}</Link></Menu.Item>
                   )