Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/admins/shixun_settings_controller.rb

@@ -46,7 +46,7 @@ class Admins::ShixunSettingsController < Admins::BaseController
       tag_ids.each do |id|
         unless tag_repertoire_ids.include?(id)
           tag_repertoire = @shixun.shixun_tag_repertoires.new(shixun_id:@shixun.id,tag_repertoire_id:id)
-          tag_repertoire.save
+          tag_repertoire.save!
         end
       end
     else

app/controllers/exercises_controller.rb

@@ -1426,18 +1426,24 @@ class ExercisesController < ApplicationController
 
         @exercise_questions = @exercise.exercise_questions&.includes(:exercise_choices,:exercise_answers,:exercise_standard_answers,:exercise_shixun_challenges,:exercise_shixun_answers)
 
-        @paging_type = "percent"
-        # 按题型排序
+        percent_sort = "desc"
+
         if params[:sort].present?
-          @paging_type = params[:sort].to_s
+          percent_sort = params[:sort]
         end
+        # @paging_type = "percent"
+        # # 按题型排序
+        # if params[:sort].present?
+        #   @paging_type = params[:sort].to_s
+        # end
 
         ques_result_all = exercise_commit_result(@exercise_questions,@exercise_commit_user_ids)
 
-        if @paging_type == "percent"
-          @question_result_hash = ques_result_all.sort_by{|s| s[:percent]}
+        #默认降序排列
+        if percent_sort == "desc"
+          @question_result_hash = ques_result_all.sort_by{|s| s[:percent]}.reverse
         else
-          @question_result_hash = ques_result_all.sort_by{|s| s[:"#{@paging_type}"]}
+          @question_result_hash = ques_result_all.sort_by{|s| s[:percent]}
         end
 
         @exercise_questions_count = @exercise_questions.size

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -1002,7 +1002,7 @@ class Coursesleftnav extends Component{
                     return(
                         <div key={key} 	>
                             <a>
-                            <li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)}   className={this.props.mainurl===item.category_url?"liactive":"clearfix active"}   onMouseLeave={(e)=>this.hidesandian(e,key)}  onMouseEnter={(e)=>this.showsandian(e,key)}>
+                            <li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)}   className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}   onMouseLeave={(e)=>this.hidesandian(e,key)}  onMouseEnter={(e)=>this.showsandian(e,key)}>
                                 <a onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)}  className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
                                   {
                                     item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
@@ -1138,7 +1138,7 @@ class Coursesleftnav extends Component{
                  <div key={key}>
                    {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}
                    <a >
-                   <li className={this.props.mainurl===item.category_url?"liactive":"clearfix active"}
+                   <li className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}
                        onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)}  onMouseEnter={(e)=>this.showsandian(e,key)}
 											 title={item.name.length<7?"":item.name}
                    >