From b9b1e67c14523a31130d3bb7a03abf5a75079bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 24 Aug 2019 11:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/new/CoursesNew.js | 71 ++++++------------- .../src/modules/courses/new/Goldsubject.js | 41 ++++++++++- 2 files changed, 61 insertions(+), 51 deletions(-) diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index b87b4e81d..8c68dd4c5 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -44,7 +44,9 @@ class CoursesNew extends Component { fetching:false, boolxinjian:false, checkboxgroup:undefined, - checkbofrup:["shixun_homework","common_homework","group_homework","exercise","attachment","course_group","graduation","poll","board"], + checkbofrup:[{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"},{module_type:"group_homework",module_name:"分组作业"} + ,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"},{module_type:"graduation",module_name:"毕业设计"} + ,{module_type:"board",module_name:"讨论"},{module_type:"attachment",module_name:"资源"},{module_type:"course_group",module_name:"分班"}], checkbofrups:[], } } @@ -78,32 +80,22 @@ class CoursesNew extends Component { is_public: data.is_public === 1 ? true : false, Realnamecertification: data.authentication, Professionalcertification:data.professional_certification, - + checkbofrups:data.course_modules, }); try { - var datasysl=[]; - var dataysl2=[]; - var dataysl3=[]; - var checkbofrup =this.state.checkbofrup; - dataysl2=data.course_module_types; - datasysl=checkbofrup; - for (var k=0;k { console.log(error); @@ -450,6 +442,7 @@ class CoursesNew extends Component { search: value } }).then((result)=>{ + if(result){ if (result.data.status===0) { this.setState({ searchlistscholl: result.data.school_names, @@ -461,6 +454,7 @@ class CoursesNew extends Component { }) } } + } }).catch((error)=>{ console.log(error) }) @@ -469,7 +463,7 @@ class CoursesNew extends Component { this.applyForAddOrgForm.setVisible(true) } render() { - let {datatime,school,searchlistscholl,checkboxgroup} = this.state; + let {datatime,school,searchlistscholl,checkbofrups} = this.state; const {getFieldDecorator} = this.props.form; const propsWithoutForm = Object.assign({}, this.props) delete propsWithoutForm.form @@ -699,27 +693,9 @@ class CoursesNew extends Component { this.props.match.params.coursesId != undefined? { - checkboxgroup===undefined?"":checkboxgroup.length===0?"":checkboxgroup.map((item,key)=>{ + checkbofrups===undefined?"":checkbofrups.length===0?"":checkbofrups.map((item,key)=>{ return( - item ==="shixun_homework"? - 实训作业 - :item ==="common_homework"? - 普通作业 - :item ==="group_homework"? - 分组作业 - :item ==="exercise"? - 试卷 - :item ==="attachment"? - 资源 - :item ==="course_group"? - 分班 - :item ==="graduation"? - 毕业设计 - :item ==="poll"? - 问卷 - :item ==="board"? - 讨论 - :"" + {item.module_name} ) }) } @@ -729,16 +705,13 @@ class CoursesNew extends Component { 实训作业 普通作业 分组作业 - 试卷 - 资源 - 分班 毕业设计 + 试卷 问卷 + 资源 讨论 + 分班 - - - )} diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js index 7214f46a8..ee1d3b9c7 100644 --- a/public/react/src/modules/courses/new/Goldsubject.js +++ b/public/react/src/modules/courses/new/Goldsubject.js @@ -50,7 +50,12 @@ class Goldsubject extends Component { subject_id:"", start_date:"", Whethertocreateanewclassroom:true, - + checkbofrup:[ + {module_type:"announcement",module_name:"公告栏"},{module_type:"online_learning",module_name:"在线学习"} + ,{module_type:"shixun_homework",module_name:"实训作业"},{module_type:"common_homework",module_name:"普通作业"} + ,{module_type:"exercise",module_name:"试卷"},{module_type:"poll",module_name:"问卷"} + ,{module_type:"attachment",module_name:"资源"},{module_type:"board",module_name:"讨论"},{module_type:"course_group",module_name:"分班"},], + checkbofrups:[], } } // disabledEndDate= endValue => { @@ -139,7 +144,20 @@ class Goldsubject extends Component { course_module_types: data.course_module_types, school:data.school, Whethertocreateanewclassroom:false, + checkbofrups:data.course_modules, }); + + try { + if(data.course_modules===undefined||data.course_modules.length===0){ + this.setState({ + checkbofrups:this.state.checkbofrup, + }); + } + }catch (e) { + this.setState({ + checkbofrups:this.state.checkbofrup, + }); + } this.handleSearchschool(data.school); }).catch((error) => { console.log(error); @@ -591,7 +609,7 @@ class Goldsubject extends Component { this.applyForAddOrgForm.setVisible(true) } render() { - let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom} = this.state; + let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,checkbofrups} = this.state; const {getFieldDecorator} = this.props.form; const propsWithoutForm = Object.assign({}, this.props) delete propsWithoutForm.form @@ -860,6 +878,25 @@ class Goldsubject extends Component { "announcement","online_learning","shixun_homework","common_homework", ], })( + this.props.match.params.coursesId != undefined? + + { + checkbofrups===undefined?"":checkbofrups.length===0?"":checkbofrups.map((item,key)=>{ + return( + item.module_type==="announcement"? + 公告栏 + : + item.module_type==="online_learning"? + 在线学习 + : + item.module_type==="graduation"?"": + item.module_type==="group_homework"?"": + {item.module_name} + ) + }) + } + + : 公告栏 在线学习