From 4691df45f86222926d9e264855026303d2059b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 29 Aug 2019 09:04:35 +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 --- .../react/src/modules/courses/css/Courses.css | 6 + .../courses/gradinforms/Bullsubdirectory.js | 2 +- .../modules/courses/gradinforms/Eduinforms.js | 2 +- .../src/modules/courses/new/CoursesNew.js | 177 +++++++++++++----- .../src/modules/courses/new/Goldsubject.js | 172 +++++++++++------ .../react/src/modules/courses/poll/PollNew.js | 2 +- 6 files changed, 258 insertions(+), 103 deletions(-) diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 78b6783a0..57f567c9e 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -1063,6 +1063,12 @@ samp { color: #989898; margin-left: 40px; } +.newcoursestitleysl{ + font-size: 12px; + color: #989898; + margin-left: 51px; +} + .coursenavbox .ant-form-item-label{ margin-left:10px; diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js index b9ec4b75c..16a99aa8f 100644 --- a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js +++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js @@ -59,7 +59,7 @@ class Bullsubdirectory extends Component{ } }; changeTopicName = (e) => { - console.log("调用了changeTopicName"); + // console.log("调用了changeTopicName"); let num = e.target.value.length; if(num>60){ diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js index 10beb4507..b23c33fbb 100644 --- a/public/react/src/modules/courses/gradinforms/Eduinforms.js +++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js @@ -107,7 +107,7 @@ class Eduinforms extends Component{ } }; changeTopicName = (e) => { - console.log("调用了changeTopicName"); + // console.log("调用了changeTopicName"); let num = e.target.value.length; if(num>60){ return; diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 6e9c3c166..7ff0a9e4c 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -47,9 +47,7 @@ class CoursesNew extends Component { checkboxgroup:undefined, addonAfteronelenone:0, addonAfteronelentwo:0, - 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:"分班"}], + bordebool:false, } } componentDidMount() { @@ -382,8 +380,8 @@ class CoursesNew extends Component { }) } handleSearch=(value)=>{ - - + console.log("handleSearchhandleSearch"); + console.log(value); if(value!=""){ this.props.form.setFieldsValue({ classroom:value, @@ -393,13 +391,40 @@ class CoursesNew extends Component { } }; + handleSearchsysl=(value)=>{ + if(value){ + this.props.form.setFieldsValue({ + classroom:value, + // course:value + }); + } + } - handleChange=(value)=>{ - + handleChange=(e)=>{ this.props.form.setFieldsValue({ - // course:value, - classroom:value + // course:value, + classroom:e.target.value, }) + if(e.target.value){ + if(e.target.value.length>60){ + this.setState({ + bordebool:true, + }) + }else if(e.target.value.length===0){ + this.setState({ + bordebool:true, + }) + }else{ + this.setState({ + bordebool:false, + }) + } + }else{ + this.setState({ + bordebool:true + }) + + } }; handleSearchschool=(value)=>{ @@ -469,7 +494,7 @@ class CoursesNew extends Component { this.applyForAddOrgForm.setVisible(true) } render() { - let {datatime,school,searchlistscholl} = this.state; + let {datatime,school,searchlistscholl,bordebool} = this.state; const {getFieldDecorator} = this.props.form; const propsWithoutForm = Object.assign({}, this.props) delete propsWithoutForm.form @@ -491,6 +516,16 @@ class CoursesNew extends Component { if(addonAftertwo){ addonAfteronelens=String(addonAftertwo).length; } + var addonAfterthree=this.props.form&&this.props.form.getFieldValue('course'); + var addonAfteronelens3=0; + if(addonAfterthree){ + addonAfteronelens3=String(addonAfterthree).length; + } + var addonAfterfour=this.props.form&&this.props.form.getFieldValue('classroom'); + var addonAfteronelens4=0; + if(addonAfterfour){ + addonAfteronelens4=String(addonAfterfour).length; + } return ( @@ -545,27 +580,23 @@ class CoursesNew extends Component { `} -
+ {/*内容*/} + + {getFieldDecorator('course', { + rules: [{required: true, message: "不能为空"}], + })( + + + + )} - + {/*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*/}

@@ -603,8 +667,8 @@ class CoursesNew extends Component { 错误示例：数据结构2019春

-
- +
+ @@ -619,14 +683,41 @@ class CoursesNew extends Component { }
+ + {getFieldDecorator('classroom', { rules: [{required: true, message: "不能为空"}], - })()} - + })()} + {/*（如果本学期包含多个班级，只需创建一个课堂然后在课堂内部建立不同的分班）*/} -

