From 819bfed857fec1c06b238973442301456f0935c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 28 Jun 2019 16:47:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../graduation/tasks/GraduationTasksnew.js | 26 ++++++-- .../modules/tpm/TPMsettings/TPMsettings.js | 7 ++- .../tpm/challengesnew/TPMevaluation.js | 25 +++++++- .../src/modules/tpm/newshixuns/Newshixuns.js | 36 +++++++++-- .../Collaborators/Collaborators.js | 59 +++++++++++++++++-- 5 files changed, 132 insertions(+), 21 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js index 560658e9e..74ba21b62 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js @@ -342,8 +342,17 @@ class GraduationTasksnew extends Component { {/*内容*/}
- - + + {getFieldDecorator('tasktype', { rules: [{required: true, message: "请选择任务类型"}], })(

列表中没有？ @@ -1214,6 +1214,7 @@ export default class TPMsettings extends Component { @@ -1354,10 +1355,11 @@ export default class TPMsettings extends Component { -

执行命令不能为空

@@ -1369,6 +1371,7 @@ export default class TPMsettings extends Component { value={Compilecommandvalue} onInput={this.Compilecommand} id="compile_command" + style={{width:'100%'}} > diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js index 73262de74..00141188f 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js +++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js @@ -381,7 +381,7 @@ export default class TPMevaluation extends Component { // }) // } savegetfilepath=(value)=>{ - let {selectpath} = this.state + let {selectpath,saveshixunfilepath} = this.state // let newarr =selectpatharr; // let arrtype=false; // let arrsum=0; @@ -403,9 +403,28 @@ export default class TPMevaluation extends Component { // newselectpath=newselectpath+newarr[z]+ "；" // } - // let newselectpath=selectpath+value+ "；" - let newselectpath=value + + let newselectpath; + + if(saveshixunfilepath==="shixunfilepathplay"){ + newselectpath=value + }else{ + const type = selectpath.split('；'); + let types=false; + for(var i=0; i -

+

列表中没有？ 申请新建

diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js index 07c9f960f..d629a1c5b 100644 --- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js +++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js @@ -33,6 +33,7 @@ class Collaborators extends Component { Collaboratorsvisible: false, Collaboratorsvisibleadmin: false, value: 1, + page: 1, Searchadmin: [], allChangechecked: false, Collaboratorslist: [], @@ -155,6 +156,9 @@ class Collaborators extends Component { } onSearchadmin = (value) => { let {collaboratorList,user_name,school_name} = this.state; + this.setState({ + Searchadmin: [], + }) // if (value === "") { // this.setState({ // Searchadmin: [], @@ -172,7 +176,7 @@ class Collaborators extends Component { if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { }else{ - let newlist = response.data; + let newlist = response.data.users; for (var i = 0; i < newlist.length; i++) { newlist[i].checked = false } @@ -336,7 +340,48 @@ class Collaborators extends Component { collaboratorListsumtype:false }) } - render() { + + + contentViewScrolledit=(e)=>{ + //滑动到底判断 + + if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ + let {page,collaboratorList,user_name,school_name,Searchadmin} = this.state; + let newpage=page+1; + let newSearchadmin=Searchadmin + let id = this.props.match.params.shixunId; + let url = "/shixuns/" + id + "/add_collaborators.json"; + axios.get(url,{params:{ + user_name:user_name , + school_name:school_name, + page:newpage + }}).then((response) => { + if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { + + }else{ + let newlist = response.data.users; + for (var i = 0; i < newlist.length; i++) { + newlist[i].checked = false + newSearchadmin.push(newlist[i]) + } + + console.log(newSearchadmin) + this.setState({ + Searchadmin: newSearchadmin, + collaboratorList: collaboratorList, + page:newpage + }) + } + + }).catch((error) => { + console.log(error) + }); + + } + + } + + render() { let { collaboratorList, Collaboratorsvisible, @@ -445,13 +490,13 @@ class Collaborators extends Component { >搜索

姓名 - 呢称 + 职业 单位

-
    +
      {Searchadmin.length === 0 ?
    • 请试试搜索一下
      • : Searchadmin.map((item, key) => { @@ -460,10 +505,12 @@ class Collaborators extends Component { this.selectChangenickname(e, key)} id={item.user_id}> - {item.nickname} + {item.nickname} {item.identify} {item.school_name} + title={item.school_name} + style={{width: '150px'}} + className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name} ) }) From d0166f5980bf956ac30897ff2d4ee316379abfe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 28 Jun 2019 16:54:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20=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/shixunHomework/Listofworks.js | 2 +- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 4 ++-- .../modules/courses/shixunHomework/Workquestionandanswer.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 6995db1ba..04a878dc0 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1707,7 +1707,7 @@ class Listofworks extends Component { 作业问答 {this.props.isAdmin() ? - this.state.code_review === false ? "" : 代码查重 : ""} diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 5d9d2d200..11017259a 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1676,7 +1676,7 @@ class Trainingjobsetting extends Component { } 作业问答 - {this.props.isAdmin()?this.state.code_review===false?"": 代码查重 : ""}