From dbb08aa04ba0acc713fe4b940126e7b0962e8751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 28 Jun 2019 11:03:16 +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 --- .../tasks/GraduationTasksSubmitnew.js | 4 +- .../graduation/tasks/GraduationTasksedit.js | 192 +++++++++++------- .../graduation/tasks/GraduationTasksnew.js | 64 +++++- 3 files changed, 175 insertions(+), 85 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index 3e0972be2..45b0111ea 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -89,7 +89,7 @@ class GraduationTasksSubmitnew extends Component{ if(fileList.length === 0){ this.setState({ - tshixunsreplace:true, + shixunsreplace:true, }) return } @@ -355,8 +355,6 @@ class GraduationTasksSubmitnew extends Component{ for(var list of fileList){ listid.push(list.response.id) } - - // e.preventDefault(); if( GraduationTasksnewtype===true){ this.props.form.validateFields((err, values) => { if (!err) { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js index 515149fb0..a6b86ff81 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js @@ -27,6 +27,7 @@ class GraduationTasksedit extends Component{ tasktype:undefined, name:"", description:undefined, + shixunsreplace:false, } } @@ -73,74 +74,7 @@ class GraduationTasksedit extends Component{ } - handleSubmit=(e)=>{ - - let {fileList}=this.state; - let listid=[] - let graduation_id=this.state.data.graduation_id; - for(var list of fileList){ - if(list.response!=undefined){ - listid.push(list.response.id) - }else{ - listid.push(list.uid) - } - - } - - // console.log(listid) - e.preventDefault(); - if(GraduationTasksedittype===true){ - this.props.form.validateFields((err, values) => { - - if (!err) { - if(values.tasktype===undefined){ - this.scrollToAnchors("tasktypes"); - return - } - - if(values.name===undefined){ - this.scrollToAnchors("nametypes"); - return - } - - if(values.description===undefined){ - this.scrollToAnchors("descriptiontypes"); - return - }else if(values.description.length>5000){ - this.scrollToAnchors("descriptiontypes"); - return - } - - - console.log('Received values of form: ', values); - // console.log(fileList); - let tasksid=this.props.match.params.category_id; - - let url="/graduation_tasks/"+tasksid+".json" - axios.put(url, { - task_type:parseInt(values.tasktype), - name:values.name, - description:values.description, - attachment_ids:listid, - } - ).then((response) => { - if(response.status===200) { - // console.log(response) - GraduationTasksedittype=false; - // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions"; - // this.goback() - this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting"); - } - }).catch((error) => { - console.log(error) - }) - - } - }); - } - - } goback=()=>{ // let courseId=this.props.match.params.coursesId; @@ -239,10 +173,100 @@ class GraduationTasksedit extends Component{ }); } + Commoninterface=(fileList)=>{ + let listid=[] + let graduation_id=this.state.data.graduation_id; + for(var list of fileList){ + if(list.response!=undefined){ + listid.push(list.response.id) + }else{ + listid.push(list.uid) + } + + } + + // console.log(listid) + if(GraduationTasksedittype===true){ + this.props.form.validateFields((err, values) => { + + if (!err) { + + if(values.tasktype===undefined){ + this.scrollToAnchors("tasktypes"); + return + } + + if(values.name===undefined){ + this.scrollToAnchors("nametypes"); + return + } + + if(values.description===undefined){ + this.scrollToAnchors("descriptiontypes"); + return + }else if(values.description.length>5000){ + this.scrollToAnchors("descriptiontypes"); + return + } + + + console.log('Received values of form: ', values); + // console.log(fileList); + let tasksid=this.props.match.params.category_id; + + let url="/graduation_tasks/"+tasksid+".json" + axios.put(url, { + task_type:parseInt(values.tasktype), + name:values.name, + description:values.description, + attachment_ids:listid, + } + ).then((response) => { + if(response.status===200) { + // console.log(response) + GraduationTasksedittype=false; + // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions"; + // this.goback() + this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting"); + } + }).catch((error) => { + console.log(error) + }) + + } + }); + } + } + handleSubmit=(e)=>{ + + let {fileList}=this.state; + if(fileList.length===0){ + this.setState({ + shixunsreplace:true, + }) + return + } + + this.Commoninterface(fileList); + } + //确认 + hidestartshixunsreplace = ()=>{ + let {fileList}=this.state; + + this.Commoninterface(fileList); + + + } + //取消 + hidestartshixunsreplacetwo=()=>{ + this.setState({ + shixunsreplace:false, + }) + } render(){ const { getFieldDecorator } = this.props.form; let {title_num,pageType,name,description,Loadtype, - Modalstype,Modalstopval,ModalCancel,ModalSave} =this.state; + Modalstype,Modalstopval,ModalCancel,ModalSave,shixunsreplace} =this.state; let {coursedata}=this.props; let courseId=this.props.match.params.coursesId; @@ -280,6 +304,24 @@ class GraduationTasksedit extends Component{ modalSave={ModalSave} loadtype={Loadtype} /> + +
+

还未上传附件

+

是否确认提交作品?

+
+
+ this.hidestartshixunsreplace()}>确认 + this.hidestartshixunsreplacetwo()}>取消 +
+
@@ -302,8 +344,12 @@ class GraduationTasksedit extends Component{ 返回
- {description===undefined?"":
- {/*内容*/} + {description===undefined?"": +
+ {/**/} + {/* */} + + {/*内容*/}
@@ -406,11 +452,13 @@ class GraduationTasksedit extends Component{
- + 取消
- } + {/**/} +
+ }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js index 6b9a96108..8ab9878da 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js @@ -23,7 +23,8 @@ class GraduationTasksnew extends Component { title_value: "", fileList: [], contents: [{val: "", id: 1}], - type: true + type: true, + shixunsreplace:false, } } @@ -47,15 +48,13 @@ class GraduationTasksnew extends Component { }) } + Commoninterface =(fileList)=>{ - handleSubmit = (e) => { - let {fileList} = this.state; let listid = [] for (var list of fileList) { listid.push(list.response.id) } - e.preventDefault(); if (GraduationTasksnewtype === true) { this.props.form.validateFields((err, values) => { if (!err) { @@ -100,9 +99,9 @@ class GraduationTasksnew extends Component { }); } + } - } goback = () => { @@ -210,11 +209,38 @@ class GraduationTasksnew extends Component { } } + // 提交按钮 + handleSubmit = (e) => { + let {fileList} = this.state; + if(fileList.length===0){ + this.setState({ + shixunsreplace:true, + }) + + return + } + + this.Commoninterface(fileList); + + } + //确认 + hidestartshixunsreplace =()=>{ + let {fileList} = this.state; + + this.Commoninterface(fileList); + } + //取消 + hidestartshixunsreplacetwo=()=>{ + this.setState({ + shixunsreplace:false, + }) + + } render() { const {getFieldDecorator} = this.props.form; let { coursename, coursesearch, title_num, title_value, pageType, fileList, contents, type, - Modalstype, Modalstopval, ModalCancel, ModalSave + Modalstype, Modalstopval, ModalCancel, ModalSave,shixunsreplace } = this.state; let {coursedata} = this.props; @@ -254,6 +280,24 @@ class GraduationTasksnew extends Component { modalCancel={ModalCancel} modalSave={ModalSave} /> + +
+

还未上传附件

+

是否确认提交作品?

+
+
+ this.hidestartshixunsreplace()}>确认 + this.hidestartshixunsreplacetwo()}>取消 +
+
@@ -273,8 +317,8 @@ class GraduationTasksnew extends Component {
-
+ {/**/}