Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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)

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

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

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -1717,6 +1717,19 @@ class Trainingjobsetting extends Component {
                             unifiedsetting:this.state.unifiedsetting,
                             latedeductiontwo:20,
                         });
+                        //均分比例
+                        try {
+                            if(this.state.proportion==="均分比例"){
+                                this.Equalproportion(20);
+
+                            }else if(this.state.proportion==="经验值比例"){
+                                this.Empiricalvalueratio(20);
+
+                            }
+                        }catch (e) {
+
+                        }
+
                     }else {
                         this.setState({
                             flagPageEditsbox:true,