From 8fb1e9c372f51170b6763b5f20ab4044191c9465 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Fri, 6 Mar 2020 18:17:42 +0800 Subject: [PATCH] issue --- .../courses/coursesDetail/CoursesLeftNav.js | 17 +++++++--------- .../courses/coursesPublic/Addcourses.js | 15 ++++++++++---- .../src/modules/courses/new/CoursesNew.js | 20 +++++++++---------- .../RepositoryAddFileupload_file.js | 19 ++++++++++++++---- 4 files changed, 43 insertions(+), 28 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index 80c250134..999ae4e15 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -499,7 +499,6 @@ class Coursesleftnav extends Component{ } cannerNavmoda=()=>{ - this.setState({ Navmodalnametype:false, NavmodalValuetype:false, @@ -525,6 +524,7 @@ class Coursesleftnav extends Component{ } saveNavmodapost=(url,value,positiontype,coursesId)=>{ + axios.post(url, {name:value}).then((result)=>{ if(result!=undefined){ @@ -539,13 +539,13 @@ class Coursesleftnav extends Component{ if(positiontype==="files"){ this.updasaveNavmoda() trigger('updateNavSuccess') - window.location.href=`/courses/${coursesId}/file/${result.data.category_id}`; + this.props.history.push(`/courses/${coursesId}/file/${result.data.category_id}`); } if(positiontype==="boards"){ this.updasaveNavmoda() trigger('updateNavSuccess') - window.location.href=`/courses/${coursesId}/boards/${result.data.category_id}`; + this.props.history.push(`/courses/${coursesId}/boards/${result.data.category_id}`); } if(positiontype!="course_groups"){ @@ -585,7 +585,6 @@ class Coursesleftnav extends Component{ } saveNavmoda=()=>{ - debugger; let {Navmodaltypename,setnavid,NavmodalValue}=this.state; let id =setnavid; @@ -950,17 +949,15 @@ class Coursesleftnav extends Component{ {/* ""*/} {/*}*/} - { - Navmodalnametype===true?:"" - } + { + debugger; let{Addcoursestype}=this.state; this.setState({ isSpin:true }) let {invite_code,professor,assistant_professor,student}=this.state; + invite_code="MBTAP"; if(invite_code===undefined||invite_code===""){ this.setState({ invite_codetype:true, @@ -269,13 +271,18 @@ class Addcourses extends Component{ this.props.history.push('/courses/2704/boards/8367/messages/42072') return; } - if(response.data.course_id!=undefined){ - this.submitasyn(response.data.course_id) - } notification.open({ message:"提示", description:response.data.message - }); + }); + if(response.data.course_id!=undefined){ + this.submitasyn(response.data.course_id) + }else{ + // 无返回课程id则是选择的教师或者助教身份，成功后跳转到课堂首页 + // console.log(this.props); + // console.log(this.props.history.push); + window.location.href="/courses"; + } if(Addcoursestype===true){ this.props.hideAddcoursestype(); } diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 873b1d9d7..e599bfa93 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -73,8 +73,8 @@ class CoursesNew extends Component { period: data.class_period===undefined?'':data.class_period===null?'':data.class_period===null?'':data.class_period==="null"?'':data.class_period+"", credit: data.credit===undefined?'':data.credit===null?'':data.credit===null?'':data.credit==="null"?'':data.credit+"", checkboxgroup: data.course_module_types, - Realnamecertification: data.authentication, - Professionalcertification:data.professional_certification, + // Realnamecertification: data.authentication, + // Professionalcertification:data.professional_certification, endtime: data.end_date === undefined ? "" : moment(data.end_date, dateFormat), school:data.school @@ -84,8 +84,8 @@ class CoursesNew extends Component { datatime: data.end_date, dataname:data.name, is_public: data.is_public === 1 ? true : false, - Realnamecertification: data.authentication, - Professionalcertification:data.professional_certification, + // Realnamecertification: data.authentication, + // Professionalcertification:data.professional_certification, addonAfteronelenone: data.class_period===undefined?'':data.class_period===null?'':data.class_period===null?'':data.class_period==="null"?'':data.class_period, addonAfteronelentwo:data.credit===undefined?'':data.credit===null?'':data.credit===null?'':data.credit==="null"?'':data.credit, @@ -237,8 +237,8 @@ class CoursesNew extends Component { end_date: datatime===undefined?"":datatime, is_public: is_public === true || is_public === 1 ? 1 : 0, course_module_types: values.checkboxgroup, - authentication: this.state.Realnamecertification, - professional_certification: this.state.Professionalcertification, + // authentication: this.state.Realnamecertification, + // professional_certification: this.state.Professionalcertification, school:values.school } ).then((response) => { @@ -313,8 +313,8 @@ class CoursesNew extends Component { end_date: datatime===undefined?"":datatime, is_public: is_public === true || is_public === 1 ? 1 : 0, course_module_types: values.checkboxgroup, - authentication: this.state.Realnamecertification, - professional_certification: this.state.Professionalcertification, + // authentication: this.state.Realnamecertification, + // professional_certification: this.state.Professionalcertification, school:values.school } ).then((response) => { @@ -953,7 +953,7 @@ class CoursesNew extends Component { )} -
+ {/*
-
+
*/}
{ + if(info.response){ let shixunId = this.props.match.params.shixunId; let {message,filspath}=this.state; if(message===""||message===undefined){ @@ -105,13 +109,20 @@ class RepositoryAddFileupload_files extends Component { secret_repository:Repositoryflag }}) .then((response) => { - if (response.data.status == 0) { - this.props.showNotification("删除成功") + if (response.data.status === 0) { + let fileList = this.state.fileList.filter(item=>item.uid !== info.uid); + this.setState({ + fileList + }) + this.props.showNotification("删除成功"); } }) .catch(function (error) { console.log(error); }); + }else{ + this.props.showNotification("还未上传完成，无法进行删除操作！"); + } } FormInput=(e)=>{ @@ -195,7 +206,7 @@ class RepositoryAddFileupload_files extends Component { return false } - this.props.showNotification("上传成功") + // this.props.showNotification("上传成功"); }, };