diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 81d5a6a27..398a45228 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -110,34 +110,34 @@ class Testpapersettinghomepage extends Component{
             groupyslsval:list
         })
     }
-    experiment=(url)=>{
-
-        axios.get(url).then((response) => {
-        	   console.log(response);
-            if(response.data.status&&response.data.status===-1){
-
-            }else if(response.data.status&&response.data.status===-2){
-                   if(response.data.messages === "100"){
-                       // 已超出文件导出的上限数量（100 ），建议：
-										 this.setState({
-											 DownloadType:true,
-											 DownloadMessageval:100
-										 })
-                   }else {
-                     //因附件资料超过500M
-										 this.setState({
-											 DownloadType:true,
-											 DownloadMessageval:500
-										 })
-                   }
-            }else {
-                window.open("/api"+url, '_blank');
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-
-    }
+    // experiment=(url)=>{
+		//
+    //     axios.get(url).then((response) => {
+    //     	   console.log(response);
+    //         if(response.data.status&&response.data.status===-1){
+		//
+    //         }else if(response.data.status&&response.data.status===-2){
+    //                if(response.data.messages === "100"){
+    //                    // 已超出文件导出的上限数量（100 ），建议：
+		// 								 this.setState({
+		// 									 DownloadType:true,
+		// 									 DownloadMessageval:100
+		// 								 })
+    //                }else {
+    //                  //因附件资料超过500M
+		// 								 this.setState({
+		// 									 DownloadType:true,
+		// 									 DownloadMessageval:500
+		// 								 })
+    //                }
+    //         }else {
+    //             window.open("/api"+url, '_blank');
+    //         }
+    //     }).catch((error) => {
+    //         console.log(error)
+    //     });
+		//
+    // }
 
 	setgameexercise=(url)=>{
 
@@ -169,18 +169,18 @@ class Testpapersettinghomepage extends Component{
 			Loadtype:false
 		})
 	}
-	DownloadType=()=>{
-		this.setState({
-			DownloadType:false,
-			DownloadMessageval:undefined
-		})
-	}
-	Downloadcal=()=>{
-		this.setState({
-			DownloadType:false,
-			DownloadMessageval:undefined
-		})
-	}
+	// DownloadType=()=>{
+	// 	this.setState({
+	// 		DownloadType:false,
+	// 		DownloadMessageval:undefined
+	// 	})
+	// }
+	// Downloadcal=()=>{
+	// 	this.setState({
+	// 		DownloadType:false,
+	// 		DownloadMessageval:undefined
+	// 	})
+	// }
     render(){
         let {tab,visible,Commonheadofthetestpaper}=this.state;
         const isAdmin =this.props.isAdmin();
@@ -188,12 +188,12 @@ class Testpapersettinghomepage extends Component{
 
         return(
             <div className="newMain clearfix ">
-								<DownloadMessage
-									{...this.props}
-									value={this.state.DownloadMessageval}
-									modalCancel={this.Downloadcal}
-									modalsType={this.DownloadType}
-								/>
+								{/*<DownloadMessage*/}
+								{/*	{...this.props}*/}
+								{/*	value={this.state.DownloadMessageval}*/}
+								{/*	modalCancel={this.Downloadcal}*/}
+								{/*	modalsType={this.DownloadType}*/}
+								{/*/>*/}
                 <div className={"educontent mb20"} style={{width:"1200px"}}>
 									{/* 公用的提示弹框 */}
 									{this.state.Modalstype===true?<Modals
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index b8210e6f6..1e01b5d6d 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -597,6 +597,7 @@ class Listofworks extends Component {
 	componentDidMount() {
 		console.log("Listofworks");
 		console.log("componentDidMount");
+		this.props.onRef(this)
 		var homeworkid = this.props.match.params.homeworkid;
 		// console.log(homeworkid)
 		// this.Gettitleinformation(homeworkid);
@@ -1156,6 +1157,7 @@ class Listofworks extends Component {
 	}
 	//立即截止
 	homeworkends = () => {
+		console.log("1160");
 		let homeworkid = this.props.match.params.homeworkid;
 		let url = "/homework_commons/" + homeworkid + "/end_groups.json";
 
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index a6663c600..2ee8bd7a8 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -18,9 +18,6 @@ import Workquestionandanswer from './Workquestionandanswer';
 import CoursesListType from '../coursesPublic/CoursesListType';
 import ShixunStudentWork from "./ShixunStudentWork";
 import Startshixuntask from "../coursesPublic/Startshixuntask";
-import HomeworkModal from "../coursesPublic/HomeworkModal";
-import moment from 'moment';
-
 class ShixunHomeworkPage extends Component {
 	constructor(props) {
 		super(props);
@@ -30,6 +27,8 @@ class ShixunHomeworkPage extends Component {
 			teacherdata: undefined,
 			code_review: false,
 			view_report: false,
+			visible: false,
+			showmodel:false,
 		}
 
 	}
@@ -76,190 +75,34 @@ class ShixunHomeworkPage extends Component {
 			shixuntypes: types[3]
 		})
 	}
-	//立即发布
-	homeworkstart = () => {
-		debugger
-		let homeworkid = this.props.match.params.homeworkid;
-		let url = "/homework_commons/" + homeworkid + "/publish_groups.json";
-
-
-		axios.get(url).then((response) => {
 
-			if (response.status === 200) {
-				let starttime = this.props.getNowFormatDates(1);
-				let endtime = this.props.getNowFormatDates(2);
-				this.setState({
-					modalname: "立即发布",
-					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
-					svisible: true,
-					Topval:"学生将立即收到作业",
-					// Botvalleft:"暂不发布",
-					Botval:`本操作只对"未发布"的分班有效`,
-					starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
-					endtime: "截止时间：" + endtime,
-					starttimes:starttime,
-					typs:"start",
-					Cancelname: "暂不发布",
-					Savesname: "立即发布",
-					Cancel: this.homeworkhide,
-					Saves: this.homeworkstartend,
-					course_groups: response.data.course_groups,
-				})
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
 
+	confirmysl(url) {
+		this.refs.DownloadMessage.confirmysl(url);
 	}
-
-	getcourse_groupslist = (id) => {
-		this.setState({
-			course_groupslist: id
-		})
-
+	onRef = (ref) => {
+		console.log("84");
+		console.log(ref);
+		this.child = ref
 	}
-
-	isupdatas = () => {
-		// var homeworkid = this.props.match.params.homeworkid;
-		// // this.Gettitleinformation(homeworkid);
-		// this.Getalistofworks(homeworkid);
+	homeworkendss(){
+		this.child.homeworkends();
 	}
-
-	homeworkhide = () => {
-		this.isupdatas()
-		this.setState({
-			modalname: undefined,
-			modaltype: undefined,
-			svisible: false,
-			Topval: undefined,
-			Topvalright: undefined,
-			Botvalleft: undefined,
-			Botval: undefined,
-			starttime: undefined,
-			endtime: undefined,
-			Cancelname: undefined,
-			Savesname: undefined,
-			Cancel: undefined,
-			Saves: undefined,
-			StudentList_value: undefined,
-			addname: undefined,
-			addnametype: false,
-			addnametab: undefined,
-			course_groupyslstwo: undefined,
-			typs:undefined,
-			starttimes:undefined,
-		})
+	homeworkstarts(){
+		this.child.homeworkstart();
 	}
-// 立即发布
-	homeworkstartend = (ds,endtime) => {
-		var homeworkid = this.props.match.params.homeworkid;
-		let {course_groupslist} = this.state;
-
-		let coursesId = this.props.match.params.coursesId;
-		let url = "/courses/" + coursesId + "/homework_commons/publish_homework.json";
-		axios.post(url, {
-			homework_ids: [homeworkid],
-			group_ids: course_groupslist,
-			end_time:endtime,
-		}).then((result) => {
-			if (result.status === 200) {
-				if (result.data.status === 0) {
-					notification.open({
-						message: "提示",
-						description: result.data.message
-					});
-					this.homeworkhide()
-				}
-
-			}
-		}).catch((error) => {
-			console.log(error);
-		})
+	workshowmodels(){
+		this.child.workshowmodel();
 	}
 
-
-	//立即截止
-	homeworkends = () => {
-		let homeworkid = this.props.match.params.homeworkid;
-		let url = "/homework_commons/" + homeworkid + "/end_groups.json";
-
-		axios.get(url).then((response) => {
-
-			if (response.status === 200) {
-				this.setState({})
-				this.setState({
-					modalname: "立即截止",
-					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
-					svisible: true,
-					Topval:"学生将不能再提交作业",
-					// Botvalleft:"暂不截止",
-					Botval:`本操作只对"提交中"的分班有效`,
-					Cancelname: "暂不截止",
-					Savesname: "立即截止",
-					Cancel: this.homeworkhide,
-					Saves: this.coursetaskend,
-					starttime: undefined,
-					endtime: undefined,
-					course_groups: response.data.course_groups,
-					typs:"end",
-				})
-			}
-		}).catch((error) => {
-			console.log(error)
-		});
-	}
-
-	//立即截止确定按钮
-	coursetaskend = () => {
-		var homeworkid = this.props.match.params.homeworkid;
-		let {course_groupslist} = this.state;
-
-
-		const cid = this.props.match.params.coursesId;
-		let url = "/courses/" + cid + "/homework_commons/end_homework.json";
-		axios.post(url, {
-				group_ids: course_groupslist,
-				homework_ids: [homeworkid],
-			})
-			.then((response) => {
-				if (response.data.status == 0) {
-					notification.open({
-						message: "提示",
-						description: response.data.message
-					});
-					this.homeworkhide()
-				}
-			})
-			.catch(function (error) {
-				console.log(error);
-			});
-	}
+///////////////教师截止
 
 	render() {
-		let {tab, jobsettingsdata, teacherdata} = this.state;
+		let {tab, teacherdata,  jobsettingsdata} = this.state;
+
 		const isAdmin = this.props.isAdmin();
 		return (
 			<div className="newMain clearfix ">
-				{/*立即发布*/}
-				<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 mb20"} style={{width: "1200px"}}>
 
 					<div className="educontent mb20">
@@ -358,17 +201,17 @@ class ShixunHomeworkPage extends Component {
 									</li> : ""}
 								{this.props.isAdmin() ?
 									teacherdata && teacherdata.end_immediately === true ?
-										<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a>
+										<a className="fr color-blue font-16" onClick={this.homeworkendss}>立即截止</a>
 										: ""
 									: ""}
 								{this.props.isAdmin() ?
 									teacherdata && teacherdata.publish_immediately === true ?
-										<a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a>
+										<a className="fr color-blue font-16" onClick={this.homeworkstarts}>立即发布</a>
 										: ""
 									: ""}
 								{this.props.isAdmin() ?
 									teacherdata && teacherdata.code_review === true ?
-										<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>
+										<a className="fr color-blue font-16" onClick={this.workshowmodels}>代码查重</a>
 										: "" : ""}
 								{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
 																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/shixun_work_report`}>
@@ -392,21 +235,21 @@ class ShixunHomeworkPage extends Component {
 					{
 						// 教师列表
 						parseInt(tab) === 0 ? (isAdmin === true ?
-							<Listofworks {...this.props} {...this.state}
+							<Listofworks {...this.props} {...this.state} onRef={this.onRef}
 													 Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworks>
 							:
-							<Listofworksstudentone  {...this.props} {...this.state}
+							<Listofworksstudentone  {...this.props} {...this.state} onRef={this.onRef}
 																			Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>)
 							:
 							parseInt(tab) === 1 ?
-								<Workquestionandanswer {...this.props} {...this.state}
+								<Workquestionandanswer {...this.props} {...this.state} onRef={this.onRef}
 																			 Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>
 								:
 								parseInt(tab) === 2 ?
-									<ShixunStudentWork {...this.props} {...this.state}
+									<ShixunStudentWork {...this.props} {...this.state} onRef={this.onRef}
 																		 Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>
 									:
-									<Trainingjobsetting {...this.props} {...this.state}
+									<Trainingjobsetting {...this.props} {...this.state} onRef={this.onRef}
 																			Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>
 					}
 				</div>