diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js index eae3fb43d..b0c65009d 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js @@ -79,16 +79,15 @@ class GraduateTopicDetailTable extends Component{ }) } sureAgreeTopic=(count)=>{ - if(count > 0){ - let{tableData}=this.props; - let{operationId,classesId}=this.state - let courseId=this.props.match.params.course_id; + let{tableData}=this.props; + let{operationId,classesId}=this.state + let courseId=this.props.match.params.course_id; + + if(classesId!=undefined){ let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name; this.agreeChoose(courseId,operationId,classesId,name); }else{ - this.setState({ - un_choose_notice:"请先添加分班" - }) + this.agreeChoose(courseId,operationId,classesId); } } @@ -205,7 +204,7 @@ class GraduateTopicDetailTable extends Component{ >

确认同意学生的选题,将学生加入我的分班

-
+ { tableData.group_list && tableData.group_list.length===0?"":
选择:

{un_choose_notice}

-
+
}
取消 this.sureAgreeTopic(tableData.group_list.length)}>确定 diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index 221f90764..de906ad43 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -278,7 +278,7 @@ class Challengesjupyter extends Component { this.setState({ showtime:false }) - }, 500) + }, 800) }else{ this.setState({ @@ -292,7 +292,7 @@ class Challengesjupyter extends Component { }) this.props.showNotification('实训保存失败!'); }) - }, 500) + }, 800) }