调整

public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js

@@ -7,7 +7,6 @@ import Loading from '../../../../Loading';
 import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
 import axios from 'axios';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
-import OneSelfOrderModal from "../../coursesPublic/OneSelfOrderModal";
 import AccessoryModal from "../../coursesPublic/AccessoryModal";
 import Associationmodel from '../../coursesPublic/Associationmodel';
 import CoursesListType from '../../coursesPublic/CoursesListType';
@@ -41,7 +40,6 @@ class GraduationTaskDetail extends Component{
 		this.state={
 			modalname:undefined,
 			visible:false,
-			OneSelftype:false,
 			Topval:undefined,
 			starttime:undefined,
 			starttimes:undefined,
@@ -117,20 +115,17 @@ class GraduationTaskDetail extends Component{
 	}
 	//立即发布
 	publish=()=>{
-  	let {questionslist}=this.state;
 		let starttime= this.props.getNowFormatDates(1,1);
 		let endtime=this.props.getNowFormatDates(2,1);
 		// this.homeworkstart()
 		this.setState({
 			modalname:"立即发布",
 			visible:true,
-			OneSelftype:true,
 			Topval:"学生将立即收到毕设任务",
 			// Botvalleft:"点击修改",
 			// Botval:`本操作只对"未发布"的分班有效`,
 			starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
-			starttimes:questionslist.end_time,
+			starttimes:this.props.getNowFormatDates(1),
-			staytime:this.props.getNowFormatDates(1),
 			typs:"start",
 			endtime:endtime,
 			Cancelname:"暂不发布",
@@ -181,9 +176,7 @@ class GraduationTaskDetail extends Component{
 		this.setState({
 			modalname:"立即截止",
 			visible:true,
-			OneSelftype:true,
 			Topval:"学生将不能再提交作品",
-			starttime:undefined,
 			// Botvalleft:"暂不截止",
 			// Botval:`本操作只对"提交中"的分班有效`,
 			Cancelname:"暂不截止",
@@ -219,7 +212,6 @@ class GraduationTaskDetail extends Component{
 			Modalstype:false,
 			Loadtype:false,
 			visible:false,
-			OneSelftype:false,
 			Modulationtype:false,
 			Allocationtype:false,
 			Modalstopval:"",
@@ -329,12 +321,11 @@ class GraduationTaskDetail extends Component{
 				{
 					questionslist &&
 					<div className={"educontent mb20"}>
-          <OneSelfOrderModal
+						<HomeworkModal
-						staytime={this.state.staytime}
 							starttimes={this.state.starttimes}
 							typs={this.state.typs}
 							modalname={this.state.modalname}
-						OneSelftype={this.state.OneSelftype}
+							visible={this.state.visible}
 							Topval={this.state.Topval}
 							Topvalright={this.state.Topvalright}
 							Botvalleft={this.state.Botvalleft}