Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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

@@ -288,7 +288,7 @@ class GraduationTaskssettingapp extends Component{
 
   allowlatefun=(e)=>{
     let {end_time}=this.state;
-    debugger
+
    if(e.target.value===true||e.target.value===1){
 
       this.setState({
@@ -317,24 +317,24 @@ class GraduationTaskssettingapp extends Component{
     })
   }
 
-  updatesfuncrosscomment=(types,checked,newlatetime,newcommenttime)=>{
+  updatesfuncrosscomment=(types,newlatetime,newcommenttime)=>{
 		let {endtimetype}=this.state;
 		if(types===1){
 				this.setState({
 					latetime:newlatetime,
-					crosscomment:checked,
+					crosscomment:true,
 					commenttime:newcommenttime
 				})
 		}else{
 			if(endtimetype===true){
 				this.setState({
-					crosscomment:checked,
+					crosscomment:true,
 					commenttime:newcommenttime
 				})
 			}else{
 				this.setState({
 					end_time:newlatetime,
-					crosscomment:checked,
+					crosscomment:true,
 					commenttime:newcommenttime
 				})
 			}
@@ -342,42 +342,41 @@ class GraduationTaskssettingapp extends Component{
 
 	}
   funcrosscomment=(e)=>{
-debugger
 		let {latetime,end_time,allowlate}=this.state;
+		let newlatetimea=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
+		let newcommenttimea=moment(new Date()).format("YYYY-MM-DD HH:mm");
+
+		let newlatetimes=moment(latetime).add(7, 'days').format("YYYY-MM-DD HH:mm");
+		let newcommenttimes=moment(latetime).format("YYYY-MM-DD HH:mm");
+
+		let newend_timeb=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
+		let newcommenttimeb=moment(new Date()).add(8, 'days').format("YYYY-MM-DD HH:mm");
+
+		let newend_timed=moment(end_time).add(7, 'days').format("YYYY-MM-DD HH:mm");
+		let newcommenttimed=moment(end_time).add(8, 'days').format("YYYY-MM-DD HH:mm");
+
     let newtime;
 		if(e.target.checked===true){
+
       if(allowlate===1||allowlate===true){
        if(latetime===null||latetime===""){
-				 let newlatetime=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
+				 this.updatesfuncrosscomment(1,newlatetimea,newcommenttimea)
-				 let newcommenttime=moment(new Date()).format("YYYY-MM-DD HH:mm");
-				 this.updatesfuncrosscomment=(1,e.target.checked,newlatetime,newcommenttime)
 			 }else{
-				 let newlatetime=moment(latetime).add(7, 'days').format("YYYY-MM-DD HH:mm");
+				 this.updatesfuncrosscomment(1,newlatetimes,newcommenttimes)
-				 let newcommenttime=moment(latetime).format("YYYY-MM-DD HH:mm");
-				 this.updatesfuncrosscomment=(1,e.target.checked,newlatetime,newcommenttime)
 			 }
 			}else{
 				if(end_time===null||end_time===""){
-					let newend_time=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
+					this.updatesfuncrosscomment(2,newend_timeb,newcommenttimeb)
-					let newcommenttime=moment(new Date()).add(8, 'days').format("YYYY-MM-DD HH:mm");
-					this.updatesfuncrosscomment=(2,e.target.checked,newend_time,newcommenttime)
-
 				}else{
-					let newend_time=moment(end_time).add(7, 'days').format("YYYY-MM-DD HH:mm");
+					this.updatesfuncrosscomment(2,newend_timed,newcommenttimed)
-					let newcommenttime=moment(end_time).add(8, 'days').format("YYYY-MM-DD HH:mm");
-					this.updatesfuncrosscomment=(2,e.target.checked,newend_time,newcommenttime)
 				}
 			}
-
-
 		}else{
 			this.setState({
 				crosscomment:e.target.checked,
 				commenttime:undefined
 			})
 		}
-
-
   }
 
   funcommentstatus=(e)=>{
@@ -407,7 +406,7 @@ debugger
       visibles:true,
 			Topval:"学生将立即收到毕设任务",
       // Botvalleft:"点击修改",
-			Botval:`本操作只对"未发布"的分班有效`,
+			// Botval:`本操作只对"未发布"的分班有效`,
       starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",
@@ -781,7 +780,7 @@ debugger
       visibles:true,
 			Topval:"学生将不能再提交作品",
       // Botvalleft:"暂不截止",
-			Botval:`本操作只对"提交中"的分班有效`,
+			// Botval:`本操作只对"提交中"的分班有效`,
       Cancelname:"暂不截止",
       Savesname:"立即截止",
       Cancel:this.cancelmodel,

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

@@ -318,7 +318,7 @@ class GraduationTaskssettinglist extends Component{
 			visible:true,
 			Topval:"学生将不能再提交作品",
 			// Botvalleft:"暂不截止",
-			Botval:`本操作只对"提交中"的分班有效`,
+			// Botval:`本操作只对"提交中"的分班有效`,
 			Cancelname:"暂不截止",
 			Savesname:"立即截止",
 			Cancel:this.cancelmodel,
@@ -337,7 +337,7 @@ class GraduationTaskssettinglist extends Component{
 			visible:true,
 			Topval:"学生将立即收到毕设任务",
 			// Botvalleft:"点击修改",
-			Botval:`本操作只对"未发布"的分班有效`,
+			// Botval:`本操作只对"未发布"的分班有效`,
 			starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",

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

@@ -61,7 +61,7 @@ class GraduationTasksquestions extends Component{
       visible:true,
 			Topval:"学生将不能再提交作品",
       // Botvalleft:"暂不截止",
-			Botval:`本操作只对"提交中"的分班有效`,
+			// Botval:`本操作只对"提交中"的分班有效`,
       Cancelname:"暂不截止",
       Savesname:"立即截止",
       Cancel:this.cancelmodel,
@@ -80,7 +80,7 @@ class GraduationTasksquestions extends Component{
       visible:true,
 			Topval:"学生将立即收到毕设任务",
       // Botvalleft:"点击修改",
-			Botval:`本操作只对"未发布"的分班有效`,
+			// Botval:`本操作只对"未发布"的分班有效`,
 			starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",