From 3411c80099d387839c37f2bad1591c37d3d211f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 15:15:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index c600e01ff..93ed7ff7d 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -3231,7 +3231,7 @@ class Listofworksstudentone extends Component {
{course_is_end===true?"": - {teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true? + {teacherdata&&teacherdata.update_score===true&&computeTimetype===true? (this.props.isNotMember()===false?
查看最新成绩
:""): @@ -3555,9 +3555,13 @@ class Listofworksstudentone extends Component { { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"": {computeTimetype===true? (this.props.isNotMember()===false? -
- 查看最新成绩 -
+ ( + teacherdata&&teacherdata.update_score===true? +
+ 查看最新成绩 +
+ :"" + ) :"") : (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": @@ -3783,9 +3787,15 @@ class Listofworksstudentone extends Component { 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"": {computeTimetype===true? - (this.props.isNotMember()===false?
- 查看最新成绩 -
:""): + + (this.props.isNotMember()===false? + ( + teacherdata&&teacherdata.update_score===true? +
+ 查看最新成绩 +
:"" + ) + :""): teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": (this.props.isNotMember()===false?
查看最新成绩 From 1edbcf9ad3ee859567c93ac19e641f59c27bbb10 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 23 Sep 2019 15:27:16 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=9A=E4=BD=99=20=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/graduation/tasks/GraduationTaskssetting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 874a69ca5..3adf9c06e 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -992,7 +992,7 @@ class GraduationTaskssettingapp extends Component{ } {/*内容*/} {task_type===2?
-
分组设置 （提交作品时需要关联同组成员，组内成员作品共享）
+
分组设置
~ From 334a5e322afb0e6b5d2248f958a1b7d76ced2014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 23 Sep 2019 15:35:49 +0800 Subject: [PATCH 3/6] =?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 --- .../tasks/GraduationTasksSubmitedit.js | 2 +- .../tasks/GraduationTasksSubmitnew.js | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 41768333a..7c697e31b 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -285,7 +285,7 @@ class GraduationTasksSubmitedit extends Component{ let{ search,page,limit,workslist}=this.state; - let newpage=page+2 + let newpage=page+1 this.searchList(search,newpage,limit,workslist.task_id,1) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index be29d45a4..7438b36a4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -271,20 +271,27 @@ class GraduationTasksSubmitnew extends Component{ contentViewScroll=(e)=>{ - //滑动到底判断 + + + //滑动到底判断 + const {memberslist} = this.state; let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ - // console.log("到达底部"); - let{ search,page,limit }=this.state; + if(memberslist.length===0){ + return; + }else{ + let{ search,page,limit }=this.state; - let newpage=page+2 + let newpage=page+1 + + this.searchList(search,newpage,limit,1) + + } + } - this.searchList(search,newpage,limit,1) - } } From 64fabd601f2a63d4b547b4e0a9c7b0a77a9095d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 15:39:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Trainingjobsetting.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 2b06936cf..bc30f4537 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1717,6 +1717,14 @@ class Trainingjobsetting extends Component { unifiedsetting:this.state.unifiedsetting, latedeductiontwo:20, }); + //均分比例 + if(this.state.proportion==="均分比例"){ + this.Equalproportion(20); + + }else if(this.state.proportion==="经验值比例"){ + this.Empiricalvalueratio(20); + + } }else { this.setState({ flagPageEditsbox:true, From 4ca77262f514ec190486c1c18f1764b5079757b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 15:42:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Trainingjobsetting.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index bc30f4537..366f239d0 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1718,13 +1718,18 @@ class Trainingjobsetting extends Component { latedeductiontwo:20, }); //均分比例 - if(this.state.proportion==="均分比例"){ - this.Equalproportion(20); + try { + if(this.state.proportion==="均分比例"){ + this.Equalproportion(20); - }else if(this.state.proportion==="经验值比例"){ - this.Empiricalvalueratio(20); + }else if(this.state.proportion==="经验值比例"){ + this.Empiricalvalueratio(20); + + } + }catch (e) { } + }else { this.setState({ flagPageEditsbox:true, From 18898e1081869609611a6173ee66036e3f8cd8a7 Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Mon, 23 Sep 2019 16:20:09 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/polls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index 7cb7ee800..6ffe277a3 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -692,7 +692,7 @@ class PollsController < ApplicationController else unified_setting = @poll.unified_setting end - show_result = params[:show_result] ? 1 : 0 + show_result = params[:show_result].to_i un_anonymous = params[:un_anonymous] ? true : false # 统一设置或者分班为0，则更新问卷，并删除问卷分组 if unified_setting || (course_group_ids.size == 0)