+

正确示例：数据结构2019春季班级

@@ -675,11 +766,7 @@ class CoursesNew extends Component { rules:[{ pattern: new RegExp(/^[0-9]+([.]{1}[0-9]+){0,1}$/, "g"), message: '必须是数值' - }, - { - max:5, - message: '不能超过5个字符', - }]} + }]} )( )} @@ -694,11 +781,7 @@ class CoursesNew extends Component { rules:[{ pattern: new RegExp(/^[0-9]+([.]{1}[0-9]+){0,1}$/, "g"), message: '必须是数值' - }, - { - max:5, - message: '不能超过5个字符', - } + } ]} )( diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js index 5149d3e5a..c9642f458 100644 --- a/public/react/src/modules/courses/new/Goldsubject.js +++ b/public/react/src/modules/courses/new/Goldsubject.js @@ -54,12 +54,7 @@ class Goldsubject extends Component { addonAfteronelenone:"", addonAfteronelentwo:"", 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:"分班"},], - + bordebool:false, } } // disabledEndDate= endValue => { @@ -110,8 +105,8 @@ class Goldsubject extends Component { }; componentDidMount() { - console.log("新建精品课堂的数据"); - console.log(this.props); + // console.log("新建精品课堂的数据"); + // console.log(this.props); let coursesId = this.props.match.params.coursesId; let user_school=this.props.current_user&&this.props.current_user.user_school; @@ -164,8 +159,8 @@ class Goldsubject extends Component { if (response) { // this.goback if(response.data){ - console.log("获取Goldsubject.js"); - console.log(response.data); + // console.log("获取Goldsubject.js"); + // console.log(response.data); if(response.data.status===0){ this.props.form.setFieldsValue({ classroom: response.data.course_name, @@ -206,20 +201,20 @@ class Goldsubject extends Component { } } onChangeTimepublishs = (date, dateString) => { - console.log("结束时间11111111111"); - console.log(dateString); + // console.log("结束时间11111111111"); + // console.log(dateString); if(dateString===""){ this.setState({ datatime: undefined, }) - console.log("结束时间111111111116"); + // console.log("结束时间111111111116"); this.props.form.setFieldsValue({ endtime:undefined, }); }else{ - console.log("结束时间111111111117"); + // console.log("结束时间111111111117"); this.setState({ datatime: dateString, @@ -231,10 +226,10 @@ class Goldsubject extends Component { }; onChangeTimepublishstwo = (date, dateString) => { - console.log("结束时间22222222222"); - console.log(dateString); + // console.log("结束时间22222222222"); + // console.log(dateString); if(dateString===""){ - console.log("结束时间222222222223"); + // console.log("结束时间222222222223"); this.setState({ datatimetwo: undefined, }) @@ -242,7 +237,7 @@ class Goldsubject extends Component { starttime: undefined, }); }else{ - console.log("结束时间222222222224"); + // console.log("结束时间222222222224"); this.setState({ datatimetwo: dateString, @@ -320,13 +315,23 @@ class Goldsubject extends Component { if (!err) { + var classroomysl=values.classroom+""; + + try { + if(classroomysl){ + if(classroomysl.length>60){ + classroomysl=classroomysl.substring(0,60); + } + } + }catch (e) { + } // console.log('Received values of form: ', values); var datasysl={ // subject_id:128, //这是带过来的值 编辑就不要传值了 - name: values.classroom, + name: classroomysl, class_period: values.period, credit: parseFloat(values.credit), start_date:moment(values.starttime).format("YYYY-MM-DD"), @@ -336,12 +341,12 @@ class Goldsubject extends Component { school:values.school }; try { - console.log("327"); - console.log(datasysl); + // console.log("327"); + // console.log(datasysl); // console.log(JSON.stringify(datasysl)); - console.log("88887777"); - console.log(moment(values.starttime).format("YYYY-MM-DD")); - console.log(moment(values.endtime).format("YYYY-MM-DD")); + // console.log("88887777"); + // console.log(moment(values.starttime).format("YYYY-MM-DD")); + // console.log(moment(values.endtime).format("YYYY-MM-DD")); }catch (e) { } @@ -375,15 +380,15 @@ class Goldsubject extends Component { }) } - console.log("错误信息信息信息1"); - console.log(err); - console.log(values.starttime); - console.log(values.endtime); + // console.log("错误信息信息信息1"); + // console.log(err); + // console.log(values.starttime); + // console.log(values.endtime); }); } else { this.props.form.validateFields((err, values) => { - console.log("错误信息信息信息2"); + // console.log("错误信息信息信息2"); console.log(err); if (err) { return; @@ -419,11 +424,11 @@ class Goldsubject extends Component { school:values.school }; try { - console.log("提交的ysldatas数据"); - console.log(ysldatas); + // console.log("提交的ysldatas数据"); + // console.log(ysldatas); // console.log(JSON.stringify(ysldatas)); - console.log(moment(values.starttime).format("YYYY-MM-DD")); - console.log(moment(values.endtime).format("YYYY-MM-DD")); + // console.log(moment(values.starttime).format("YYYY-MM-DD")); + // console.log(moment(values.endtime).format("YYYY-MM-DD")); }catch (e) { } @@ -527,12 +532,33 @@ class Goldsubject extends Component { }; - handleChange=(value)=>{ - + handleChange=(e)=>{ + console.log(e); this.props.form.setFieldsValue({ // course:value, - classroom:value + classroom:e.target.value, }) + if(e.target.value){ + if(e.target.value.length>60){ + this.setState({ + bordebool:true, + }) + }else if(e.target.value.length===0){ + this.setState({ + bordebool:true, + }) + }else{ + this.setState({ + bordebool:false, + }) + } + }else{ + this.setState({ + bordebool:true + }) + + } + }; handleSearchschool=(value)=>{ @@ -602,7 +628,7 @@ class Goldsubject extends Component { this.applyForAddOrgForm.setVisible(true) } render() { - let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,addonAfteronelenone,addonAfteronelentwo} = this.state; + let {datatime,datatimetwo,school,bordebool,searchlistscholl,Whethertocreateanewclassroom,addonAfteronelenone,addonAfteronelentwo} = this.state; const {getFieldDecorator} = this.props.form; const propsWithoutForm = Object.assign({}, this.props) delete propsWithoutForm.form @@ -624,8 +650,12 @@ class Goldsubject extends Component { if(addonAftertwo){ addonAfteronelens=String(addonAftertwo).length; } - console.log(addonAfteronelenone); - console.log(addonAfteronelentwo); + var addonAfterthree=this.props.form&&this.props.form.getFieldValue('classroom'); + var addonAfteronelens3=0; + if(addonAfterthree){ + addonAfteronelens3=String(addonAfterthree).length; + } + return ( @@ -687,20 +717,16 @@ class Goldsubject extends Component { .ant-select-dropdown{ // top: 221px !important; // left: 115px !important; - width: 280px !important; height: 160px; } .ant-select-dropdown-menu{ - width: 280px !important; height: 160px; } .construction .ant-input{ - width: 280px !important; margin-left: 0px !important; } .construction { - width: 280px; - margin-left: 10px; + margin-left: 11px; } .construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder { @@ -753,19 +779,61 @@ class Goldsubject extends Component { }
- + + {getFieldDecorator('classroom', { - rules: [{required: true, message: "不能为空"}], + rules: [{required: true, message: "不能为空"}], })( - - {options} + )} {/**/} @@ -863,7 +931,6 @@ class Goldsubject extends Component { width={"210px"} value={datatimetwo === undefined ? "" :datatimetwo === null ? "" : moment(datatimetwo, dateFormat)} disabledTime={disabledDateTime} - disabledDate={this.isabledStartDate} dropdownClassName="hideDisable" onChange={this.onChangeTimepublishstwo} /> @@ -887,7 +954,6 @@ class Goldsubject extends Component { width={"210px"} value={datatime === undefined ? "" :datatime === null ? "" : moment(datatime, dateFormat)} disabledTime={disabledDateTime} - disabledDate={this.disabledEndDate} dropdownClassName="hideDisable" onChange={this.onChangeTimepublishs} /> diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index 27194e5e0..ea84586d8 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -77,7 +77,7 @@ class PollNew extends Component { } changeTopicName = (e) => { - console.log("调用了changeTopicName"); + // console.log("调用了changeTopicName"); let num = parseInt(e.target.value.length); if(num>60){ return;