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 1/4] =?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 2/4] =?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 3/4] =?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) From b0ee2ab8f0054a4da93780d0ba3977b217a20592 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 23 Sep 2019 16:32:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BE=E5=83=8F=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user.json.jbuilder | 2 +- app/views/users/homepage_info.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user.json.jbuilder b/app/views/users/_user.json.jbuilder index 4fb05b7ba..581072072 100644 --- a/app/views/users/_user.json.jbuilder +++ b/app/views/users/_user.json.jbuilder @@ -4,5 +4,5 @@ json.name user.full_name json.grade user.grade json.identity user&.user_extension&.identity # json.email user.mail # 邮箱原则上不暴露的，如果实在需要的话只能对某些具体的接口公开 -json.image_url image_tag(url_to_avatar(user)) +json.image_url url_to_avatar(user) json.school user.school_name \ No newline at end of file diff --git a/app/views/users/homepage_info.json.jbuilder b/app/views/users/homepage_info.json.jbuilder index 78e0e1d7b..112bd215c 100644 --- a/app/views/users/homepage_info.json.jbuilder +++ b/app/views/users/homepage_info.json.jbuilder @@ -1,6 +1,6 @@ json.id @user.id json.name @user.full_name -json.avatar_url image_tag("/" + url_to_avatar(@user)) +json.avatar_url url_to_avatar(@user) json.is_logged_user @user.logged_user? json.experience @user.experience json.grade @user.grade