diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 59ec88fc7..15e795bdb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -95,13 +95,13 @@ class ApplicationController < ActionController::Base
 			check_account
 			tip_exception(@course.excellent ? 410 : 409, "您没有权限进入")
 		end
-		if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id
-			# 实名认证和职业认证的身份判断
-			tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication &&
-				@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
-			tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
-			tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
-		end
+		# if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id
+		# 	# 实名认证和职业认证的身份判断
+		# 	tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication &&
+		# 		@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
+		# 	tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
+		# 	tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
+		# end
 		uid_logger("###############user_course_identity:#{@user_course_identity}")
 	end
 
diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index db99f9da5..f97a137bb 100644
--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@@ -25,7 +25,7 @@ module GitHelper
         decode_content =
             if cd["encoding"] == 'GB18030' && cd['confidence'] > 0.8
               content.encode('UTF-8', 'GBK', {:invalid => :replace, :undef => :replace, :replace => ' '})
-            elsif cd['encoding'].blank?
+            elsif cd['encoding'].blank? && !content.blank?
               raise("ERROR_UTF8")
             else
               content.force_encoding('UTF-8')
@@ -36,7 +36,7 @@ module GitHelper
 
     rescue Exception => e
       Rails.logger.error(e.message)
-      error_msg = e.message == "ERROR_UTF8" ? "文件无法预览" : "文档内容获取异常"
+      error_msg = e.message == "ERROR_UTF8" ? "文件编码异常，请将文件编码设置为UTF-8" : "文档内容获取异常"
       error_status =  e.message == "ERROR_UTF8" ? -2 : -1
       raise Educoder::TipException.new(error_status, error_msg)
     end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f82775235..3283595e5 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -153,8 +153,8 @@ class CoursesController < ApplicationController
     begin
       ActiveRecord::Base.transaction do
         @course = Course.new(name: params[:name], class_period: params[:class_period], credit: params[:credit],
-                             end_date: params[:end_date], is_public: params[:is_public], school_id: @school.id,
-                             authentication: params[:authentication], professional_certification: params[:professional_certification])
+                             end_date: params[:end_date], is_public: params[:is_public], school_id: @school.id)
+                             # authentication: params[:authentication], professional_certification: params[:professional_certification])
         @course.tea_id = current_user.id
 
         if params[:subject_id].blank?
@@ -219,8 +219,8 @@ class CoursesController < ApplicationController
           extra_params[:is_end] = 1
         end
 
-        extra_params[:authentication] = params[:authentication]
-        extra_params[:professional_certification] = params[:professional_certification]
+        # extra_params[:authentication] = params[:authentication]
+        # extra_params[:professional_certification] = params[:professional_certification]
 
         if @course.subject
           @course.start_date = params[:start_date]
@@ -1157,10 +1157,10 @@ class CoursesController < ApplicationController
         return normal_status(-1, "课堂已结束，无法加入") if course.is_end
 
         # 实名认证和职业认证的身份判断
-        return normal_status(-2, "该课堂要求成员完成实名和职业认证") if course.authentication &&
-            course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
-        return normal_status(-2, "该课堂要求成员完成实名认证") if course.authentication && !current_user.authentication
-        return normal_status(-2, "该课堂要求成员完成职业认证") if course.professional_certification && !current_user.professional_certification
+        # return normal_status(-2, "该课堂要求成员完成实名和职业认证") if course.authentication &&
+        #     course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
+        # return normal_status(-2, "该课堂要求成员完成实名认证") if course.authentication && !current_user.authentication
+        # return normal_status(-2, "该课堂要求成员完成职业认证") if course.professional_certification && !current_user.professional_certification
 
         # 身份验证
         if params[:professor].blank? && params[:assistant_professor].blank? && params[:student].blank?
@@ -1452,6 +1452,7 @@ class CoursesController < ApplicationController
   # Never trust parameters from the scary internet, only allow the white list through.
   def course_params
     params.require(:course).permit(:name, :class_period, :credit, :end_date, :is_public, :authentication, :professional_certification)
+    # params.require(:course).permit(:name, :class_period, :credit, :end_date, :is_public, :authentication, :professional_certification)
   end
 
   def validate_course_name
diff --git a/app/controllers/examination_banks_controller.rb b/app/controllers/examination_banks_controller.rb
index cc34d9fea..3df11a432 100644
--- a/app/controllers/examination_banks_controller.rb
+++ b/app/controllers/examination_banks_controller.rb
@@ -36,8 +36,8 @@ class ExaminationBanksController < ApplicationController
       end
 
       current_user.item_baskets.destroy_all
+      render_ok({exam_id: exam.id})
     end
-    render_ok
   rescue ApplicationService::Error => ex
     render_error(ex.message)
   end
diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index d4e7ae4a3..415207707 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -58,7 +58,7 @@ class HomeworkCommonsController < ApplicationController
     end
 
     @published_count = @user_course_identity < Course::STUDENT ? @homework_commons.homework_published.size :
-                           @homework_commons.size
+                         @homework_commons.size
 
     unless search.blank?
       @homework_commons = @homework_commons.where("homework_commons.name like ?", "%#{search}%")
@@ -110,7 +110,7 @@ class HomeworkCommonsController < ApplicationController
     if @homework_type == 4
       @homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_group_settings, :shixuns, :course_second_category, user: :user_extension)
     elsif @homework_type == 3
-        @homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_group_settings, :homework_detail_group, :course_second_category, user: :user_extension)
+      @homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_group_settings, :homework_detail_group, :course_second_category, user: :user_extension)
     else
       @homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_group_settings, :course_second_category, user: :user_extension)
     end
@@ -128,7 +128,7 @@ class HomeworkCommonsController < ApplicationController
     if @homework.publish_time.blank? || (@homework.publish_time > Time.now)
       @student_works = []
       if (params[:format] == "xlsx") || (params[:format] == "zip")
-        normal_status(-1,"作业未发布")
+        normal_status(-1, "作业未发布")
       end
     else
       if @user_course_identity == Course::STUDENT
@@ -145,14 +145,14 @@ class HomeworkCommonsController < ApplicationController
 
         # 学生已提交作品且补交（提交）已截止、作品公开、非匿评阶段
         if @work&.work_status.to_i > 0 && (@homework.work_public || @homework.score_open) &&
-            ((!@homework.anonymous_comment && @homework.end_or_late) || (@homework_detail_manual.comment_status > 4 && @homework.end_or_late))
+          ((!@homework.anonymous_comment && @homework.end_or_late) || (@homework_detail_manual.comment_status > 4 && @homework.end_or_late))
           @student_works = student_works.where("student_works.user_id != #{@work.user_id}")
 
           # 匿评、申诉阶段只能看到分配给自己的匿评作品
         elsif @work&.work_status.to_i > 0 && @homework.anonymous_comment && @homework_detail_manual.comment_status > 2 && @homework_detail_manual.comment_status <= 4
           @is_evaluation = true
           @student_works = student_works.joins(:student_works_evaluation_distributions).where(
-              "student_works_evaluation_distributions.user_id = #{@current_user.id}")
+            "student_works_evaluation_distributions.user_id = #{@current_user.id}")
         else
           @student_works = []
         end
@@ -173,7 +173,7 @@ class HomeworkCommonsController < ApplicationController
         unless params[:teacher_comment].blank?
           student_work_ids = StudentWorksScore.where(student_work_id: @student_works.map(&:id)).pluck(:student_work_id)
           if params[:teacher_comment].to_i == 0
-            @student_works  = @student_works.where.not(id: student_work_ids)
+            @student_works = @student_works.where.not(id: student_work_ids)
           elsif params[:teacher_comment].to_i == 1
             @student_works = @student_works.where(id: student_work_ids)
           end
@@ -182,7 +182,7 @@ class HomeworkCommonsController < ApplicationController
         # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
         if params[:work_status].present?
           params_work_status = params[:work_status]
-          work_status = params_work_status.map{|status| status.to_i}
+          work_status = params_work_status.map {|status| status.to_i}
           if @homework.homework_type == "practice"
             @student_works = @student_works.where(compelete_status: work_status)
           else
@@ -241,17 +241,17 @@ class HomeworkCommonsController < ApplicationController
         if @user_course_identity >= Course::STUDENT
           tip_exception(403, "无权限操作")
         elsif @work_excel.blank? || @work_excel.size == 0
-          normal_status(-1,"暂无用户提交！")
+          normal_status(-1, "暂无用户提交！")
         elsif params[:export].present? && params[:export]
-          normal_status(0,"正在下载中")
+          normal_status(0, "正在下载中")
         else
           respond_to do |format|
-            format.xlsx{
+            format.xlsx {
               set_export_cookies
-              student_work_to_xlsx(@work_excel,@homework)
+              student_work_to_xlsx(@work_excel, @homework)
               exercise_export_name = "#{current_user.real_name}_#{@course.name}_#{@homework.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
-              render xlsx: "#{exercise_export_name.strip}",template: "homework_commons/works_list.xlsx.axlsx",locals:
-                  {table_columns: @work_head_cells,task_users: @work_cells_column}
+              render xlsx: "#{exercise_export_name.strip}", template: "homework_commons/works_list.xlsx.axlsx", locals:
+                {table_columns: @work_head_cells, task_users: @work_cells_column}
             }
           end
         end
@@ -268,10 +268,10 @@ class HomeworkCommonsController < ApplicationController
 
           if status == 0
             if params[:export].present? && params[:export]
-              normal_status(0,"正在下载中")
+              normal_status(0, "正在下载中")
             else
               respond_to do |format|
-                format.zip{
+                format.zip {
                   set_export_cookies
                   zipfile = zip_homework_common @homework, zip_works
                   file = decode64(zipfile[0][:base64file])
@@ -289,33 +289,21 @@ class HomeworkCommonsController < ApplicationController
 
   def update_score
     tip_exception("作业还未发布，暂不能计算成绩") if @homework.publish_time.nil? || @homework.publish_time > Time.now
-    begin
-      @homework.update_homework_work_score
-      normal_status("更新成功")
-    rescue Exception => e
-      uid_logger(e.message)
-      tip_exception(e.message)
-      raise ActiveRecord::Rollback
-    end
+    @homework.update_homework_work_score
+    normal_status("更新成功")
   end
 
   def update_student_score
     work = @homework.student_works.find_by(user_id: current_user.id)
     myshixun = Myshixun.find_by(shixun_id: params[:shixun_id], user_id: current_user.id)
     ActiveRecord::Base.transaction do
-      begin
-        if work && myshixun
-          challenge_settings = @homework.homework_challenge_settings
-          games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
-          HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
-          normal_status("更新成功")
-        else
-          normal_status("还未开启挑战，暂不能更新成绩")
-        end
-      rescue Exception => e
-        uid_logger(e.message)
-        tip_exception(e.message)
-        raise ActiveRecord::Rollback
+      if work && myshixun
+        challenge_settings = @homework.homework_challenge_settings
+        games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
+        HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
+        normal_status("更新成功")
+      else
+        normal_status("还未开启挑战，暂不能更新成绩")
       end
     end
   end
@@ -382,41 +370,35 @@ class HomeworkCommonsController < ApplicationController
     end
 
     ActiveRecord::Base.transaction do
-      begin
-        @homework = HomeworkCommon.new(homework_params)
-        @homework.reference_answer = params[:reference_answer].to_s.strip
-        @homework.homework_type = @homework_type
-        @homework.user_id = current_user.id
-        @homework.course_id = @course.id
-
-        homework_detail_manual = HomeworkDetailManual.new
-        @homework.homework_detail_manual = homework_detail_manual
-        homework_detail_manual.te_proportion = 0.7
-        homework_detail_manual.ta_proportion = 0.3
-
-        if @homework_type == 3
-          homework_detail_group = HomeworkDetailGroup.new(min_num: params[:min_num].to_i, max_num: params[:max_num].to_i,
-                                                          base_on_project: params[:base_on_project])
-          @homework.homework_detail_group = homework_detail_group
-        end
+      @homework = HomeworkCommon.new(homework_params)
+      @homework.reference_answer = params[:reference_answer].to_s.strip
+      @homework.homework_type = @homework_type
+      @homework.user_id = current_user.id
+      @homework.course_id = @course.id
+
+      homework_detail_manual = HomeworkDetailManual.new
+      @homework.homework_detail_manual = homework_detail_manual
+      homework_detail_manual.te_proportion = 0.7
+      homework_detail_manual.ta_proportion = 0.3
+
+      if @homework_type == 3
+        homework_detail_group = HomeworkDetailGroup.new(min_num: params[:min_num].to_i, max_num: params[:max_num].to_i,
+                                                        base_on_project: params[:base_on_project])
+        @homework.homework_detail_group = homework_detail_group
+      end
 
-        if @homework.save!
-          homework_detail_manual.save! if homework_detail_manual
-          homework_detail_group.save! if homework_detail_group
+      if @homework.save!
+        homework_detail_manual.save! if homework_detail_manual
+        homework_detail_group.save! if homework_detail_group
 
-          # 作业描述的附件
-          Attachment.associate_container(params[:attachment_ids], @homework.id, @homework.class) if params[:attachment_ids]
-          # 作业参考答案的附件
-          Attachment.associate_container(params[:reference_attachment_ids], @homework.id, @homework.class, 2) if params[:reference_attachment_ids]
+        # 作业描述的附件
+        Attachment.associate_container(params[:attachment_ids], @homework.id, @homework.class) if params[:attachment_ids]
+        # 作业参考答案的附件
+        Attachment.associate_container(params[:reference_attachment_ids], @homework.id, @homework.class, 2) if params[:reference_attachment_ids]
 
-          HomeworksService.new.create_works_list(@homework, @course)
-        else
-          tip_exception("创建失败")
-        end
-      rescue Exception => e
-        uid_logger(e.message)
-        tip_exception(e.message)
-        raise ActiveRecord::Rollback
+        HomeworksService.new.create_works_list(@homework, @course)
+      else
+        tip_exception("创建失败")
       end
     end
   end
@@ -432,30 +414,25 @@ class HomeworkCommonsController < ApplicationController
     end
 
     ActiveRecord::Base.transaction do
-      begin
-        @homework.update_attributes!(homework_params)
-        @homework.reference_answer = params[:reference_answer].to_s.strip
-
-        if @homework.homework_type == "group"
-          homework_detail_group = @homework.homework_detail_group
-          param_min = params[:min_num].to_i
-          param_max = params[:max_num].to_i
-          homework_detail_group.min_num = @homework.has_commit_work ? [param_min, homework_detail_group.min_num].min : param_min
-          homework_detail_group.max_num = @homework.has_commit_work ? [param_max, homework_detail_group.max_num].max : param_max
-          homework_detail_group.base_on_project = params[:base_on_project] unless @homework.has_relate_project
-          homework_detail_group.save!
-        end
-        # 作业描述的附件
-        Attachment.associate_container(params[:attachment_ids], @homework.id, @homework.class) if params[:attachment_ids]
-        # 作业参考答案的附件
-        Attachment.associate_container(params[:reference_attachment_ids], @homework.id, @homework.class, 2) if params[:reference_attachment_ids]
-
-        normal_status(0, "更新成功")
-      rescue Exception => e
-        uid_logger(e.message)
-        tip_exception(e.message)
-        raise ActiveRecord::Rollback
+      @homework.update_attributes!(homework_params)
+      @homework.reference_answer = params[:reference_answer].to_s.strip
+
+      if @homework.homework_type == "group"
+        homework_detail_group = @homework.homework_detail_group
+        param_min = params[:min_num].to_i
+        param_max = params[:max_num].to_i
+        homework_detail_group.min_num = @homework.has_commit_work ? [param_min, homework_detail_group.min_num].min : param_min
+        homework_detail_group.max_num = @homework.has_commit_work ? [param_max, homework_detail_group.max_num].max : param_max
+        homework_detail_group.base_on_project = params[:base_on_project] unless @homework.has_relate_project
+        homework_detail_group.save!
       end
+      # 作业描述的附件
+      Attachment.associate_container(params[:attachment_ids], @homework.id, @homework.class) if params[:attachment_ids]
+      # 作业参考答案的附件
+      Attachment.associate_container(params[:reference_attachment_ids], @homework.id, @homework.class, 2) if params[:reference_attachment_ids]
+
+      normal_status(0, "更新成功")
+
     end
   end
 
@@ -467,304 +444,298 @@ class HomeworkCommonsController < ApplicationController
   end
 
   def update_settings
-    begin
-      # 课堂结束后不能再更新
-      unless @course.is_end
-
-        # 发布设置
-        UpdateHomeworkPublishSettingService.call(@homework, publish_params)
-
-        # 补交设置
-        tip_exception("缺少allow_late参数") if params[:allow_late].nil?
-        tip_exception("缺少late_penalty参数") if params[:allow_late] && params[:late_penalty].blank?
-        tip_exception("缺少late_time参数") if params[:allow_late] && params[:late_time].blank?
-
-        current_late_penalty = @homework.late_penalty
-        if params[:allow_late]
-          tip_exception("补交结束时间必须晚于截止时间") if params[:late_time] <= strf_time(@homework.end_time)
-          tip_exception("补交结束时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && params[:late_time] >
-              strf_time(@course.end_date.end_of_day)
-          tip_exception("迟交扣分不能小于0") if params[:late_penalty] && params[:late_penalty].to_i < 0
+    # 课堂结束后不能再更新
+    unless @course.is_end
+
+      # 发布设置
+      UpdateHomeworkPublishSettingService.call(@homework, publish_params)
+
+      # 补交设置
+      tip_exception("缺少allow_late参数") if params[:allow_late].nil?
+      tip_exception("缺少late_penalty参数") if params[:allow_late] && params[:late_penalty].blank?
+      tip_exception("缺少late_time参数") if params[:allow_late] && params[:late_time].blank?
+
+      current_late_penalty = @homework.late_penalty
+      if params[:allow_late]
+        tip_exception("补交结束时间必须晚于截止时间") if params[:late_time] <= strf_time(@homework.end_time)
+        tip_exception("补交结束时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && params[:late_time] >
+          strf_time(@course.end_date.end_of_day)
+        tip_exception("迟交扣分不能小于0") if params[:late_penalty] && params[:late_penalty].to_i < 0
+
+        @homework.allow_late = true
+        @homework.late_time = params[:late_time]
+        @homework.late_penalty = params[:late_penalty].to_i
+      else
+        @homework.allow_late = false
+        @homework.late_penalty = 0
+        @homework.late_time = nil
+      end
 
-          @homework.allow_late = true
-          @homework.late_time = params[:late_time]
-          @homework.late_penalty = params[:late_penalty].to_i
-        else
-          @homework.allow_late = false
-          @homework.late_penalty = 0
-          @homework.late_time = nil
+      # 迟交扣分有变动则更新迟交学生的成绩
+      late_penalty_change = @homework.late_penalty != current_late_penalty
+
+      if @homework.homework_type == "practice"
+
+        # 实训作业的评分设置
+        tip_exception("总分值不能为空") if params[:total_score].blank?
+        tip_exception("总分值不能小于0") if params[:total_score].to_i < 0
+        tip_exception("缺少answer_open_evaluation参数") if params[:answer_open_evaluation].nil?
+        tip_exception("缺少work_efficiency参数") if params[:work_efficiency].nil?
+        tip_exception("缺少eff_score参数") if params[:work_efficiency] && params[:eff_score].blank?
+        tip_exception("效率分不能小于等于0") if params[:work_efficiency] && params[:eff_score] && params[:eff_score].to_f <= 0
+        tip_exception("效率分不能大于总分值") if params[:work_efficiency] && params[:eff_score] && params[:eff_score].to_f.round(2) > params[:total_score].to_f.round(2)
+        tip_exception("缺少shixun_evaluation参数") if params[:shixun_evaluation].blank?
+        tip_exception("缺少challenge_settings参数") if params[:challenge_settings].blank?
+        # tip_exception("缺少challenge_id参数") if params[:challenge_settings][:challenge_id].blank?
+        # tip_exception("缺少challenge_score参数") if params[:challenge_settings][:challenge_score].blank?
+        # tip_exception("challenge_id参数的长度与challenge_score参数的长度不匹配") if
+        #     params[:challenge_settings][:challenge_score].length != params[:challenge_settings][:challenge_id].length
+
+        sum_challenge_score = params[:challenge_settings].pluck(:challenge_score).reject(&:blank?)&.map {|score| score.to_f}.sum
+        total_score = params[:work_efficiency] ? (params[:eff_score].to_f + sum_challenge_score) : sum_challenge_score
+        tip_exception("分值之和必须等于总分值：#{params[:total_score]}分") if params[:total_score].to_f.round(2) != total_score.to_f.round(2)
+
+        current_eff_score = @homework.eff_score.to_f.round(2)
+        @homework.total_score = params[:total_score]
+        @homework.work_efficiency = params[:work_efficiency]
+        @homework.eff_score = params[:work_efficiency] ? params[:eff_score].to_f.round(2) : 0
+
+        update_eff_score = current_eff_score.round(2) != @homework.eff_score.round(2)
+
+        if @homework_detail_manual.answer_open_evaluation != params[:answer_open_evaluation]
+          @homework_detail_manual.answer_open_evaluation = params[:answer_open_evaluation]
+          score_change = true
         end
 
-        # 迟交扣分有变动则更新迟交学生的成绩
-        late_penalty_change = @homework.late_penalty != current_late_penalty
-
-        if @homework.homework_type == "practice"
-
-          # 实训作业的评分设置
-          tip_exception("总分值不能为空") if params[:total_score].blank?
-          tip_exception("总分值不能小于0") if params[:total_score].to_i < 0
-          tip_exception("缺少answer_open_evaluation参数") if params[:answer_open_evaluation].nil?
-          tip_exception("缺少work_efficiency参数") if params[:work_efficiency].nil?
-          tip_exception("缺少eff_score参数") if params[:work_efficiency] && params[:eff_score].blank?
-          tip_exception("效率分不能小于等于0") if params[:work_efficiency] && params[:eff_score] && params[:eff_score].to_f <= 0
-          tip_exception("效率分不能大于总分值") if params[:work_efficiency] && params[:eff_score] && params[:eff_score].to_f.round(2) > params[:total_score].to_f.round(2)
-          tip_exception("缺少shixun_evaluation参数") if params[:shixun_evaluation].blank?
-          tip_exception("缺少challenge_settings参数") if params[:challenge_settings].blank?
-          # tip_exception("缺少challenge_id参数") if params[:challenge_settings][:challenge_id].blank?
-          # tip_exception("缺少challenge_score参数") if params[:challenge_settings][:challenge_score].blank?
-          # tip_exception("challenge_id参数的长度与challenge_score参数的长度不匹配") if
-          #     params[:challenge_settings][:challenge_score].length != params[:challenge_settings][:challenge_id].length
-
-          sum_challenge_score = params[:challenge_settings].pluck(:challenge_score).reject(&:blank?)&.map{|score| score.to_f}.sum
-          total_score = params[:work_efficiency] ? (params[:eff_score].to_f + sum_challenge_score) : sum_challenge_score
-          tip_exception("分值之和必须等于总分值：#{params[:total_score]}分") if params[:total_score].to_f.round(2) != total_score.to_f.round(2)
-
-          current_eff_score = @homework.eff_score.to_f.round(2)
-          @homework.total_score = params[:total_score]
-          @homework.work_efficiency = params[:work_efficiency]
-          @homework.eff_score = params[:work_efficiency] ? params[:eff_score].to_f.round(2) : 0
-
-          update_eff_score = current_eff_score.round(2) != @homework.eff_score.round(2)
-
-          if @homework_detail_manual.answer_open_evaluation != params[:answer_open_evaluation]
-            @homework_detail_manual.answer_open_evaluation = params[:answer_open_evaluation]
-            score_change = true
-          end
-
-          @homework_detail_manual.shixun_evaluation = params[:shixun_evaluation].to_i
-
-          if params[:challenge_settings]
-            params[:challenge_settings].each do |challenge|
-              setting = @homework.homework_challenge_settings.find_by(challenge_id: challenge[:challenge_id])
-              score = challenge[:challenge_score]
-              if setting && setting.score != score
-                score_change = true
-                setting.update_attributes!(score: score)
-              elsif setting.blank?
-                score_change = true
-                HomeworkChallengeSetting.create!(homework_common_id: @homework.id, challenge_id: challenge[:challenge_id],
-                                                 shixun_id: @homework.homework_commons_shixun.try(:shixun_id), score: score)
-              end
-            end
+        @homework_detail_manual.shixun_evaluation = params[:shixun_evaluation].to_i
 
-            if @homework.homework_challenge_settings.where.not(challenge_id: params[:challenge_settings].pluck(:challenge_id)).count > 0
+        if params[:challenge_settings]
+          params[:challenge_settings].each do |challenge|
+            setting = @homework.homework_challenge_settings.find_by(challenge_id: challenge[:challenge_id])
+            score = challenge[:challenge_score]
+            if setting && setting.score != score
               score_change = true
-              @homework.homework_challenge_settings.where.not(challenge_id: params[:challenge_settings].pluck(:challenge_id)).destroy_all
+              setting.update_attributes!(score: score)
+            elsif setting.blank?
+              score_change = true
+              HomeworkChallengeSetting.create!(homework_common_id: @homework.id, challenge_id: challenge[:challenge_id],
+                                               shixun_id: @homework.homework_commons_shixun.try(:shixun_id), score: score)
             end
           end
 
-          # 公开设置
-          tip_exception("缺少score_open参数") if params[:score_open].nil?
-          @homework.score_open = params[:score_open]
-
-          @homework.save!
-          if score_change && @homework.end_or_late_none_group
-            UpdateShixunWorkScoreJob.perform_later(@homework.id)
-          elsif update_eff_score && (@homework.end_or_late_none_group || @homework.max_efficiency > 0)
-            # 更新所有学生的效率分(作业允许补交且补交已截止 或者 作业不允许补交且提交已截止 或者作业已计算过效率分)
-            HomeworksService.new.update_student_eff_score HomeworkCommon.find_by(id: @homework.id)
+          if @homework.homework_challenge_settings.where.not(challenge_id: params[:challenge_settings].pluck(:challenge_id)).count > 0
+            score_change = true
+            @homework.homework_challenge_settings.where.not(challenge_id: params[:challenge_settings].pluck(:challenge_id)).destroy_all
           end
+        end
 
-          # 更新迟交扣分
-          if !(score_change || update_eff_score) && late_penalty_change
-            @homework.student_works.where(work_status: 2).each do |work|
-              work.late_penalty = @homework.late_penalty
-              work.save!
-            end
-          end
+        # 公开设置
+        tip_exception("缺少score_open参数") if params[:score_open].nil?
+        @homework.score_open = params[:score_open]
 
-          unless @homework.allow_late
-            @homework.student_works.where(work_status: 2).update_all(work_status: 1)
-          end
+        @homework.save!
+        if score_change && @homework.end_or_late_none_group
+          UpdateShixunWorkScoreJob.perform_later(@homework.id)
+        elsif update_eff_score && (@homework.end_or_late_none_group || @homework.max_efficiency > 0)
+          # 更新所有学生的效率分(作业允许补交且补交已截止 或者 作业不允许补交且提交已截止 或者作业已计算过效率分)
+          HomeworksService.new.update_student_eff_score HomeworkCommon.find_by(id: @homework.id)
+        end
 
-          @homework_detail_manual.save!
-          @homework.save!
-        else
+        # 更新迟交扣分
+        if !(score_change || update_eff_score) && late_penalty_change
+          @homework.student_works.where(work_status: 2).each do |work|
+            work.late_penalty = @homework.late_penalty
+            work.save!
+          end
+        end
 
-          # 普通和分组作业的匿评设置
-          current_absence_penalty = @homework_detail_manual.absence_penalty
-          current_appeal_penalty = @homework_detail_manual.appeal_penalty
-
-          # 匿评未开启前可以更新：是否开启匿评、匿评开始时间、匿评数
-          if @homework_detail_manual.comment_status < 3
-            tip_exception("缺少anonymous_comment参数") if params[:anonymous_comment].nil?
-            # anonymous_comment :true 是启用，false 是不启用
-            if params[:anonymous_comment]
-              tip_exception("匿评开启时间不能为空") if params[:evaluation_start].blank?
-              tip_exception("匿评开启时间不能早于截止时间") if params[:evaluation_start] < strf_time(@homework.end_time)
-              tip_exception("匿评结束时间不能为空") if params[:evaluation_end].blank?
-              tip_exception("匿评截止时间必须晚于匿评开启时间") if params[:evaluation_end] <= params[:evaluation_start]
-              tip_exception("匿评截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && params[:evaluation_end] >
-                  strf_time(@course.end_date.end_of_day)
-              tip_exception("匿评数必须为正整数") if params[:evaluation_num].blank? || params[:evaluation_num].to_i < 1
-              tip_exception("缺评扣分不能为空") if params[:absence_penalty].blank?
-              tip_exception("缺评扣分不能小于0") if params[:absence_penalty].to_i < 0
-              tip_exception("缺评扣分不能大于100") if params[:absence_penalty].to_i > 100
-            end
+        unless @homework.allow_late
+          @homework.student_works.where(work_status: 2).update_all(work_status: 1)
+        end
 
-            @homework.anonymous_comment = params[:anonymous_comment]
-            @homework_detail_manual.evaluation_start = !@homework.anonymous_comment ? nil : params[:evaluation_start]
-            @homework_detail_manual.evaluation_num = !@homework.anonymous_comment ? 0 : params[:evaluation_num]
-
-            # 不启用匿评时还原申诉设置和教师、助教的评分比例
-            unless @homework.anonymous_comment
-              @homework.anonymous_appeal = false
-              @homework_detail_manual.appeal_time = nil
-              @homework_detail_manual.appeal_penalty = 0
-              @homework_detail_manual.te_proportion = 1
-              @homework_detail_manual.ta_proportion = 0
-            end
+        @homework_detail_manual.save!
+        @homework.save!
+      else
 
+        # 普通和分组作业的匿评设置
+        current_absence_penalty = @homework_detail_manual.absence_penalty
+        current_appeal_penalty = @homework_detail_manual.appeal_penalty
+
+        # 匿评未开启前可以更新：是否开启匿评、匿评开始时间、匿评数
+        if @homework_detail_manual.comment_status < 3
+          tip_exception("缺少anonymous_comment参数") if params[:anonymous_comment].nil?
+          # anonymous_comment :true 是启用，false 是不启用
+          if params[:anonymous_comment]
+            tip_exception("匿评开启时间不能为空") if params[:evaluation_start].blank?
+            tip_exception("匿评开启时间不能早于截止时间") if params[:evaluation_start] < strf_time(@homework.end_time)
+            tip_exception("匿评结束时间不能为空") if params[:evaluation_end].blank?
+            tip_exception("匿评截止时间必须晚于匿评开启时间") if params[:evaluation_end] <= params[:evaluation_start]
+            tip_exception("匿评截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && params[:evaluation_end] >
+              strf_time(@course.end_date.end_of_day)
+            tip_exception("匿评数必须为正整数") if params[:evaluation_num].blank? || params[:evaluation_num].to_i < 1
+            tip_exception("缺评扣分不能为空") if params[:absence_penalty].blank?
+            tip_exception("缺评扣分不能小于0") if params[:absence_penalty].to_i < 0
+            tip_exception("缺评扣分不能大于100") if params[:absence_penalty].to_i > 100
           end
 
-          # 匿评未截止时可以更新匿评结束时间
-          if @homework_detail_manual.comment_status < 4
-            tip_exception("匿评结束时间不能为空") if @homework.anonymous_comment && params[:evaluation_end].blank?
-            tip_exception("匿评截止时间必须晚于匿评开启时间") if @homework.anonymous_comment &&
-                params[:evaluation_end] <= strf_time(@homework_detail_manual.evaluation_start)
-            tip_exception("匿评截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @homework.anonymous_comment &&
-                @course.end_date.present? && params[:evaluation_end] > strf_time(@course.end_date.end_of_day)
+          @homework.anonymous_comment = params[:anonymous_comment]
+          @homework_detail_manual.evaluation_start = !@homework.anonymous_comment ? nil : params[:evaluation_start]
+          @homework_detail_manual.evaluation_num = !@homework.anonymous_comment ? 0 : params[:evaluation_num]
 
-            @homework_detail_manual.evaluation_end = !@homework.anonymous_comment ? nil : params[:evaluation_end]
+          # 不启用匿评时还原申诉设置和教师、助教的评分比例
+          unless @homework.anonymous_comment
+            @homework.anonymous_appeal = false
+            @homework_detail_manual.appeal_time = nil
+            @homework_detail_manual.appeal_penalty = 0
+            @homework_detail_manual.te_proportion = 1
+            @homework_detail_manual.ta_proportion = 0
           end
 
-          # 作业未结束可以更新缺评扣分
-          tip_exception("缺评扣分不能为空") if @homework.anonymous_comment && params[:absence_penalty].blank?
-          tip_exception("缺评扣分不能小于0") if @homework.anonymous_comment && params[:absence_penalty].to_i < 0
-          tip_exception("缺评扣分不能大于100") if @homework.anonymous_comment && params[:absence_penalty].to_i > 100
-          @homework_detail_manual.absence_penalty = !@homework.anonymous_comment ? 0 : params[:absence_penalty].to_i
+        end
 
+        # 匿评未截止时可以更新匿评结束时间
+        if @homework_detail_manual.comment_status < 4
+          tip_exception("匿评结束时间不能为空") if @homework.anonymous_comment && params[:evaluation_end].blank?
+          tip_exception("匿评截止时间必须晚于匿评开启时间") if @homework.anonymous_comment &&
+            params[:evaluation_end] <= strf_time(@homework_detail_manual.evaluation_start)
+          tip_exception("匿评截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @homework.anonymous_comment &&
+            @course.end_date.present? && params[:evaluation_end] > strf_time(@course.end_date.end_of_day)
 
-          # 匿评申诉设置
-          # 匿评申诉未开启前可以更新：是否启用匿评申诉
-          if @homework_detail_manual.comment_status < 4 && @homework.anonymous_comment
-            tip_exception("缺少anonymous_appeal参数") if params[:anonymous_appeal].nil?
-            @homework.anonymous_appeal = params[:anonymous_appeal]
-          end
+          @homework_detail_manual.evaluation_end = !@homework.anonymous_comment ? nil : params[:evaluation_end]
+        end
 
+        # 作业未结束可以更新缺评扣分
+        tip_exception("缺评扣分不能为空") if @homework.anonymous_comment && params[:absence_penalty].blank?
+        tip_exception("缺评扣分不能小于0") if @homework.anonymous_comment && params[:absence_penalty].to_i < 0
+        tip_exception("缺评扣分不能大于100") if @homework.anonymous_comment && params[:absence_penalty].to_i > 100
+        @homework_detail_manual.absence_penalty = !@homework.anonymous_comment ? 0 : params[:absence_penalty].to_i
 
-          # 匿评申诉未结束前可以更新：匿评申诉结束时间
-          if @homework_detail_manual.comment_status < 5
-            tip_exception("匿评申诉结束时间不能为空") if @homework.anonymous_appeal && params[:appeal_time].blank?
-            tip_exception("匿评开启时间不能早于匿评截止时间") if @homework.anonymous_appeal &&
-                params[:appeal_time] <= strf_time(@homework_detail_manual.evaluation_end)
-            tip_exception("匿评申诉结束不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @homework.anonymous_appeal &&
-                @course.end_date.present? && params[:appeal_time] > strf_time(@course.end_date.end_of_day)
 
-            @homework_detail_manual.appeal_time = @homework.anonymous_appeal ? params[:appeal_time] : nil
-          end
+        # 匿评申诉设置
+        # 匿评申诉未开启前可以更新：是否启用匿评申诉
+        if @homework_detail_manual.comment_status < 4 && @homework.anonymous_comment
+          tip_exception("缺少anonymous_appeal参数") if params[:anonymous_appeal].nil?
+          @homework.anonymous_appeal = params[:anonymous_appeal]
+        end
 
-          # 作业未结束可以更新违规匿评扣分
-          tip_exception("违规匿评扣分不能为空") if @homework.anonymous_appeal && params[:appeal_penalty].blank?
-          tip_exception("违规匿评扣分不能小于0") if @homework.anonymous_appeal && params[:appeal_penalty].to_i < 0
-          tip_exception("违规匿评扣分不能大于100") if @homework.anonymous_appeal && params[:appeal_penalty].to_i > 100
-          @homework_detail_manual.appeal_penalty = @homework.anonymous_appeal ? params[:appeal_penalty].to_i : 0
-
-          # 如果缺评扣分的设置有变更且匿评已截止
-          absence_penalty_change = current_absence_penalty != @homework_detail_manual.absence_penalty &&
-              @homework_detail_manual.comment_status >= 4
-          # 如果违规匿评扣分的设置有变更且匿评已截止
-          appeal_penalty_change = current_appeal_penalty != @homework_detail_manual.appeal_penalty &&
-              @homework_detail_manual.comment_status >= 4
-
-          # 评分设置
-          tip_exception("助教评分模式不能为空") if params[:ta_mode].blank?
-
-          # 助教评分模式的变更
-          ta_mode_change = @homework_detail_manual.ta_mode != params[:ta_mode].to_i
-          @homework_detail_manual.ta_mode = params[:ta_mode].to_i
-
-          # 最终成绩组成
-          tip_exception("最终成绩组成模式不能为空") if params[:final_mode].nil?
-
-          final_mode_change = @homework_detail_manual.final_mode != params[:final_mode]
-          @homework_detail_manual.final_mode = params[:final_mode]
-          if !@homework_detail_manual.final_mode
-            tip_exception("教师评分比例不能为空") if params[:te_proportion].blank?
-            te_proportion = params[:te_proportion].to_f.round(2)
-            tip_exception("教师评分比例不能小于0") if te_proportion < 0
-            tip_exception("助教评分比例不能为空") if params[:ta_proportion].blank?
-            ta_proportion = params[:ta_proportion].to_f.round(2)
-            tip_exception("助教评分比例不能小于0") if ta_proportion < 0
-            if !@homework.anonymous_comment
-              tip_exception("评分比例之和不能大于100") if (te_proportion + ta_proportion) > 1.0
-            else
-              tip_exception("学生评分比例不能为空") if params[:st_proportion].blank?
-              st_proportion = params[:st_proportion].to_f.round(2)
-              tip_exception("学生评分比例不能小于0") if st_proportion < 0
-              tip_exception("评分比例之和不能大于100") if (te_proportion + ta_proportion + st_proportion) > 1.0
-            end
 
-            proportion_change = @homework_detail_manual.te_proportion.round(2) != te_proportion ||
-                @homework_detail_manual.ta_proportion.round(2) != ta_proportion
-            @homework_detail_manual.te_proportion = te_proportion
-            @homework_detail_manual.ta_proportion = ta_proportion
+        # 匿评申诉未结束前可以更新：匿评申诉结束时间
+        if @homework_detail_manual.comment_status < 5
+          tip_exception("匿评申诉结束时间不能为空") if @homework.anonymous_appeal && params[:appeal_time].blank?
+          tip_exception("匿评开启时间不能早于匿评截止时间") if @homework.anonymous_appeal &&
+            params[:appeal_time] <= strf_time(@homework_detail_manual.evaluation_end)
+          tip_exception("匿评申诉结束不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @homework.anonymous_appeal &&
+            @course.end_date.present? && params[:appeal_time] > strf_time(@course.end_date.end_of_day)
+
+          @homework_detail_manual.appeal_time = @homework.anonymous_appeal ? params[:appeal_time] : nil
+        end
+
+        # 作业未结束可以更新违规匿评扣分
+        tip_exception("违规匿评扣分不能为空") if @homework.anonymous_appeal && params[:appeal_penalty].blank?
+        tip_exception("违规匿评扣分不能小于0") if @homework.anonymous_appeal && params[:appeal_penalty].to_i < 0
+        tip_exception("违规匿评扣分不能大于100") if @homework.anonymous_appeal && params[:appeal_penalty].to_i > 100
+        @homework_detail_manual.appeal_penalty = @homework.anonymous_appeal ? params[:appeal_penalty].to_i : 0
+
+        # 如果缺评扣分的设置有变更且匿评已截止
+        absence_penalty_change = current_absence_penalty != @homework_detail_manual.absence_penalty &&
+          @homework_detail_manual.comment_status >= 4
+        # 如果违规匿评扣分的设置有变更且匿评已截止
+        appeal_penalty_change = current_appeal_penalty != @homework_detail_manual.appeal_penalty &&
+          @homework_detail_manual.comment_status >= 4
+
+        # 评分设置
+        tip_exception("助教评分模式不能为空") if params[:ta_mode].blank?
+
+        # 助教评分模式的变更
+        ta_mode_change = @homework_detail_manual.ta_mode != params[:ta_mode].to_i
+        @homework_detail_manual.ta_mode = params[:ta_mode].to_i
+
+        # 最终成绩组成
+        tip_exception("最终成绩组成模式不能为空") if params[:final_mode].nil?
+
+        final_mode_change = @homework_detail_manual.final_mode != params[:final_mode]
+        @homework_detail_manual.final_mode = params[:final_mode]
+        if !@homework_detail_manual.final_mode
+          tip_exception("教师评分比例不能为空") if params[:te_proportion].blank?
+          te_proportion = params[:te_proportion].to_f.round(2)
+          tip_exception("教师评分比例不能小于0") if te_proportion < 0
+          tip_exception("助教评分比例不能为空") if params[:ta_proportion].blank?
+          ta_proportion = params[:ta_proportion].to_f.round(2)
+          tip_exception("助教评分比例不能小于0") if ta_proportion < 0
+          if !@homework.anonymous_comment
+            tip_exception("评分比例之和不能大于100") if (te_proportion + ta_proportion) > 1.0
           else
-            @homework_detail_manual.te_proportion = 1
-            @homework_detail_manual.ta_proportion = 0
+            tip_exception("学生评分比例不能为空") if params[:st_proportion].blank?
+            st_proportion = params[:st_proportion].to_f.round(2)
+            tip_exception("学生评分比例不能小于0") if st_proportion < 0
+            tip_exception("评分比例之和不能大于100") if (te_proportion + ta_proportion + st_proportion) > 1.0
           end
 
-          # 公开属性设置
-          tip_exception("缺少work_public参数") if params[:work_public].nil?
-          tip_exception("缺少score_open参数") if params[:score_open].nil?
-          tip_exception("缺少answer_public参数") if params[:answer_public].nil?
-          @homework.work_public = params[:work_public]
-          @homework.score_open = params[:score_open]
-          @homework.answer_public = params[:answer_public]
-
-          @homework_detail_manual.save!
-          @homework.save!
-
-          # 迟交扣分、缺评扣分、违规匿评扣分、助教评分模式变更、最终成绩组成、评分比例变更都需要更新学生成绩
-          if late_penalty_change || absence_penalty_change || appeal_penalty_change || ta_mode_change ||
-              final_mode_change || proportion_change
-
-            student_works = @homework.student_works.has_committed
-            work_ids = student_works.pluck(:id)
-
-            student_works.each do |student_work|
-              # 迟交扣分
-              student_work.late_penalty = student_work.work_status == 1 ? 0 : @homework.late_penalty
-
-              # 缺评扣分的更新 如果之前的作业缺评扣分为0，则需重新计算缺评次数
-              if absence_penalty_change
-                absence_penalty_count = current_absence_penalty == 0 ? student_work.absence_count :
-                                            (student_work.absence_penalty / current_absence_penalty).to_i
-                student_work.absence_penalty = absence_penalty_count * @homework_detail_manual.absence_penalty
-              end
+          proportion_change = @homework_detail_manual.te_proportion.round(2) != te_proportion ||
+            @homework_detail_manual.ta_proportion.round(2) != ta_proportion
+          @homework_detail_manual.te_proportion = te_proportion
+          @homework_detail_manual.ta_proportion = ta_proportion
+        else
+          @homework_detail_manual.te_proportion = 1
+          @homework_detail_manual.ta_proportion = 0
+        end
 
-              # 违规匿评扣分 如果之前的作业违规扣分为0，则需重新计算违规匿评次数
-              if appeal_penalty_change
-                appeal_penalty_count = current_appeal_penalty == 0 ? student_work.appeal_count :
-                                           (student_work.appeal_penalty / current_appeal_penalty).to_i
-                student_work.appeal_penalty = appeal_penalty_count * @homework_detail_manual.appeal_penalty
-              end
+        # 公开属性设置
+        tip_exception("缺少work_public参数") if params[:work_public].nil?
+        tip_exception("缺少score_open参数") if params[:score_open].nil?
+        tip_exception("缺少answer_public参数") if params[:answer_public].nil?
+        @homework.work_public = params[:work_public]
+        @homework.score_open = params[:score_open]
+        @homework.answer_public = params[:answer_public]
+
+        @homework_detail_manual.save!
+        @homework.save!
+
+        # 迟交扣分、缺评扣分、违规匿评扣分、助教评分模式变更、最终成绩组成、评分比例变更都需要更新学生成绩
+        if late_penalty_change || absence_penalty_change || appeal_penalty_change || ta_mode_change ||
+          final_mode_change || proportion_change
+
+          student_works = @homework.student_works.has_committed
+          work_ids = student_works.pluck(:id)
+
+          student_works.each do |student_work|
+            # 迟交扣分
+            student_work.late_penalty = student_work.work_status == 1 ? 0 : @homework.late_penalty
+
+            # 缺评扣分的更新 如果之前的作业缺评扣分为0，则需重新计算缺评次数
+            if absence_penalty_change
+              absence_penalty_count = current_absence_penalty == 0 ? student_work.absence_count :
+                                        (student_work.absence_penalty / current_absence_penalty).to_i
+              student_work.absence_penalty = absence_penalty_count * @homework_detail_manual.absence_penalty
+            end
 
-              # 助教模式变更且有助教评分记录时才更新
-              if ta_mode_change && student_work.student_works_scores.where("reviewer_role = 2 AND score IS NOT NULL").count > 0
-                student_work.teaching_asistant_score = student_work.ta_score @homework_detail_manual.ta_mode
-              end
+            # 违规匿评扣分 如果之前的作业违规扣分为0，则需重新计算违规匿评次数
+            if appeal_penalty_change
+              appeal_penalty_count = current_appeal_penalty == 0 ? student_work.appeal_count :
+                                       (student_work.appeal_penalty / current_appeal_penalty).to_i
+              student_work.appeal_penalty = appeal_penalty_count * @homework_detail_manual.appeal_penalty
+            end
 
-              student_work.save!
+            # 助教模式变更且有助教评分记录时才更新
+            if ta_mode_change && student_work.student_works_scores.where("reviewer_role = 2 AND score IS NOT NULL").count > 0
+              student_work.teaching_asistant_score = student_work.ta_score @homework_detail_manual.ta_mode
             end
-          end
 
+            student_work.save!
+          end
         end
-        normal_status(0, "更新成功")
-      else
-        tip_exception("课堂已结束不能再更新")
+
       end
+      normal_status(0, "更新成功")
+    else
+      tip_exception("课堂已结束不能再更新")
+    end
     # rescue ActiveRecord::RecordInvalid
     #   render_error("保存失败")
     # rescue ApplicationService::Error => ex
     #   uid_logger(ex.message)
     #   render_error(ex.message)
     #   raise ActiveRecord::Rollback
-    rescue Exception => e
-      uid_logger(e.backtrace)
-      tip_exception(e.message)
-      raise ActiveRecord::Rollback
-    end
   end
 
   # 选用实训
@@ -799,7 +770,7 @@ class HomeworkCommonsController < ApplicationController
     @total_count = @shixuns.size
 
     ## 分页参数
-    page  = params[:page] || 1
+    page = params[:page] || 1
     @shixuns = @shixuns.reorder("shixuns.created_at desc").includes(:challenges, user: [user_extension: :school]).page(page).per(10)
   end
 
@@ -822,15 +793,15 @@ class HomeworkCommonsController < ApplicationController
   def subjects
     @tags = Repertoire.where(nil).order("updated_at desc")
     # select = params[:select]  # 路径导航类型
-    select = params[:type]  # 路径导航类型
+    select = params[:type] # 路径导航类型
     reorder = params[:order] || "myshixun_count"
     sort = params[:sort] || "desc"
     search = params[:search]
 
     ## 分页参数
-    page  = params[:page] || 1
+    page = params[:page] || 1
     limit = params[:limit] || 15
-    offset = (page.to_i-1) * limit
+    offset = (page.to_i - 1) * limit
 
     # 最热排序
     if reorder == "myshixun_count"
@@ -903,8 +874,8 @@ class HomeworkCommonsController < ApplicationController
 
         # 为实训作业创建与stage同名的子目录
         category = CourseSecondCategory.find_by(name: stage.name, course_id: @course.id, category_type: "shixun_homework") ||
-            CourseSecondCategory.create!(name: stage.name, course_id: @course.id, category_type: "shixun_homework",
-                                         course_module_id: course_module.id, position: course_module.course_second_categories.count + 1)
+          CourseSecondCategory.create!(name: stage.name, course_id: @course.id, category_type: "shixun_homework",
+                                       course_module_id: course_module.id, position: course_module.course_second_categories.count + 1)
 
         # 去掉不对当前用户的单位公开的实训，已发布的实训
         stage.shixuns.no_jupyter.where(id: shixun_ids).unhidden.each do |shixun|
@@ -935,16 +906,14 @@ class HomeworkCommonsController < ApplicationController
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
-      tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
-        @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+      tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       tip_exception("缺少分班截止时间参数") if params[:group_end_times].blank?
-      group_end_times = params[:group_end_times].reject(&:blank?)&.map{|time| time.to_time}
+      group_end_times = params[:group_end_times].reject(&:blank?)&.map {|time| time.to_time}
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|
         tip_exception("分班截止时间不能早于当前时间") if time <= Time.now
-        tip_exception("分班截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
-          @course.end_date.present? && time > @course.end_date.end_of_day
+        tip_exception("分班截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && time > @course.end_date.end_of_day
       end
     end
 
@@ -955,94 +924,89 @@ class HomeworkCommonsController < ApplicationController
     publish_groups = charge_group_ids & group_ids if group_ids
 
     # ActiveRecord::Base.transaction do
-      begin
-        homeworks.each do |homework|
-          # 作业未发布时
-          if homework.homework_detail_manual.try(:comment_status) == 0
-            if !params[:group_ids].blank?
-
-              # 全选即统一设置，unified_setting为true
-              if @course.course_groups.where(id: publish_groups).size == @course.course_groups.size &&
-                ((params[:detail] && group_end_times.min == group_end_times.max) || params[:detail].blank?)
-                homework.homework_group_settings.destroy_all
-                homework.unified_setting = true
-                homework.end_time = params[:detail] ? group_end_times.max : params[:end_time]
-              else
-                homework.unified_setting = false
-                # 创建作业分班设置：homework_group_setting
-                homework.create_homework_group_settings
-
-                # 选中的分班设置的发布时间改为当前时间，截止时间改为传的截止时间参数
-                if params[:detail]
-                  group_ids.each_with_index do |group_id, index|
-                    homework.homework_group_settings.find_by(course_group_id: group_id)&.update_attributes!(publish_time: Time.now,
-                                                                                                           end_time: group_end_times[index])
-                  end
-                else
-                  homework.homework_group_settings.where(course_group_id: publish_groups).update_all(publish_time: Time.now,
-                                                                                                         end_time: params[:end_time])
-                end
-                # 发消息
-                tiding_group_ids = publish_groups
-              end
-            else
-              homework.homework_group_settings.destroy_all
-              # students = @course.students
-            end
-
-            homework.publish_time = Time.now
-
-            # 截止时间的处理
-            if homework.end_time.nil?
-              homework.end_time = params[:detail] ? group_end_times.max : params[:end_time]
-            elsif homework.max_group_end_time
-              homework.end_time = homework.max_group_end_time
-            end
-            homework.homework_detail_manual.update_attributes!(comment_status: 1)
-
-            if homework.course_act.blank?
-              CourseActivity.create!(user_id: homework.user_id, course_id: homework.course_id, course_act: homework)
-            end
-            # 发消息
-            HomeworkCommonPushNotifyJob.perform_later(homework.id, tiding_group_ids)
+    homeworks.each do |homework|
+      # 作业未发布时
+      if homework.homework_detail_manual.try(:comment_status) == 0
+        if !params[:group_ids].blank?
+
+          # 全选即统一设置，unified_setting为true
+          if @course.course_groups.where(id: publish_groups).size == @course.course_groups.size &&
+            ((params[:detail] && group_end_times.min == group_end_times.max) || params[:detail].blank?)
+            homework.homework_group_settings.destroy_all
+            homework.unified_setting = true
+            homework.end_time = params[:detail] ? group_end_times.max : params[:end_time]
           else
+            homework.unified_setting = false
+            # 创建作业分班设置：homework_group_setting
             homework.create_homework_group_settings
 
-            none_publish_settings = homework.homework_group_settings.where(course_group_id: publish_groups).none_published
+            # 选中的分班设置的发布时间改为当前时间，截止时间改为传的截止时间参数
             if params[:detail]
               group_ids.each_with_index do |group_id, index|
-                none_publish_settings.find_by(course_group_id: group_id)&.update_attributes!(publish_time: Time.now,
-                                                                                                       end_time: group_end_times[index])
+                homework.homework_group_settings.find_by(course_group_id: group_id)&.update_attributes!(publish_time: Time.now,
+                                                                                                        end_time: group_end_times[index])
               end
             else
-              none_publish_settings.update_all(publish_time: Time.now, end_time: params[:end_time])
+              homework.homework_group_settings.where(course_group_id: publish_groups).update_all(publish_time: Time.now,
+                                                                                                 end_time: params[:end_time])
             end
-
-            if homework.max_group_end_time
-              homework.end_time = homework.max_group_end_time
-            end
-            HomeworkCommonPushNotifyJob.perform_later(homework.id, none_publish_settings.pluck(:course_group_id))
+            # 发消息
+            tiding_group_ids = publish_groups
           end
+        else
+          homework.homework_group_settings.destroy_all
+          # students = @course.students
+        end
 
+        homework.publish_time = Time.now
 
-          if homework.end_time > Time.now && homework.homework_detail_manual.try(:comment_status) > 1
-            homework.homework_detail_manual.update_attributes!(comment_status: 1)
-          end
+        # 截止时间的处理
+        if homework.end_time.nil?
+          homework.end_time = params[:detail] ? group_end_times.max : params[:end_time]
+        elsif homework.max_group_end_time
+          homework.end_time = homework.max_group_end_time
+        end
+        homework.homework_detail_manual.update_attributes!(comment_status: 1)
 
-          # 补交结束时间
-          homework.late_time = Time.at(homework.end_time.to_i + 30*24*3600) if homework.allow_late && homework.late_time.nil?
+        if homework.course_act.blank?
+          CourseActivity.create!(user_id: homework.user_id, course_id: homework.course_id, course_act: homework)
+        end
+        # 发消息
+        HomeworkCommonPushNotifyJob.perform_later(homework.id, tiding_group_ids)
+      else
+        homework.create_homework_group_settings
 
-          homework.save!
+        none_publish_settings = homework.homework_group_settings.where(course_group_id: publish_groups).none_published
+        if params[:detail]
+          group_ids.each_with_index do |group_id, index|
+            none_publish_settings.find_by(course_group_id: group_id)&.update_attributes!(publish_time: Time.now,
+                                                                                         end_time: group_end_times[index])
+          end
+        else
+          none_publish_settings.update_all(publish_time: Time.now, end_time: params[:end_time])
+        end
 
-          # 更新学生状态及成绩(手动点击计算)
-          # HomeworkPublishUpdateWorkStatusJob.perform_later(tiding_group_ids, homework.id)
+        if homework.max_group_end_time
+          homework.end_time = homework.max_group_end_time
         end
-        normal_status(0, "发布成功")
-      rescue Exception => e
-        uid_logger(e.message)
-        tip_exception("发布失败")
-        raise ActiveRecord::Rollback
+        HomeworkCommonPushNotifyJob.perform_later(homework.id, none_publish_settings.pluck(:course_group_id))
       end
+
+
+      if homework.end_time > Time.now && homework.homework_detail_manual.try(:comment_status) > 1
+        homework.homework_detail_manual.update_attributes!(comment_status: 1)
+      end
+
+      # 补交结束时间
+      homework.late_time = Time.at(homework.end_time.to_i + 30 * 24 * 3600) if homework.allow_late && homework.late_time.nil?
+
+      homework.save!
+
+      # 更新学生状态及成绩(手动点击计算)
+      # HomeworkPublishUpdateWorkStatusJob.perform_later(tiding_group_ids, homework.id)
+    end
+    normal_status(0, "发布成功")
+
     # end
   end
 
@@ -1051,9 +1015,9 @@ class HomeworkCommonsController < ApplicationController
     charge_ids = @course.charge_group_ids(@current_user)
     if @homework.end_immediately charge_ids
       # 可立即截止的分班：统一设置则是用户管理的所有分班，否则是当前用户管理的分班中已发布且未截止的
-      charge_group_ids = @course.charge_group_ids(@current_user)  # 当前用户管理的分班
+      charge_group_ids = @course.charge_group_ids(@current_user) # 当前用户管理的分班
       group_ids = @homework.unified_setting ? charge_group_ids :
-                      @homework.homework_group_settings.where(course_group_id: charge_group_ids).published_no_end.pluck(:course_group_id)
+                    @homework.homework_group_settings.where(course_group_id: charge_group_ids).published_no_end.pluck(:course_group_id)
       @course_groups = @course.course_groups.where(id: group_ids)
     else
       tip_exception("没有可截止的分班")
@@ -1074,56 +1038,50 @@ class HomeworkCommonsController < ApplicationController
     group_ids = params[:group_ids]&.reject(&:blank?)&.map(&:to_i)
     end_groups = charge_group_ids & group_ids if group_ids
 
-    begin
-      homeworks.each do |homework|
-        ActiveRecord::Base.transaction do
-          homework_detail_manual = homework.homework_detail_manual
-
-          # 分组设置
-          if !params[:group_ids].blank?
-            # 确保之前是统一设置或者有新创建的分班的数据一致性
-            homework.create_homework_group_settings
+    homeworks.each do |homework|
+      ActiveRecord::Base.transaction do
+        homework_detail_manual = homework.homework_detail_manual
 
-            homework.unified_setting = false if homework.unified_setting && end_groups.length != @course.course_groups_count
+        # 分组设置
+        if !params[:group_ids].blank?
+          # 确保之前是统一设置或者有新创建的分班的数据一致性
+          homework.create_homework_group_settings
 
-            # 已发布且未截止的分班
-            none_end_settings = homework.homework_group_settings.where(course_group_id: end_groups).published_no_end
+          homework.unified_setting = false if homework.unified_setting && end_groups.length != @course.course_groups_count
 
-            none_end_settings.update_all(end_time: time)
-            student_works = homework.student_works.where(user_id: course_students.where(course_group_id: none_end_settings.
-              pluck(:course_group_id)).pluck(:user_id)).has_committed if homework.homework_type == "practice"
+          # 已发布且未截止的分班
+          none_end_settings = homework.homework_group_settings.where(course_group_id: end_groups).published_no_end
 
-            homework.end_time = homework.max_group_end_time
-            if homework.end_time > time && homework_detail_manual.try(:comment_status) > 1
-              homework_detail_manual.update_attributes!(comment_status: 1)
-            end
+          none_end_settings.update_all(end_time: time)
+          student_works = homework.student_works.where(user_id: course_students.where(course_group_id: none_end_settings.
+            pluck(:course_group_id)).pluck(:user_id)).has_committed if homework.homework_type == "practice"
 
-            # 统一设置
-          elsif homework.unified_setting
-            student_works = homework.student_works.has_committed if homework.homework_type == "practice"
-            homework.end_time = time
+          homework.end_time = homework.max_group_end_time
+          if homework.end_time > time && homework_detail_manual.try(:comment_status) > 1
+            homework_detail_manual.update_attributes!(comment_status: 1)
           end
 
-          # homework_detail_manual.update_attributes!(comment_status: 2) if homework.end_time <= time
+          # 统一设置
+        elsif homework.unified_setting
+          student_works = homework.student_works.has_committed if homework.homework_type == "practice"
+          homework.end_time = time
+        end
+
+        # homework_detail_manual.update_attributes!(comment_status: 2) if homework.end_time <= time
 
-          # 实训作业的作品需要计算是否迟交
-          if homework.homework_type == "practice"
-            # shixun = homework.shixuns.first
-            # homework_challenge_settings = homework.homework_challenge_settings
-            unless student_works.blank?
-              student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty) if homework.allow_late
-            end
+        # 实训作业的作品需要计算是否迟交
+        if homework.homework_type == "practice"
+          # shixun = homework.shixuns.first
+          # homework_challenge_settings = homework.homework_challenge_settings
+          unless student_works.blank?
+            student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty) if homework.allow_late
           end
-          homework.save!
         end
-        HomeworkEndUpdateScoreJob.perform_later(homework.id) if !homework.allow_late && homework.end_time <= time
+        homework.save!
       end
-      normal_status(0, "更新成功")
-    rescue Exception => e
-      uid_logger(e.message)
-      tip_exception("操作失败")
-      raise ActiveRecord::Rollback
+      HomeworkEndUpdateScoreJob.perform_later(homework.id) if !homework.allow_late && homework.end_time <= time
     end
+    normal_status(0, "更新成功")
   end
 
   def set_public
@@ -1156,19 +1114,13 @@ class HomeworkCommonsController < ApplicationController
   # 删除多个作业
   def multi_destroy
     ActiveRecord::Base.transaction do
-      begin
-        homeworks = @course.homework_commons.where(id: params[:homework_ids])
-        homeworks.destroy_all
-
-        # 这些写是因为model中的关联删除无法删除is_delete=0的作品
-        StudentWork.where(homework_common_id: homeworks.pluck(:id)).destroy_all
-        normal_status(0, "删除成功")
-
-      rescue Exception => e
-        uid_logger(e.message)
-        tip_exception("删除失败")
-        raise ActiveRecord::Rollback
-      end
+      homeworks = @course.homework_commons.where(id: params[:homework_ids])
+      homeworks.destroy_all
+
+      # 这些写是因为model中的关联删除无法删除is_delete=0的作品
+      StudentWork.where(homework_common_id: homeworks.pluck(:id)).destroy_all
+      normal_status(0, "删除成功")
+
     end
   end
 
@@ -1178,41 +1130,35 @@ class HomeworkCommonsController < ApplicationController
 
     homeworks.each do |homework|
       ActiveRecord::Base.transaction do
-        begin
-          homework_bank = current_user.homework_banks.find_by(homework_common_id: homework.id)
-          if homework_bank.present?
-            # 如果作业加入过题库则更新参数
-            if homework_bank.homework_type == 1
-              homework_bank.update_attributes!(name: homework.name, description: homework.description,
-                                              reference_answer: homework.reference_answer, course_list_id: @course.course_list_id)
-            elsif homework_bank.homework_type == 3
-              homework_detail_group = homework.homework_detail_group
-              homework_bank.update_attributes!(name: homework.name, description: homework.description,
-                                              reference_answer: homework.reference_answer, course_list_id: @course.course_list_id,
-                                              min_num: homework_detail_group.min_num, max_num: homework_detail_group.max_num,
-                                              base_on_project: homework_detail_group.base_on_project)
-            end
-
-            # 附件的更新
-            homework_bank.attachments.destroy_all
-            homework.attachments.each do |attachment|
-              att = attachment.copy
-              att.author_id = homework_bank.user_id
-              att.copy_from = attachment.id
-              homework_bank.attachments << att
-            end
-          else
-            new_homework_bank = add_to_homework_bank_f homework
-            new_homework_bank.save!
+        homework_bank = current_user.homework_banks.find_by(homework_common_id: homework.id)
+        if homework_bank.present?
+          # 如果作业加入过题库则更新参数
+          if homework_bank.homework_type == 1
+            homework_bank.update_attributes!(name: homework.name, description: homework.description,
+                                             reference_answer: homework.reference_answer, course_list_id: @course.course_list_id)
+          elsif homework_bank.homework_type == 3
+            homework_detail_group = homework.homework_detail_group
+            homework_bank.update_attributes!(name: homework.name, description: homework.description,
+                                             reference_answer: homework.reference_answer, course_list_id: @course.course_list_id,
+                                             min_num: homework_detail_group.min_num, max_num: homework_detail_group.max_num,
+                                             base_on_project: homework_detail_group.base_on_project)
+          end
 
-            homework.update_attributes!(homework_bank_id: new_homework_bank.id)
+          # 附件的更新
+          homework_bank.attachments.destroy_all
+          homework.attachments.each do |attachment|
+            att = attachment.copy
+            att.author_id = homework_bank.user_id
+            att.copy_from = attachment.id
+            homework_bank.attachments << att
           end
+        else
+          new_homework_bank = add_to_homework_bank_f homework
+          new_homework_bank.save!
 
-        rescue Exception => e
-          uid_logger(e.message)
-          tip_exception(e.message)
-          raise ActiveRecord::Rollback
+          homework.update_attributes!(homework_bank_id: new_homework_bank.id)
         end
+
       end
     end
     normal_status(0, "加入成功")
@@ -1229,7 +1175,7 @@ class HomeworkCommonsController < ApplicationController
 
   # 班级作品查重
   def homework_code_repeat
-    tip_exception(-1,"分班id不能为空!") if params[:group_ids].nil?
+    tip_exception(-1, "分班id不能为空!") if params[:group_ids].nil?
     shixun = @homework.shixuns.take
     # 通过代码文件来判断语言
     language = shixun.challenges.practice_type.pluck(:path).first
@@ -1247,16 +1193,16 @@ class HomeworkCommonsController < ApplicationController
         games.each do |game|
           game.game_codes.each do |game_code|
             code_infos << {
-                path: game_code.path,
-                content: Base64.urlsafe_encode64(game_code.new_code.to_s, padding: false),
-                passed_time: game.end_time.try(:strftime, '%Y-%m-%d %H:%M:%S')
+              path: game_code.path,
+              content: Base64.urlsafe_encode64(game_code.new_code.to_s, padding: false),
+              passed_time: game.end_time.try(:strftime, '%Y-%m-%d %H:%M:%S')
             }
           end
         end
         if code_infos.size != 0
           user_lists << {
-              user_id: user_id,
-              code_info: code_infos
+            user_id: user_id,
+            code_info: code_infos
           }
         end
       end
@@ -1270,13 +1216,13 @@ class HomeworkCommonsController < ApplicationController
         normal_status("代码查重成功")
       else
         if result.status == 1
-          tip_exception(-4,"代码查重异常，请稍后重试")
+          tip_exception(-4, "代码查重异常，请稍后重试")
         else
-          tip_exception(-3,"正在查重，请在几分钟后刷新页面查看结果")
+          tip_exception(-3, "正在查重，请在几分钟后刷新页面查看结果")
         end
       end
     else
-      tip_exception(-2,"平台目前支持java、python语言的查重<br/>其他语言正在规划中，敬请期待")
+      tip_exception(-2, "平台目前支持java、python语言的查重<br/>其他语言正在规划中，敬请期待")
     end
   end
 
@@ -1295,23 +1241,23 @@ class HomeworkCommonsController < ApplicationController
     student_works = @homework.student_works.where("work_status > 0")
     # 按分班id搜索
     user_ids =
-        if params[:group_ids]
-          # 筛选了分班
-          group_student_ids =  @course.course_members.where(course_group_id: params[:group_ids]).pluck(:user_id)
-          student_works.where(:user_id => group_student_ids).pluck(:user_id)
+      if params[:group_ids]
+        # 筛选了分班
+        group_student_ids = @course.course_members.where(course_group_id: params[:group_ids]).pluck(:user_id)
+        student_works.where(:user_id => group_student_ids).pluck(:user_id)
+      else
+        # 如果当前用户有分班 显示分班内的学生，没有则显示全部
+        user_ids = @course.user_group_students(current_user.id).pluck(:user_id)
+        if user_ids.present?
+          student_works.where(:user_id => user_ids).pluck(:user_id)
         else
-          # 如果当前用户有分班 显示分班内的学生，没有则显示全部
-          user_ids = @course.user_group_students(current_user.id).pluck(:user_id)
-          if user_ids.present?
-            student_works.where(:user_id => user_ids).pluck(:user_id)
-          else
-            student_works.pluck(:user_id)
-          end
+          student_works.pluck(:user_id)
         end
+      end
     # 查询作品数总数
     @all_reviews_count = user_ids.count
     @users_reviews = @homework.homework_review_results.where("code_rate >= 50.0")
-                          .where(:user_id => user_ids).joins(user: :user_extension)
+                       .where(:user_id => user_ids).joins(user: :user_extension)
     # 按学号和姓名搜索
     if params[:search]
       @users_reviews = @users_reviews.where("concat(lastname, firstname) like :keyword or student_id like :keyword", keyword: "%#{params[:search]}%")
@@ -1325,9 +1271,9 @@ class HomeworkCommonsController < ApplicationController
 
     # 如果未分班被查重过，则显示未分班列
     @non_course_group =
-        if @homework.homework_group_reviews.where(course_group_id: 0).count > 0
-          @course.course_members.where(role: 4, course_group_id: 0).count
-        end
+      if @homework.homework_group_reviews.where(course_group_id: 0).count > 0
+        @course.course_members.where(role: 4, course_group_id: 0).count
+      end
 
     # 最新一次的查重时间
     @last_review_time = format_time @homework.homework_group_reviews.last.try(:created_at)
@@ -1353,38 +1299,38 @@ class HomeworkCommonsController < ApplicationController
       homework_challenge_settings = @homework.homework_challenge_settings
       @challenges = @shixun.challenges.where(id: homework_challenge_settings.pluck(:challenge_id), st: 0)
       @challenges =
-          @challenges.map do |challenge|
-            code_rate = 0
-            game_codes = results.code_info.select {|info| challenge.path.split("；").include?(info.origin_path)}
-            # 先判断用户该关卡是否查重了  取多个待补充文件的平均值
-            if game_codes.count > 0
-              code_rate += game_codes.map(&:rate).sum / challenge.path.split("；").length
-            end
-            logger.info("#####game_codes: #{game_codes}")
-            #target = game_codes.count > 0 ? game_codes[0].target_user_id : nil
-            # 作品完成时间
-            game = challenge.games.find_by(user_id: @user.id)
-            end_time = game.end_time
-            # 用户关卡的得分
-            all_score = homework_challenge_settings.find_by(challenge_id: challenge.id).try(:score).to_f
-            final_score = @student_work.work_challenge_score game, all_score, challenge.id
-            # 抄袭用户
-            copy_user = User.find_by_id(game_codes[0].try(:target_user_id))
-            copy_end_time = copy_user.games.find_by(challenge_id: challenge.id).try(:end_time) if copy_user.present?
-            # 代码部分
-            code_list = []
-            challenge.path.split("；").each do |path|
-              if code_info.select{|info| path == info.origin_path}.size > 0
-                info = code_info.select{|info| path == info.origin_path}[0]
-                code_list << {path: path, origin_content: info.origin_content, target_content: info.target_content}
-              end
+        @challenges.map do |challenge|
+          code_rate = 0
+          game_codes = results.code_info.select {|info| challenge.path.split("；").include?(info.origin_path)}
+          # 先判断用户该关卡是否查重了  取多个待补充文件的平均值
+          if game_codes.count > 0
+            code_rate += game_codes.map(&:rate).sum / challenge.path.split("；").length
+          end
+          logger.info("#####game_codes: #{game_codes}")
+          #target = game_codes.count > 0 ? game_codes[0].target_user_id : nil
+          # 作品完成时间
+          game = challenge.games.find_by(user_id: @user.id)
+          end_time = game.end_time
+          # 用户关卡的得分
+          all_score = homework_challenge_settings.find_by(challenge_id: challenge.id).try(:score).to_f
+          final_score = @student_work.work_challenge_score game, all_score, challenge.id
+          # 抄袭用户
+          copy_user = User.find_by_id(game_codes[0].try(:target_user_id))
+          copy_end_time = copy_user.games.find_by(challenge_id: challenge.id).try(:end_time) if copy_user.present?
+          # 代码部分
+          code_list = []
+          challenge.path.split("；").each do |path|
+            if code_info.select {|info| path == info.origin_path}.size > 0
+              info = code_info.select {|info| path == info.origin_path}[0]
+              code_list << {path: path, origin_content: info.origin_content, target_content: info.target_content}
             end
-            # TODO: 这里本来应该前端做的，但是现在页面已经刷不开了。
-            {code_rate: code_rate, copy_user_id: copy_user.try(:id), end_time: end_time, final_score: final_score,
-             all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_user.try(:full_name),
-             username: game.user.full_name, code_list: code_list, subject: challenge.subject, position: challenge.position,
-             id: challenge.id}
           end
+          # TODO: 这里本来应该前端做的，但是现在页面已经刷不开了。
+          {code_rate: code_rate, copy_user_id: copy_user.try(:id), end_time: end_time, final_score: final_score,
+           all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_user.try(:full_name),
+           username: game.user.full_name, code_list: code_list, subject: challenge.subject, position: challenge.position,
+           id: challenge.id}
+        end
 
     else
       if results.status == 1
@@ -1461,8 +1407,8 @@ class HomeworkCommonsController < ApplicationController
           user_rate = 0
           # 计算每个关卡的相似度
           challenges.each do |challenge|
-            game_codes = results.user_lists.select{|user_list| user_list.user_id == user &&
-                challenge.path.split("；").include?(user_list.origin_path)}
+            game_codes = results.user_lists.select {|user_list| user_list.user_id == user &&
+              challenge.path.split("；").include?(user_list.origin_path)}
             # 先判断用户该关卡是否查重了  取多个待补充文件的平均值
             if game_codes.count > 0
               user_rate += game_codes.map(&:rate).sum / challenge.path.split("；").length
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 21a919efd..edb3fba00 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -135,6 +135,7 @@ class PollsController < ApplicationController
         :course_id => @course.id,
         :polls_status => 1,
         :polls_type => "Course",
+        :un_anonymous => true
       }
       @poll = Poll.create!(poll_options)
     end
diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb
index d584072c2..3f0eec248 100644
--- a/app/controllers/weapps/attendances_controller.rb
+++ b/app/controllers/weapps/attendances_controller.rb
@@ -27,7 +27,7 @@ class Weapps::AttendancesController < ApplicationController
     tip_exception(403) if @user_course_identity >= Course::STUDENT
     current_date = Date.current
     current_end_time = Time.current.strftime("%H:%M:%S")
-    @current_attendance = @course.course_attendances.where("attendance_date = '#{current_date}' and end_time > '#{current_end_time}'")
+    @current_attendance = @course.course_attendances.where("attendance_date > '#{current_date}' or (attendance_date = '#{current_date}' and end_time > '#{current_end_time}')")
                             .order("attendance_date asc, start_time asc")
 
     all_attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')")
diff --git a/app/models/hack_set.rb b/app/models/hack_set.rb
index 2c21c3c22..3349b0ae6 100644
--- a/app/models/hack_set.rb
+++ b/app/models/hack_set.rb
@@ -1,8 +1,8 @@
 class HackSet < ApplicationRecord
   validates_length_of :input, maximum: 1000, message: "不能超过1000个字符"
   validates_length_of :output, maximum: 1000, message: "不能超过1000个字符"
-  validates :input, presence: { message: "测试集输入不能为空" }
-  validates :output, presence: { message: "测试集输出不能为空" }
+  #validates :input, presence: { message: "测试集输入不能为空" }
+  validates_presence_of :output, message: "不能为空"
   validates_uniqueness_of :input, scope: [:hack_id, :input], message: "多个测试集的输入不能相同"
   # 编程题测试集
   belongs_to :hack
diff --git a/app/services/schools/school_statistic_service.rb b/app/services/schools/school_statistic_service.rb
index a5082108d..5d8a30141 100644
--- a/app/services/schools/school_statistic_service.rb
+++ b/app/services/schools/school_statistic_service.rb
@@ -2,7 +2,7 @@ class Schools::SchoolStatisticService < ApplicationService
   attr_reader :school
 
   def initialize(school)
-    @school = school.includes(:courses, user_extensions: :user)
+    @school = school
     @user_extensions = school.user_extensions
   end
 
@@ -26,14 +26,14 @@ class Schools::SchoolStatisticService < ApplicationService
     @user_extensions.map{|ue| ue.user.last_login_on&.between?(1.weeks.ago, Time.now)}.size
   end
 
-  # 活跃用户（近3个月有登录）
+  # 活跃用户（近1个月有登录）
   def acitve_user_1_months_count
-    @user_extensions.map{|ue| ue.user.last_login_on&.between?(1.months.ago, Time.now)}.size
+    @user_extensions.joins(:user).map{|ue| ue.user.last_login_on&.between?(1.months.ago, Time.now)}.size
   end
 
   # 活跃用户（近3个月有登录）
   def acitve_user_3_months_count
-    @user_extensions.map{|ue| ue.user.last_login_on&.between?(3.months.ago, Time.now)}.size
+    @user_extensions.map{|ue| ue.user&.last_login_on&.between?(3.months.ago, Time.now)}.size
   end
 
   # 活跃用户（进半年有登录记录）
@@ -52,10 +52,15 @@ class Schools::SchoolStatisticService < ApplicationService
   end
 
   # 实训作业数目
-  def hom_shixuns_count
+  def homw_shixuns_count
     @school.courses.joins(:homework_commons).where(homework_commons: {homework_type: 'practice'}).size
   end
 
+  # 其他类型作业
+  def homw_other_count
+    @school.courses.joins(:homework_commons).where.not(homework_commons: {homework_type: 'practice'}).size
+  end
+
   # 资源数
   def sources_count
     @school.courses.joins(:attachments).size
@@ -67,7 +72,7 @@ class Schools::SchoolStatisticService < ApplicationService
   end
 
   # 制作实训数
-  def shixun_count
+  def shixuns_count
     @user_extensions.joins(user: :shixuns).size
   end
 
@@ -83,17 +88,17 @@ class Schools::SchoolStatisticService < ApplicationService
 
   # 挑战的关卡数
   def games_count
-    @user_extensions.joins("join games on games.user_id = user_extensions.user_id").where(games: {status: 0..2})
+    @user_extensions.joins("join games on games.user_id = user_extensions.user_id").where(games: {status: 0..2}).size
   end
 
   # 通关的关卡数
   def pass_games_count
-    @user_extensions.joins("join games on games.user_id = user_extensions.user_id").where(games: {status: 2})
+    @user_extensions.joins("join games on games.user_id = user_extensions.user_id").where(games: {status: 2}).size
   end
 
   # 评测总数
-  def evalute_count
-    @user_extensions.joins("join games on games.user_id = user_extensions.user_id").sum(:evalute_count)
+  def evaluate_count
+    @user_extensions.joins("join games on games.user_id = user_extensions.user_id").sum(:evaluate_count).to_i
   end
 
 
diff --git a/db/migrate/20200306072044_add_index_for_sta_all.rb b/db/migrate/20200306072044_add_index_for_sta_all.rb
new file mode 100644
index 000000000..f4e62c8a9
--- /dev/null
+++ b/db/migrate/20200306072044_add_index_for_sta_all.rb
@@ -0,0 +1,5 @@
+class AddIndexForStaAll < ActiveRecord::Migration[5.2]
+  def change
+    add_index :sta_alls, :school_id, :unique => true
+  end
+end
diff --git a/db/migrate/20200306131654_add_user_id_index_for_games.rb b/db/migrate/20200306131654_add_user_id_index_for_games.rb
new file mode 100644
index 000000000..ec92a1a08
--- /dev/null
+++ b/db/migrate/20200306131654_add_user_id_index_for_games.rb
@@ -0,0 +1,5 @@
+class AddUserIdIndexForGames < ActiveRecord::Migration[5.2]
+  def change
+    add_index :games, :user_id
+  end
+end
diff --git a/et --hard 8e0cf37 b/et --hard 8e0cf37
new file mode 100644
index 000000000..95a171a18
--- /dev/null
+++ b/et --hard 8e0cf37	
@@ -0,0 +1,274 @@
+commit 8e0cf3730ba50f5fb95773d7ed3bfeab51cff640 (HEAD -> forge)
+Author: dingyongkang <837816638@qq.com>
+Date:   Tue Feb 25 17:14:50 2020 +0800
+
+    合并请求模块
+
+commit b0d10c14dd86c0db5bfa37da24587687e7570b60
+Merge: ba41688b4 8a3afcbf0
+Author: dingyongkang <837816638@qq.com>
+Date:   Wed Feb 19 20:02:46 2020 +0800
+
+    工单模块
+
+commit ba41688b4b6116d677585a826e53ee0a7c3c3f7d
+Author: dingyongkang <837816638@qq.com>
+Date:   Wed Feb 19 19:33:48 2020 +0800
+
+    工单部分
+
+commit 8a3afcbf00835d67725ea9464b9abac16eb2a89c
+Merge: 57415df2a 30ef541d4
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Wed Feb 19 19:12:18 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit 57415df2aa48aebc0b29a3d4725a06dcdb63d742
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Wed Feb 19 19:11:50 2020 +0800
+
+    issue的问题修复及pull_request的问题修复
+
+commit 30ef541d40a1c7063a20423e3b95c73da8e9bf8c
+Merge: 21ce82e9c ded428147
+Author: caicai8 <1149225589@qq.com>
+Date:   Wed Feb 19 17:38:45 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit 21ce82e9c15724fc3b10c02ab3d0b5ed6670e86e
+Author: caicai8 <1149225589@qq.com>
+Date:   Wed Feb 19 17:38:41 2020 +0800
+
+    动态列表
+
+commit ded4281470613992a416be8b383e863136e2cd81
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Wed Feb 19 17:30:53 2020 +0800
+
+    修改csv的乱码问题
+
+commit a5a5add7d662377ebd0a8b3796b761f043232f4a
+Merge: d4132a802 b435933a5
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Wed Feb 19 15:12:01 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit d4132a802e5afa2d5f79d4540827348b8395edb1
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Wed Feb 19 15:10:56 2020 +0800
+
+    分支切换添加loading
+
+commit b435933a54709da3ab4e167d1657348cea359de1
+Author: caicai8 <1149225589@qq.com>
+Date:   Wed Feb 19 15:04:46 2020 +0800
+
+    动态-分页
+
+commit b10091130e3bea8ff989ccd018505d19eb4dec29
+Merge: 92fea708c 0d060af2f
+Author: caicai8 <1149225589@qq.com>
+Date:   Wed Feb 19 11:59:48 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit 92fea708c48a27cd2fddb7ebb096dddc248129ca
+Author: caicai8 <1149225589@qq.com>
+Date:   Wed Feb 19 11:59:45 2020 +0800
+
+    文件
+
+commit a93837a062dacec33a277d50f504de9bf037f687
+Author: caicai8 <1149225589@qq.com>
+Date:   Wed Feb 19 11:59:35 2020 +0800
+
+    动态
+
+commit 0d060af2f926dc92482a76346abfc94d09cd32d1
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Tue Feb 18 18:43:56 2020 +0800
+
+    前端bug修复和后端问题
+
+commit 42e8a78477525c32d98d2299c3826f0dc4f6e38f
+Merge: 64d920039 d9e89e6fb
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Tue Feb 18 16:16:49 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit 64d920039a51196fff20b813938969e3c326e1c6
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Tue Feb 18 16:16:24 2020 +0800
+
+    一些bug修改
+
+commit d9e89e6fb7934d9e215dc1e7c7d1f61093154b9a
+Author: caicai8 <1149225589@qq.com>
+Date:   Tue Feb 18 16:12:18 2020 +0800
+
+    branch
+
+commit 43e9c90439890056c94a2265296bda2626aef447
+Author: caicai8 <1149225589@qq.com>
+Date:   Tue Feb 18 14:56:09 2020 +0800
+
+    从分支页面跳转到分支提交页面
+
+commit 2e42ad82cafa3c3a96813e517253d825dddf8e27
+Merge: 9a2dd0456 d3a9af7bb
+Author: caicai8 <1149225589@qq.com>
+Date:   Tue Feb 18 13:34:48 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit 9a2dd0456eb2e25490d697ad539ac0ccf7a047cf
+Author: caicai8 <1149225589@qq.com>
+Date:   Tue Feb 18 13:34:43 2020 +0800
+
+    package
+
+commit d3a9af7bb3b4e0600f5bb7a26a349fe87eb49bc5
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Tue Feb 18 10:54:38 2020 +0800
+
+    前端样式修改
+
+commit 5feb1f6e53b325822d305bbfcd4a6c644d9039dd
+Author: caicai8 <1149225589@qq.com>
+Date:   Mon Feb 17 16:38:53 2020 +0800
+
+    clone_url
+
+commit 2eefb0ed381211ec250470202e686c2465807c7d
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Fri Feb 14 19:03:58 2020 +0800
+
+    前端部分修改
+
+commit 9990e3b5c50aa0c9a2c1e9f7442fa85208fa6211
+Merge: 0f97b2edd 6a41049e1
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Fri Feb 14 14:46:52 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit 0f97b2eddae2551be9c155adf318d800f5dd8e58
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Fri Feb 14 14:46:17 2020 +0800
+
+    前端样式修复
+
+commit 6a41049e1de36eda58d728e7eba2285db2ac68fa
+Author: Jasder <2053003901@@qq.com>
+Date:   Thu Feb 13 22:48:40 2020 +0800
+
+    ADD some count
+
+commit 36860fe5c2995331e87d6437c48cacd9155f3a16
+Merge: 1f2a0c0e6 00cb5c061
+Author: Jasder <2053003901@@qq.com>
+Date:   Thu Feb 13 22:44:17 2020 +0800
+
+    Merge branch 'forge' of http://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit 00cb5c0610f63eae6d4139a9cf1c536f5e048833
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 18:53:01 2020 +0800
+
+    修改entry的错误
+
+commit 1f2a0c0e61ad320d6c54de0721c46c02677c43b6
+Merge: a72b4f682 5a8fcf994
+Author: Jasder <2053003901@@qq.com>
+Date:   Thu Feb 13 18:51:14 2020 +0800
+
+    fic bug
+
+commit 5a8fcf994fcce0829e620cb5dd507de93606ee33
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 18:09:10 2020 +0800
+
+    修改
+
+commit a72b4f68276babbf6c65ea877266af4251ba3410
+Merge: 9a2ff48de 36ccf249b
+Author: Jasder <2053003901@@qq.com>
+Date:   Thu Feb 13 18:01:51 2020 +0800
+
+    FIC merge bug
+
+commit 9a2ff48de8c3a3f9f9958489bbe235b1f72319f7
+Author: Jasder <2053003901@@qq.com>
+Date:   Thu Feb 13 17:59:20 2020 +0800
+
+    FIX 404 page bug
+
+commit 36ccf249bf68542b4b9324d89c478789db12887b
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 17:53:16 2020 +0800
+
+    注释current_laboratory
+
+commit adc7da1a3c541ed263daf8793bdb9af1e736900c
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 17:47:49 2020 +0800
+
+    修改appconfig.js
+
+commit 6e6649aa096921a994bed0119eafc288d5ac5a29
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 17:40:39 2020 +0800
+
+    注释get_user_info里的current_laboratory
+
+commit a447a0d10229275ad6c51903762c2175b2afb743
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 17:23:57 2020 +0800
+
+    change current_laboratory is nill error
+
+commit 567d20caea58782d1e99058cb76fb1e1307f7b09
+Merge: d66c0c2f3 0408f89cb
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 17:15:29 2020 +0800
+
+    Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit d66c0c2f31b717ed3fed6bcff74318a682768635
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 17:14:59 2020 +0800
+
+    修改settings/show.json
+
+commit 0408f89cb37041a92deea969619873849198d99c
+Merge: ef807c8ec 8933a1a91
+Author: Jasder <2053003901@@qq.com>
+Date:   Thu Feb 13 17:12:02 2020 +0800
+
+    Merge branch 'forge' of http://bdgit.educoder.net/Hjqreturn/educoder into forge
+
+commit ef807c8ecfc5fd5f1129d6ab4d2f1a6c16333dbd
+Author: Jasder <2053003901@@qq.com>
+Date:   Thu Feb 13 17:10:23 2020 +0800
+
+    ADD 工单，pull_requests 数据统计
+
+commit 8933a1a916baa4805ac45c1970542d25a447f703
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 16:45:27 2020 +0800
+
+    build
+
+commit 05266a3c3ff2e03573337965c4580d7cc771e4fb
+Author: sylor_huang@126.com <sylor_huang@126.com>
+Date:   Thu Feb 13 16:33:23 2020 +0800
+
+    issue标签和里程碑
+
+commit e2550b9d741835e1e59eed25a17e004d62dd0919
+Author: dingyongkang <837816638@qq.com>
+Date:   T
\ No newline at end of file
diff --git a/lib/tasks/school_statistic.rake b/lib/tasks/school_statistic.rake
deleted file mode 100644
index 3d017ad17..000000000
--- a/lib/tasks/school_statistic.rake
+++ /dev/null
@@ -1,8 +0,0 @@
-#coding=utf-8
-
-desc "同步高校数据"
-namespace :school_statistic do
-  task sync_records: :environment do
-
-  end
-end
diff --git a/lib/tasks/static_all.rake b/lib/tasks/static_all.rake
index 4c878841e..4db09001e 100644
--- a/lib/tasks/static_all.rake
+++ b/lib/tasks/static_all.rake
@@ -2,15 +2,24 @@ desc "统计每个学校使用数据"
 
 namespace :static_all do
   task :repo => :environment do
-    School.find_each(batch_size: 100) do |school|
-      User.joins(:user_extension).where(school_id: school.id)
-
-
-      report =  StaAll.find_or_initialize_by(school_id: school.id)
-
-      report.shixun_evaluate_count = evaluate_count
-
-      report.save
+    school_alls = School.includes(courses: [:homework_commons, :attachments, :course_videos], user_extensions: :user).all
+    proc_num = ENV['processes'].blank? ? 5 : ENV['processes'].to_i
+    school_alls.find_in_batches(batch_size: 50) do |schools|
+      Parallel.each(schools, in_processes: proc_num) do |school|
+        puts("school_id: #{school.id}")
+        data = Schools::SchoolStatisticService.new(school)
+        sta_all = StaAll.find_or_initialize_by(school_id: school.id)
+        attrs = {tea_count: data.teacher_count, stu_count: data.student_count, courses_count: data.courses_count,
+                 active_users_count: data.acitve_user_3_months_count, curr_courses_count: data.curr_courses_count,
+                 homw_shixuns_count: data.homw_shixuns_count, homw_other_count: data.homw_other_count,
+                 sources_count: data.sources_count, videos_count: data.videos_count, shixuns_count: data.shixuns_count,
+                 myshixuns_count: data.myshixuns_count, mys_passed_count: data.pass_myshixun_count,
+                 games_count: data.games_count, games_passed_count: data.pass_games_count, build_count: data.evaluate_count}
+        puts "sta_all: #{attrs}"
+        sta_all.assign_attributes(attrs)
+        sta_all.save!
+      end
     end
+
   end
 end
\ No newline at end of file
diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js
index e1ba02ef3..f8cec6702 100644
--- a/public/react/scripts/build.js
+++ b/public/react/scripts/build.js
@@ -221,12 +221,12 @@ function generateNewIndexJsp() {
     // <script type="text/javascript" src="/js/js_min_all.js"></script>
     var result = data
         .replace(jsMinAllRegex, code)
+        .replace(flvMinAllRegex,'')
         // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
         // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
         // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
         // TODO tpi 评测结果关闭也使用了fontawesome
-        .replace(flvMinAllRegex,``)
         .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
 			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index 288afcb10..1bb859b5e 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -1,8 +1,7 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 import './public-path';
-import logo from './logo.svg';
 import './App.css';
-import {ConfigProvider} from 'antd'
+import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
 	BrowserRouter as Router,
@@ -21,9 +20,7 @@ import Trialapplicationreview from './modules/user/Trialapplicationreview';
 import Addcourses from "./modules/courses/coursesPublic/Addcourses";
 import AccountProfile from "./modules/user/AccountProfile";
 import Accountnewprofile from './modules/user/Accountnewprofile';
-import Trialapplication from './modules/login/Trialapplication';
 import Certifiedprofessional from './modules/modals/Certifiedprofessional';
-import NotFoundPage from './NotFoundPage'
 
 import Loading from './Loading'
 
@@ -32,18 +29,18 @@ import Loadable from 'react-loadable';
 
 import moment from 'moment'
 
-import {MuiThemeProvider, createMuiTheme} from 'material-ui/styles';
+import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 
 // import './AppConfig'
 
 import history from './history';
 
-import {SnackbarHOC} from 'educoder'
-import {initAxiosInterceptors} from './AppConfig'
+import { SnackbarHOC } from 'educoder'
+import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
 // ！！！tpi需要这个来加载css
-import {TPMIndexHOC} from './modules/tpm/TPMIndexHOC';
+import { TPMIndexHOC } from './modules/tpm/TPMIndexHOC';
 const store = configureStore();
 
 const theme = createMuiTheme({
@@ -52,7 +49,7 @@ const theme = createMuiTheme({
 			main: '#4CACFF',
 			contrastText: 'rgba(255, 255, 255, 0.87)'
 		},
-		secondary: {main: '#4CACFF'}, // #11cb5f This is just green.A700 as hex.
+		secondary: { main: '#4CACFF' }, // #11cb5f This is just green.A700 as hex.
 	},
 });
 //
@@ -68,23 +65,23 @@ const EducoderLogin = Loadable({
 
 
 //微信登录
-const Otherlogin=Loadable({
+const Otherlogin = Loadable({
 	loader: () => import('./modules/login/Otherlogin'),
 	loading: Loading,
 })
 
 //微信登录
-const  Loginqq=Loadable({
+const Loginqq = Loadable({
 	loader: () => import('./modules/login/Loginqq'),
 	loading: Loading,
 })
 
 
-const Otherloginstart=Loadable({
+const Otherloginstart = Loadable({
 	loader: () => import('./modules/login/Otherloginstart'),
 	loading: Loading,
 })
-const Otherloginsqq=Loadable({
+const Otherloginsqq = Loadable({
 	loader: () => import('./modules/login/Otherloginqq'),
 	loading: Loading,
 })
@@ -103,24 +100,6 @@ const CommentComponent = Loadable({
 	loading: Loading,
 })
 
-// const TestMaterialDesignComponent = Loadable({
-// 	loader: () => import('./modules/test/md/TestMaterialDesign'),
-// 	loading: Loading,
-// })
-// const TestCodeMirrorComponent = Loadable({
-// 	loader: () => import('./modules/test/codemirror/TestCodeMirror'),
-// 	loading: Loading,
-// })
-
-// const TestComponent = Loadable({
-// 	loader: () => import('./modules/test/TestRC'),
-// 	loading: Loading,
-// })
-// const TestUrlQueryComponent = Loadable({
-// 	loader: () => import('./modules/test/urlquery/TestUrlQuery'),
-// 	loading: Loading,
-// })
-
 const TPMIndexComponent = Loadable({
 	loader: () => import('./modules/tpm/TPMIndex'),
 	loading: Loading,
@@ -254,7 +233,7 @@ const BanksIndex = Loadable({
 
 
 // 教学案例
-const MoopCases =  Loadable({
+const MoopCases = Loadable({
 	loader: () => import('./modules/moop_cases/index'),
 	loading: Loading,
 })
@@ -272,23 +251,23 @@ const Interestpage = Loadable({
 // })
 
 //竞赛
-const NewCompetitions=Loadable({
+const NewCompetitions = Loadable({
 	loader: () => import('./modules/competitions/Competitions'),
 	loading: Loading,
 })
 
 //黑客松定制竞赛
-const Osshackathon=Loadable({
+const Osshackathon = Loadable({
 	loader: () => import('./modules/osshackathon/Osshackathon'),
 	loading: Loading,
 })
 
-const Messagerouting= Loadable({
+const Messagerouting = Loadable({
 	loader: () => import('./modules/message/js/Messagerouting'),
 	loading: Loading,
 })
 
-const Topicbank= Loadable({
+const Topicbank = Loadable({
 	loader: () => import('./modules/topic_bank/Topic_bank'),
 	loading: Loading,
 })
@@ -321,28 +300,28 @@ const Questionitem_banks = Loadable({
 })
 
 //试卷库
-const Testpaperlibrary= Loadable({
+const Testpaperlibrary = Loadable({
 	loader: () => import('./modules/testpaper/Testpaperlibrary'),
 	loading: Loading
 })
 //试卷编辑
-const Paperlibraryeditid= Loadable({
+const Paperlibraryeditid = Loadable({
 	loader: () => import('./modules/testpaper/Paperlibraryeditid'),
 	loading: Loading
 })
 //试卷查看
-const Paperlibraryseeid= Loadable({
+const Paperlibraryseeid = Loadable({
 	loader: () => import('./modules/testpaper/Paperlibraryseeid'),
 	loading: Loading
 })
 //人工组卷
-const Paperreview= Loadable({
+const Paperreview = Loadable({
 	loader: () => import('./modules/question/Paperreview'),
 	loading: Loading
 })
 
 //智能组卷
-const Integeneration= Loadable({
+const Integeneration = Loadable({
 	loader: () => import('./modules/testpaper/Intecomponents'),
 	loading: Loading
 })
@@ -387,44 +366,44 @@ class App extends Component {
 	constructor(props) {
 		super(props)
 		this.state = {
-			Addcoursestype:false,
-			Addcoursestypes:false,
-			mydisplay:false,
-			occupation:0,
+			Addcoursestype: false,
+			Addcoursestypes: false,
+			mydisplay: false,
+			occupation: 0,
 			mygetHelmetapi: null,
 		}
 
 	}
-	HideAddcoursestypess=(i)=>{
+	HideAddcoursestypess = (i) => {
 		console.log("调用了");
 		this.setState({
-			Addcoursestype:false,
-			Addcoursestypes:false,
-			mydisplay:true,
-			occupation:i,
+			Addcoursestype: false,
+			Addcoursestypes: false,
+			mydisplay: true,
+			occupation: i,
 		})
 	};
-	hideAddcoursestypes=()=>{
+	hideAddcoursestypes = () => {
 		this.setState({
-			Addcoursestypes:false
+			Addcoursestypes: false
 		})
 	};
-	ModalCancelsy=()=>{
+	ModalCancelsy = () => {
 		this.setState({
-			mydisplay:false,
+			mydisplay: false,
 		})
 		window.location.href = "/";
 	};
-	ModalshowCancelsy=()=>{
+	ModalshowCancelsy = () => {
 		this.setState({
-			mydisplay:true,
+			mydisplay: true,
 		})
 	};
 
 	disableVideoContextMenu = () => {
-		window.$( "body" ).on( "mousedown", "video",  function(event) {
-			if(event.which === 3) {
-				window.$('video').bind('contextmenu',function () { return false; });
+		window.$("body").on("mousedown", "video", function (event) {
+			if (event.which === 3) {
+				window.$('video').bind('contextmenu', function () { return false; });
 			} else {
 				window.$('video').unbind('contextmenu');
 			}
@@ -442,7 +421,7 @@ class App extends Component {
 		});
 
 		initAxiosInterceptors(this.props);
-	 this.getAppdata();
+		this.getAppdata();
 		//
 		// axios.interceptors.response.use((response) => {
 		// 	// console.log("response"+response);
@@ -464,9 +443,9 @@ class App extends Component {
 		});
 	}
 	//修改登录方法
-	Modifyloginvalue=()=>{
+	Modifyloginvalue = () => {
 		this.setState({
-			isRender:false,
+			isRender: false,
 		})
 	};
 
@@ -500,20 +479,20 @@ class App extends Component {
 		}
 		document.head.appendChild(link);
 	}
-  //获取当前定制信息
-	getAppdata=()=>{
+	//获取当前定制信息
+	getAppdata = () => {
 		let url = "/setting.json";
 		axios.get(url).then((response) => {
 			// console.log("app.js开始请求/setting.json");
 			// console.log("获取当前定制信息");
-			if(response){
-				if(response.data){
+			if (response) {
+				if (response.data) {
 					this.setState({
-						mygetHelmetapi:response.data.setting
+						mygetHelmetapi: response.data.setting
 					});
 					//存储配置到游览器
-					localStorage.setItem('chromesetting',JSON.stringify(response.data.setting));
-					localStorage.setItem('chromesettingresponse',JSON.stringify(response));
+					localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+					localStorage.setItem('chromesettingresponse', JSON.stringify(response));
 					try {
 						if (response.data.setting.tab_logo_url) {
 							this.gettablogourldata(response);
@@ -543,57 +522,57 @@ class App extends Component {
 	};
 
 	render() {
-   let{mygetHelmetapi}=this.state;
+		let { mygetHelmetapi } = this.state;
 		// console.log("appappapp");
 		// console.log(mygetHelmetapi);
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
-						<Accountnewprofile {...this.props}{...this.state}/>
-						<LoginDialog {...this.props} {...this.state}  Modifyloginvalue={()=>this.Modifyloginvalue()}></LoginDialog>
+						<Accountnewprofile {...this.props}{...this.state} />
+						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
 						<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
 						<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
 						<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
-						<Addcourses {...this.props} {...this.state}  HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}/>
-						<AccountProfile {...this.props} {...this.state}   />
-						<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy}/>
+						<Addcourses {...this.props} {...this.state} HideAddcoursestypess={(i) => this.HideAddcoursestypess(i)} />
+						<AccountProfile {...this.props} {...this.state} />
+						<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy} />
 						<Router>
 							<Switch>
 
 								{/*题库*/}
 								<Route path="/topicbank/:username/:topicstype"
-											render={
-												(props) => {
+									render={
+										(props) => {
 
-													return (<Topicbank {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
+											return (<Topicbank {...this.props} {...props} {...this.state} />)
+										}
+									}></Route>
 								{/*题库*/}
 								<Route path="/topicbank/:topicstype"
-											render={
-												(props) => {
+									render={
+										(props) => {
 
-													return (<Topicbank {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
+											return (<Topicbank {...this.props} {...props} {...this.state} />)
+										}
+									}></Route>
 								{/*/!*众包创新*!/*/}
 								{/*<Route path={"/crowdsourcing"} component={ProjectPackages}/>*/}
 								{/*竞赛*/}
 								<Route path={"/competitions"}
-											render={
-												(props) => {
+									render={
+										(props) => {
 
-													return (<NewCompetitions {...this.props} {...props} {...this.state} />)
-												}
-											}></Route>
+											return (<NewCompetitions {...this.props} {...props} {...this.state} />)
+										}
+									}></Route>
 
 								{/*黑客松定制竞赛*/}
 								<Route
 									path={"/osshackathon"}
 									render={
-										(props)=>{
-											return(
+										(props) => {
+											return (
 												<Osshackathon {...this.props} {...props} {...this.state} />
 											)
 										}
@@ -601,17 +580,17 @@ class App extends Component {
 								/>
 
 								{/*认证*/}
-								<Route path="/account" component={AccountPage}/>
+								<Route path="/account" component={AccountPage} />
 
 								{/*403*/}
-								<Route path="/403" component={Shixunauthority}/>
+								<Route path="/403" component={Shixunauthority} />
 
-								<Route path="/500" component={http500}/>
+								<Route path="/500" component={http500} />
 
 								{/*404*/}
-								<Route path="/nopage" component={Shixunnopage}/>
+								<Route path="/nopage" component={Shixunnopage} />
 
-								<Route path="/compatibility" component={CompatibilityPageLoadable}/>
+								<Route path="/compatibility" component={CompatibilityPageLoadable} />
 								<Route
 									path="/login"
 									render={
@@ -649,19 +628,19 @@ class App extends Component {
 
 											return (<InfosIndex {...this.props} {...props} {...this.state} />)
 										}
-								}></Route>
+									}></Route>
 
 								<Route path="/banks"
 									render={
 										(props) => {
 											return (<BanksIndex {...this.props} {...props} {...this.state} />)
 										}
-								}></Route>
+									}></Route>
 								{/*<Route*/}
-									{/*path="/personalcompetit"*/}
-									{/*render={*/}
-										{/*(props) => (<PersonalCompetit {...this.props} {...props} {...this.state}></PersonalCompetit>)*/}
-									{/*}*/}
+								{/*path="/personalcompetit"*/}
+								{/*render={*/}
+								{/*(props) => (<PersonalCompetit {...this.props} {...props} {...this.state}></PersonalCompetit>)*/}
+								{/*}*/}
 								{/*/>*/}
 								<Route
 									path="/changepassword"
@@ -679,93 +658,82 @@ class App extends Component {
 								<Route path="/shixuns/new" component={Newshixuns}>
 								</Route>
 								<Route path="/colleges/:id/statistics"
-											 render={
-												 (props) => (<College  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<College  {...this.props} {...props} {...this.state} />)
+									} />
 								{/* jupyter */}
 								<Route path="/tasks/:identifier/jupyter/"
 									render={
 										(props) => {
-											return (<JupyterTPI {...this.props} {...props} {...this.state}/>)
+											return (<JupyterTPI {...this.props} {...props} {...this.state} />)
 										}
 									}
 								/>
 
-								<Route path="/tasks/:stageId" component={IndexWrapperComponent}/>
+								<Route path="/tasks/:stageId" component={IndexWrapperComponent} />
 
 								{/*<Route path="/shixuns/:shixunId" component={TPMIndexComponent}>*/}
 								{/*</Route>*/}
 
 								<Route path="/shixuns/:shixunId"
-											 render={
-												 (props)=>(<TPMIndexComponent {...this.props} {...props} {...this.state}></TPMIndexComponent>)
-											 }
+									render={
+										(props) => (<TPMIndexComponent {...this.props} {...props} {...this.state}></TPMIndexComponent>)
+									}
 								></Route>
-								{/*列表页 实训项目列表*/}
-								{/*<Route path="/shixuns" component={TPMShixunsIndexComponent}/>*/}
-
-
 								<Route path="/shixuns"
-											 render={
-												 (props)=>(<TPMShixunsIndexComponent {...this.props} {...props} {...this.state}></TPMShixunsIndexComponent>)
-											 }
+									render={
+										(props) => (<TPMShixunsIndexComponent {...this.props} {...props} {...this.state}></TPMShixunsIndexComponent>)
+									}
 								></Route>
-
-
-
-
-
 								{/*实训课程（原实训路径）*/}
 								<Route path="/paths" component={ShixunPaths}></Route>
-
 								<Route path="/search"
-											render={
-												(props)=>(<SearchPage {...this.props} {...props} {...this.state}></SearchPage>)
-											}
+									render={
+										(props) => (<SearchPage {...this.props} {...props} {...this.state}></SearchPage>)
+									}
 								></Route>
-
 								{/*课堂*/}
 								<Route path="/courses" component={CoursesIndex} {...this.props}  {...this.state}></Route>
 
 								{/* <Route path="/forums" component={ForumsIndexComponent}>
 								</Route> */}
 								{/* 教学案例 */}
-								<Route path="/moop_cases"render={
-										(props) => (<MoopCases {...this.props} {...props} {...this.state} />)
-								}/>
+								<Route path="/moop_cases" render={
+									(props) => (<MoopCases {...this.props} {...props} {...this.state} />)
+								} />
 
 								<Route path="/forums"
 									render={
-										(props)=>(<ForumsIndexComponent {...this.props} {...props} {...this.state}></ForumsIndexComponent>)
+										(props) => (<ForumsIndexComponent {...this.props} {...props} {...this.state}></ForumsIndexComponent>)
 									}
 								>
 								</Route>
-								<Route path="/comment" component={CommentComponent}/>
+								<Route path="/comment" component={CommentComponent} />
 								{/*<Route path="/testMaterial" component={TestMaterialDesignComponent}/>*/}
 								{/*<Route path="/test" component={TestIndex}/>*/}
 								{/*<Route path="/testCodeMirror" component={TestCodeMirrorComponent}/>*/}
 								{/*<Route path="/testRCComponent" component={TestComponent}/>*/}
 								{/*<Route path="/testUrlQuery" component={TestUrlQueryComponent}/>*/}
 								{/*<Route*/}
-									{/*path="/registration"*/}
-									{/*render={*/}
-										{/*(props) => (<Registration {...this.props} {...props} {...this.state}></Registration>)*/}
-									{/*}*/}
+								{/*path="/registration"*/}
+								{/*render={*/}
+								{/*(props) => (<Registration {...this.props} {...props} {...this.state}></Registration>)*/}
+								{/*}*/}
 								{/*/>*/}
 
 								<Route path="/messages"
-											render={
-												(props)=>(<Messagerouting {...this.props} {...props} {...this.state}></Messagerouting>)
-											}
+									render={
+										(props) => (<Messagerouting {...this.props} {...props} {...this.state}></Messagerouting>)
+									}
 								></Route>
 								<Route path="/help/:type"
-											render={
-												(props)=>(<Help {...this.props} {...props} {...this.state}></Help>)
-											}/>
+									render={
+										(props) => (<Help {...this.props} {...props} {...this.state}></Help>)
+									} />
 								<Route path="/ecs"
-											render={
-												(props)=>(<Ecs {...this.props} {...props} {...this.state}></Ecs>)
-											}/>
+									render={
+										(props) => (<Ecs {...this.props} {...props} {...this.state}></Ecs>)
+									} />
 
 								<Route path="/problems/new/:id?"
 									render={
@@ -776,9 +744,9 @@ class App extends Component {
 								/>
 
 								<Route path="/myproblems/record_detail/:id"
-											 render={
-												 (props) => (<RecordDetail  {...this.props} {...props} {...this.state} />)
-											 }
+									render={
+										(props) => (<RecordDetail  {...this.props} {...props} {...this.state} />)
+									}
 								/>
 								<Route
 									path="/problems/:id/edit"
@@ -786,75 +754,71 @@ class App extends Component {
 										(props) => (<NewOrEditTask {...this.props} {...props} {...this.state} />)
 									} />
 								<Route path="/Integeneration/:type/:id"
-											 render={
-												 (props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
+									} />
 								<Route path="/paperreview/:type"
-											 render={
-												 (props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
-											 }/>
-								{/*<Route path="/paperlibrary/edit/:id"*/}
-								{/*			 render={*/}
-								{/*				 (props) => (<Paperlibraryeditid  {...this.props} {...props} {...this.state} />)*/}
-								{/*			 }/>*/}
-
-								{/*<Route path="/paperlibrary/see/:id"*/}
-								{/*			 render={*/}
-								{/*				 (props) => (<Paperlibraryseeid  {...this.props} {...props} {...this.state} />)*/}
-								{/*			 }/>*/}
+									render={
+										(props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
+									} />
+								<Route path="/paperlibrary/edit/:id"
+									render={
+										(props) => (<Paperlibraryeditid  {...this.props} {...props} {...this.state} />)
+									} />
+
+								<Route path="/paperlibrary/see/:id"
+									render={
+										(props) => (<Paperlibraryseeid  {...this.props} {...props} {...this.state} />)
+									} />
 
 								<Route path="/myproblems/:id/:tab?"
-											 render={
-												 (props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
-											 } />
-								{/*<Route path="/question/edit/:id"*/}
-								{/*			 render={*/}
-								{/*				 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)*/}
-								{/*			 } />*/}
-
-								{/*<Route path="/question/newitem"*/}
-								{/*			 render={*/}
-								{/*				 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)*/}
-								{/*			 } />*/}
-								{/*<Route path="/question/:type"*/}
-								{/*			 render={*/}
-								{/*				 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)*/}
-								{/*			 } />*/}
-								{/*<Route path="/paperlibrary"*/}
-								{/*			 render={*/}
-								{/*				 (props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)*/}
-								{/*			 }/>*/}
+									render={
+										(props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
+									} />
+								<Route path="/problemset/edit/:id"
+									render={
+										(props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
+									} />
+
+								<Route path="/problemset/newitem"
+									render={
+										(props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
+									} />
+								<Route path="/problemset/:type"
+									render={
+										(props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
+									} />
+								<Route path="/paperlibrary"
+									render={
+										(props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)
+									} />
 
 								<Route path="/Integeneration"
-											 render={
-												 (props) => (<Integeneration  {...this.props} {...props} {...this.state} />)
-											 }/>
+									render={
+										(props) => (<Integeneration  {...this.props} {...props} {...this.state} />)
+									} />
 
 								<Route path="/problems"
-											 render={
-												 (props) => (<Developer  {...this.props} {...props} {...this.state} />)
-											 }/>
-
-								{/*<Route path="/question"*/}
-								{/*			 render={*/}
-								{/*				 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)*/}
-								{/*			 }/>*/}
-
-
+									render={
+										(props) => (<Developer  {...this.props} {...props} {...this.state} />)
+									} />
 
+								<Route path="/problemset"
+									render={
+										(props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
+									} />
 								{/*<Route path="/wxcode/:identifier?" component={WXCode}*/}
 								{/*	render={*/}
 								{/*		(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/}
 								{/*	}*/}
 								{/*/>*/}
-
 								<Route exact path="/"
-											// component={ShixunsHome}
-											render={
-												(props)=>(<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)
-											}
+									// component={ShixunsHome}
+									render={
+										(props) => (<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)
+									}
 								/>
-								<Route component={Shixunnopage}/>
+								<Route component={Shixunnopage} />
 
 							</Switch>
 						</Router>
@@ -976,4 +940,4 @@ moment.defineLocale('zh-cn', {
 		doy: 4  // The week that contains Jan 4th is the first week of the year.
 	}
 });
-export default SnackbarHOC()(App) ;
+export default SnackbarHOC()(App);
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 9f37e7ead..f5510a039 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -258,16 +258,10 @@ export function initAxiosInterceptors(props) {
             }
             //
 					// console.log(config);
-					if (config.method === "post") {
-						if (requestMap[config.url] === true) { // 避免重复的请求  导致页面f5刷新 也会被阻止  显示这个方法会影响到定制信息
-							// console.log(config);
-							// console.log(JSON.parse(config));
-							// console.log(config.url);
-							// console.log("被阻止了是重复请求=================================");
+						if (requestMap[config.url] === true) {
 							return false;
 						}
-					}
-            // 非file_update请求
+          //   // 非file_update请求
             if (config.url.indexOf('update_file') === -1) {
                 requestMap[config.url] = true;
 
diff --git a/public/react/src/common/quillForEditor/font.css b/public/react/src/common/quillForEditor/font.css
new file mode 100644
index 000000000..08e78a5a2
--- /dev/null
+++ b/public/react/src/common/quillForEditor/font.css
@@ -0,0 +1,66 @@
+@charset "utf-8";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+    font-family:SimSun !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+    font-family:SimHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+    font-family:Microsoft YaHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+    font-family:KaiTi !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
+    content: "仿宋";
+    font-family:FangSong !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+    font-family:Arial !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+    font-family:Times New Roman !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
+    content: "sans-serif";
+    font-family:sans-serif !important;
+}
+
+.ql-font-SimSun {
+    font-family:SimSun !important;
+}
+.ql-font-SimHei {
+    font-family:SimHei !important;
+}
+.ql-font-Microsoft-YaHei {
+    font-family:Microsoft YaHei !important;
+}
+.ql-font-KaiTi {
+    font-family:KaiTi !important;
+}
+.ql-font-FangSong {
+    font-family:FangSong !important;
+}
+.ql-font-Arial {
+    font-family:Arial !important;
+}
+.ql-font-Times-New-Roman {
+    font-family:Times New Roman   !important;
+}
+.ql-font-sans-serif {
+    font-family:sans-serif  !important;
+}
diff --git a/public/react/src/common/quillForEditor/index.js b/public/react/src/common/quillForEditor/index.js
index 89a4f6224..ba37059ba 100644
--- a/public/react/src/common/quillForEditor/index.js
+++ b/public/react/src/common/quillForEditor/index.js
@@ -11,6 +11,7 @@ import 'quill/dist/quill.core.css'; // 核心样式
 import 'quill/dist/quill.snow.css'; // 有工具栏
 import 'quill/dist/quill.bubble.css'; // 无工具栏
 import 'katex/dist/katex.min.css'; // katex 表达式样式
+import './font.css'
 import React, { useState, useRef, useEffect } from 'react';
 import Quill from 'quill';
 import katex from 'katex';
@@ -19,12 +20,12 @@ import { fetchUploadImage } from '../../services/ojService.js';
 import { getImageUrl } from 'educoder'
 import ImageBlot from './ImageBlot';
 import FillBlot from './FillBlot';
-const Size = Quill.import('attributors/style/size');
-const Font = Quill.import('formats/font');
+var Size = Quill.import('attributors/style/size');
 // const Color = Quill.import('attributes/style/color');
 Size.whitelist = ['14px', '16px', '18px', '20px', false];
-Font.whitelist = ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif'];
-
+var fonts = ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong'];
+var Font = Quill.import('formats/font');
+Font.whitelist = fonts; //将字体加入到白名单
 window.Quill = Quill;
 window.katex = katex;
 Quill.register(ImageBlot);
@@ -59,7 +60,7 @@ function QuillForEditor ({
     {align: []}, {list: 'ordered'}, {list: 'bullet'}, // 列表
     {script: 'sub'}, {script: 'super'},
     { 'color': [] }, { 'background': [] },
-		{ 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']},
+		{ 'font': []},
     {header: [1,2,3,4,5,false]},
     'blockquote', 'code-block',
     'link', 'image', 'video',
diff --git a/public/react/src/common/quillForEditor/quill.core.css b/public/react/src/common/quillForEditor/quill.core.css
new file mode 100644
index 000000000..516e388b6
--- /dev/null
+++ b/public/react/src/common/quillForEditor/quill.core.css
@@ -0,0 +1,18 @@
+.ql-editor .ql-font-Microsoft-YaHei {
+    font-family: "Microsoft YaHei";
+}
+.ql-editor .ql-font-SimSun {
+    font-family: "SimSun";
+}
+.ql-editor .ql-font-SimHei {
+    font-family: "SimHei";
+}
+.ql-editor .ql-font-KaiTi {
+    font-family: "KaiTi";
+}
+.ql-editor .ql-font-Arial {
+    font-family: "Arial";
+}
+.ql-editor .Times-New-Roman {
+    font-family: "Times New Roman";
+}
diff --git a/public/react/src/common/quillForEditor/quill.snow.css b/public/react/src/common/quillForEditor/quill.snow.css
new file mode 100644
index 000000000..962b40f99
--- /dev/null
+++ b/public/react/src/common/quillForEditor/quill.snow.css
@@ -0,0 +1,28 @@
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+    content: '微软雅黑';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+}
diff --git a/public/react/src/modal/GotoQQgroup.js b/public/react/src/modal/GotoQQgroup.js
index 0ac34da65..bab39b08f 100644
--- a/public/react/src/modal/GotoQQgroup.js
+++ b/public/react/src/modal/GotoQQgroup.js
@@ -1,31 +1,25 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import { Modal} from 'antd';
-import axios from 'axios';
+import { getImageUrl } from 'educoder';
+import { Modal } from 'antd';
 import '../modules/user/account/common.css';
 import './gotoqqgroup.css'
 class GotoQQgroup extends Component {
 
 	constructor(props) {
 		super(props);
-		this.state={
-
-		}
 	}
 
-	modalCancel=()=>{
+	modalCancel = () => {
 		try {
 			this.props.setgoshowqqgtounp(false);
-		}catch (e) {
-
+		} catch (e) {
 		}
 	}
 
-	setDownload=()=>{
-		//立即联系
+	setDownload = () => {
 		try {
 			this.props.setgoshowqqgtounp(false);
-		}catch (e) {
+		} catch (e) {
 
 		}
 	}
@@ -33,7 +27,7 @@ class GotoQQgroup extends Component {
 
 	render() {
 
-		return(
+		return (
 			<Modal
 				keyboard={false}
 				closable={false}
@@ -41,16 +35,16 @@ class GotoQQgroup extends Component {
 				destroyOnClose={true}
 				title="提示"
 				centered={true}
-				visible={this.props.goshowqqgtounp===undefined?false:this.props.goshowqqgtounp}
+				visible={this.props.goshowqqgtounp === undefined ? false : this.props.goshowqqgtounp}
 				width="530px"
 			>
 				<div className="educouddiv intermediatecenter verticallayout">
 					<div className="tabeltext-alignleft mt10"><p>您可以在QQ服务群向管理员申请，获得继续操作的权限</p></div>
-					<img  width={"200px"} className="mt10" src={getImageUrl("images/educoder/qqqun20191230.png")}/>
+					<img width={"200px"} className="mt10" src={getImageUrl("images/educoder/qqqun20191230.png")} />
 
 					<div className="tabeltext-alignleft mt10"><p>群号：612934990</p></div>
 					<div className="clearfix mt30 edu-txt-center">
-						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
+						<a className="task-btn mr30" onClick={() => this.modalCancel()}>取消</a>
 						<a className="task-btn task-btn-orange" target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">立即联系</a>
 					</div>
 				</div>
diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js
index ea49e862b..9c18313fe 100644
--- a/public/react/src/modules/courses/boards/index.js
+++ b/public/react/src/modules/courses/boards/index.js
@@ -98,12 +98,12 @@ class Boards extends Component{
     this.fetchBoards()
     this.fetchAll()
 
-    on('updateNavSuccess', this.updateNavSuccess)
+    // on('updateNavSuccess', this.updateNavSuccess)
   }
 
-  componentWillUnmount() {
-    off('updateNavSuccess', this.updateNavSuccess)
-  }
+  // componentWillUnmount() {
+  //   off('updateNavSuccess', this.updateNavSuccess)
+  // }
   updateNavSuccess = () => {
     this.fetchBoards()
     if (this.props.match.params.boardId == this.state.boardid) {
@@ -112,7 +112,7 @@ class Boards extends Component{
   }
 
   componentDidUpdate = (prevProps) => {
-		if ( prevProps.match.params.boardId != this.props.match.params.boardId ) {
+		if ( prevProps.match.params.boardId !== this.props.match.params.boardId ) {
       this.setState({
         isSpin:true
       })
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index 80c250134..999ae4e15 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -499,7 +499,6 @@ class Coursesleftnav extends Component{
   }
 
   cannerNavmoda=()=>{
-
     this.setState({
       Navmodalnametype:false,
       NavmodalValuetype:false,
@@ -525,6 +524,7 @@ class Coursesleftnav extends Component{
   }
 
   saveNavmodapost=(url,value,positiontype,coursesId)=>{
+
     axios.post(url,
       {name:value}).then((result)=>{
       	if(result!=undefined){
@@ -539,13 +539,13 @@ class Coursesleftnav extends Component{
 						if(positiontype==="files"){
               this.updasaveNavmoda()
               trigger('updateNavSuccess')
-							window.location.href=`/courses/${coursesId}/file/${result.data.category_id}`;
+							this.props.history.push(`/courses/${coursesId}/file/${result.data.category_id}`);
 						}
 
 					  if(positiontype==="boards"){
               this.updasaveNavmoda()
               trigger('updateNavSuccess')
-							window.location.href=`/courses/${coursesId}/boards/${result.data.category_id}`;
+							this.props.history.push(`/courses/${coursesId}/boards/${result.data.category_id}`);
 						}
 
             if(positiontype!="course_groups"){
@@ -585,7 +585,6 @@ class Coursesleftnav extends Component{
   }
 
   saveNavmoda=()=>{
-    debugger;
     let {Navmodaltypename,setnavid,NavmodalValue}=this.state;
     let id =setnavid;
 
@@ -950,17 +949,15 @@ class Coursesleftnav extends Component{
            {/*    ""*/}
            {/*}*/}
 
-           {
-             Navmodalnametype===true?<style>
-               {
+           <style>
+              {
                  `
               body {
-							    width: calc(100%) !important;
+                  width: calc(100%) !important;
 							}
               `
                }
-             </style>:""
-           }
+            </style>
            <Modal
              keyboard={false}
              title={Navmodalname}
diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js
index f03608c8b..db0f9afd6 100644
--- a/public/react/src/modules/courses/coursesPublic/Addcourses.js
+++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js
@@ -269,13 +269,19 @@ class Addcourses extends Component{
           this.props.history.push('/courses/2704/boards/8367/messages/42072')
           return;
         }
-				if(response.data.course_id!=undefined){
-					this.submitasyn(response.data.course_id)
-				}
 				notification.open({
 					message:"提示",
 					description:response.data.message
-				});
+        });
+				if(response.data.course_id!=undefined){
+					this.submitasyn(response.data.course_id)
+        }
+        // else{
+        //   // 无返回课程id则是选择的教师或者助教身份，成功后跳转到课堂首页
+        //   // console.log(this.props);
+        //   // console.log(this.props.history.push);
+			  //   window.location.href="/courses";
+        // }
 				if(Addcoursestype===true){
 					this.props.hideAddcoursestype();
 				}
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 873b1d9d7..e599bfa93 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -73,8 +73,8 @@ class CoursesNew extends Component {
                         period: data.class_period===undefined?'':data.class_period===null?'':data.class_period===null?'':data.class_period==="null"?'':data.class_period+"",
                         credit: data.credit===undefined?'':data.credit===null?'':data.credit===null?'':data.credit==="null"?'':data.credit+"",
                         checkboxgroup: data.course_module_types,
-                        Realnamecertification: data.authentication,
-                        Professionalcertification:data.professional_certification,
+                        // Realnamecertification: data.authentication,
+                        // Professionalcertification:data.professional_certification,
                         endtime: data.end_date === undefined ? "" : moment(data.end_date, dateFormat),
                         school:data.school
 
@@ -84,8 +84,8 @@ class CoursesNew extends Component {
                         datatime: data.end_date,
 											  dataname:data.name,
                         is_public: data.is_public === 1 ? true : false,
-                        Realnamecertification: data.authentication,
-                        Professionalcertification:data.professional_certification,
+                        // Realnamecertification: data.authentication,
+                        // Professionalcertification:data.professional_certification,
                         addonAfteronelenone: data.class_period===undefined?'':data.class_period===null?'':data.class_period===null?'':data.class_period==="null"?'':data.class_period,
                         addonAfteronelentwo:data.credit===undefined?'':data.credit===null?'':data.credit===null?'':data.credit==="null"?'':data.credit,
 
@@ -237,8 +237,8 @@ class CoursesNew extends Component {
                             end_date: datatime===undefined?"":datatime,
                             is_public: is_public === true || is_public === 1 ? 1 : 0,
                             course_module_types: values.checkboxgroup,
-                            authentication: this.state.Realnamecertification,
-                            professional_certification: this.state.Professionalcertification,
+                            // authentication: this.state.Realnamecertification,
+                            // professional_certification: this.state.Professionalcertification,
                             school:values.school
                         }
                     ).then((response) => {
@@ -313,8 +313,8 @@ class CoursesNew extends Component {
                             end_date: datatime===undefined?"":datatime,
                             is_public: is_public === true || is_public === 1 ? 1 : 0,
                             course_module_types: values.checkboxgroup,
-                            authentication: this.state.Realnamecertification,
-                            professional_certification: this.state.Professionalcertification,
+                            // authentication: this.state.Realnamecertification,
+                            // professional_certification: this.state.Professionalcertification,
                             school:values.school
                         }
                     ).then((response) => {
@@ -953,7 +953,7 @@ class CoursesNew extends Component {
                                         )}
                                     </Form.Item>
                                 </div>
-                                <div className="stud-class-set bor-bottom-greyE padding10200 coursenavbox  height100px" >
+                                {/* <div className="stud-class-set bor-bottom-greyE padding10200 coursenavbox  height100px" >
                                     <span  className={"fl"}>
                                     <Form.Item
                                         label="加入课堂条件"
@@ -978,7 +978,7 @@ class CoursesNew extends Component {
                                         )}
                                     </Form.Item>
                                    </span>
-                                </div>
+                                </div> */}
                                 <div className="stud-class-set padding10200 coursenavbox bor-bottom-greyE">
                                     <Form.Item
                                         label="公开设置"
diff --git a/public/react/src/modules/developer/newOrEditTask/index.js b/public/react/src/modules/developer/newOrEditTask/index.js
index 565d6af30..b95668413 100644
--- a/public/react/src/modules/developer/newOrEditTask/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 新建或编辑任务
- * @Author: tangjiang 
- * @Date: 2019-11-15 16:38:34 
+ * @Author: tangjiang
+ * @Date: 2019-11-15 16:38:34
  * @Last Modified by: tangjiang
  * @Last Modified time: 2019-11-19 23:23:41
  */
@@ -20,7 +20,7 @@ import actions from '../../../redux/actions';
 // import {ModalConfirm} from '../../../common/components/ModalConfirm';
 
 const NewOrEditTask = (props) => {
-  const { 
+  const {
     publishLoading,
     handlePublish,
     // testCases = [],
@@ -41,7 +41,7 @@ const NewOrEditTask = (props) => {
     courseQuestions
     // updateTestAndValidate,
   } = props;
-  
+
   // 表单提交
   const handleSubmitForm = () => {
     // 改变loading状态
@@ -53,7 +53,7 @@ const NewOrEditTask = (props) => {
       props.handleFormSubmit(props); // 提交表单
     }
   };
-  
+
   useEffect(() => {
     // 获取用户信息
     getUserInfoForNew();
@@ -121,7 +121,7 @@ const NewOrEditTask = (props) => {
     // 清空描述信息
     toStore('oj_description', '');
     // props.history.push('/problems');
-    props.history.push(`/question?${props.searchParams}`);
+    props.history.push(`/problemset?${props.searchParams}`);
   }
 
   // 发布
@@ -163,8 +163,8 @@ const NewOrEditTask = (props) => {
           onClick={handleClickCancel}
           style={{ background: '#666666', color: '#fff', border: 'none' }}
         >取消</Button>
-        <Button 
-          type="primary" 
+        <Button
+          type="primary"
           loading={submitLoading}
           onClick={handleSubmitForm}
         >保存</Button>
@@ -174,14 +174,14 @@ const NewOrEditTask = (props) => {
   // 发布/模拟挑战
   const renderPubOrFight = () => {
     const pubButton = isPublish
-     ? (<Button 
+     ? (<Button
           style={{ background: 'rgba(102,102,102,1)', border: 'none' }}
-          type="primary" 
+          type="primary"
           loading={publishLoading}
           onClick={handleClickCancelPublish}
        >撤销发布</Button>)
-     : (<Button 
-          type="primary" 
+     : (<Button
+          type="primary"
           loading={publishLoading}
           onClick={handleClickPublish}
        >立即发布</Button>);
@@ -191,13 +191,13 @@ const NewOrEditTask = (props) => {
     ) : (
       <Button type="primary" onClick={imitationChallenge}>模拟挑战</Button>
     );
-  
+
     if (isPublish) {
       return (
         <React.Fragment>
           {pubButton}
-          <Button 
-              type="primary" 
+          <Button
+              type="primary"
               loading={submitLoading}
               onClick={handleSubmitForm}
             >保存</Button>
@@ -207,8 +207,8 @@ const NewOrEditTask = (props) => {
     } else {
       return (
         <React.Fragment>
-          <Button 
-              type="primary" 
+          <Button
+              type="primary"
               loading={submitLoading}
               onClick={handleSubmitForm}
             >保存</Button>
@@ -217,7 +217,7 @@ const NewOrEditTask = (props) => {
         </React.Fragment>
       );
     }
-    
+
   }
 
   // 渲染退出
@@ -296,7 +296,7 @@ const mapDispatchToProps = (dispatch) => ({
   clearOJFormStore: () => dispatch(actions.clearOJFormStore()),
   // 按钮状态
   changeSubmitLoadingStatus: (flag) => dispatch(actions.changeSubmitLoadingStatus(flag)),
-  // 发布按钮状态 
+  // 发布按钮状态
   changePublishLoadingStatus: (flag) => dispatch(actions.changePublishLoadingStatus(flag)),
   // 测试用例及验证
   updateTestAndValidate: (obj) => dispatch(actions.updateTestAndValidate(obj)),
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
index a16f30c18..0e2203de0 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 添加测试用例
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-21 09:19:38
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 10:37:41
@@ -19,14 +19,14 @@ const AddTestDemo = (props) => {
   const {
     // key,
     // onSubmitTest,
-    onDeleteTest, 
+    onDeleteTest,
     testCase,
     testCaseValidate,
     isOpen
   } = props;
 
   // const [isEditor, setIsEditor] = useState(false); // 是否是编辑
-  
+
   // 删除操作
   const handleDeletePanel = (e) => {
     // console.log('点击的删除按钮')
@@ -63,7 +63,7 @@ const AddTestDemo = (props) => {
     const value = e.target.value;
     testCaseOutputChange(value, index);
   }
-  
+
   // 右侧删除图标
   const genExtra = () => (
     <Icon
@@ -127,7 +127,7 @@ const AddTestDemo = (props) => {
    * 文本输入框可编辑的情况
    *  1. 新增时
    *  2. isAdd 为 false 且 isEditor 为true 时
-   * @param {*} testCase 
+   * @param {*} testCase
    */
   // const isDisabled = (testCase) => {
   //   return !testCase.isAdd && !isEditor;
@@ -138,21 +138,19 @@ const AddTestDemo = (props) => {
   //   defaultActiveKey: [isOpen ? '1' : '']
   // };
   // console.log(activePane);
-  
+
   // 切换手风琴
   const handleChangeCollapse = () => {
     const {index, updateOpenTestCaseIndex} = props;
     updateOpenTestCaseIndex(index);
   }
-  
+
   return (
     <Collapse className={'collapse_area'} activeKey={isOpen?'1':''} onChange={() => handleChangeCollapse()}>
       <Panel header={`测试用例${props.index + 1}`} extra={genExtra()} key="1">
         <Form>
           <FormItem
             label={<span className={'label_text'}>输入</span>}
-            validateStatus={testCaseValidate.input.validateStatus}
-            help={testCaseValidate.input.errMsg}
             colon={ false }
           >
             <TextArea
diff --git a/public/react/src/modules/developer/studentStudy/index.js b/public/react/src/modules/developer/studentStudy/index.js
index 184ce0af5..b646ce969 100644
--- a/public/react/src/modules/developer/studentStudy/index.js
+++ b/public/react/src/modules/developer/studentStudy/index.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 学员学习
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-23 10:53:19
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-02-10 18:24:01
@@ -37,7 +37,7 @@ function StudentStudy (props) {
   } = props;
 
   const {
-    match: { params }, 
+    match: { params },
     getUserProgramDetail,
     saveUserProgramIdentifier
   } = props;
@@ -48,7 +48,18 @@ function StudentStudy (props) {
     // 保存当前的id
     saveUserProgramIdentifier(id);
     // startProgramQuestion(id);
-    getUserProgramDetail(id);
+		// console.log("getUserProgramDetail(id)");
+		// console.log(id);
+		// console.log(id.charAt(id.length-1));
+		try {
+			if(id.charAt(id.length-1)==="?"){
+				id = id.substring(0, id.length - 1);
+			}
+		}catch (e) {
+
+		}
+
+		getUserProgramDetail(id);
     const $searchs = window.location.search && window.location.search.substring(1);
     if ($searchs) {
       const $params = $searchs.split('&') || [];
@@ -108,9 +119,9 @@ function StudentStudy (props) {
     changeShowOrHideControl(false);
     props.saveEditorCodeForDetail('');
     props.clearOjForUserReducer();
-    props.history.push(`/problems/${identifier}/edit?{searchParams}`);
+    props.history.push(`/problems/${identifier}/edit`);
   }
-  // 处理退出 
+  // 处理退出
   const handleClickQuit = () => {
     // 退出时，清空内容
     props.clearOjForUserReducer();
@@ -118,7 +129,7 @@ function StudentStudy (props) {
     changeShowOrHideControl(false);
     props.saveEditorCodeForDetail('');
     // props.history.push('/problems');
-    props.history.push(`/question?${searchParams}`);
+    props.history.push(`/problemset?${searchParams}`);
   }
 
   return (
@@ -136,9 +147,9 @@ function StudentStudy (props) {
         </div>
         <div className={'study_quit'}>
           {/* to={`/problems/${_hack_id}/edit`} */}
-          <span 
+          <span
             style={{ display: userInfo.hack_manager ? 'inline-block' : 'none' }}
-            onClick={() => handleClickEditor(hack.identifier)} 
+            onClick={() => handleClickEditor(hack.identifier)}
             className={`quit-btn`}
           >
             <Icon type="form" className="quit-icon"/> 编辑
@@ -161,7 +172,7 @@ function StudentStudy (props) {
             <LeftPane />
           </div>
           <SplitPane split="vertical" defaultSize="100%" allowResize={false}>
-            <RightPane 
+            <RightPane
               updateNotice={handleUpdateNotice}
             />
             <div />
@@ -182,7 +193,7 @@ const mapStateToProps = (state) => {
     user_program_identifier,
     hack_identifier,
     searchParams
-  }; 
+  };
 };
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/public/react/src/modules/modals/Bottomsubmit.js b/public/react/src/modules/modals/Bottomsubmit.js
index 187910cb9..22fb7c8fd 100644
--- a/public/react/src/modules/modals/Bottomsubmit.js
+++ b/public/react/src/modules/modals/Bottomsubmit.js
@@ -12,9 +12,13 @@ class Bottomsubmit extends Component {
 
   cannelfun = () => {
     // window.location.href=
-		if(this.props.Cohetepaperbool===true){
-			this.props.setCohetepaperbool(false);
-		}else {
+		try {
+			if(this.props.Cohetepaperbool===true){
+				this.props.setCohetepaperbool(false);
+			}else {
+				this.props.history.replace(this.props.url);
+			}
+		}catch (e) {
 			this.props.history.replace(this.props.url);
 		}
 
diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js
index a7e944826..9ba9eec03 100644
--- a/public/react/src/modules/paths/ShixunPathSearch.js
+++ b/public/react/src/modules/paths/ShixunPathSearch.js
@@ -1,164 +1,178 @@
 import React, { Component } from 'react';
 import axios from 'axios';
-import {Dropdown,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
+import { Dropdown, Menu } from 'antd';
+import { getImageUrl } from 'educoder';
 import PathCard from "./ShixunPathCard";
 import UpgradeModals from '../modals/UpgradeModals';
 import Pagination from '@icedesign/base/lib/pagination';
 import '@icedesign/base/lib/pagination/style.js';
 import './ShixunPaths.css';
+import KeywordList from '../tpm/shixuns/shixun-keyword-list';
+import btnUrl from '../tpm/shixuns/btn-new.png';
 
-class ShixunPathSearch extends Component{
+class ShixunPathSearch extends Component {
   constructor(props) {
-      super(props)
-      this.state = {
-        order:"updated_at",
-        select:undefined,
-        search:"",
-        page:1,
-        pathList:null,
-        sortList:'',
-        total_count:0,
-        sort:"desc",
-        limit:16,
-        discipline_id:undefined,
-        sub_discipline_id:undefined
-      }
+    super(props)
+    this.state = {
+      order: "updated_at",
+      select: undefined,
+      search: "",
+      page: 1,
+      pathList: null,
+      sortList: '',
+      total_count: 0,
+      sort: "desc",
+      limit: 16,
+      discipline_id: undefined,
+      sub_discipline_id: undefined
+    }
   }
 
-
-  //切换列表状态
-  changeStatus=(value)=>{
-
-    let {discipline_id,sub_discipline_id }=this.state;
+  //适配器
+  onChangeLabel(value) {
+    let rs = value === 'new' ? 'updated_at' : 'myshixuns_scount'
+    let { discipline_id, sub_discipline_id } = this.state;
     this.setState({
-      order:value,
-      page:1
+      order: rs,
+      page: 1
     })
-    this.getList(value,discipline_id,sub_discipline_id,1);
+    this.getList(rs, discipline_id, sub_discipline_id, 1)
   }
 
-
   //选择页数
-  onChange=(pageNumber)=> {
+  onChange = (pageNumber) => {
 
-    let { order,discipline_id,sub_discipline_id }=this.state;
+    let { order, discipline_id, sub_discipline_id } = this.state;
     this.setState({
-      page:pageNumber
+      page: pageNumber
     })
-    this.getList(order,discipline_id,sub_discipline_id,pageNumber);
+    this.getList(order, discipline_id, sub_discipline_id, pageNumber);
   }
 
   //顶部分类
-  changeSelect=(e,tag_id,sum)=>{
+  changeSelect = (e, tag_id, sum) => {
 
     this.setState({
-      order:"updated_at",
-      discipline_id:tag_id,
-      page:1,
-      sub_discipline_id:undefined
+      order: "updated_at",
+      discipline_id: tag_id,
+      page: 1,
+      sub_discipline_id: undefined
     })
-    let { order }=this.state;
-    this.getList(order,tag_id,undefined,1 );
+    let { order } = this.state;
+    this.getList(order, tag_id, undefined, 1);
     e.stopPropagation();
   }
 
 
-  componentDidMount(){
-		document.title="实践课程";
-		const upsystem=`/users/system_update.json`;
-		axios.get(upsystem).then((response)=>{
-			let updata=response.data;
-			this.setState({
-				updata:updata
-			})
-		}).catch((error)=>{
-			console.log(error);
-		})
+  componentDidMount() {
+    document.title = "实践课程";
+    const upsystem = `/users/system_update.json`;
+    axios.get(upsystem).then((response) => {
+      let updata = response.data;
+      this.setState({
+        updata: updata
+      })
+    }).catch((error) => {
+      console.log(error);
+    })
     this.getdisciplines()
-		let { order,discipline_id,sub_discipline_id,page }=this.state;
-    this.getList(order,discipline_id,sub_discipline_id,page );
+    let { order, discipline_id, sub_discipline_id, page } = this.state;
+    this.getList(order, discipline_id, sub_discipline_id, page);
 
   }
 
-  getdisciplines=()=>{
-    let url='/disciplines.json';
-    axios.get(url,{params:{
-        source:"subject"
-      }}).then((result)=>{
-      if(result.status==200){
-          // console.log(result.data.disciplines)
+  getdisciplines = () => {
+    let url = '/disciplines.json';
+    axios.get(url, {
+      params: {
+        source: "subject"
+      }
+    }).then((result) => {
+      if (result.status == 200) {
+        // console.log(result.data.disciplines)
         this.setState({
-          sortList:result.data.disciplines
+          sortList: result.data.disciplines
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
-  getList=(order,discipline_id,sub_discipline_id,page )=>{
+  OnSearchInput = (value, type) => {
+    this.setState({
+      search: value,
+      page: 1
+    })
+    const { order, discipline_id, sub_discipline_id } = this.state
+    this.getList(order, discipline_id, sub_discipline_id, 1, value)
+  }
 
-    let url='/paths.json';
-    axios.get(url,{params:{
-        sort:"desc",
-        limit:16,
-        order:order,
-				page:page,
-        discipline_id:discipline_id,
-        sub_discipline_id:sub_discipline_id
-			}}).then((result)=>{
-      if(result.status==200){
+  getList = (order, discipline_id, sub_discipline_id, page, keyword = '') => {
+
+    let url = '/paths.json';
+    axios.get(url, {
+      params: {
+        sort: "desc",
+        limit: 16,
+        order: order,
+        keyword,
+        page: page,
+        discipline_id: discipline_id,
+        sub_discipline_id: sub_discipline_id
+      }
+    }).then((result) => {
+      if (result.status == 200) {
         this.setState({
-          pathList:result.data.subjects,
-          total_count:result.data.total_count
+          pathList: result.data.subjects,
+          total_count: result.data.total_count
         })
       }
-    }).catch((error)=>{
+    }).catch((error) => {
       console.log(error);
     })
   }
 
   //头部获取是否已经登录了
-  getUser=(url,type)=>{
-    if(this.props.checkIfLogin()===false){
+  getUser = (url) => {
+    if (this.props.checkIfLogin() === false) {
       this.props.showLoginDialog()
       return
     }
-    if(this.props.checkIfProfileCompleted()===false){
+    if (this.props.checkIfProfileCompleted() === false) {
       this.props.showProfileCompleteDialog()
       return
     }
 
-    if(url !== undefined || url!==""){
+    if (url !== undefined || url !== "") {
       this.props.history.push(url);
     }
 
 
   }
 
-  getshixunchildValues=(e,id,item)=>{
+  getshixunchildValues = (e, id, item) => {
 
     this.setState({
-      discipline_id:item.id,
-      sub_discipline_id:id,
+      discipline_id: item.id,
+      sub_discipline_id: id,
     })
-    let { order,page }=this.state;
-    this.getList(order,item.id,id,page );
+    let { order, page } = this.state;
+    this.getList(order, item.id, id, page);
     e.stopPropagation();
   }
 
-  getmenu=(list,item)=>{
-    return(
+  getmenu = (list, item) => {
+    return (
       <Menu>
         <Menu.Item>
           <div className="mt5 subshaicontent-part">
             <div className="sub-Item clearfix">
               {
-                list.map((tag,e)=>{
-                  return(
-                    <a className={parseInt(this.state.sub_discipline_id)===tag.id?"shixun_repertoire mr20 color-blue":"shixun_repertoire mr20"}
-                       key={e} id={tag.id} name={tag.id} rel="subshaicontent" onClick={(e)=>this.getshixunchildValues(e,tag.id,item)}>{tag.name}</a>
+                list.map((tag, e) => {
+                  return (
+                    <a className={parseInt(this.state.sub_discipline_id) === tag.id ? "shixun_repertoire mr20 color-blue" : "shixun_repertoire mr20"}
+                      key={e} id={tag.id} name={tag.id} rel="subshaicontent" onClick={(e) => this.getshixunchildValues(e, tag.id, item)}>{tag.name}</a>
                   )
                 })
               }
@@ -166,18 +180,18 @@ class ShixunPathSearch extends Component{
           </div>
         </Menu.Item>
       </Menu>
-      )
+    )
   }
-	render() {
-    let { order,sortList,search,page,total_count,discipline_id }=this.state;
-    let pathstype=false;
-    if(this.props&&this.props.mygetHelmetapi!=null){
-      let paths="/paths";
-      this.props.mygetHelmetapi.navbar.map((item,key)=>{
+  render() {
+    let { order, sortList, search, page, total_count, discipline_id } = this.state;
+    let pathstype = false;
+    if (this.props && this.props.mygetHelmetapi != null) {
+      let paths = "/paths";
+      this.props.mygetHelmetapi.navbar.map((item, key) => {
         var reg = RegExp(item.link);
-        if(paths.match(reg)){
-          if(item.hidden===true){
-            pathstype=true
+        if (paths.match(reg)) {
+          if (item.hidden === true) {
+            pathstype = true
           }
         }
 
@@ -185,21 +199,21 @@ class ShixunPathSearch extends Component{
     }
 
     return (
-        <div>
-					{this.state.updata===undefined?"":<UpgradeModals
-							{...this.state}
-						/>}
+      <div>
+        {this.state.updata === undefined ? "" : <UpgradeModals
+          {...this.state}
+        />}
 
-					<style>
-						{
-							`
+        <style>
+          {
+            `
 					     ::-webkit-scrollbar {
                       width: 0px !important;
                }
 							.pathImg{
 									width: 100%;
 									height: 300px;
-									background-image: url(${getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url===null?`images/path/path.png`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url)});
+									background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.subject_banner_url === null ? `images/path/path.png` : this.props.mygetHelmetapi && this.props.mygetHelmetapi.subject_banner_url)});
 									background-color: #000a4f;
 									/* background-size: cover; */
 									background-position: center;
@@ -217,57 +231,39 @@ class ShixunPathSearch extends Component{
 								}
 								a{text-decoration:none !important;}
 							`
-						}
-					</style>
-          <div className="pr">
-            <div className="pathImg"></div>
-            <div className="edu-back-white padding20 pathIndexNav">
-              <ul className="educontent clearfix">
-                  <li className={discipline_id > 0 ? "" : "active"}><a onClick={(e)=>this.changeSelect(e,undefined)}>全部</a></li>
-                  {
-                    sortList && sortList.map((item,key)=>{
-                      return(
-                        <li className={discipline_id == `${item.id}` ? "active" : ""}  onClick={(e)=>this.changeSelect(e,`${item.id}`,item.sub_disciplines.length)} key={key}>
-                          <Dropdown disabled={item.sub_disciplines.length===0} overlay={()=>this.getmenu(item.sub_disciplines,item)} placement="bottomCenter">
-                            <a value={item.id}>{item.name}</a>
-                          </Dropdown>
-                        </li>
-                      )
-                    })
-                  }
-              </ul>
-            </div>
-          </div>
-          <div className="mt20 educontent mb20 clearfix mainPageArray">
-            {/*<a href="javascript:void(0)" className={ order == "publish_time" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("publish_time")}>全部</a>*/}
-            {/*<a href="javascript:void(0)" className={ order == "mine" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} onClick={ () => this.changeStatus("mine")}>我的</a>*/}
-            <span className={ order == "updated_at" ? "active" : ""} onClick={ () => this.changeStatus("updated_at")}>最新</span>
-            <span className={ order == "myshixuns_count" ? "active" : ""} onClick={ () => this.changeStatus("myshixuns_count")}>最热</span>
-            {this.props.user&&this.props.user.main_site===false?"":this.props.Headertop===undefined?"":<a className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/paths/new")}>+新建实践课程</a>}
-            {this.props.user&&this.props.user.main_site===true?"":this.props.Headertop===undefined?"":
-              pathstype===true?"":this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?<a className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/paths/new")}>+新建实践课程</a>:""
-            }
-            {/*<div className="fr mr5 search-new">*/}
-              {/*/!* <Search*/}
-              {/*placeholder="请输入路径名称进行搜索"*/}
-              {/*id="subject_search_input"*/}
-              {/*value={search}*/}
-              {/*onInput={this.inputSearchValue}*/}
-              {/*onSearch={this.searchValue}*/}
-              {/*autoComplete="off"*/}
-              {/*></Search> *!/*/}
-            {/*</div>*/}
+          }
+        </style>
+        <div className="pr">
+          <div className="pathImg"></div>
+          <div className="edu-back-white padding20 pathIndexNav">
+            <ul className="educontent clearfix">
+              <li className={discipline_id > 0 ? "" : "active"}><a onClick={(e) => this.changeSelect(e, undefined)}>全部</a></li>
+              {
+                sortList && sortList.map((item, key) => {
+                  return (
+                    <li className={discipline_id == `${item.id}` ? "active" : ""} onClick={(e) => this.changeSelect(e, `${item.id}`, item.sub_disciplines.length)} key={key}>
+                      <Dropdown disabled={item.sub_disciplines.length === 0} overlay={() => this.getmenu(item.sub_disciplines, item)} placement="bottomCenter">
+                        <a value={item.id}>{item.name}</a>
+                      </Dropdown>
+                    </li>
+                  )
+                })
+              }
+            </ul>
           </div>
-          <PathCard {...this.props} {...this.state}></PathCard>
-          {
-						this.state.pathList===null?"":total_count > 16 &&
+        </div>
+        <KeywordList btnUrl={btnUrl} onChangeLabel={this.onChangeLabel.bind(this)} OnSearchInput={this.OnSearchInput.bind(this)} onNewHandler={this.getUser.bind(this, '/paths/new')} btnStyle={{ top: '92px' }} />
+
+        <PathCard {...this.props} {...this.state}></PathCard>
+        {
+          this.state.pathList === null ? "" : total_count > 16 &&
             <div className="educontent mb80 edu-txt-center mt10">
-							<Pagination  current={page} total={ total_count || 1299 } type="mini" pageSize={16}  onChange={this.onChange} />
+              <Pagination current={page} total={total_count || 1299} type="mini" pageSize={16} onChange={this.onChange} />
             </div>
-          }
+        }
 
-        </div>
-      )
+      </div>
+    )
   }
 }
 export default ShixunPathSearch;
diff --git a/public/react/src/modules/paths/statics/index.js b/public/react/src/modules/paths/statics/index.js
index 6b14f118c..5988f113d 100644
--- a/public/react/src/modules/paths/statics/index.js
+++ b/public/react/src/modules/paths/statics/index.js
@@ -23,7 +23,7 @@ const App = (props) => {
     total,
     staticList,
     changeParams,
-    initTotal
+    initTotal,
   } = props;
   // const [datas, setDatas] = useState([]);
   // const [sortedInfo, setSortedInfo] = useState({});
@@ -212,10 +212,12 @@ const App = (props) => {
       sorter: (a, b) => a.cost_time - b.cost_time
     }
   ];
-
+  
+ 
   useEffect(() => {
     changeParams({
-      page: 1
+      page: 1,
+      type: "subject_info"
     });
     pathId && staticList(pathId);
   }, []);
@@ -224,6 +226,7 @@ const App = (props) => {
     pathId && staticList(pathId);
   }
 
+
   // const {
   //   study_count,
   //   course_study_count,
@@ -334,8 +337,9 @@ const mapStateToProps = (state) => {
   return {
     subject_info,
     other_info,
-    total
+    total,
   }
+  
 };
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/public/react/src/modules/question/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js
index d50f41484..4307c5ba2 100644
--- a/public/react/src/modules/question/NewMyShixunModel.js
+++ b/public/react/src/modules/question/NewMyShixunModel.js
@@ -23,6 +23,7 @@ import Bottomsubmit from "../modals/Bottomsubmit";
 import QuestionModalys from "./component/QuestionModalys";
 
 //exam_id 试卷的id
+var 	Undoclickable=true;
 class NewMyShixunModel extends Component {
 	constructor(props) {
 		super(props);
@@ -162,11 +163,32 @@ class NewMyShixunModel extends Component {
 
 	//初始化
 	componentDidMount() {
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+		let isysladmins=false;
+		let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
 		let {defaultActiveKey} = this.props;
 		var defaultActiveKeys=defaultActiveKey;
+	 try {
+		 if(this.props){
+			 if(this.props.current_user){
+				 if(this.props.current_user.admin){
+					 isysladmins=true;
+				 }
+				 else if(this.props.current_user.business){
+					 isysladmins=true;
+				 }
+			 }
+		 }
+		 if(is_teacher===false){
+			 if(this.props.current_user.user_identity !=="学生"){
+				 //专业人士
+				 is_teacher=true
+			 }
+		 }
+	 }catch (e) {
+
+	 }
+
 		if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
 			defaultActiveKeys="0"
 		}else{
@@ -206,12 +228,33 @@ class NewMyShixunModel extends Component {
 
 	componentDidUpdate(prevProps) {
 		if(prevProps.current_user !== this.props.current_user) {
-			debugger
-			const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-			const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+			let isysladmins=false;
+			let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 			const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
 			let {defaultActiveKey} = this.props;
 			var defaultActiveKeys=defaultActiveKey;
+			try {
+				if(this.props){
+					if(this.props.current_user){
+						if(this.props.current_user.admin){
+							isysladmins=true;
+						}
+						else if(this.props.current_user.business){
+							isysladmins=true;
+						}
+					}
+				}
+				if(is_teacher===false){
+					if(this.props.current_user.user_identity !=="学生"){
+						//专业人士
+						is_teacher=true
+					}
+				}
+			}catch (e) {
+
+			}
+
+
 			if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
 				defaultActiveKeys="0"
 			}else{
@@ -219,6 +262,12 @@ class NewMyShixunModel extends Component {
 			}
 			this.callback(defaultActiveKeys);
 		}
+		if(prevProps.Contentdata !== this.props.Contentdata){
+			this.setState({
+				Contentdata:this.props.Contentdata,
+			})
+
+		}
 	}
 
 	//公共和我的
@@ -680,7 +729,35 @@ class NewMyShixunModel extends Component {
 	}
 
 
-	//选用
+
+	// 不选用  Question.js页面也有个
+	NOgetitem_baskets=(data)=>{
+		let url="/examination_banks/cancel_items.json";
+
+		axios.post(url, data)
+			.then((result) => {
+				if (result.data.status == 0) {
+					var data = {
+						discipline_id:this.state.discipline_id,
+						sub_discipline_id:this.state.sub_discipline_id,
+						tag_discipline_id:this.state.tag_discipline_id,
+						public: this.state.defaultActiveKey,
+						difficulty: this.state.difficulty,
+						item_type: this.state.item_type,
+						keyword: this.state.keywords,
+						page: this.state.page,
+						per_page:10,
+						exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
+					};
+					this.getdatasy(data);
+					this.getbasket_listdata();
+				}
+			}).catch((error) => {
+			////console.log(error);
+		})
+	}
+
+	//选用    Question.js页面也有个
 	getitem_baskets=(data)=>{
 		//选用题型可以上传单个 或者多个题型
 		let url="";
@@ -694,7 +771,6 @@ class NewMyShixunModel extends Component {
 		axios.post(url, data)
 			.then((result) => {
 				if (result.data.status == 0) {
-					// this.props.showNotification(`选用成功`);
 					var data = {
 						discipline_id:this.state.discipline_id,
 						sub_discipline_id:this.state.sub_discipline_id,
@@ -709,9 +785,6 @@ class NewMyShixunModel extends Component {
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
-					// this.setState({
-					// 	visible:true
-					// })
 				}
 			}).catch((error) => {
 			////console.log(error);
@@ -719,63 +792,84 @@ class NewMyShixunModel extends Component {
 	}
 	// 撤销
 	getitem_basketss=(id)=>{
+
 		let url="";
 		if(this.props.exam_id===undefined){
-			url=`/item_baskets/${id}.json`;
-			axios.delete(url)
-				.then((result) => {
-					if (result.data.status == 0) {
-						// this.props.showNotification(`撤销成功`);
-						var data = {
-							discipline_id:this.state.discipline_id,
-							sub_discipline_id:this.state.sub_discipline_id,
-							tag_discipline_id:this.state.tag_discipline_id,
-							public: this.state.defaultActiveKey,
-							difficulty: this.state.difficulty,
-							item_type: this.state.item_type,
-							keyword: this.state.keywords,
-							page: this.state.page,
-							per_page:10,
-							exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
-						};
-						this.getdatasy(data);
-						this.getbasket_listdata();
-					}
-				}).catch((error) => {
-				////console.log(error);
-			})
+			if(Undoclickable===true) {
+				Undoclickable = false;
+				url = `/item_baskets/${id}.json`;
+				axios.delete(url)
+					.then((result) => {
+						if (result.data.status == 0) {
+							// this.props.showNotification(`撤销成功`);
+							var data = {
+								discipline_id: this.state.discipline_id,
+								sub_discipline_id: this.state.sub_discipline_id,
+								tag_discipline_id: this.state.tag_discipline_id,
+								public: this.state.defaultActiveKey,
+								difficulty: this.state.difficulty,
+								item_type: this.state.item_type,
+								keyword: this.state.keywords,
+								page: this.state.page,
+								per_page: 10,
+								exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
+							};
+							this.getdatasy(data);
+							this.getbasket_listdata();
+						}
+						setTimeout(()=>{
+							Undoclickable=true;
+						},1000);
+
+					}).catch((error) => {
+					setTimeout(()=>{
+						Undoclickable=true;
+					},1000);
+
+				})
+			}
 		}else{
-			url=`/examination_banks/${this.props.exam_id}/revoke_item.json`;
-			axios.delete(url,{ data: {
-						item_id:id===undefined?"":parseInt(id),
-					}})
-				.then((result) => {
-					if (result.data.status == 0) {
-						// this.props.showNotification(`撤销成功`);
-						var data = {
-							discipline_id:this.state.discipline_id,
-							sub_discipline_id:this.state.sub_discipline_id,
-							tag_discipline_id:this.state.tag_discipline_id,
-							public: this.state.defaultActiveKey,
-							difficulty: this.state.difficulty,
-							item_type: this.state.item_type,
-							keyword: this.state.keywords,
-							page: this.state.page,
-							per_page:10,
-							exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
-						};
-						this.getdatasy(data);
-						this.getbasket_listdata();
-					}
-				}).catch((error) => {
-				////console.log(error);
-			})
+			if(Undoclickable===true) {
+				Undoclickable = false;
+				url = `/examination_banks/${this.props.exam_id}/revoke_item.json`;
+				axios.delete(url, {
+						data: {
+							item_id: id === undefined ? "" : parseInt(id),
+						}
+					})
+					.then((result) => {
+						if (result.data.status == 0) {
+							// this.props.showNotification(`撤销成功`);
+							var data = {
+								discipline_id: this.state.discipline_id,
+								sub_discipline_id: this.state.sub_discipline_id,
+								tag_discipline_id: this.state.tag_discipline_id,
+								public: this.state.defaultActiveKey,
+								difficulty: this.state.difficulty,
+								item_type: this.state.item_type,
+								keyword: this.state.keywords,
+								page: this.state.page,
+								per_page: 10,
+								exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
+							};
+							this.getdatasy(data);
+							this.getbasket_listdata();
+						}
+						setTimeout(()=>{
+							Undoclickable=true;
+						},1000);
+					}).catch((error) => {
+					setTimeout(()=>{
+						Undoclickable=true;
+					},1000);
+				})
+			}
 		}
 
 
 	}
 	//全选试题库
-	selectallquestionsonthispage=()=>{
+	selectallquestionsonthispage=(bool)=>{
 		var item_idsdata=[];
 
 		var arr= this.state.Contentdata.items;
@@ -783,6 +877,10 @@ class NewMyShixunModel extends Component {
 			if(data.item_type==="PROGRAM"){
 				//编程题
 				if(data.choosed===true){
+					if(data.program_attr.status===1){
+						//已发布
+						item_idsdata.push(data.id);
+					}
 
 				}else{
 					//未选用
@@ -796,7 +894,7 @@ class NewMyShixunModel extends Component {
 			}else{
 				//不是编程题
 				if(data.choosed===true){
-
+					item_idsdata.push(data.id);
 				}else{
 					//未选用
 					item_idsdata.push(data.id);
@@ -808,10 +906,21 @@ class NewMyShixunModel extends Component {
 			item_ids:item_idsdata,
 			exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
 		}
-		this.getitem_baskets(data);
-		this.setState({
-			selectallquestionsonthispages:true,
-		})
+
+
+		if(bool===false){
+			this.getitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages:true,
+			})
+		}else{
+			this.NOgetitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages:false,
+			})
+		}
+
+
 	}
 
 	//全选的状态
@@ -884,7 +993,7 @@ class NewMyShixunModel extends Component {
 			page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes,basket_list,
 			completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
 			program_questions_count, single_questions_count, subjective_questions_count,selectionbools,
-			modalsTypeInaudit
+			modalsTypeInaudit,Contentdata
 		} = this.state;
 
 		const Datacount = completion_questions_count + judgement_questions_count
@@ -893,6 +1002,8 @@ class NewMyShixunModel extends Component {
 			+ single_questions_count
 			+ subjective_questions_count;
 
+    // console.log("弹出框");
+    // console.log(Contentdata)
 		return (
 			<div className="newMain clearfix "    ref={this.saveContainer}>
 
@@ -962,12 +1073,13 @@ class NewMyShixunModel extends Component {
 				/>
 				{/*头部*/}
 				<Contentpart {...this.state} {...this.props}
+										 Contentdata={Contentdata}
 										 exam_id={this.props.exam_id}
 										 Isitapopup={"true"}
 										 chakanjiexiboolindex={this.state.chakanjiexiboolindex}
 										 chakanjiexibool={(e)=>this.chakanjiexibool(e)}
 										 getitem_basketss={(id)=>this.getitem_basketss(id)}
-										 selectallquestionsonthispage={()=>this.selectallquestionsonthispage()}
+										 selectallquestionsonthispage={(bool)=>this.selectallquestionsonthispage(bool)}
 										 getitem_baskets={(e)=>this.getitem_baskets(e)}
 										 setdatafuns={(e) => this.setdatafuns(e)}
 										 setdatafunsval={(e) => this.setdatafunsval(e)}
diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js
index 33f137cd1..fadba71ca 100644
--- a/public/react/src/modules/question/Paperreview.js
+++ b/public/react/src/modules/question/Paperreview.js
@@ -27,6 +27,7 @@ import Comthetestpaperst from "./comthetestpaper/Comthetestpaperst";
 import NewMyShixunModel from "../question/NewMyShixunModel";
 import IntelligentModel from "../question/component/IntelligentModel"
 //人工组卷预览
+let Changes=true;
 class Paperreview extends Component {
 	constructor(props) {
 		super(props);
@@ -235,7 +236,9 @@ class Paperreview extends Component {
 						.then((result) => {
 							if (result.data.status === 0) {
 								// this.props.showNotification(`组卷成功`);
-								this.props.history.replace('/paperlibrary');
+								// console.log(result.data.exam_id);
+								//本来调试卷库首页的
+								this.props.history.replace('/paperlibrary/see/'+result.data.exam_id);
 							}
 						}).catch((error) => {
 						//console.log(error);
@@ -331,20 +334,30 @@ class Paperreview extends Component {
 	}
 	//换题
 	Changingtopics=(id)=>{
-		const url=`/examination_intelligent_settings/${this.props.match.params.id}/exchange_one_item.json`;
-		let data={
-			item_id:id,
+		if(Changes===true){
+			Changes=false;
+			const url=`/examination_intelligent_settings/${this.props.match.params.id}/exchange_one_item.json`;
+			let data={
+				item_id:id,
+			}
+			axios.post(url, data)
+				.then((result) => {
+					if (result.data.status == 0) {
+						//console.log(result);
+						var data = {}
+						this.getdata(data);
+					}
+					setTimeout(()=>{
+						Changes=true;
+					},1000);
+				}).catch((error) => {
+				//console.log(error);
+				setTimeout(()=>{
+					Changes=true;
+				},1000);
+			})
 		}
-		axios.post(url, data)
-			.then((result) => {
-				if (result.data.status == 0) {
-					//console.log(result);
-					var data = {}
-					this.getdata(data);
-				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+
 	}
 
 	setIntelligentformation=(bool)=>{
@@ -384,7 +397,7 @@ class Paperreview extends Component {
 					{
 						newmyshixunmodelbool===true?
 							<div className="fangdatwo">
-								<NewMyShixunModel {...this.props} {...this.state} exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
+								<NewMyShixunModel {...this.props} {...this.state} Contentdata={this.state.Contentdata} exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
 							</div>
 							:
 							""
@@ -407,7 +420,7 @@ class Paperreview extends Component {
 									artificialtype==="artificial"?
 										<Breadcrumb separator=">">
 											<Breadcrumb.Item >试题库</Breadcrumb.Item>
-											<Breadcrumb.Item className={"xiaoshou"} href="/question">人工组卷</Breadcrumb.Item>
+											<Breadcrumb.Item className={"xiaoshou"} href="/problemset">人工组卷</Breadcrumb.Item>
 											<Breadcrumb.Item className={"xiaoshout"}>试卷预览</Breadcrumb.Item>
 										</Breadcrumb>
 										:
@@ -418,7 +431,7 @@ class Paperreview extends Component {
 										</Breadcrumb>
 									:
 									<Breadcrumb separator=">">
-										<Breadcrumb.Item href="/question">试题库</Breadcrumb.Item>
+										<Breadcrumb.Item href="/problemset">试题库</Breadcrumb.Item>
 										<Breadcrumb.Item className={"xiaoshou"}>新增试卷</Breadcrumb.Item>
 									</Breadcrumb>
 							}
@@ -427,11 +440,12 @@ class Paperreview extends Component {
 
 						{
 							Cohetepaperbool===false?
-								<Paperreview_item {...this.state} {...this.props} Changingtopics={(e)=>this.Changingtopics(e)} Replacementtype={(e)=>this.Replacementtype(e)} getdata={(data)=>this.getdata(data)} setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}>
+								<Paperreview_item {...this.state} {...this.props}  artificialtype={artificialtype} Changingtopics={(e)=>this.Changingtopics(e)} Replacementtype={(e)=>this.Replacementtype(e)} getdata={(data)=>this.getdata(data)} setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}>
 
 								</Paperreview_item>
 								:
 								<Comthetestpaperst {...this.state} {...this.props}
+
 																	 getJudquestio={(ref) => this.getcontentMdRef(ref)}
 																	setitem_type={(item) => this.setitem_type(item)}
 
@@ -449,7 +463,8 @@ class Paperreview extends Component {
 
 				<Bottomsubmit {...this.props} {...this.state} bottomvalue={Cohetepaperbool===false?"保存组卷":"完成"}
 											setCohetepaperbool={(bool)=>this.setCohetepaperbool(bool)}
-											onSubmits={() => this.preservation()} url={	artificialtype==="artificial"?'/question':'/paperlibrary'}></Bottomsubmit>
+											Cohetepaperbool={this.state.Cohetepaperbool}
+											onSubmits={() => this.preservation()} url={	artificialtype==="artificial"?'/problemset':'/paperlibrary'}></Bottomsubmit>
 			</div>
 		)
 
diff --git a/public/react/src/modules/question/Paperreview_item.js b/public/react/src/modules/question/Paperreview_item.js
index 0156b3211..a4c5e5773 100644
--- a/public/react/src/modules/question/Paperreview_item.js
+++ b/public/react/src/modules/question/Paperreview_item.js
@@ -85,9 +85,17 @@ class Paperreview_item extends Component {
 		const positions = this.props.single_questions.questions[result.destination.index].position;
 
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+		}else {
+			var data = {
+				position: positions
+			}
 		}
+
 		axios.post(url, data)
 			.then((result) => {
 				if (result.data.status == 0) {
@@ -104,8 +112,18 @@ class Paperreview_item extends Component {
 		const ids = this.props.multiple_questions.questions[result.source.index].id;
 		const positions = this.props.multiple_questions.questions[result.destination.index].position;
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+
+		}else {
+			var data = {
+				position: positions
+			}
+
 		}
 		axios.post(url, data)
 			.then((result) => {
@@ -125,8 +143,18 @@ class Paperreview_item extends Component {
 		const ids = this.props.judgement_questions.questions[result.source.index].id;
 		const positions = this.props.judgement_questions.questions[result.destination.index].position;
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+
+
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+
+		}else {
+			var data = {
+				position: positions
+			}
 		}
 		axios.post(url, data)
 			.then((result) => {
@@ -145,8 +173,18 @@ class Paperreview_item extends Component {
 		const ids = this.props.program_questions.questions[result.source.index].id;
 		const positions = this.props.program_questions.questions[result.destination.index].position;
 		const url = `/item_baskets/${ids}/adjust_position.json`
-		var data = {
-			position: positions
+
+
+
+		if(this.props.match.params.type==="Intelligence") {
+			var data = {
+				position: positions,
+				exam_setting_id:this.props.match.params.id,
+			}
+		}else {
+			var data = {
+				position: positions
+			}
 		}
 		axios.post(url, data)
 			.then((result) => {
@@ -176,22 +214,43 @@ class Paperreview_item extends Component {
 	}
 
 	setDownloady = (fenshu) => {
-		const url = "/item_baskets/batch_set_score.json";
-		var data = {
-			score: fenshu,
-			item_type: this.state.titilesm === "单选题" ? "SINGLE" : this.state.titilesm === "多选题" ? "MULTIPLE" : this.state.titilesm === "判断题" ? "JUDGMENT" : this.state.titilesm === "编程题" ? "PROGRAM" : '',
-
+		if(this.props.match.params.type==="Intelligence") {
+			//智能选题
+			const url = "/item_baskets/batch_set_score.json";
+			var data = {
+				score: fenshu,
+				item_type: this.state.titilesm === "单选题" ? "SINGLE" : this.state.titilesm === "多选题" ? "MULTIPLE" : this.state.titilesm === "判断题" ? "JUDGMENT" : this.state.titilesm === "编程题" ? "PROGRAM" : '',
+				exam_setting_id:this.props.match.params.id,
+			}
+			axios.post(url, data)
+				.then((result) => {
+					if (result.data.status == 0) {
+						// this.props.showNotification(`调分成功`);
+						this.props.getdata({});
+						this.Singlemagazine("", false);
+					}
+				}).catch((error) => {
+				//console.log(error);
+			})
+		}else{
+			const url = "/item_baskets/batch_set_score.json";
+			var data = {
+				score: fenshu,
+				item_type: this.state.titilesm === "单选题" ? "SINGLE" : this.state.titilesm === "多选题" ? "MULTIPLE" : this.state.titilesm === "判断题" ? "JUDGMENT" : this.state.titilesm === "编程题" ? "PROGRAM" : '',
+
+			}
+			axios.post(url, data)
+				.then((result) => {
+					if (result.data.status == 0) {
+						// this.props.showNotification(`调分成功`);
+						this.props.getdata({});
+						this.Singlemagazine("", false);
+					}
+				}).catch((error) => {
+				//console.log(error);
+			})
 		}
-		axios.post(url, data)
-			.then((result) => {
-				if (result.data.status == 0) {
-					// this.props.showNotification(`调分成功`);
-					this.props.getdata({});
-					this.Singlemagazine("", false);
-				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+
 	}
 
 	setDownloadys=(value)=>{
@@ -239,24 +298,49 @@ class Paperreview_item extends Component {
 				modalsTypedel: bool,
 				titilesms: names
 			})
-			const url = `/item_baskets/delete_item_type.json`;
-			axios.delete((url), {
-					data: {
-						item_type: names
-					}
-				})
-				.then((response) => {
-					if (response.data.status == 0) {
-						// this.props.showNotification('大题删除成功');
-						this.props.getdata({});
-						this.setState({
-							titilesms: ""
-						})
-					}
-				})
-				.catch(function (error) {
-					////console.log(error);
-				});
+			if(this.props.match.params.type==="Intelligence") {
+				//智能组卷
+				const url = `/item_baskets/delete_item_type.json`;
+				axios.delete((url), {
+						data: {
+							item_type: names,
+							exam_setting_id:this.props.match.params.id,
+						}
+					})
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('大题删除成功');
+							this.props.getdata({});
+							this.setState({
+								titilesms: ""
+							})
+						}
+					})
+					.catch(function (error) {
+						////console.log(error);
+					});
+
+			}else{
+				const url = `/item_baskets/delete_item_type.json`;
+				axios.delete((url), {
+						data: {
+							item_type: names
+						}
+					})
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('大题删除成功');
+							this.props.getdata({});
+							this.setState({
+								titilesms: ""
+							})
+						}
+					})
+					.catch(function (error) {
+						////console.log(error);
+					});
+			}
+
 
 
 
@@ -271,17 +355,35 @@ class Paperreview_item extends Component {
 			})
 		}else {
 			//确定
-			const url = `/item_baskets/${this.state.item_bank_id}.json`;
-			axios.delete((url))
-				.then((response) => {
-					if (response.data.status == 0) {
-						// this.props.showNotification('试题删除成功');
-						this.props.getdata({});
-					}
-				})
-				.catch(function (error) {
+			if(this.props.match.params.type==="Intelligence"){
+				//智能组卷
+				const url = `/item_baskets/${this.state.item_bank_id}.json`;
+				axios.delete(url, { data: {
+							exam_setting_id: this.props.match.params.id,
+						}})
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('试题删除成功');
+							this.props.getdata({});
+						}
+					})
+					.catch(function (error) {
+
+					});
+			}else{
+				const url = `/item_baskets/${this.state.item_bank_id}.json`;
+				axios.delete(url)
+					.then((response) => {
+						if (response.data.status == 0) {
+							// this.props.showNotification('试题删除成功');
+							this.props.getdata({});
+						}
+					})
+					.catch(function (error) {
+
+					});
+			}
 
-				});
 
 			this.setState({
 				modalsTypedels: bool,
@@ -291,7 +393,8 @@ class Paperreview_item extends Component {
 	}
 
 	showsetmodalsTypedels=(id,bool,type)=>{
-		debugger
+		console.log("Paperreview_item");
+
 		this.setState({
 			item_bank_id:id,
 		})
@@ -360,7 +463,7 @@ class Paperreview_item extends Component {
 	}
 
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
 	showparagraphs = (e,name) => {
@@ -394,6 +497,8 @@ class Paperreview_item extends Component {
 			modalsTypeys
 		} = this.state;
 		let {single_questions, multiple_questions, judgement_questions, program_questions, all_score} = this.props;
+		console.log("this.props");
+		console.log(this.props);
 		return (
 			<div className=" clearfix  educontent Contentquestionbankstyle w100s w1200wuh mt19">
 				{
diff --git a/public/react/src/modules/question/Paperreview_items.js b/public/react/src/modules/question/Paperreview_items.js
index 75ed4a248..ba377f35f 100644
--- a/public/react/src/modules/question/Paperreview_items.js
+++ b/public/react/src/modules/question/Paperreview_items.js
@@ -61,6 +61,9 @@ class Paperreview_items extends Component {
 		// //console.log(object);
 		// //console.log("Paperreview_items");
 		// //console.log(object.item_id);
+		//这里换题修改过
+		//这里删除修改过
+		// /Integeneration/Intelligence/ 换题item_id   删除item_id
 		return (
 			<div>
 				{
diff --git a/public/react/src/modules/question/Paperreview_single.js b/public/react/src/modules/question/Paperreview_single.js
index 4066658b9..7193229d8 100644
--- a/public/react/src/modules/question/Paperreview_single.js
+++ b/public/react/src/modules/question/Paperreview_single.js
@@ -18,6 +18,7 @@ import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import '../tpm/newshixuns/css/Newshixuns.css';
 import QuillForEditor from "../../common/quillForEditor";
+import QuestionModalPicture from "./component/QuestionModalPicture";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -35,6 +36,8 @@ class Paperreview_single extends Component {
 			questions: 0,
 			totalscore: 0,
 			total: 0,
+			url: ""
+
 		}
 
 	}
@@ -67,9 +70,20 @@ class Paperreview_single extends Component {
 	Singlemagaziness = () => {
 
 	}
-
+	handleShowUploadImage = (url) => {
+		// console.log('==============>>>>>>>>>>>>',url);
+		// setUrl(url);
+		this.setState({
+			url:url
+		})
+	}
+	handleClose=()=>{
+		this.setState({
+			url:'',
+		})
+	}
 	render() {
-		let {questions, totalscore, total, items} = this.state;
+		let {questions, totalscore, total, items,url} = this.state;
 		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
 
 
@@ -94,12 +108,30 @@ class Paperreview_single extends Component {
 		const options = [
 			'bold', // 加粗
 		]
+
+		try {
+			if(itemsnamesy.constructor === Object){
+				// console.log("是对象");
+				// console.log(itemsnamesy);
+			}else {
+				// console.log("不是对象");
+				// console.log(itemsnamesy);
+				itemsnamesy=itemsnamesy+"";
+			}
+		}catch (e) {
+
+		}
 		return (
 			<div key={indexxy}
 					 className={ "w100s borderwdswuh   mb20  pd20 "}
 					 onMouseEnter={() => this.props.showparagraphs(indexxy,name)} style={{
 				minHeight: "114px",
 			}}>
+				{url?
+					<QuestionModalPicture  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
+					:
+					""
+				}
 				<style>{
 					`
 						.programquill .ql-editor{
@@ -183,6 +215,7 @@ class Paperreview_single extends Component {
 										<QuillForEditor
 											readOnly={true}
 											value={itemssname}
+											showUploadImage={this.handleShowUploadImage}
 										/>
 								}
 
@@ -226,6 +259,7 @@ class Paperreview_single extends Component {
 													<QuillForEditor
 														readOnly={true}
 														value={itemsnamesy}
+														showUploadImage={this.handleShowUploadImage}
 													/>
 											}
 
@@ -257,6 +291,7 @@ class Paperreview_single extends Component {
 																	<QuillForEditor
 																		readOnly={true}
 																		value={string}
+																		showUploadImage={this.handleShowUploadImage}
 																	/>
 																	:""
 															:
diff --git a/public/react/src/modules/question/Question.js b/public/react/src/modules/question/Question.js
index e4a618f19..81d70bdb3 100644
--- a/public/react/src/modules/question/Question.js
+++ b/public/react/src/modules/question/Question.js
@@ -21,7 +21,9 @@ import NoneData from './component/NoneData';
 import './questioncss/questioncom.css';
 import SiderBars from "../question/component/SiderBars";
 import QuestionModalys from "./component/QuestionModalys";
+import Certifiedprofessional from "../modals/Certifiedprofessional";
 
+var 	Undoclickable=true;
 class Question extends Component {
 	constructor(props) {
 		super(props);
@@ -69,6 +71,11 @@ class Question extends Component {
 			isVisible: false,
 			selectionbools:false,
 			chakanjiexiboolindex:"无",
+			mydisplay:false,
+			occupation:2,
+
+
+
 		}
 
 	}
@@ -230,11 +237,9 @@ class Question extends Component {
 		}
 
 		axios.get((url), {params: data}).then((response) => {
-			setTimeout(()=>{
 				this.setState({
 					booljupyterurls:false,
 				})
-			},1000);
 			if (response === null || response === undefined) {
 
 				return
@@ -287,7 +292,10 @@ class Question extends Component {
 			})
 
 			this.getdataslen(response.data.items);
+			// Undoclickable=true;
+
 		}).catch((error) => {
+			// Undoclickable=true;
 
 		});
 	}
@@ -634,6 +642,7 @@ class Question extends Component {
 						single_questions_count: result.data.single_questions_count,
 						subjective_questions_count: result.data.subjective_questions_count,
 					})
+				// Undoclickable=true;
 
 			}).catch((error) => {
 			// ////console.log(error);
@@ -646,15 +655,13 @@ class Question extends Component {
 				single_questions_count: 0,
 				subjective_questions_count: 0,
 			})
+			// Undoclickable=true;
 		})
 
 	}
-
-
-   //选用
-	getitem_baskets=(data)=>{
-		//选用题型可以上传单个 或者多个题型
-		let url="/item_baskets.json";
+   // 不选用   NewMyShixunModel.js 页面也有个
+	NOgetitem_baskets=(data)=>{
+		let url="/examination_banks/cancel_items.json";
 
 		axios.post(url, data)
 			.then((result) => {
@@ -681,15 +688,16 @@ class Question extends Component {
 			////console.log(error);
 		})
 	}
-  // 撤销
-	getitem_basketss=(id)=>{
+
+   //选用   NewMyShixunModel.js 页面也有个
+	getitem_baskets=(data)=>{
 		//选用题型可以上传单个 或者多个题型
-		let url=`/item_baskets/${id}.json`;
+		let url="/item_baskets.json";
 
-		axios.delete(url)
+		axios.post(url, data)
 			.then((result) => {
 				if (result.data.status == 0) {
-					// this.props.showNotification(`撤销成功`);
+					// this.props.showNotification(`选用成功`);
 					var data = {
 						discipline_id:this.state.discipline_id,
 						sub_discipline_id:this.state.sub_discipline_id,
@@ -703,13 +711,62 @@ class Question extends Component {
 					};
 					this.getdatasy(data);
 					this.getbasket_listdata();
+					// this.setState({
+					// 	visible:true
+					// })
 				}
 			}).catch((error) => {
 			////console.log(error);
 		})
 	}
+  // 撤销
+	getitem_basketss=(id)=>{
+		this.setState({
+
+		})
+		if(Undoclickable===true){
+			Undoclickable=false;
+			//选用题型可以上传单个 或者多个题型
+			let url=`/item_baskets/${id}.json`;
+
+			axios.delete(url)
+				.then((result) => {
+					if (result.data.status == 0) {
+						// this.props.showNotification(`撤销成功`);
+						var data = {
+							discipline_id:this.state.discipline_id,
+							sub_discipline_id:this.state.sub_discipline_id,
+							tag_discipline_id:this.state.tag_discipline_id,
+							public: this.state.defaultActiveKey,
+							difficulty: this.state.difficulty,
+							item_type: this.state.item_type,
+							keyword: this.state.keywords,
+							page: this.state.page,
+							per_page:10,
+						};
+						this.getdatasy(data);
+						this.getbasket_listdata();
+					}
+					setTimeout(()=>{
+						Undoclickable=true;
+					},1000);
+				}).catch((error) => {
+				////console.log(error);
+				setTimeout(()=>{
+					Undoclickable=true;
+				},1000);
+
+			})
+
+		}else{
+
+		return
+		}
+
+
+	}
 	//全选试题库
-	selectallquestionsonthispage=()=>{
+	selectallquestionsonthispage=(bool)=>{
 		var item_idsdata=[];
 
 		var arr= this.state.Contentdata.items;
@@ -717,7 +774,10 @@ class Question extends Component {
 			if(data.item_type==="PROGRAM"){
 				//编程题
 				if(data.choosed===true){
-
+					if(data.program_attr.status===1){
+						//已发布
+						item_idsdata.push(data.id);
+					}
 				}else{
 					//未选用
 					if(data.program_attr.status===1){
@@ -730,7 +790,7 @@ class Question extends Component {
 			}else{
 				//不是编程题
 				if(data.choosed===true){
-
+					item_idsdata.push(data.id);
 				}else{
 					//未选用
 					item_idsdata.push(data.id);
@@ -741,10 +801,18 @@ class Question extends Component {
 		const data={
 			item_ids:item_idsdata
 		}
-		this.getitem_baskets(data);
-		this.setState({
-			selectallquestionsonthispages:true,
-		})
+		if(bool===false){
+			this.getitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages:true,
+			})
+		}else{
+			this.NOgetitem_baskets(data);
+			this.setState({
+				selectallquestionsonthispages:false,
+			})
+		}
+
 	}
 
 	//全选的状态
@@ -778,11 +846,38 @@ class Question extends Component {
 			});
 
 	}
+	HideAddcoursestypess=(i)=>{
+		console.log("调用了");
+		this.setState({
+			mydisplay:true,
+			occupation:i,
+		})
+	}
 
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
 
 	//跳转
 	gotopaperreview=()=>{
+    let isysladmins=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					isysladmins=true;
+				}
+				else if(this.props.current_user.business){
+					isysladmins=true;
+				}
+			}
+		}
 
+		if(this.props.current_user.professional_certification===false&&isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
 		this.props.history.replace("/paperreview/artificial");
 
 	}
@@ -817,7 +912,7 @@ class Question extends Component {
 			page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes,basket_list,
 			completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count,
 			program_questions_count, single_questions_count, subjective_questions_count,selectionbools,
-			modalsTypeInaudit
+			modalsTypeInaudit,mydisplay
 		} = this.state;
 
 		const Datacount = completion_questions_count + judgement_questions_count
@@ -825,23 +920,62 @@ class Question extends Component {
 			+ program_questions_count
 			+ single_questions_count
 			+ subjective_questions_count;
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
+		let isysladmins=false;
 		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
+		try {
+			if(this.props){
+				if(this.props.current_user){
+					if(this.props.current_user.admin){
+						isysladmins=true;
+					}
+					else if(this.props.current_user.business){
+						isysladmins=true;
+					}
+				}
+			}
+		}catch (e) {
 
+		}
 
 		return (
 			<div className="newMain clearfix"    ref={this.saveContainer}>
+				<style>{
+					`
+					.newHeaders{
+						position: fixed;
+						top: 0px;
+						z-index:  999 !important;
+						}
+					`
+				}</style>
+				{
+					mydisplay===true?
+						<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.mydisplayHidedel} />
+
+						:""
+				}
+				{
+					mydisplay===true?
+						<style>
+							{
+								`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+							}
+						</style>
+
+						:""
+				}
 				{
 					visible===true?
 						<style>
 							{
 								`
-						.newHeaders{
-						position: fixed;
-						top: 0px;
-						z-index:  999 !important;
-						}
+						
 						.ant-drawer {
     z-index: 800 !important;
 }
@@ -853,18 +987,17 @@ class Question extends Component {
 						 position: relative;
 							z-index: 9999999 ;
 						}
+						
 						`
 							}
 						</style>
 						:""
 				}
-				{
-					visible===true?
+
 				<div
 				style={{
-					marginTop: "60px"
+					marginTop: "81px"
 				}}></div>
-				:""}
 				{
 					modalsTypes===true?
 						<QuestionModals {...this.props}{...this.state} modalsTypes={modalsTypes} modalCancels={() => this.modalCancels()}
@@ -895,19 +1028,7 @@ class Question extends Component {
 						`
 					}
 				</style>
-				{
-					isysladmins===true?
-						<SiderBars
-							Datacount={Datacount}
-							myvisible={visible}
-							{...this.props}
-							{...this.state}
-							showDrawer={() => this.showDrawer()}
-							Headertop={Headertop}
-
-						/>
-						:
-						is_teacher===true&&professional_certification===true?
+
 							<SiderBars
 								Datacount={Datacount}
 								myvisible={visible}
@@ -917,11 +1038,6 @@ class Question extends Component {
 								Headertop={Headertop}
 
 							/>
-							:
-
-						""
-				}
-
 
 				{/*顶部*/}
 
@@ -943,7 +1059,7 @@ class Question extends Component {
 										 chakanjiexiboolindex={this.state.chakanjiexiboolindex}
 										 chakanjiexibool={(e)=>this.chakanjiexibool(e)}
 										 getitem_basketss={(id)=>this.getitem_basketss(id)}
-										 selectallquestionsonthispage={()=>this.selectallquestionsonthispage()}
+										 selectallquestionsonthispage={(bool)=>this.selectallquestionsonthispage(bool)}
 										 getitem_baskets={(e)=>this.getitem_baskets(e)}
 										 setdatafuns={(e) => this.setdatafuns(e)}
 										 setdatafunsval={(e) => this.setdatafunsval(e)}
@@ -974,7 +1090,7 @@ class Question extends Component {
 					{
 						`
 						 .ant-drawer-content-wrapper{
-						width: 200px !important;
+						width: 160px !important;
 						overflow：hidden;
 						margin-top: 62px;
 						}
@@ -1022,8 +1138,8 @@ class Question extends Component {
 									""
 									: <div className="sortinxdirection "  >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">单选题{'('}{single_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">单选题{'('}{single_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("SINGLE")}></i></p>
 									</div>
 							}
@@ -1033,8 +1149,8 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">多选题{'('}{multiple_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">多选题{'('}{multiple_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("MULTIPLE")}></i></p>
 									</div>
 							}
@@ -1044,8 +1160,8 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">判断题{'('}{judgement_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">判断题{'('}{judgement_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("JUDGMENT")}></i></p>
 									</div>
 							}
@@ -1055,8 +1171,8 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">填空题{'('}{completion_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">填空题{'('}{completion_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("COMPLETION")}></i></p>
 									</div>
 							}
@@ -1066,8 +1182,8 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">简答题{'('}{subjective_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">简答题{'('}{subjective_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("SUBJECTIVE")}></i></p>
 									</div>
 							}
@@ -1077,8 +1193,8 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection">
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">实训题{'('}{practical_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">实训题{'('}{practical_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor "></i></p>
 									</div>
 							}
@@ -1088,8 +1204,8 @@ class Question extends Component {
 									:
 									<div className="sortinxdirection" >
 										<p
-											className="w50s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">编程题{'('}{program_questions_count}{')'}</p>
-										<p className="w50s intermediatecenterysls xaxisreverseorder"><i
+											className="w80s intermediatecenterysls sortinxdirection font-14 xiaoshou xiaoshoums">编程题{'('}{program_questions_count}{')'}</p>
+										<p className="w20s intermediatecenterysls xaxisreverseorder"><i
 											className="iconfont icon-shanchu1 font-14 lg  lh30 icondrawercolor " onClick={()=>this.showQuestionModals("PROGRAM")}></i></p>
 									</div>
 							}
diff --git a/public/react/src/modules/question/Questionitem_banks.js b/public/react/src/modules/question/Questionitem_banks.js
index 11605ec6d..aade5de2e 100644
--- a/public/react/src/modules/question/Questionitem_banks.js
+++ b/public/react/src/modules/question/Questionitem_banks.js
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import {Link, NavLink} from 'react-router-dom';
+import {Link, NavLink,Prompt} from 'react-router-dom';
 import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl,queryString} from 'educoder';
 import axios from 'axios';
 import {
@@ -22,6 +22,7 @@ import JudquestionEditor from "./component/JudquestionEditor";
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
 import { connect } from 'react-redux';
 import actions from "../../redux/actions";
+var restricte=false;
 class Questionitem_banks extends Component {
 	constructor(props) {
 		super(props);
@@ -37,7 +38,8 @@ class Questionitem_banks extends Component {
 			knowledgepoints: [],
 			disciplmy:[],
 			pages:1,
-		}
+
+	}
 
 	}
 
@@ -172,6 +174,20 @@ class Questionitem_banks extends Component {
 
 	}
 
+	componentWillMount () {
+		// 拦截判断是否离开当前页面
+		window.addEventListener('beforeunload', this.beforeunload);
+	}
+	componentWillUnmount () {
+		// 销毁拦截判断是否离开当前页面
+		window.removeEventListener('beforeunload', this.beforeunload);
+	}
+	beforeunload (e) {
+		let confirmationMessage = '你确定离开此页面吗?';
+		(e || window.event).returnValue = confirmationMessage;
+		return confirmationMessage;
+	}
+
 
 	getdata = (data) => {
 		// const url=`/item_banks.json`;
@@ -295,7 +311,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`新增单选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 							}
 						}).catch((error) => {
@@ -306,7 +323,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`编辑单选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 
 							}
@@ -373,7 +391,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`新增多选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 
 							}
@@ -386,7 +405,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`编辑多选题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 
 							}
@@ -440,7 +460,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`新增判断题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 							}
 						}).catch((error) => {
@@ -452,7 +473,8 @@ class Questionitem_banks extends Component {
 						.then((result) => {
 							if (result.data.status == 0) {
 								// this.props.showNotification(`编辑判断题成功`);
-								this.props.history.replace('/question');
+								this.restricte=true;
+								this.props.history.replace('/problemset');
 
 							}
 						}).catch((error) => {
@@ -473,17 +495,24 @@ class Questionitem_banks extends Component {
 				myrbkc.push(myda.id);
 			}
 
-			this.props.setOjInitialValue({
-				difficult: Getdatasdata[0].rbnd,
-				sub_discipline_id: Getdatasdata[3].rbkc[1],
-				tag_discipline_id: myrbkc,
-			});
+			// this.props.setOjInitialValue({
+			// 	difficult: Getdatasdata[0].rbnd,
+			// 	sub_discipline_id: Getdatasdata[3].rbkc[1],
+			// 	tag_discipline_id: myrbkc,
+			// });
+
+
 
 			let arrays=myrbkc.join(',');
 			// console.log("开始打印了");
 			// console.log(arrays);
+			this.restricte=true;
+	    window.open(`/problems/new?difficult=${Getdatasdata[0].rbnd}&sub_discipline_id=${Getdatasdata[3].rbkc[1]}&tag_discipline_id=${arrays}&newoj=1&pages=${this.state.pages}`);
+			setTimeout(() => {
+				this.restricte=true;
+			}, 1000);
+			// this.props.history.replace( `/problems/new?difficult=${Getdatasdata[0].rbnd}&sub_discipline_id=${Getdatasdata[3].rbkc[1]}&tag_discipline_id=${arrays}&newoj=1&pages=${this.state.pages}`);
 
-	window.open( `/problems/new?difficult=${Getdatasdata[0].rbnd}&sub_discipline_id=${Getdatasdata[3].rbkc[1]}&tag_discipline_id=${arrays}&newoj=1&pages=${this.state.pages}`);
 		}
 
 
@@ -498,20 +527,30 @@ class Questionitem_banks extends Component {
 	}
 
 	render() {
-		let {page, limit, count, Headertop, visible, placement, modalsType, item_type} = this.state;
+		let {page, limit, count, Headertop, visible, placement, modalsType, item_type,restricte} = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
 		// ////console.log(params);
 		return (
 			<div>
 				<div id={"Itembankstopid"} className="newMain clearfix intermediatecenter "
 				>
+					{
+						restricte===false?
+							<Prompt
+								when={true}
+								message={() => '你确定离开此页面吗?'}
+							/>
+							:
+							""
+					}
+
 
 					<style>
 						{
 							`
 					 body{
             width: 100%!important;
-           
+
           }
 						.newFooter{
 						display: none;
@@ -522,7 +561,7 @@ class Questionitem_banks extends Component {
 					<div className="w1200mss">
 						<div className="w100s mt30">
 							<Breadcrumb separator=">">
-								<Breadcrumb.Item href="/question">试题库</Breadcrumb.Item>
+								<Breadcrumb.Item href="/problemset">试题库</Breadcrumb.Item>
 								<Breadcrumb.Item>{JSON.stringify(params) === "{}" ? "新增" : "编辑"}试题</Breadcrumb.Item>
 							</Breadcrumb>
 						</div>
@@ -588,7 +627,7 @@ class Questionitem_banks extends Component {
 						""
 						:
 						<Bottomsubmit {...this.props} {...this.state} bottomvalue={item_type === "PROGRAM" ? "创建" : "保存"}
-													onSubmits={() => this.preservation()} url={item_type === "PROGRAM" ?'/problems':'/question'}></Bottomsubmit>
+													onSubmits={() => this.preservation()} url={'/problemset'}></Bottomsubmit>
 				}
 			</div>
 		)
@@ -598,14 +637,15 @@ class Questionitem_banks extends Component {
 
 }
 
-const mapStateToProps = (state) => ({});
-const mapDispatchToProps = (dispatch) => ({
-	setOjInitialValue: (params) => dispatch(actions.setOjInitialValue(params))
-});
-
-export default connect(
-	mapStateToProps,
-	mapDispatchToProps
-)(SnackbarHOC()(TPMIndexHOC(Questionitem_banks)));
-
+// const mapStateToProps = (state) => ({});
+// const mapDispatchToProps = (dispatch) => ({
+// 	setOjInitialValue: (params) => dispatch(actions.setOjInitialValue(params))
+// });
+//
+// export default connect(
+// 	mapStateToProps,
+// 	mapDispatchToProps
+// )(SnackbarHOC()(TPMIndexHOC(Questionitem_banks)));
+
+export default SnackbarHOC()(TPMIndexHOC(Questionitem_banks));
 
diff --git a/public/react/src/modules/question/component/ChoquesEditor.js b/public/react/src/modules/question/component/ChoquesEditor.js
index 25aab75a1..d2a0b231b 100644
--- a/public/react/src/modules/question/component/ChoquesEditor.js
+++ b/public/react/src/modules/question/component/ChoquesEditor.js
@@ -9,6 +9,7 @@ import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor';
 import axios from 'axios'
 import update from 'immutability-helper'
 import './../questioncss/questioncom.css';
+import '../questioncss/font.css';
 import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
 import QuillForEditor from '../../../common/quillForEditor';
 const { TextArea } = Input;
@@ -230,14 +231,25 @@ class ChoquesEditor extends Component{
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
-		  try {
-				texts=JSON.stringify(value);
-			}catch (e) {
 				texts="";
-			}
 		} else {
-			value =  JSON.stringify(value);
-			texts=value;
+			if(_text.length>=500){
+				var result = _text.substring(0,450);
+				texts={"ops":[{"insert":result}]};
+				texts=JSON.stringify(texts);
+			}else {
+				// 提交到后台的内容需要处理一下;
+				value =  JSON.stringify(value);
+				if(value.length>=500){
+					let a=value.length-500;
+					let b=_text.length-a;
+					var result = _text.substring(0,b);
+					texts={"ops":[{"insert":result}]};
+					texts=JSON.stringify(texts);
+				}else{
+					texts=value;
+				}
+			}
 		}
 		let question_choices = this.state.question_choices.slice(0);
 		question_choices[index] = texts;
@@ -260,29 +272,36 @@ class ChoquesEditor extends Component{
 	toShowMode = () => {
 
 	}
+	isNull=( str )=>{
+		if ( str == "" ) return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		//为空或纯空格为 true    有值为false
+		console.log(re.test(str))
+		return re.test(str);
 
+	}
 	onContentChange=(value,quill)=>{
 		// debugger
 		const _text = quill.getText();
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
-			 try {
-				 this.setState({
-					 question_titleysl: JSON.stringify(value)
-				 })
-			 }catch (e) {
 				 this.setState({
 					 question_titleysl:""
 				 })
-			 }
 		} else {
 			// 提交到后台的内容需要处理一下;
-			let texts="";
-			texts =  JSON.stringify(value);
-			this.setState({
-				question_titleysl:texts
-			})
+		  try {
+				let 	texts =  JSON.stringify(value);
+				this.setState({
+					question_titleysl:texts
+				})
+			}catch (e) {
+				this.setState({
+					question_titleysl:""
+				})
+			}
 		}
 	}
 	onContentChanges=(value,quill)=>{
@@ -290,23 +309,22 @@ class ChoquesEditor extends Component{
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
-			 try {
-				 this.setState({
-					 question_titlesysl: JSON.stringify(value)
-				 })
-			 }catch (e) {
 				 this.setState({
 					 question_titlesysl:""
 				 })
-			 }
 		} else {
 			// 提交到后台的内容需要处理一下;
-			let texts="";
+     try {
+			 let texts =  JSON.stringify(value);
+			 this.setState({
+				 question_titlesysl:texts
+			 })
+		 }catch (e) {
+			 this.setState({
+				 question_titlesysl:""
+			 })
+		 }
 
-			texts =  JSON.stringify(value);
-			this.setState({
-				question_titlesysl:texts
-			})
 		}
 	}
 
@@ -333,10 +351,7 @@ class ChoquesEditor extends Component{
 		// //////console.log("xuanzheshijuan");
 		// //////console.log(answerTagArray);
 		// //////console.log(!exerciseIsPublish);
-		const options=['code-block', 'image', 'formula',{size: ['14px', '16px', '18px', '20px']},
-			{ 'color': ['#333333','#e60000','#ff9900','#ffff00','#ffffff']},
-			{ 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']}
-		]
+		const options=['code-block', 'image', 'formula']
 		return(
 			<div className="padding20-30  signleEditor duoxuano" id={qNumber}>
 				<style>{`
@@ -362,6 +377,10 @@ class ChoquesEditor extends Component{
               }
                .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-font {
               line-height: 20px;
+               min-width: 150px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-container .ql-editor p{
+                  font-family: MicrosoftYaHei;
               }
             `}</style>
 				<p className="mb10 clearfix">
@@ -408,7 +427,7 @@ class ChoquesEditor extends Component{
 										 autoFocus={false}
 										imgAttrs={{width: '146px', height: '136px'}}
 										style={{ height: '166px'}}
-										placeholder="请您输入题干"
+										placeholder="请您输入选项"
 										options={options}
 										value={item}
 										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
@@ -418,7 +437,7 @@ class ChoquesEditor extends Component{
 										autoFocus={false}
 										imgAttrs={{width: '146px', height: '136px'}}
 										style={{ height: '166px'}}
-										placeholder="请您输入题干"
+										placeholder="请您输入选项"
 										options={options}
 										value={JSON.parse(item)}
 										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
diff --git a/public/react/src/modules/question/component/Contentpart.js b/public/react/src/modules/question/component/Contentpart.js
index 6b6c57a43..b58dc9922 100644
--- a/public/react/src/modules/question/component/Contentpart.js
+++ b/public/react/src/modules/question/component/Contentpart.js
@@ -17,6 +17,8 @@ import NoneDatas from '../component/NoneDatas';
 import LoadingSpin from '../../../common/LoadingSpin';
 import Contentquestionbank from "./Contentquestionbank";
 import Listjihe from "./Listjihe";
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
+import QuestionModalPicture from '../component/QuestionModalPicture.js'
 const { TabPane } = Tabs;
 const Search = Input.Search;
 class Contentpart extends Component {
@@ -25,25 +27,114 @@ class Contentpart extends Component {
 		this.state = {
 			page:1,
 			chakanjiexibool:false,
+			mydisplay:false,
+			occupation:2,
+			url: "",
+			isysladmins:false,
 		}
 	}
 	//初始化
 	componentDidMount(){
 
+		let isysladmins=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					isysladmins=true;
+				}
+				else if(this.props.current_user.business){
+					isysladmins=true;
+				}
+			}
+		}
+		this.setState({
+			isysladmins:isysladmins
+		})
 
 	}
+	handleShowUploadImage = (url) => {
+		// console.log('==============>>>>>>>>>>>>',url);
+		// setUrl(url);
+		this.setState({
+			url:url
+		})
+	}
+	handleClose=()=>{
+		this.setState({
+			url:'',
+		})
+	}
 
 	chakanjiexibool=(index)=>{
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
    this.props.chakanjiexibool(index);
 	}
+
+	showmodels=(e)=>{
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodels(e)
+	}
+
+	showmodelsInaudit=(e)=>{
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodelsInaudit(e)
+	}
+
+	showmodelysl=(e)=>{
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodelysl(e)
+	}
+
+
+
+
+
+
 	componentDidUpdate(prevProps) {
 		if(prevProps.current_user !== this.props.current_user) {
 
-			const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-			const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+			let isysladmins=false;
+			let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 			const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
 			let {defaultActiveKey} = this.props;
 			var defaultActiveKeys=defaultActiveKey;
+		try {
+			if(this.props){
+				if(this.props.current_user){
+					if(this.props.current_user.admin){
+						isysladmins=true;
+					}
+					else if(this.props.current_user.business){
+						isysladmins=true;
+					}
+				}
+			}
+
+			if(is_teacher===false){
+				if(this.props.current_user.user_identity !=="学生"){
+					//专业人士
+					is_teacher=true
+				}
+			}
+		}catch (e) {
+
+		}
+			this.setState({
+				isysladmins:isysladmins
+			})
+
 			if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
 				defaultActiveKeys="0"
 			}else{
@@ -52,7 +143,26 @@ class Contentpart extends Component {
 			this.props.callback(defaultActiveKeys);
 		}
 	}
+	HideAddcoursestypess=(i)=>{
+		console.log("调用了");
+		this.setState({
+			mydisplay:true,
+			occupation:i,
+		})
+	}
+
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
+
 	xinzenw=(e)=>{
+		//只限制了教师
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
 		var urls="";
 		 if(this.props.discipline_id){
 			 // if(urls==="?"){
@@ -91,17 +201,36 @@ class Contentpart extends Component {
 
 		}
 
-			this.props.history.push("/question/newitem?pages="+this.props.pages+urls);
+			this.props.history.push("/problemset/newitem?pages="+this.props.pages+urls);
 
 	}
 	render() {
-		let {page}=this.state;
+		let {page,mydisplay,url}=this.state;
 		let {defaultActiveKey,item_type,booljupyterurls}=this.props;
 		const defaultActiveKeys=defaultActiveKey+'';
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+		let isysladmins=false;
+		let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
+		try {
+			if(is_teacher===false){
+				if(this.props.current_user.user_identity !=="学生"){
+					//专业人士
+					is_teacher=true
+				}
+			}
+			if(this.props){
+				if(this.props.current_user){
+					if(this.props.current_user.admin){
+						isysladmins=true;
+					}
+					else if(this.props.current_user.business){
+						isysladmins=true;
+					}
+				}
+			}
+		}catch (e) {
 
+		}
 
 		const content = (
 			<div className="questiontypes" style={{
@@ -136,12 +265,38 @@ class Contentpart extends Component {
 		);
 
 
-		//console.log("Contentpart.js");
-		//console.log(this.props.defaultActiveKey);
+		// console.log("Contentpart.js");
+		// console.log(this.props.current_user.professional_certification);
 
 		return (
 			<div className=" clearfix mt25">
 				<div className="educontent mt10 pb20 w1200s">
+					{url?
+						<QuestionModalPicture  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
+						:
+						""
+					}
+					{
+						mydisplay===true?
+							<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.mydisplayHidedel} />
+
+							:""
+					}
+					{
+						mydisplay===true?
+							<style>
+								{
+									`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+								}
+							</style>
+
+							:""
+					}
 					<div className="w1200ms contentparttit" style={{
 						position: "relative",
 					}}>
@@ -166,7 +321,7 @@ class Contentpart extends Component {
 
 
 						{
-							isysladmins===true||(is_teacher===true&&professional_certification===true)?
+							isysladmins===true||is_teacher===true?
 									<Tabs activeKey={defaultActiveKeys} onChange={(e)=>this.props.callback(e)}>
 										<TabPane tab="公共" key="1">
 										</TabPane>
@@ -192,12 +347,13 @@ class Contentpart extends Component {
 									`
 									
 									.xaxisreverseorder .ant-input-group-addon{
-									width: 60px !important;
-									
+									width: 48px !important;
+										
 									}
 									
-									.xaxisreverseorder .ant-input-lg {
-    height: 41px !important;}
+									.xaxisreverseorder .ant-input-wrapper .ant-input-group-addon button .ant-input-lg {
+								 height: 39px !important;
+									 }
                  
                   .xaxisreverseorder .ant-popover{
                        top: 30px !important;
@@ -207,14 +363,14 @@ class Contentpart extends Component {
                   .xaxisreverseorder .ant-popover-inner-content {
                    padding:0px !important;
                    }
-   
+									 
 									`
 								}
 							</style>
 						 <div className="xaxisreverseorder">
 							 {
 								 defaultActiveKey===0||defaultActiveKey==="0"?
-									 isysladmins===true||(is_teacher===true&&professional_certification===true)?
+									 isysladmins===true||is_teacher===true?
 											 this.props.Isitapopup&&this.props.Isitapopup==="true"?
 												 ""
 												 :
@@ -247,7 +403,7 @@ class Contentpart extends Component {
 								 defaultActiveKey===0||defaultActiveKey==="0"?
 									 this.props.Isitapopup&&this.props.Isitapopup==="true"?
 										 <Search
-											 style={isysladmins===true||(is_teacher===true&&professional_certification)?{ marginRight:"0px"}:{marginRight:"0px"}}
+											 style={isysladmins===true||is_teacher===true?{ marginRight:"0px"}:{marginRight:"0px"}}
 											 className={"xaxisreverseorder searchwidth"}
 											 placeholder="请输入题目名称、内容"
 											 enterButton
@@ -256,7 +412,7 @@ class Contentpart extends Component {
 											 onSearch={ (value)=>this.props.setdatafuns(value)} />
 										 :
 									 <Search
-										 style={isysladmins===true||(is_teacher===true&&professional_certification)?{ marginRight:"30px"}:{marginRight:"0px"}}
+										 style={isysladmins===true||is_teacher===true?{ marginRight:"30px"}:{marginRight:"0px"}}
 										 className={"xaxisreverseorder searchwidth"}
 										 placeholder="请输入题目名称、内容"
 										 enterButton
@@ -285,12 +441,12 @@ class Contentpart extends Component {
 							<div className=" w100s mb10">
 								{
 							defaultActiveKey===1||defaultActiveKey==="1"?
-										<Contentquestionbank {...this.props} {...this.state}  selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()} ></Contentquestionbank>
+										<Contentquestionbank {...this.props} {...this.state}  selectallquestionsonthispage={(bool)=>this.props.selectallquestionsonthispage(bool)} ></Contentquestionbank>
 										:""
 								}
 								{
 									defaultActiveKey===0||defaultActiveKey==="0"?
-										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispage={()=>this.props.selectallquestionsonthispage()}></Contentquestionbank>
+										<Contentquestionbank {...this.props} {...this.state} selectallquestionsonthispage={(bool)=>this.props.selectallquestionsonthispage(bool)}></Contentquestionbank>
 										:""
 								}
 							</div>
@@ -320,9 +476,12 @@ class Contentpart extends Component {
 													pages={this.props.pages}
 													getitem_basketss={(id)=>this.props.getitem_basketss(id)}
 													getitem_baskets={(e)=>this.props.getitem_baskets(e)}
-													showmodels={(e)=>this.props.showmodels(e)}
-													showmodelysl={(e)=>this.props.showmodelysl(e)}
-													showmodelsInaudit={(e)=>this.props.showmodelsInaudit(e)}
+													showmodels={(e)=>this.showmodels(e)}
+													showmodelysl={(e)=>this.showmodelysl(e)}
+													showmodelsInaudit={(e)=>this.showmodelsInaudit(e)}
+													handleShowUploadImage={(e)=>this.handleShowUploadImage(e)}
+													handleClose={()=>this.handleClose()}
+
 								>
 
 								</Listjihe>
diff --git a/public/react/src/modules/question/component/Contentquestionbank.js b/public/react/src/modules/question/component/Contentquestionbank.js
index 79e8bbb88..e6a724fef 100644
--- a/public/react/src/modules/question/component/Contentquestionbank.js
+++ b/public/react/src/modules/question/component/Contentquestionbank.js
@@ -50,9 +50,9 @@ class Contentquestionbank extends Component {
 						<div className="sortinxdirection w50s">
 							{
 								selectionbools===true?
-									<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage()} disabled></Checkbox>
+									<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage(this.props.selectallquestionsonthispages)} ></Checkbox>
 									:
-									<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage()}></Checkbox>
+									<Checkbox checked={this.props.selectallquestionsonthispages} onChange={()=>this.props.selectallquestionsonthispage(this.props.selectallquestionsonthispages)}></Checkbox>
 
 							}
 							<p className="setequesbank ml20">选用本页全部试题</p>
diff --git a/public/react/src/modules/question/component/Headplugselections.js b/public/react/src/modules/question/component/Headplugselections.js
index 4da7a57e3..2f315a0d6 100644
--- a/public/react/src/modules/question/component/Headplugselections.js
+++ b/public/react/src/modules/question/component/Headplugselections.js
@@ -260,7 +260,7 @@ class Headplugselections extends Component {
 												disciplinesdata&&disciplinesdata.map((item,key)=>{
 													return(
 														item.sub_disciplines.length>0?
-															<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={	overlaymenu(item.sub_disciplines,item.id)} key={key} placement={"bottomRight"}>
+															<Dropdown getPopupContainer={trigger => trigger.parentNode} overlay={	overlaymenu(item.sub_disciplines,item.id)} key={key} placement="bottomLeft">
 																<li  key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id}  onClick={()=>this.shixunserdchAlls(item.sub_disciplines,item.id)}>
 																	{item.name}
 																</li>
@@ -305,7 +305,7 @@ class Headplugselections extends Component {
 										}
 										<div className="fl pr shaiAllItem mt1">
 											<li className={this.state.tixing===null?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing(null)}>全部</li>
-											<li className={this.state.tixing==="PROGRAM"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("PROGRAM")}>编程题</li>
+											{/*<li className={this.state.tixing==="PROGRAM"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("PROGRAM")}>编程题</li>*/}
 											<li className={this.state.tixing==="SINGLE"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("SINGLE")}>单选题</li>
 											<li className={this.state.tixing==="MULTIPLE"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("MULTIPLE")}>多选题</li>
 											<li className={this.state.tixing==="JUDGMENT"?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.settixingtixing("JUDGMENT")}>判断题</li>
diff --git a/public/react/src/modules/question/component/Itembankstop.js b/public/react/src/modules/question/component/Itembankstop.js
index 126dc6bc8..65a3b1b51 100644
--- a/public/react/src/modules/question/component/Itembankstop.js
+++ b/public/react/src/modules/question/component/Itembankstop.js
@@ -805,7 +805,7 @@ class Itembankstop extends Component {
 						)(
 								<Select style={{width: '270px'}} disabled={this.state.boolnews} onChange={this.handleFormtixing}
 												placeholder="请选择...">
-									<Option value="PROGRAM">编程题</Option>
+									{/*<Option value="PROGRAM">编程题</Option>*/}
 									<Option value="SINGLE">单选题</Option>
 									<Option value="MULTIPLE">多选题</Option>
 									<Option value="JUDGMENT">判断题</Option>
diff --git a/public/react/src/modules/question/component/JudquestionEditor.js b/public/react/src/modules/question/component/JudquestionEditor.js
index 09cf1094f..868700c6b 100644
--- a/public/react/src/modules/question/component/JudquestionEditor.js
+++ b/public/react/src/modules/question/component/JudquestionEditor.js
@@ -9,6 +9,7 @@ import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor';
 import axios from 'axios'
 import update from 'immutability-helper'
 import './../questioncss/questioncom.css';
+import '../questioncss/font.css';
 import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
 import QuillForEditor from '../../../common/quillForEditor';
 
@@ -287,62 +288,65 @@ class JudquestionEditor extends Component{
 	 })
 
 	}
+	isNull=( str )=>{
+		if ( str == "" ) return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		//为空或纯空格为 true    有值为false
+		console.log(re.test(str))
+		return re.test(str);
 
+	}
 	onContentChange=(value,quill)=>{
 		// console.log("这是题干赋值");
 		// console.log(value);
 		// console.log(quill);
 		const _text = quill.getText();
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
-		// console.log(_text);
-		// console.log(_text.length);
+
+
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
-			try {
 				this.setState({
-					question_titleysl:JSON.stringify(value)
+					question_titleysl:""
+				})
+			// console.log("空");
+		} else {
+			// 提交到后台的内容需要处理一下;
+		  try {
+				let texts =  JSON.stringify(value);
+				this.setState({
+					question_titleysl:texts
 				})
 			}catch (e) {
 				this.setState({
 					question_titleysl:""
 				})
 			}
-
-			// console.log("空");
-		} else {
-			// console.log("有");
-
-			// 提交到后台的内容需要处理一下;
-			let texts="";
-			texts =  JSON.stringify(value);
-			this.setState({
-				question_titleysl:texts
-			})
 		}
 	}
 	onContentChanges=(value,quill)=>{
 		const _text = quill.getText();
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
+
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
-			try {
-				this.setState({
-					question_titlesysl:JSON.stringify(value)
-				})
-			}catch (e) {
 				this.setState({
 					question_titlesysl:""
 				})
-			}
-
 		} else {
 			// 提交到后台的内容需要处理一下;
-			let texts="";
+     try {
 
-			texts =  JSON.stringify(value);
-			this.setState({
-				question_titlesysl:texts
-			})
+			 let texts =  JSON.stringify(value);
+			 this.setState({
+				 question_titlesysl:texts
+			 })
+		 }catch (e) {
+			 this.setState({
+				 question_titlesysl:""
+			 })
+		 }
 		}
 	}
 	render() {
@@ -368,10 +372,7 @@ class JudquestionEditor extends Component{
 		// ////////console.log(answerTagArray);
 		// ////////console.log(!exerciseIsPublish);
 		const params= this.props&&this.props.match&&this.props.match.params;
-		const options=['code-block', 'image', 'formula',{size: ['14px', '16px', '18px', '20px']},
-			{ 'color': ['#333333','#e60000','#ff9900','#ffff00','#ffffff']},
-			{ 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']}
-		]
+		const options=['code-block', 'image', 'formula']
 		return(
 			<div className="padding20-30  signleEditor danxuano" id={qNumber}>
 				<style>{`
@@ -397,6 +398,10 @@ class JudquestionEditor extends Component{
               }
                .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-font {
               line-height: 20px;
+               min-width: 150px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-container .ql-editor p{
+                  font-family: MicrosoftYaHei;
               }
             `}</style>
 				<p className="mb10 clearfix">
diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js
index d613227fe..2802bcd25 100644
--- a/public/react/src/modules/question/component/Listjihe.js
+++ b/public/react/src/modules/question/component/Listjihe.js
@@ -8,10 +8,12 @@ import {
 	Table,
 	Pagination,
 	Radio,
-	Tooltip
+	Tooltip,
+	Icon
 } from "antd";
 import './../questioncss/questioncom.css';
 import QuillForEditor from "../../../common/quillForEditor";
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -23,6 +25,28 @@ const tagArrays = [
 	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
 	'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
+const questionType = [
+	{
+		type:'SINGLE',
+		color:'typeGreen',
+		name:'单选题'
+	},
+	{
+		type:'MULTIPLE',
+		color:'typeBlue',
+		name:'多选题'
+	},
+	{
+		type:'JUDGMENT',
+		color:'typeRed',
+		name:'判断题'
+	},
+	{
+		type:'PROGRAM',
+		color:'typeYellow',
+		name:'编程题'
+	}
+]
 //Paperreview_single.js Paperlibraryseeid_items.js
 class Listjihe extends Component {
 	constructor(props) {
@@ -31,15 +55,46 @@ class Listjihe extends Component {
 			page: 1,
 			name: "单选题",
 			nd: "简单",
+			url: "",
+			mydisplay:false,
+			occupation:2,
+			isysladmins:false,
 		}
 	}
 
 	//初始化
 	componentDidMount() {
+		let isysladmins=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					isysladmins=true;
+				}
+				else if(this.props.current_user.business){
+					isysladmins=true;
+				}
+			}
+		}
+		this.setState({
+			isysladmins:isysladmins
+		})
 
+	}
+	handleShowUploadImage = (url) => {
+		try {
+			this.props.handleShowUploadImage(url);
+		}catch (e) {
+
+		}
 
 	}
+	handleClose=()=>{
+		try {
+			this.props.handleClose();
+		}catch (e) {
 
+		}
+	}
 	//选用
 	Selectingpracticaltraining = (id) => {
 		let data = {}
@@ -53,8 +108,15 @@ class Listjihe extends Component {
 				exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id),
 			}
 		}
-
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+   this.getitem_baskets(data);
+	}
+	getitem_baskets=(data)=>{
 		this.props.getitem_baskets(data);
+
 	}
 	//撤销
 	Selectingpracticaltrainings = (id) => {
@@ -63,8 +125,29 @@ class Listjihe extends Component {
 	}
 
 
+  seturls(url){
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.history.replace(url);
+	}
+
+	HideAddcoursestypess=(i)=>{
+		console.log("调用了");
+		this.setState({
+			mydisplay:true,
+			occupation:i,
+		})
+	}
+
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
 	render() {
-		let {page, name, nd} = this.state;
+		let {page, name, nd,url,mydisplay} = this.state;
 		let {defaultActiveKey, items, listjihe, chakanjiexiboolindex, keindex} = this.props;
 
 		// 编程答案
@@ -132,7 +215,7 @@ class Listjihe extends Component {
 		}catch (e) {
 		}
 		if(itemssname===undefined){
-			itemssname=items.name
+			itemssname=items.name+""
 		}
 
 
@@ -141,7 +224,8 @@ class Listjihe extends Component {
 			itemsnamesy= JSON.parse(items&&items.program_attr&&items.program_attr.description);
 
 		}catch (e) {
-			itemsnamesy=items&&items.program_attr&&items.program_attr.description;
+			itemsnamesy=items&&items.program_attr&&items.program_attr.description+"";
+
 		}
 
 		var analysisnames="";
@@ -149,7 +233,7 @@ class Listjihe extends Component {
 			analysisnames= JSON.parse(items&&items.analysis);
 
 		}catch (e) {
-			analysisnames=items&&items.analysis;
+			analysisnames=items&&items.analysis+"";
 		}
 		// console.log(items.name);
 		// console.log(itemsnamesy);
@@ -158,10 +242,61 @@ class Listjihe extends Component {
 		const options = [
 			'bold', // 加粗
 		]
+
+		try {
+			if(itemsnamesy.constructor === Object){
+				// console.log("是对象");
+				// console.log(itemsnamesy);
+			}else {
+				// console.log("不是对象");
+				// console.log(itemsnamesy);
+				itemsnamesy=itemsnamesy+"";
+			}
+		}catch (e) {
+
+		}
+		const types = questionType.filter(item=>item.type === items.item_type);
 		return (
 			<div key={keindex}
-					 className={chakanjiexiboolindex === keindex ? "w100s borderwds283  pd20 mb20 listjihecolors" : "w100s borderwds  pd20 mb20 listjihecolors"}>
+					 className={chakanjiexiboolindex === keindex ? "w100s borderwds283 pd20 mb20 listjihecolors" : "borderwds pd20 mb20 listjihecolors"}>
 				{/*顶部*/}
+				{
+					mydisplay===true?
+						<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.mydisplayHidedel} />
+
+						:""
+				}
+				{
+					mydisplay===true?
+						<style>
+							{
+								`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+							}
+						</style>
+
+						:""
+				}
+				<style>
+					{
+						`
+						
+						
+						`
+					}
+				</style>
+
+				{/* 显示上传的图片信息 */}
+				{/*<div className="show_upload_image" style={{ display: url ? 'block' : 'none'}}>*/}
+				{/*	<Icon type="close" className="image_close" onClick={()=>this.handleClose()}/>*/}
+				{/*	<div className="image_info">*/}
+				{/*		<img className="image" src={url} alt=""/>*/}
+				{/*	</div>*/}
+				{/*</div>*/}
 				<style>
 					{
 						`	.markdown-body .ql-editor{
@@ -188,6 +323,7 @@ class Listjihe extends Component {
 					}
 				</style>
 				<div className="w100s sortinxdirection">
+					<span className={`typesBtn ${types && types[0].color}`}>{types && types[0].name}</span>
 					<div className="listjihetixingstitsy" style={{
 						fontWeight:"bold"
 					}} >
@@ -197,11 +333,11 @@ class Listjihe extends Component {
 					</div>
 					{
 						items.item_type==="PROGRAM"?
-							<a href={`/problems/${items.program_attr.identifier}/edit`}>
-							<div className="ml10 w100s  "  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
+							<a onClick={()=>this.seturls(`/problems/${items.program_attr.identifier}/edit`)}  className="ml10 flex1 mt2">
+							<div  style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
 							</a>
 						:
-							<div className="ml10 w100s  markdown-body" style={{wordBreak: "break-word",fontWeight:"bold"}}>
+							<div className="ml10 flex1 markdown-body mt2" style={{wordBreak: "break-word",fontWeight:"bold"}}>
 
 								{	items===undefined||items===null||items===""?"":
 									items.name === undefined || items.name === null || items.name === "" ?
@@ -212,6 +348,7 @@ class Listjihe extends Component {
 											<QuillForEditor
 												readOnly={true}
 												value={itemssname}
+												showUploadImage={this.handleShowUploadImage}
 											/>
 											:""
 								}
@@ -249,6 +386,7 @@ class Listjihe extends Component {
 														<QuillForEditor
 															readOnly={true}
 															value={itemsnamesy}
+															showUploadImage={this.handleShowUploadImage}
 														/>
 												}
 											</p>
@@ -282,6 +420,7 @@ class Listjihe extends Component {
 																<QuillForEditor
 																	readOnly={true}
 																	value={string}
+																	showUploadImage={this.handleShowUploadImage}
 																/>
 																:""
 
@@ -369,7 +508,7 @@ class Listjihe extends Component {
 											this.props.Isitapopup&&this.props.Isitapopup==="true"?
 												""
 												:
-											<a  target="_blank"   href={`/problems/${items.program_attr.identifier}/edit?editoj=1&pages=`+this.props.pages}>
+											<a    onClick={()=>this.seturls(`/problems/${items.program_attr.identifier}/edit`)}>
 												<p className="viewparsings  xiaoshou mr25">
 													<i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
 													<span>编辑</span>
@@ -379,7 +518,7 @@ class Listjihe extends Component {
 												this.props.Isitapopup&&this.props.Isitapopup==="true"?
 													""
 													:
-											<a target="_blank"   href={`/question/edit/${items.id}`}>
+											<a  onClick={()=>this.seturls(`/problemset/edit/${items.id}`)}>
 												<p className="viewparsings  xiaoshou mr25">
 													<i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
 													<span>编辑</span>
@@ -401,7 +540,10 @@ class Listjihe extends Component {
 															:
 															(
 																items.public==true?
-													        ""
+																	<p className="viewparsings  xiaoshou mr25" >
+																		<i className="iconfont icon-dianjiliang font-13 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+																		<span>已公开</span>
+																	</p>
 													      :
 																	<p className="viewparsings  xiaoshou mr25" onClick={(e) => this.props.showmodelsInaudit(e)}>
 																		<i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
@@ -425,7 +567,10 @@ class Listjihe extends Component {
 														</p>
 												)
 											:
-											""
+											<p className="viewparsings   mr25" >
+												<i className="iconfont icon-dianjiliang font-13 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+												<span>已公开</span>
+											</p>
 									}
 
 								</div>
@@ -435,7 +580,7 @@ class Listjihe extends Component {
 							items.item_type === "PROGRAM" ?
 								""
 								:
-								<p className="viewparsings  xiaoshou mr25" onClick={() => this.props.chakanjiexibool(keindex)}>
+								<p className="viewparsings xiaoshou  mr25" onClick={() => this.props.chakanjiexibool(keindex)}>
 									<i className="iconfont icon-jiexi font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
 									查看解析</p>
 						}
@@ -493,6 +638,7 @@ class Listjihe extends Component {
 												imgAttrs={{width: '60px', height: '30px'}}
 												readOnly={true}
 												value={analysisnames}
+												showUploadImage={this.handleShowUploadImage}
 											/>
 											:
 									"暂无解析"
diff --git a/public/react/src/modules/question/component/QuestionModalPicture.js b/public/react/src/modules/question/component/QuestionModalPicture.js
new file mode 100644
index 000000000..bd556e338
--- /dev/null
+++ b/public/react/src/modules/question/component/QuestionModalPicture.js
@@ -0,0 +1,58 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal,Icon} from 'antd';
+import axios from 'axios';
+import './../questioncss/questioncom.css'
+import './../../../common/components/comment/index.scss';
+
+//立即申请试用
+class QuestionModalPicture extends Component {
+
+	constructor(props) {
+		super(props);
+		this.state={
+
+		}
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={true}
+				footer={null}
+				destroyOnClose={true}
+				title=""
+				centered={true}
+				visible={this.props.url?true:false}
+				onCancel={this.props.handleClose}
+			>
+				{/* 显示上传的图片信息 */}
+				<style>
+					{
+						`
+						.intermediatecenter{
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							justify-content: center;
+							}
+						`
+					}
+				</style>
+				<div className="show_upload_image intermediatecenter" style={{ display: this.props.url ? 'block' : 'none'}}>
+					{/*<Icon type="close" className="image_close" onClick={this.props.handleClose}/>*/}
+					<div className="image_info intermediatecenter">
+						<img className="image" style={{
+							width:"100%"
+						}} src={ this.props.url} alt=""/>
+					</div>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default QuestionModalPicture;
diff --git a/public/react/src/modules/question/component/SiderBars.js b/public/react/src/modules/question/component/SiderBars.js
index 78674068c..724ae7f79 100644
--- a/public/react/src/modules/question/component/SiderBars.js
+++ b/public/react/src/modules/question/component/SiderBars.js
@@ -94,6 +94,22 @@ class SiderBars extends Component {
 
 		var mypath= this.props&&this.props.match&&this.props.match.path;
 		let{myvisible,Datacount,animateStyle}=this.props;
+		let swsilan=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					swsilan=true;
+				}
+				else if(this.props.current_user.business){
+					swsilan=true;
+				}
+				else if(this.props.current_user.is_teacher){
+					swsilan=true;
+				}else if(this.props.current_user.user_identity !=="学生") {
+					swsilan=true;
+				}
+			}
+		}
 		return (
 
 			<div className={myvisible===true?"-task-sidebar mystask-sidebar":Datacount&&Datacount>0?"-task-sidebar mystask-sidebars":"-task-sidebar mystask-sidebarss"} >
@@ -101,7 +117,7 @@ class SiderBars extends Component {
 				{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div>
 
 					{
-						mypath&&mypath==="/question"?
+						mypath&&mypath==="/problemset"&&swsilan===true?
 							<Tooltip placement="left" title={"试题库"}>
 
 								<div className="feedback feedbackdivcolor xiaoshou shitikus"  onClick={()=>this.props.showDrawer()} >
@@ -117,7 +133,7 @@ class SiderBars extends Component {
 									<a target="_blank" className="color_white xiaoshou" >
 										<i className="iconfont icon-shitilan color-white xiaoshou"></i>
 									</a>
-									<p className="color-white font-12 xiaoshou">试题库</p>
+									<p className="color-white font-12 xiaoshou">试题篮</p>
 								</div>
 							</Tooltip>
 							:""
diff --git a/public/react/src/modules/question/component/SingleEditor.js b/public/react/src/modules/question/component/SingleEditor.js
index 39c2e447e..fab9170b8 100644
--- a/public/react/src/modules/question/component/SingleEditor.js
+++ b/public/react/src/modules/question/component/SingleEditor.js
@@ -10,6 +10,7 @@ import TPMMDEditor from '../../../modules/tpm/challengesnew/TPMMDEditor';
 import axios from 'axios'
 import update from 'immutability-helper'
 import './../questioncss/questioncom.css';
+import '../questioncss/font.css';
 import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder';
 const { TextArea } = Input;
 const confirm = Modal.confirm;
@@ -139,7 +140,13 @@ class SingleEditor extends Component{
 			// this.refs['titleEditor'].showError()
 			this.props.showNotification('请您输入题干');
 			return editordata;
+		}else{
+			console.log("question_titleysl");
+			console.log(question_titleysl);
 		}
+
+
+
 		for(let i = 0; i < question_choices.length; i++) {
 			if (!question_choices[i]) {
 				// this.refs[`optionEditor${i}`].showError()
@@ -243,6 +250,7 @@ class SingleEditor extends Component{
 		this.setState({ standard_answers })
 	}
 	onOptionContentChange = (value,quill,index) => {
+		debugger
 		if (index >= this.state.question_choices.length) {
 			// TODO 新建，然后删除CD选项，再输入题干，会调用到这里，且index是3
 			return;
@@ -252,14 +260,25 @@ class SingleEditor extends Component{
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
-			try {
-				texts= JSON.stringify(value)
-			}catch (e) {
 				texts="";
-			}
 		} else {
-			value =  JSON.stringify(value);
-			texts=value;
+			if(_text.length>=500){
+				var result = _text.substring(0,450);
+				texts={"ops":[{"insert":result}]};
+				texts=JSON.stringify(texts);
+			}else {
+				// 提交到后台的内容需要处理一下;
+				value =  JSON.stringify(value);
+				if(value.length>=500){
+					let a=value.length-500;
+					let b=_text.length-a;
+					var result = _text.substring(0,b);
+					texts={"ops":[{"insert":result}]};
+					texts=JSON.stringify(texts);
+				}else{
+					texts=value;
+				}
+			}
 		}
 		let question_choices = this.state.question_choices.slice(0);
 		question_choices[index] = texts;
@@ -280,50 +299,61 @@ class SingleEditor extends Component{
 	toShowMode = () => {
 
 	}
+	isNull=( str )=>{
+		if ( str == "" ) return true;
+		var regu = "^[ ]+$";
+		var re = new RegExp(regu);
+		//为空或纯空格为 true    有值为false
+		console.log(re.test(str))
+		return re.test(str);
 
+	}
 	onContentChange=(value,quill)=>{
 		var _text = quill.getText();
 
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
+
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
-		 try {
-			 this.setState({
-				 question_titleysl: JSON.stringify(value)
-			 })
-		 }catch (e) {
 			 this.setState({
 				 question_titleysl:""
 			 })
-		 }
 		} else {
+			try {
 				let texts =  JSON.stringify(value);
-			this.setState({
-				question_titleysl:texts
-			})
+				this.setState({
+					question_titleysl:texts===undefined|| null?"":texts
+				})
+			}catch (e) {
+				this.setState({
+					question_titleysl:""
+				})
+			}
 
 		}
 	}
 	onContentChanges=(value,quill)=>{
 		const _text = quill.getText();
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
+
 		if (!reg.test(_text)) {
 			// 处理编辑器内容为空
+				this.setState({
+					question_titlesysl:""
+				})
+		} else {
 			try {
+				let texts =  JSON.stringify(value);
 				this.setState({
-					question_titlesysl:JSON.stringify(value)
+					question_titlesysl:texts===undefined|| null?"":texts
 				})
 			}catch (e) {
 				this.setState({
 					question_titlesysl:""
 				})
 			}
-		} else {
 
-			let texts =  JSON.stringify(value);
-			this.setState({
-				question_titlesysl:texts
-			})
+
 		}
 	}
 	handleShowImage = (url) => {
@@ -354,9 +384,7 @@ class SingleEditor extends Component{
 		// //////console.log("xuanzheshijuan");
 		// //////console.log(answerTagArray);
 		// //////console.log(!exerciseIsPublish);
-		const options=['code-block', 'image', 'formula',{size: ['14px', '16px', '18px', '20px']},
-			{ 'color': ['#333333','#e60000','#ff9900','#ffff00','#ffffff']},
-			{ 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']}
+		const options=['code-block', 'image', 'formula'
 		]
 		return(
 			<div className="padding20-30  signleEditor danxuano" id={qNumber}>
@@ -384,6 +412,10 @@ class SingleEditor extends Component{
               }
                .signleEditor .quill_editor_for_react_area  .ql-toolbar .ql-formats .ql-font {
               line-height: 20px;
+               min-width: 150px;
+              }
+               .signleEditor .quill_editor_for_react_area  .ql-container .ql-editor p{
+                  font-family: MicrosoftYaHei;
               }
             `}</style>
 				<p className="mb10 clearfix">
@@ -428,7 +460,7 @@ class SingleEditor extends Component{
 										autoFocus={false}
 										imgAttrs={{width: '146px', height: '136px'}}
 										style={{ height: '166px'}}
-										placeholder="请您输入题干"
+										placeholder="请您输入选项"
 										options={options}
 										value={item}
 										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
@@ -438,7 +470,7 @@ class SingleEditor extends Component{
 										autoFocus={false}
 										imgAttrs={{width: '146px', height: '136px'}}
 										style={{ height: '166px'}}
-										placeholder="请您输入题干"
+										placeholder="请您输入选项"
 										options={options}
 										value={JSON.parse(item)}
 										onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)}
diff --git a/public/react/src/modules/question/questioncss/font.css b/public/react/src/modules/question/questioncss/font.css
new file mode 100644
index 000000000..1f2cd8386
--- /dev/null
+++ b/public/react/src/modules/question/questioncss/font.css
@@ -0,0 +1,67 @@
+@charset "utf-8";
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+    font-family:SimSun !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+    font-family:SimHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+    font-family:Microsoft YaHei !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+    font-family:KaiTi !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
+    content: "仿宋";
+    font-family:FangSong !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+    font-family:Arial !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+    font-family:Times New Roman !important;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
+    content: "sans-serif";
+    font-family:sans-serif !important;
+}
+
+
+.ql-font-SimSun {
+    font-family:SimSun !important;
+}
+.ql-font-SimHei {
+    font-family:SimHei !important;
+}
+.ql-font-Microsoft-YaHei {
+    font-family:Microsoft YaHei !important;
+}
+.ql-font-KaiTi {
+    font-family:KaiTi !important;
+}
+.ql-font-FangSong {
+    font-family:FangSong !important;
+}
+.ql-font-Arial {
+    font-family:Arial !important;
+}
+.ql-font-Times-New-Roman {
+    font-family:Times New Roman   !important;
+}
+.ql-font-sans-serif {
+    font-family:sans-serif  !important;
+}
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index 3fee3fc1e..d5ac90d12 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -271,6 +271,12 @@
     width:30%;
 }
 
+.w80s{
+    width:80%;
+}
+.w20s{
+    width:20%;
+}
 
 .w50s{
     width: 50%;
@@ -323,7 +329,7 @@
 .listjihetixingstitsy {
     color: #333333;
     font-size: 14px;
-    line-height: 20px !important;
+    line-height: 25px !important;
     height: 25px !important;
 }
 
@@ -413,10 +419,10 @@
     color: #4CACFF;
 }
 .xiaoshou{
-    cursor:pointer;
+    cursor:pointer !important;
 }
 .xiaoshout{
-    cursor:default;
+    cursor:default !important;
 }
 .mt40{
     margin-top: 40px;
@@ -913,7 +919,7 @@
     width: 40px !important;
     position: absolute;
     border-radius: 4px;
-    top: -50%;
+    top: -79%;
 }
 .shitikussmys{
     width:29px !important;
@@ -1112,3 +1118,27 @@
 .text-indents50{
     text-indent: 50px
 }
+.typesBtn{
+    padding:0px 10px;
+    height:24px;
+    line-height:24px;
+    border-radius:2px;
+    margin-right:10px;
+    font-size: 13px;
+}
+.typeGreen{
+    color:#15DB7A;
+    border:1px solid #15DB7A;
+}
+.typeBlue{
+    color:#0CB9F1;
+    border:1px solid #0CB9F1;
+}
+.typeRed{
+    color:#FF5555;
+    border:1px solid #FF5555;
+}
+.typeYellow{
+    color:#FFB538;
+    border:1px solid #FFB538;
+}
diff --git a/public/react/src/modules/question/questioncss/quill.core.css b/public/react/src/modules/question/questioncss/quill.core.css
new file mode 100644
index 000000000..516e388b6
--- /dev/null
+++ b/public/react/src/modules/question/questioncss/quill.core.css
@@ -0,0 +1,18 @@
+.ql-editor .ql-font-Microsoft-YaHei {
+    font-family: "Microsoft YaHei";
+}
+.ql-editor .ql-font-SimSun {
+    font-family: "SimSun";
+}
+.ql-editor .ql-font-SimHei {
+    font-family: "SimHei";
+}
+.ql-editor .ql-font-KaiTi {
+    font-family: "KaiTi";
+}
+.ql-editor .ql-font-Arial {
+    font-family: "Arial";
+}
+.ql-editor .Times-New-Roman {
+    font-family: "Times New Roman";
+}
diff --git a/public/react/src/modules/question/questioncss/quill.snow.css b/public/react/src/modules/question/questioncss/quill.snow.css
new file mode 100644
index 000000000..962b40f99
--- /dev/null
+++ b/public/react/src/modules/question/questioncss/quill.snow.css
@@ -0,0 +1,28 @@
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+    content: '微软雅黑';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+    content: "宋体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+}
diff --git a/public/react/src/modules/testpaper/Intecomponents.js b/public/react/src/modules/testpaper/Intecomponents.js
index 8776b6a9e..ce5040821 100644
--- a/public/react/src/modules/testpaper/Intecomponents.js
+++ b/public/react/src/modules/testpaper/Intecomponents.js
@@ -282,6 +282,34 @@ class Intecomponents extends Component {
 
 	}
 	preservation = () => {
+
+		let mylistcour=1;
+		try {
+			mylistcour=this.state.single_question_count+this.state.multiple_question_count+this.state.judgement_question_count+this.state.program_question_count
+		}catch (e) {
+
+		}
+		if(mylistcour===0){
+			this.props.showNotification(`没有题不能组卷`);
+			return;
+		}
+
+		let arraycour=1;
+		try {
+			arraycour=this.Judquestio.Getdatas()[3].rbdxt+this.Judquestio.Getdatas()[4].rbdxtx+ this.Judquestio.Getdatas()[5].rbpdt+this.Judquestio.Getdatas()[6].rbbct
+
+		}catch (e) {
+
+		}
+
+		if(arraycour===0){
+			this.props.showNotification(`没有设置题型及数量不能组卷`);
+			return;
+		}
+
+
+
+
 		if (this.Judquestio.Getdatas().length === 0) {
 			this.scrollToAnchor("Itembankstopid");
 			return;
diff --git a/public/react/src/modules/testpaper/Paperlibraryeditid.js b/public/react/src/modules/testpaper/Paperlibraryeditid.js
index 8700a216f..e5104804f 100644
--- a/public/react/src/modules/testpaper/Paperlibraryeditid.js
+++ b/public/react/src/modules/testpaper/Paperlibraryeditid.js
@@ -31,7 +31,7 @@ class Paperlibraryeditid extends Component {
 		super(props);
 		this.Judquestio = React.createRef();
 		this.state = {
-			paperlibrartdata: [],
+			Contentdata: [],
 			disciplinesdata: [],
 			knowledgepoints: [],
 			disciplmy: [],
@@ -139,7 +139,7 @@ class Paperlibraryeditid extends Component {
 		axios.get(urls).then((response) => {
 			if (response) {
 				this.setState({
-					paperlibrartdata: response.data,
+					Contentdata: response.data,
 					item_banksedit: response.data.exam,
 				})
 			}
@@ -188,7 +188,7 @@ class Paperlibraryeditid extends Component {
 			.then((result) => {
 				if (result.data.status === 0) {
 					// this.props.showNotification(`试卷更新成功`);
-					this.props.history.push('/paperlibrary');
+					this.props.history.push('/paperlibrary/see/'+this.props.match.params.id);
 				}
 			}).catch((error) => {
 			//console.log(error);
@@ -227,7 +227,7 @@ class Paperlibraryeditid extends Component {
 	}
 
 	render() {
-		let {paperlibrartdata,newmyshixunmodelbool,defaultActiveKey} = this.state;
+		let {Contentdata,newmyshixunmodelbool,defaultActiveKey} = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
 		let urlsysl=`/paperlibrary?defaultActiveKey=${defaultActiveKey}`;
 
@@ -248,7 +248,7 @@ class Paperlibraryeditid extends Component {
 					{
 						newmyshixunmodelbool===true?
 							<div className="fangdatwo">
-							<NewMyShixunModel {...this.state} {...this.props} exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
+							<NewMyShixunModel {...this.state} {...this.props} Contentdata={this.state.Contentdata} exam_id={this.props.match.params.id} 	setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}></NewMyShixunModel>
 							</div>
 							:
 							""
@@ -291,9 +291,9 @@ class Paperlibraryeditid extends Component {
 							<div className={"seeoagertitscss"}>
 							<Seeoagertits
 								setnewmyshixunmodelbool={(e)=>this.setnewmyshixunmodelbool(e)}
-								all_score={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_questions_count}
-								all_questions_count={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.all_score}
-								difficulty={paperlibrartdata && paperlibrartdata.exam && paperlibrartdata.exam.difficulty}
+								all_score={Contentdata && Contentdata.exam && Contentdata.exam.all_questions_count}
+								all_questions_count={Contentdata && Contentdata.exam && Contentdata.exam.all_score}
+								difficulty={Contentdata && Contentdata.exam && Contentdata.exam.difficulty}
 							>
 							</Seeoagertits>
 							</div>
@@ -301,15 +301,15 @@ class Paperlibraryeditid extends Component {
 								{...this.state}
 								{...this.props}
 								getdata={() => this.getdata()}
-								single_questions={paperlibrartdata && paperlibrartdata.single_questions && paperlibrartdata.single_questions.questions.length > 0 ? paperlibrartdata.single_questions : null}
-								multiple_questions={paperlibrartdata && paperlibrartdata.multiple_questions
-								&& paperlibrartdata.multiple_questions.questions.length > 0 ? paperlibrartdata.multiple_questions : null
+								single_questions={Contentdata && Contentdata.single_questions && Contentdata.single_questions.questions.length > 0 ? Contentdata.single_questions : null}
+								multiple_questions={Contentdata && Contentdata.multiple_questions
+								&& Contentdata.multiple_questions.questions.length > 0 ? Contentdata.multiple_questions : null
 								}
-								judgement_questions={paperlibrartdata && paperlibrartdata.judgement_questions
-								&& paperlibrartdata.judgement_questions.questions.length > 0 ? paperlibrartdata.judgement_questions : null
+								judgement_questions={Contentdata && Contentdata.judgement_questions
+								&& Contentdata.judgement_questions.questions.length > 0 ? Contentdata.judgement_questions : null
 								}
-								program_questions={paperlibrartdata && paperlibrartdata.program_questions
-								&& paperlibrartdata.program_questions.questions.length > 0 ? paperlibrartdata.program_questions : null
+								program_questions={Contentdata && Contentdata.program_questions
+								&& Contentdata.program_questions.questions.length > 0 ? Contentdata.program_questions : null
 								}
 							></Paperlibraryseeid_itemss>
 
diff --git a/public/react/src/modules/testpaper/Testpaperlibrary.js b/public/react/src/modules/testpaper/Testpaperlibrary.js
index 0fb34200e..f86fcee81 100644
--- a/public/react/src/modules/testpaper/Testpaperlibrary.js
+++ b/public/react/src/modules/testpaper/Testpaperlibrary.js
@@ -162,13 +162,11 @@ class Testpaperlibrary extends Component {
 				booljupyterurls:true,
 			})
 		}
-
+ 
 		axios.get((url), {params: data}).then((response) => {
-			setTimeout(()=>{
 				this.setState({
 					booljupyterurls:false,
 				})
-			},1000);
 			if (response === null || response === undefined) {
 
 				return
@@ -304,7 +302,7 @@ class Testpaperlibrary extends Component {
 						tag_discipline_id:this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
-						keyword: this.state.keywords,
+						keyword: this.state.keyword,
 						page: this.state.page,
 						per_page:10,
 					};
@@ -330,7 +328,7 @@ class Testpaperlibrary extends Component {
 						tag_discipline_id:this.state.tag_discipline_id,
 						public: this.state.defaultActiveKey,
 						difficulty: this.state.difficulty,
-						keyword: this.state.keywords,
+						keyword: this.state.keyword,
 						page: this.state.page,
 						per_page:10,
 					};
diff --git a/public/react/src/modules/testpaper/component/Contentpart.js b/public/react/src/modules/testpaper/component/Contentpart.js
index 8a3d57414..f5c0a5cb4 100644
--- a/public/react/src/modules/testpaper/component/Contentpart.js
+++ b/public/react/src/modules/testpaper/component/Contentpart.js
@@ -17,6 +17,7 @@ import NoneDatas from '../component/NoneDatas';
 import Contentquestionbank from "./Contentquestionbank";
 import LoadingSpin from '../../../common/LoadingSpin';
 import Listjihe from "./Listjihe";
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
 const { TabPane } = Tabs;
 const Search = Input.Search;
 class Contentpart extends Component {
@@ -25,6 +26,10 @@ class Contentpart extends Component {
 		this.state = {
 			page:1,
 			defaultActiveKeyss:"0",
+			mydisplay:false,
+			occupation:2,
+			isysladmins:false,
+
 
 		}
 	}
@@ -50,21 +55,56 @@ class Contentpart extends Component {
 			}
 
 		}
+		let isysladmins=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					isysladmins=true;
+				}
+				else if(this.props.current_user.business){
+					isysladmins=true;
+				}
+			}
+		}
+		this.setState({
+			isysladmins:isysladmins
+		})
 
 	}
 	//跳转人工组卷
 	Mantegeneration=()=>{
-		this.props.history.push('/question');
+		this.props.history.push('/problemset');
 	}
 
 
 	componentDidUpdate(prevProps) {
 		if(prevProps.current_user !== this.props.current_user) {
-			const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-			const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+			let isysladmins=false;
+			let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 			const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
 			let {defaultActiveKey} = this.props;
 			let defaultActiveKeys=defaultActiveKey;
+		try {
+			if(this.props){
+				if(this.props.current_user){
+					if(this.props.current_user.admin){
+						isysladmins=true;
+					}
+					else if(this.props.current_user.business){
+						isysladmins=true;
+					}
+				}
+			}
+
+			if(is_teacher===false){
+				if(this.props.current_user.user_identity !=="学生"){
+					//专业人士
+					is_teacher=true
+				}
+			}
+		}catch (e) {
+
+		}
 			if(isysladmins===true||(is_teacher===true&&professional_certification===true)){
 				defaultActiveKeys="0"
 			}else{
@@ -86,15 +126,120 @@ class Contentpart extends Component {
 			this.props.callback(defaultActiveKeys,false);
 		}
 	}
+	HideAddcoursestypess=(i)=>{
+		console.log("调用了");
+		this.setState({
+			mydisplay:true,
+			occupation:i,
+		})
+	}
+
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
+	xinzenw=(url)=>{
+		//只限制了教师
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+
+		this.props.history.push(url);
+
+	}
+	HideAddcoursestypess=(i)=>{
+		console.log("调用了");
+		this.setState({
+			mydisplay:true,
+			occupation:i,
+		})
+	}
+
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
+
+	Testpapereditor=(e)=>{
+
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.Testpapereditor(e)
+
+	}
+
+	showmodels=(e)=>{
+
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodels(e)
+
+	}
+
+
+	showmodelysl=(e)=>{
+
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodelysl(e)
+
+	}
+
+
+	showmodelsInaudit=(e)=>{
+
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
+		this.props.showmodelsInaudit(e)
+
+	}
+
+
+
+
+
 
 	render() {
-		let {page,defaultActiveKeyss}=this.state;
+		let {page,defaultActiveKeyss,mydisplay}=this.state;
 		let {defaultActiveKey,defaultActiveKeybool}=this.props;
     let defaultActiveKeys=defaultActiveKey+'';
 
-		const isysladmins=this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-		const is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+		let isysladmins=false;
+		let is_teacher=this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 		const professional_certification=this.props&&this.props.current_user&&this.props.current_user.professional_certification?this.props.current_user.professional_certification:false;
+	  try {
+			if(this.props){
+				if(this.props.current_user){
+					if(this.props.current_user.admin){
+						isysladmins=true;
+					}
+					else if(this.props.current_user.business){
+						isysladmins=true;
+					}
+				}
+			}
+
+
+			if(is_teacher===false){
+				if(this.props.current_user.user_identity !=="学生"){
+					//专业人士
+					is_teacher=true
+				}
+			}
+		}catch (e) {
+
+		}
 
 		const contents = (
 			<div  className="questiontypes" style={{
@@ -125,6 +270,27 @@ class Contentpart extends Component {
 		return (
 			<div className=" clearfix mt25">
 				<div className="educontent mt10 pb20 w1200s">
+					{
+						mydisplay===true?
+							<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.mydisplayHidedel} />
+
+							:""
+					}
+					{
+						mydisplay===true?
+							<style>
+								{
+									`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+								}
+							</style>
+
+							:""
+					}
 					<div className="w1200ms contentparttit" style={{
 						position: "relative",
 					}}>
@@ -149,7 +315,7 @@ class Contentpart extends Component {
 						</style>
 
 						{
-							isysladmins===true||(is_teacher===true&&professional_certification===true)?
+							isysladmins===true||is_teacher===true?
 									<Tabs activeKey={defaultActiveKeys} onChange={(e)=>this.props.callback(e,true)}>
 										<TabPane tab="公共" key="1">
 										</TabPane>
@@ -172,7 +338,7 @@ class Contentpart extends Component {
 								{
 									`
 									.sortinxdirection .ant-input-group-addon{
-									width: 60px !important;
+									width: 48px !important;
 									
 									}
 									
@@ -186,7 +352,7 @@ class Contentpart extends Component {
 									`
 								}
 							</style>
-							<div className={isysladmins===true||(is_teacher===true&&professional_certification===true)?"sortinxdirection":"xaxisreverseorder"}>
+							<div className={isysladmins===true||is_teacher===true?"sortinxdirection":"xaxisreverseorder"}>
 								<Search
 									style={{ width: "347px",marginRight:"60px",}}
 									placeholder="请输入题目名称、内容"
@@ -194,26 +360,32 @@ class Contentpart extends Component {
 									size="large"
 									onInput={(e)=>this.props.setdatafunsval(e)}
 									onSearch={ (value)=>this.props.setdatafuns(value)}
-									value={this.props.keywords}
+									value={this.props.keyword}
 								/>
 
 								{
-									isysladmins===true||(is_teacher===true&&professional_certification===true)?
+									isysladmins===true||is_teacher===true?
 										<div className="xaxisreverseorder" style={{
 											width:"50%"
 										}}>
-
-											<a href={'/Integeneration'}>
+											<a  onClick={()=>this.xinzenw('/problemset')}>
 												<div className="newbutoonss">
-													<p className="newbutoontess" >智能组卷</p>
-												</div>
-											</a>
-
-											<a href={'/question'} >
-												<div className="newbutoons mr39">
 													<p className="newbutoontess" >人工组卷</p>
 												</div>
 											</a>
+
+
+											{/*<a  onClick={()=>this.xinzenw('/Integeneration')}>*/}
+											{/*	<div className="newbutoonss">*/}
+											{/*		<p className="newbutoontess" >智能组卷</p>*/}
+											{/*	</div>*/}
+											{/*</a>*/}
+
+											{/*<a  onClick={()=>this.xinzenw('/problemset')}>*/}
+											{/*	<div className="newbutoons mr39">*/}
+											{/*		<p className="newbutoontess" >人工组卷</p>*/}
+											{/*	</div>*/}
+											{/*</a>*/}
 										</div>
 										:""
 								}
@@ -260,9 +432,9 @@ class Contentpart extends Component {
 										: this.props.Contentdata.exams.map((object, index) => {
 											return (
 												<Listjihe {...this.state} {...this.props} items={object} key={index}
-																	Testpapereditor={(e)=>this.props.Testpapereditor(e)}
-																	showmodels={(e)=>this.props.showmodels(e)}
-																	showmodelysl={(e)=>this.props.showmodelysl(e)}
+																	Testpapereditor={(e)=>this.Testpapereditor(e)}
+																	showmodels={(e)=>this.showmodels(e)}
+																	showmodelysl={(e)=>this.showmodelysl(e)}
 																	Isitapopup={this.props.Isitapopup}
 																	showmodelsInaudit={(e)=>this.props.showmodelsInaudit(e)}
 												>
diff --git a/public/react/src/modules/testpaper/component/Listjihe.js b/public/react/src/modules/testpaper/component/Listjihe.js
index b2f358b96..569ab3008 100644
--- a/public/react/src/modules/testpaper/component/Listjihe.js
+++ b/public/react/src/modules/testpaper/component/Listjihe.js
@@ -10,6 +10,7 @@ import {
 	Radio
 } from "antd";
 import './../testioncss/testioncss.css';
+import Certifiedprofessional from "../../modals/Certifiedprofessional";
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
 	'J．', 'K．', 'L．', 'M．', 'N．', 'O．', 'P．', 'Q．', 'R．',
@@ -23,12 +24,27 @@ class Listjihe extends Component {
 			name:"单选题",
 			nd:"简单",
 			chakanjiexibool:false,
+			mydisplay:false,
+			occupation:2,
+			isysladmins:false,
 		}
 	}
 	//初始化
 	componentDidMount(){
-
-
+		let isysladmins=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					isysladmins=true;
+				}
+				else if(this.props.current_user.business){
+					isysladmins=true;
+				}
+			}
+		}
+		this.setState({
+			isysladmins:isysladmins
+		})
 	}
 
 	chakanjiexibool=()=>{
@@ -55,15 +71,31 @@ class Listjihe extends Component {
 
 		this.props.getitem_basketss(id);
 	}
+	HideAddcoursestypess=(i)=>{
+		console.log("调用了");
+		this.setState({
+			mydisplay:true,
+			occupation:i,
+		})
+	}
 
+	mydisplayHidedel=()=>{
+		this.setState({
+			mydisplay:false,
+		})
+	}
 
 	gotoseesj=(id)=>{
+		if(this.props.current_user.professional_certification===false&&this.state.isysladmins===false){
+			this.HideAddcoursestypess(2);
+			return
+		}
 		this.props.history.push(`/paperlibrary/see/${id}?defaultActiveKey=${this.props.defaultActiveKey}`);
 	}
 
 
 	render() {
-		let {page,name,nd,chakanjiexibool}=this.state;
+		let {page,name,nd,chakanjiexibool,mydisplay}=this.state;
 		let {defaultActiveKey,items}=this.props;
 
 	   const names=	items&&items.name&&items.name;
@@ -77,12 +109,33 @@ class Listjihe extends Component {
 
 		return (
 			<div className={" borderwdsst  pd20 mb20 intermediatecenter  listjihecolor "} >
+				{
+					mydisplay===true?
+						<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.mydisplayHidedel} />
+
+						:""
+				}
+				{
+					mydisplay===true?
+						<style>
+							{
+								`
+									  body{
+            overflow:hidden!important;
+          }
+
+									`
+							}
+						</style>
+
+						:""
+				}
         <div className="sortinxdirection w100s">
            <div className="sjimg intermediatecenter">
 						 <img src={getImageUrl("images/educoder/shijuans.png")}  className="imgtp"/>
 					 </div>
            <div className="w100s  verticallayout ml20" >
-						 <div className="w100s " > <a className="sjtitle xiaoshou " title={names} onClick={()=>this.gotoseesj(items.id)}><p className="maxnamewidth100s">{names}</p></a></div>
+						 <div className="w100s " > <a className="sjtitle xiaoshou " title={names} onClick={()=>this.gotoseesj(items.id)}><p className="maxnamewidth100s xiaoshou">{names}</p></a></div>
 						 <div className="w100s sortinxdirection mt9">
 							 <p className="sjtitles">试题数：<span >{question_counts}</span></p>
 							 <p className="sjtitles ml48">总分：<span >{total_scores}</span></p>
@@ -135,21 +188,22 @@ class Listjihe extends Component {
 								 }
 
 								 {
-									 items.apply===false?
-										 <p className="viewparsings  xiaoshou mr25 " onClick={() => this.props.showmodels(items.id)}>
-											 <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-											 <span>公开</span>
-										 </p>
-										 :
-										 (
 											 items.public==true?
-												 ""
-												 :
-												 <p className="viewparsings  xiaoshou mr25" onClick={(e) => this.props.showmodelsInaudit(e)}>
-													 <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
-													 <span>公开审核中</span>
+												 <p className="viewparsings   mr25 ">
+													 <i className="iconfont  icon-dianjiliang font-13 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+													 <span>已公开</span>
 												 </p>
-										 )
+												 :
+												 items.apply===false?
+													 <p className="viewparsings  xiaoshou mr25 " onClick={() => this.props.showmodels(items.id)}>
+														 <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+														 <span>公开</span>
+													 </p>
+													 :
+													 <p className="viewparsings  xiaoshou mr25" onClick={(e) => this.props.showmodelsInaudit(e)}>
+														 <i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+														 <span>公开审核中</span>
+													 </p>
 								 }
 							 </div>
 						 :""}
@@ -159,7 +213,9 @@ class Listjihe extends Component {
 						 </div>
 					 </div>
 
-					 <div className="sjfqks reversedirection">
+					 <div className="sjfqks reversedirection" style={{
+						 display: "none"
+					 }}>
 						 <div className="newbutoonss">
 							 <p className="newbutoontess" >发起考试</p>
 						 </div>
diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js
index 06298299f..58959d745 100644
--- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js
+++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_item.js
@@ -286,7 +286,7 @@ class Paperreview_item extends Component {
 	}
 
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
 	showparagraphs = (e,name) => {
diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
index 9fffcca76..76b715519 100644
--- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
+++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
@@ -16,6 +16,7 @@ import {
 import '../testioncss/testioncss.css';
 import '../../tpm/newshixuns/css/Newshixuns.css';
 import QuillForEditor from "../../../common/quillForEditor";
+import QuestionModalPicture from "../../question/component/QuestionModalPicture";
 
 const tagArray = [
 	'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@@ -33,6 +34,7 @@ class Paperlibraryseeid_items extends Component {
 			questions: 0,
 			totalscore: 0,
 			total: 0,
+			url: ""
 		}
 
 	}
@@ -65,9 +67,20 @@ class Paperlibraryseeid_items extends Component {
 	Singlemagaziness = () => {
 
 	}
-
+	handleShowUploadImage = (url) => {
+		// console.log('==============>>>>>>>>>>>>',url);
+		// setUrl(url);
+		this.setState({
+			url:url
+		})
+	}
+	handleClose=()=>{
+		this.setState({
+			url:'',
+		})
+	}
 	render() {
-		let {questions, totalscore, total, items} = this.state;
+		let {questions, totalscore, total, items,url} = this.state;
 		let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
 
 
@@ -90,12 +103,30 @@ class Paperlibraryseeid_items extends Component {
 		const options = [
 			'bold', // 加粗
 		]
+		try {
+			if(itemsnamesy.constructor === Object){
+				// console.log("是对象");
+				// console.log(itemsnamesy);
+			}else {
+				// console.log("不是对象");
+				// console.log(itemsnamesy);
+				itemsnamesy=itemsnamesy+"";
+			}
+		}catch (e) {
+
+		}
+
 		return (
 			<div key={indexxy}
 					 className={ "w100s borderwdswuh   mb20  pd20 "}
 					 style={{
 				minHeight: "114px",
 			}}>
+				{url?
+					<QuestionModalPicture  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
+					:
+					""
+				}
 				<style>{
 					`
 						.programquill .ql-editor{
@@ -179,6 +210,8 @@ class Paperlibraryseeid_items extends Component {
 											<QuillForEditor
 												readOnly={true}
 												value={itemssname}
+												showUploadImage={this.handleShowUploadImage}
+
 											/>
 									}
 
@@ -221,6 +254,8 @@ class Paperlibraryseeid_items extends Component {
 														<QuillForEditor
 														readOnly={true}
 														value={itemsnamesy}
+														showUploadImage={this.handleShowUploadImage}
+
 														/>
 													}
 
@@ -251,6 +286,8 @@ class Paperlibraryseeid_items extends Component {
 																	<QuillForEditor
 																		readOnly={true}
 																		value={string}
+																		showUploadImage={this.handleShowUploadImage}
+
 																	/>
 																	:""
 															:
diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
index b725b4e5e..2cdc60623 100644
--- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
+++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_itemss.js
@@ -291,7 +291,8 @@ class Paperlibraryseeid_itemss extends Component {
 	}
 
 	showsetmodalsTypedels=(id,bool,type)=>{
-		debugger
+		console.log("Paperlibraryseeid_itemss");
+
 		this.setState({
 			item_bank_id:id,
 		})
@@ -360,7 +361,7 @@ class Paperlibraryseeid_itemss extends Component {
 	}
 
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
 	showparagraphs = (e,name) => {
diff --git a/public/react/src/modules/testpaper/component/Seeoagertits.js b/public/react/src/modules/testpaper/component/Seeoagertits.js
index a983bd67e..573655a63 100644
--- a/public/react/src/modules/testpaper/component/Seeoagertits.js
+++ b/public/react/src/modules/testpaper/component/Seeoagertits.js
@@ -26,7 +26,7 @@ class Seeoagertit extends Component {
 	onChange=(e)=> {
 	}
 	jixuxuantioncli = () => {
-		this.props.history.replace("/question");
+		this.props.history.replace("/problemset");
 	}
 
 	render() {
diff --git a/public/react/src/modules/testpaper/testioncss/testioncss.css b/public/react/src/modules/testpaper/testioncss/testioncss.css
index 0426c119c..8c9597ed0 100644
--- a/public/react/src/modules/testpaper/testioncss/testioncss.css
+++ b/public/react/src/modules/testpaper/testioncss/testioncss.css
@@ -400,13 +400,13 @@
     color: #4CACFF;
 }
 .xiaoshou{
-    cursor:pointer;
+    cursor:pointer !important;
 }
 .xiaoshout{
-    cursor:default;
+    cursor:default !important;
 }
 .shubiao{
-    cursor:default;
+    cursor:default !important;
 }
 .mt40{
     margin-top: 40px;
@@ -544,7 +544,7 @@
     margin-top: 19px;
 }
 .mytags{
-    width:106px;
+    min-width:106px;
     height:32px;
     border-radius:2px;
     border:1px solid #DDDDDD;
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 4efb6202b..99018567c 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -940,12 +940,35 @@ submittojoinclass=(value)=>{
 				width:'93px',
 				height:'80px',
 			}}>
-				<a href={'/question'} className={"popovertests"} ><p className="questiontype">试题库</p></a>
+				<Link to={'/question'} className={"popovertests"} ><p className="questiontype">试题库</p></Link>
 				<p className="questiontypeheng"></p>
-				<a href={'/paperlibrary'} className={"popovertests"} ><p className="questiontype">试卷库</p></a>
+				<Link to={'/paperlibrary'} className={"popovertests"} ><p className="questiontype">试卷库</p></Link>
+
 			</div>
 		);
-    return (
+
+		// console.log("头部");
+		// console.log(this.props);
+		//判断平台身份
+		let Periofters=false;
+		if(this.props){
+			if(this.props.current_user){
+				if(this.props.current_user.admin){
+					Periofters=true;
+				}
+				else if(this.props.current_user.business){
+					Periofters=true;
+				}
+				else if(this.props.current_user.is_teacher){
+					Periofters=true;
+				}else if(this.props.current_user.user_identity !=="学生") {
+					Periofters=true;
+				}
+			}
+		}
+
+
+		return (
 
       <div className="newHeaders" id="nHeader"  >
 				<style>{
@@ -1043,7 +1066,7 @@ submittojoinclass=(value)=>{
 												 color:#010101 !important;
 												}
 												.queyppors {
-                       top: 63px !important;
+                       top: 42px !important;
                         }
 
 											 .questionbanks .ant-popover-inner-content {
@@ -1052,17 +1075,22 @@ submittojoinclass=(value)=>{
 												`
 											}
 										</style>
-										{/*<li className={`pr  questionbanks`} >*/}
-										{/*	<Popover className="queyppors" id={"yslpopovers"} placement="bottom"  content={contents} trigger="click" >*/}
-										{/*		<div className=" sortinxdirection mr10">*/}
-										{/*			<div style={{*/}
-										{/*				color:"#fff"*/}
-										{/*			}}>*/}
-										{/*				题库*/}
-										{/*			</div>*/}
-										{/*		</div>*/}
-										{/*	</Popover>*/}
-										{/*</li>*/}
+										{/*{*/}
+										{/*	Periofters===true?*/}
+										{/*		<li className={`pr  questionbanks`}  >*/}
+										{/*			<Popover  className="queyppors" id={"yslpopovers"} placement="bottom"  content={contents} trigger="click" >*/}
+										{/*				<div className=" sortinxdirection mr10">*/}
+										{/*					<div style={{*/}
+										{/*						color:"#fff"*/}
+										{/*					}}>*/}
+										{/*						题库*/}
+										{/*					</div>*/}
+										{/*				</div>*/}
+										{/*			</Popover>*/}
+										{/*		</li>*/}
+										{/*		:""*/}
+										{/*}*/}
+
 
 										<li
 											style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block'}}
@@ -1239,7 +1267,9 @@ submittojoinclass=(value)=>{
                 {/* p 老师  l 学生 */}
 								{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
 								{pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>{this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}</Link></li>}
-								{this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""}
+                {this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""}
+                { Periofters === true &&<li><Link to ={`/problemset`}>我的试题库</Link></li> }
+								{ Periofters === true &&<li><Link to ={`/paperlibrary`}>我的试卷库</Link></li> }
 								{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
 								<li style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
 									<a href={this.props.Headertop === undefined ? ''  : this.props.Headertop.customer_management_url}>客户管理</a>
diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css
index 4f19260aa..2ec090e7d 100644
--- a/public/react/src/modules/tpm/TPMIndex.css
+++ b/public/react/src/modules/tpm/TPMIndex.css
@@ -268,7 +268,7 @@ body>.-task-title {
     background: #EEEEEE;
 }
 .mystask-sidebar{
-    right: 220px !important;
+    right: 181px !important;
 }
 .mystask-sidebars{
     right: 20px !important;
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 9ba60c27a..a5da90e2c 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -769,7 +769,7 @@ export function TPMIndexHOC(WrappedComponent) {
 							{...this.dialogObj}
 						/>:""}
 						{
-							mypath&&mypath==="/question"?
+							mypath&&mypath==="/problemset"?
                   ""
 								:
 								<SiderBar
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
index dff4645cd..eb0557472 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
@@ -53,8 +53,11 @@ class RepositoryAddFileupload_files extends Component {
 
       if(info.file.response){
         if(info.file.response.status===-1) {
-          this.props.showNotification(info.file.response.message)
+          this.props.showNotification(info.file.response.message);
           return
+        }else{
+          this.props.showNotification("上传成功！");
+          return;
         }
       }
 
@@ -62,7 +65,6 @@ class RepositoryAddFileupload_files extends Component {
       fileList = fileList.map(file => {
         if (file.response) {
           if (file.response.status===0) {
-
           }
         }
         return file;
@@ -73,45 +75,54 @@ class RepositoryAddFileupload_files extends Component {
   };
 
   onAttachmentRemove=(info)=>{
-    let shixunId = this.props.match.params.shixunId;
-    let {message,filspath}=this.state;
-    if(message===""||message===undefined){
-      this.props.showNotification('删除文件请先填写提交信息');
-      return
-    }
+    console.log(info);
+    if(info.response){
+      let shixunId = this.props.match.params.shixunId;
+      let {message,filspath}=this.state;
+      if(message===""||message===undefined){
+        this.props.showNotification('删除文件请先填写提交信息');
+        return;
+      }
 
-    let matchpath =this.props.match.path;
+      let matchpath =this.props.match.path;
 
-    let Repositoryflag =undefined;
+      let Repositoryflag =undefined;
 
-    if( matchpath.indexOf("repository")>-1){
-      Repositoryflag =undefined;
-    }
-    if(matchpath.indexOf("secret_repository")>-1){
-      Repositoryflag =true;
-    }
+      if( matchpath.indexOf("repository")>-1){
+        Repositoryflag =undefined;
+      }
+      if(matchpath.indexOf("secret_repository")>-1){
+        Repositoryflag =true;
+      }
 
-    let newfilspath=filspath;
+      let newfilspath=filspath;
 
-    if(newfilspath===""){
-      newfilspath=info.name
-    }else{
-      newfilspath=filspath+"/"+info.name
-    }
-    const url = `/shixuns//${shixunId}/delete_git_file.json`;
-    axios.delete(url, { data: {
+      if(newfilspath===""){
+        newfilspath=info.name
+      }else{
+        newfilspath=filspath+"/"+info.name
+      }
+      const url = `/shixuns//${shixunId}/delete_git_file.json`;
+      axios.delete(url, { data: {
         path:newfilspath,
         message:message,
         secret_repository:Repositoryflag
       }})
       .then((response) => {
-        if (response.data.status == 0) {
-          this.props.showNotification("删除成功")
+        if (response.data.status === 0) {
+          let fileList = this.state.fileList.filter(item=>item.uid !== info.uid);
+          this.setState({
+            fileList
+          })
+          this.props.showNotification("删除成功");
         }
       })
       .catch(function (error) {
         console.log(error);
       });
+    }else{
+      this.props.showNotification("还未上传完成，无法进行删除操作！");
+    }
   }
 
   FormInput=(e)=>{
@@ -195,7 +206,7 @@ class RepositoryAddFileupload_files extends Component {
           return  false
         }
 
-        this.props.showNotification("上传成功")
+        // this.props.showNotification("上传成功");
       },
     };
 
diff --git a/public/react/src/modules/tpm/shixuns/ShixunCard.js b/public/react/src/modules/tpm/shixuns/ShixunCard.js
deleted file mode 100644
index a292f4d87..000000000
--- a/public/react/src/modules/tpm/shixuns/ShixunCard.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
-import { Rating ,Pagination} from "@icedesign/base";
-
-import {getImageUrl,setImagesUrl, toPath,getUrl} from 'educoder';
-
-import { Spin,Icon,Tooltip ,Rate} from 'antd';
-import LoadingSpin from '../../../common/LoadingSpin';
-import './shixunCss/shixunCard.css';
-
-// 引入业务组件样式
-
-import axios from 'axios';
-
-const $ = window.$;
-
-class ShixunCard extends Component {
-  constructor(props) {
-    super(props)
-
-    this.state = {
-      startValue:[],
-      order_by:"",
-      page:1,
-      limit:16,
-      keyword:"",
-      status:0,
-      diff:0,
-      hideme:false,
-      tag_level:3,
-      tag_id:''
-    }
-
-  }
-
-  PaginationonChange=(pageNumber)=> {
-    this.props.shixunsPage(pageNumber);
-  }
-
-  render() {
-    let {middleshixundata, pagination, typepvisible, pages, totalcount} = this.props;
-		const MyRate = ({ defaultValue, ...rest }) => {
-			let myValue = defaultValue;
-			// console.log(myValue-Math.floor(myValue))
-			// if (myValue < Math.ceil(myValue)) {
-			// 	myValue = Math.floor(myValue) + 0.5;
-			// }
-
-			return <Rating {...rest} value={myValue} />;
-		};
-    return (
-      <div className="educontent mb80">
-
-				<Spin spinning={typepvisible} tip="正在获取相关数据..."  size="large" style={{marginTop:'15%'}}>
-
-					{ middleshixundata === undefined?"":middleshixundata.length === 0 ?<div className="edu-tab-con-box clearfix edu-txt-center">
-						<style>
-							{`
-            .edu-tab-con-box{
-              padding:100px 0px;
-            }
-            .ant-modal-body .edu-tab-con-box{
-              padding:0px!important;
-            }
-            img.edu-nodata-img{
-              margin: 40px auto 20px;
-            }
-          `}
-						</style>
-						<img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
-						<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
-					</div>:""}
-
-
-					<div className="mb20 clearfix"
-             // style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "none" : "block"}}
-				>
-            <style>
-              {
-                `
-                .square-list{
-                  margin-top:5px;
-                }
-                `
-              }
-            </style>
-          <div className="shixun_list_content">
-            <div className="square-list clearfix">
-              {middleshixundata === undefined || middleshixundata.length === 0?" ":middleshixundata.map((item,key)=>{
-                return(
-                  <div className="square-Item" key={key} id={item.id}>
-										<style>
-											{
-												`
-											.tag-green {
-														position: absolute;
-														left: 10px;
-														bottom: 125px;
-												}
-												.tag-org{
-													position: absolute;
-														left: 0px;
-														top: 20px;
-												}
-												.tag-org-name{
-												width:66px;
-												height:28px;
-												background:#FF6802;
-												width:66px;
-												height:28px;
-												border-radius:0px 20px 20px 0px;
-												}
-												.tag-org-name-test{
-												width:45px;
-												height:23px;
-												font-size:14px;
-												color:#FFFFFF;
-												line-height:19px;
-                        margin-right: 6px;
-												}
-												.intermediatecenter{
-														display: flex;
-														flex-direction: column;
-														align-items: center;
-														justify-content: center;
-												}
-												`
-											}
-										</style>
-                    {
-                      item.tag_name === null ? "":
-                        <div className="tag-green">
-                          <span className="tag-name"> {item.tag_name}</span>
-                          {/*<img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>*/}
-                        </div>
-                    }
-                    {
-										item.is_jupyter===true?
-										<div className="tag-org">
-											<p className="tag-org-name intermediatecenter"> <span className="tag-org-name-test">Jupyter</span></p>
-											{/*<img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>*/}
-										</div>
-											:""}
-
-                    <div className={item.power === false ? "closeSquare" : "none"}>
-                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
-                           className="mt80 mb25"/>
-                      <p className="font-14 color-white">非试用内容，需要授权</p>
-                    </div>
-
-                    <a href={"/shixuns/"+item.identifier+"/challenges"}  className="square-img" target="_blank">
-                      {/*<img  src={getImageUrl("images/"+item.pic+"?1540534846")}/>*/}
-                      <img  src={setImagesUrl(`${item.pic}`)}/>
-                    </a>
-										{/*target="_blank"*/}
-
-                    <div className="square-main">
-                      <p className="task-hide">
-                        <a href={"/shixuns/"+item.identifier+"/challenges"} className="justify color-grey-name" title={item.name} target="_blank">
-                          {item.name}
-                        </a>
-                      </p>
-
-											{/*target="_blank"*/}
-											{/*<style>*/}
-												{/*{*/}
-													{/*`*/}
-													{/*.anticon-star{*/}
-														{/*font-size:16px;*/}
-													{/*}*/}
-													{/*.pathInfo{*/}
-														{/*margin-right:-5px;*/}
-													{/*}*/}
-													{/*.ant-rate{*/}
-														{/*color: #FFA800;*/}
-													{/*}*/}
-													{/*`*/}
-												{/*}*/}
-											{/*</style>*/}
-                      <p className="clearfix mt8 ml-3">
-                        <span className="rateYoStar fl" style={{padding: '0px',height: '20px',lineHeight: '19px',cursor: 'default'}} title="">
-                              {/*<Rate allowHalf value={item.score_info===null?5:item.score_info} disabled key={key} />*/}
-                                <MyRate key={key} allowHalf defaultValue={item.score_info===null?5:item.score_info} disabled/>
-                        </span>
-                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt5">{item.score_info===null?"5分":item.score_info+"分"}</span>
-                      </p>
-
-                      <p className="clearfix mt8 font-12 color-grey-B4">
-                        {item.is_jupyter===false?<Tooltip placement="bottom" title={"关卡"}>
-                            <span className="mr10 fl squareIconSpan">
-                              <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
-                            </span>
-                        </Tooltip>:""}
-
-                        {/*<Tooltip placement="bottom" title={"经验值"}>*/}
-                            {/*<span className="mr10 fl squareIconSpan">*/}
-                                {/*<i className="iconfont icon-jingyan fl mr3"></i>{item.exp}*/}
-                            {/*</span>*/}
-                        {/*</Tooltip>*/}
-
-                        <Tooltip placement="bottom" title={"学习人数"}>
-                            <span className="mr10 fl squareIconSpan" style={{display:item.stu_num===0?"none":"block"}}>
-                               <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
-                            </span>
-                        </Tooltip>
-
-                        <span className="fr color-grey-B3 squareIconSpan">{item.level}</span>
-                      </p>
-
-                    </div>
-                  </div>
-                )
-              })
-              }
-
-            </div>
-
-            <div className="both"></div>
-            {/*totalcount*/}
-            <div className={"ml425"}
-              //className={totalcount < 22 ? "ml425" : "ml425"}
-                 style={{display: pagination ? "block" : "none"}}>
-              {/*<Pagination showQuickJumper defaultCurrent={1} current={pages} total={totalcount} pageSize={12} onChange={this.PaginationonChange} />*/}
-              {/* 不加参数请求的时候，没返回总数了。加了个比较大的数字，让他可以翻页 */}
-              <Pagination defaultCurrent={1} current={pages} total={ totalcount || 1299 } type="mini" pageSize={16}  onChange={this.PaginationonChange} />
-            </div>
-
-          </div>
-
-        </div>
-        </Spin>
-      </div>
-    )
-  }
-}
-
-export default ShixunCard;
diff --git a/public/react/src/modules/tpm/shixuns/ShixunCardList.js b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
deleted file mode 100644
index a0c021980..000000000
--- a/public/react/src/modules/tpm/shixuns/ShixunCardList.js
+++ /dev/null
@@ -1,316 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route} from "react-router-dom";
-
-import { Switch ,Input,Tooltip,Icon} from 'antd';
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import 'antd/lib/switch/style/index.css'
-
-import './shixunCss/ShixunCardList.css';
-import GotoQQgroup from '../../../modal/GotoQQgroup'
-
-import { on, off } from 'educoder'
-
-const $ = window.$;
-
-const Search = Input.Search;
-
-class ShixunCardList extends Component {
-
-	constructor(props) {
-		super(props);
-		this.state={
-			allevent:"desc",
-			mine:0,
-			InputValue: props.keyword || "",
-			typemy:0,
-			hots:0,
-			news:0,
-			shixunid:"",
-			upcircle:false,
-      typekeyid:undefined,
-			goshowqqgtounp:false,
-		}
-	}
-
-	componentDidUpdate = (prevProps, prevState) => {
-	  if (this.props.keyword != prevProps.keyword) {
-		  this.setState({
-			  InputValue: this.props.keyword
-		  })
-	  }
-	}
-	componentDidMount = () => {
-	  on('searchKeywordChange', (event, data) => {
-		  // console.log(data)
-		  this.Input_search(data)
-	  })
-	}
-	componentWillUnmount = () => {
-	  off('searchKeywordChange')
-	}
-
-
-	latestHot=(e,key)=>{
-
-    let{upcircle,typekeyid}=this.state;
-
-		let id = e.target.id;
-		$("#"+id).siblings().removeClass("active");
-		$("#"+id).addClass("active");
-
-		let type;
-
-		// if(id==="all"){
-	  //   	type="publish_time";
-		// }
-		if(id==="hot"){
-			type="hot";
-		}else if(id==="new"){
-			type="new";
-
-		}
-
-		if(typekeyid===key){
-      if(upcircle===true){
-        this.setState({
-          upcircle:false,
-        })
-        // this.props.Shixunsupcircles("desc")
-      }else if(upcircle===false){
-        this.setState({
-          upcircle:true,
-        })
-		  // this.props.Shixunsupcircles("desc")
-      }
-    }else{
-		  this.setState({
-        typekeyid:key
-      })
-    }
-
-
-		this.props.ShixunsState(false,type,"desc");
-	}
-
-
-	onSwitchChange=(e,key)=>{
-		let id=e.target.id
-		$("#"+id).siblings().removeClass("active");
-		$("#"+id).addClass("active");
-		let {typemy,upcircle,typekeyid}=this.state;
-
-		if(typekeyid===key){
-      if(upcircle===true){
-        this.setState({
-          upcircle:false,
-        })
-        this.props.Shixunsupcircles("desc")
-      }else if(upcircle===false){
-        this.setState({
-          upcircle:true
-        })
-        this.props.Shixunsupcircles("asc")
-      }
-    }else{
-      this.setState({
-        typekeyid:key
-      })
-    }
-
-
-		if(typemy===0){
-			this.setState({
-				typemy:1
-			})
-		}else{
-			this.setState({
-				typemy:0
-			})
-		}
-		// allevent
-		this.props.ShixunsSwitch();
-	}
-	//输入框搜索
-	Input_search = (value) => {
-		this.setState({
-			InputValue: value
-		})
-		this.props.OnSearchInput(value,true);
-	}
-
-	Input_searchs = (e) => {
-		this.setState({
-			InputValue: e.target.value
-		})
-    this.props.OnSearchInput(e.target.value,false);
-	}
-	upcircles=(val)=>{
-  		if(val==="asc"){
-  			this.setState({
-				upcircle:false,
-			})
-			this.props.Shixunsupcircles("desc")
-		}else if(val==="desc"){
-			this.setState({
-				upcircle:true
-			})
-			this.props.Shixunsupcircles("asc")
-		}
-	}
-
-	//头部获取是否已经登录了
-	getUser=(url,type)=>{
-		if(this.props.checkIfLogin()===false){
-			this.props.showLoginDialog()
-			return
-		}
-		if(this.props.checkIfProfileCompleted()===false){
-			this.props.showProfileCompleteDialog()
-			return
-		}
-		if(this.props&&this.props.current_user&&this.props.current_user.is_shixun_marker===false){
-			this.setgoshowqqgtounp(true);
-			return;
-		}
-
-		if(url !== undefined || url!==""){
-			window.location.href = url;
-		}
-
-
-	}
-
-	// 处理弹框
-	setgoshowqqgtounp=(bool)=>{
-		this.setState({
-			goshowqqgtounp:bool
-		})
-	}
-	render(){
-		let {mine,InputValue,upcircle,goshowqqgtounp}=this.state;
-
-		// console.log("NewHeadermygetHelmetapi123123123123");
-		let shixuntype=false;
-		if(this.props&&this.props.mygetHelmetapi!=null){
-			let shixun="/shixuns";
-			let paths="/paths";
-			let courses="/courses";
-			this.props.mygetHelmetapi.navbar.map((item,key)=>{
-				var reg = RegExp(item.link);
-				if(shixun.match(reg)){
-					if(item.hidden===true){
-						shixuntype=true
-					}
-				}
-			})
-		}
-
-
-		return (
-			<div className="educontent mt20">
-				<div className="clearfix">
-
-					{
-						goshowqqgtounp===true?
-							<GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool)=>this.setgoshowqqgtounp(bool)}></GotoQQgroup>
-							:
-							""
-					}
-
-					{/*<div className="fl mr20 font-16 bestChoose shixun_repertoire active"*/}
-						 {/*id={"all"}*/}
-						 {/*onClick={(e)=>this.latestHot(e,1)}>全部*/}
-					{/*</div>*/}
-					{/*<div className="fl mr20 font-16 bestChoose shixun_repertoire"*/}
-						 {/*id={mine}*/}
-						 {/*onClick={(e)=>this.onSwitchChange(e,2)}>我的*/}
-					{/*</div>*/}
-
-					<div className="fl mr20 font-16 bestChoose shixun_repertoire active"
-							 id="new"
-							 onClick={(e)=>this.latestHot(e,4)}>最新
-					</div>
-
-					<div className="fl font-16 bestChoose shixun_repertoire"
-						 id="hot"
-						 onClick={(e)=>this.latestHot(e,3)}>最热
-					</div>
-
-					{shixuntype===true?"":<span className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/shixuns/new")}>+新建实训项目</span>}
-
-					<div className="fr mr20 mt3">
-						{
-							this.props.middleshixundata&&this.props.middleshixundata.search_tags
-						}
-					</div>
-					{/*<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"*/}
-					    {/*style={{display:upcircle===true?"block":"none"}}*/}
-						 {/*// onClick={()=>this.upcircles("asc")}*/}
-					{/*>*/}
-						{/*<Tooltip placement="bottom" title={"升序"}>*/}
-							{/*<Icon type="up-circle" theme="twoTone" />*/}
-              {/*/!*<Icon type="sort-descending" />*!/*/}
-						{/*</Tooltip>*/}
-					{/*</div>*/}
-					{/*<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"*/}
-						 {/*// onClick={()=>this.upcircles("desc")}*/}
-						 {/*style={{display:upcircle===true?"none":"block"}}*/}
-					{/*>*/}
-						{/*<Tooltip placement="bottom" title={"降序"}>*/}
-							{/*<Icon type="down-circle" theme="twoTone"  />*/}
-              {/*/!*<Icon type="sort-ascending" />*!/*/}
-						{/*</Tooltip>*/}
-					{/*</div>*/}
-
-					{/*<div className="fr mt3">*/}
-						{/*<Search*/}
-							{/*style={{ width: 300 }}*/}
-							{/*className="search-new-input fl"*/}
-							{/*placeholder="请输入创建者/实训/关卡名称进行搜索"*/}
-							{/*value={InputValue}*/}
-							{/*onInput={this.Input_searchs}*/}
-							{/*onSearch={value => this.Input_search(value)}*/}
-							{/*enterButton*/}
-						{/*/>*/}
-
-            {/* <Search
-              style={{ width: 300 }}
-              className="fl"
-              placeholder="请输入创建者/实训/关卡名称进行搜索"
-              value={InputValue}
-              onInput={this.Input_searchs}
-              onSearch={value => this.Input_search(value)}
-              autoComplete="off"
-            ></Search> */}
-					{/*</div>*/}
-					{/*<div className="fr">*/}
-						{/*<span className="fl color-grey-6 mr30 font-16 mt5" id="search_name">{*/}
-							{/*this.props.search_tags === null ? "" : this.props.search_tags*/}
-						{/*}</span>*/}
-						{/*<div className="fl mr5" style={{marginTop:'1px'}}>*/}
-						{/*/!* <div className="controlblue"></div>*/}
-						{/*<span className="controlring"></span> *!/*/}
-						{/*<Switch*/}
-						{/*className="controlbtn mr10 mt10 pr"*/}
-						{/*size="small"*/}
-						{/*style={{marginTop:'1px'}}*/}
-						{/*onChange={this.onSwitchChange}*/}
-						{/*/>*/}
-						{/*</div>*/}
-						{/*<span className="fl font-16 cdefault" data-tip-down="隐藏我学习的实训">隐藏我的</span>*/}
-
-					{/*</div>*/}
-					{/*<span className="fr color-grey-6 mr30 font-16" id="search_name"></span>*/}
-				</div>
-			</div>
-		);
-	}
-}
-
-export default ShixunCardList;
diff --git a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js
deleted file mode 100644
index 71f2cce90..000000000
--- a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js
+++ /dev/null
@@ -1,301 +0,0 @@
-import React, { Component } from 'react';
-
-import { Select, Input,Menu, Dropdown } from 'antd';
-
-import 'antd/lib/style/index.css';
-
-import 'antd/lib/select/style/index.css';
-
-import 'antd/lib/input/style/index.css';
-
-import './shixunCss/ShixunSearchBar.css'; 
-
-import axios from 'axios';
-
-const $ = window.$;
-
-const Option = Select.Option;
-
-const Search = Input.Search;
-
-
-class ShixunSearchBar extends Component {
-
- constructor(props) {
-      super(props)
-      this.state = {
-            status: undefined,
-            diff: 0,
-            InputValue: undefined,
-            shixunhoverData: [],
-            shixunchildValues:'',
-          shixunsearchAllvalue:"a",
-          openStatus:false,
-          openLevel:false
-      }
-}
-
-      //状态筛选
-    status_search = (value) => {
-        let newvalue = value;
-        if (newvalue === "0") {
-            newvalue = " "
-        } else if (newvalue === "1") {
-            newvalue = 2
-        } else if (newvalue === "2") {
-            newvalue = 1
-        } else if (newvalue === "3") {
-            newvalue = 3
-        }
-
-      this.setState({
-          status: newvalue,
-          openStatus:false
-      })
-        let list = [{'type': 1}, {'value': newvalue}];
-      this.props.StatusEnquiry(list);
-}
-
-      //难度筛选
-diff_search = (value) => {
-      this.setState({
-        diff: value,
-        openLevel:false
-      })
-      let list=[{'type':2},{'value':value}];
-      this.props.StatusEnquiry(list);
-}
-
-      //输入框搜索
-Input_search = (value) => {
-      this.setState({
-          InputValue: value
-      })
-      this.props.OnSearchInput(value);
-}
-      //查询
-shixunsearchAll = (e) => {
-     let{shixunsearchAllvalue}=this.state;
-    let id = e.target.value;
-
-    if(shixunsearchAllvalue===id){
-        return
-    }
-    if(id===0){
-        id=" "
-        this.setState({
-            InputValue: " "
-        })
-        this.props.OnSearchInput("");
-    }
-    let list=[{'tag_level':1},{'tag_id':id}];
-    if(id!=undefined){
-        this.setState({
-            shixunsearchAllvalue:id,
-            shixunchildValues:""
-        })
-        this.props.Updatasearchlist(list);
-    }
-
-}
-
-    shixunsearchall=(e)=>{
-        let{shixunsearchAllvalue}=this.state;
-        let id = "a";
-
-        if(shixunsearchAllvalue===id){
-            return
-        }
-        this.setState({
-            shixunsearchAllvalue:"a",
-            shixunchildValues:""
-        })
-        this.props.allUpdatashixunlist();
-    }
-
-					//选择Tab页详情
-		getshixunchildValue = (e) => {
-					 let id = e.target.name;
-					 let newid=e.target.id;
-					 let list=[{'tag_level':2},{'tag_id':id}];
-					 if(id!=undefined||newid!=undefined){
-						this.setState({
-								shixunsearchAllvalue:newid
-						})
-						this.props.Updatasearchlist(list);
-				}
-		}
-
-getshixunchildValues = (e) => {
-    let id = e.target.id;
-    let newid=e.target.name;
-    let list=[{'tag_level':3},{'tag_id':id}];
-    if(id!=undefined||newid!=undefined){
-        this.setState({
-            shixunchildValues:id,
-            shixunsearchAllvalue:newid
-        })
-        this.props.Updatasearchlist(list);
-    }
-
-}
-
-componentDidMount() {
-      let hoverUrlArr = [];
-      let hoverUrl = `/shixuns/menus.json`;
-      axios.get(hoverUrl
-      ).then((response) => {
-            hoverUrlArr = response.data;
-            // hoverUrlArr.reverse();
-            this.setState({
-                  shixunhoverData: hoverUrlArr
-            })
-      }).catch((error) => {
-            console.log(error)
-      })
-}
-
-render() {
-    let {shixunhoverData, shixunchildValues, shixunsearchAllvalue, InputValue,openStatus,openLevel} = this.state;
-    let {typepvisible} = this.props;
-     // //实训首页筛选的移入和点击事件
-     // $(".shaiItem").hover(function(){
-     //      var hei=parseInt($(".shaiAllItem").height())-2;
-     //     $(this).find(".subshaicontent").css("top", '34px');
-     //      $(this).find(".subshaicontent").show();
-     //  },function(){
-     //      $(this).find(".subshaicontent").hide();
-     //  });
-		 //
-     //  $(".shaiItem").live("click",function(){
-     //      $(".shaiItem").removeClass("active");
-     //      $(this).addClass("active");
-     //      $(".subshaicontent").hide();
-     //  });
-		 //
-     //  $(".subshaicontent").live("click", function(event){
-     //      $(".subshaicontent").hide();
-     //      event.stopPropagation();
-     //  });
-
-		 let overlaymenu=(item,id)=>(
-				 <Menu>
-					{
-						item.map((list,k)=>{
-							return(
-								<Menu.Item>
-								<div className="mt5 subshaicontent-part" key={k}>
-									<a style={{ height: '20px' }} className={ "mb15 shixun_repertoire color-dark"}  name={list.id} id={id} onClick={this.getshixunchildValue}>{list.name}</a>
-									<div className="sub-Item clearfix">
-										{
-											list.tags.map((tag,e)=>{
-												return(
-													<a className={parseInt(shixunchildValues)===tag.id?"shixun_repertoire active":"shixun_repertoire"} key={e} id={tag.id} name={id} rel="subshaicontent" onClick={this.getshixunchildValues}>{tag.name}</a>
-												)
-											})
-										}
-									</div>
-								</div>
-								</Menu.Item>
-							)
-						})
-					}
-				 </Menu>
-		)
-
-    return (
-        <div className="edu-back-white" >
-            <div className="educontent">
-                <div className="pt_b_26">
-                    <div className="clearfix mb20 shaiContent">
-                        <span className="shaiTitle fl">方向：</span>
-                        <div className="fl pr shaiAllItem">
-                        <li className={shixunsearchAllvalue==="a"?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value= "a"    onClick={this.shixunsearchall}>全部</li>
-													<style>
-														{
-															`
-															.ant-dropdown{
-														     width: 800px;
-															}
-															.shixun_repertoire{
-																	cursor: pointer;
-																	float: left;
-																	margin-right: 20px;
-																	color: #999;
-                                                                    cursor: pointer;
-                                                                    margin-bottom:10px;
-															}
-															.ant-dropdown-menu-item, .ant-dropdown-menu-submenu-title{
-    															padding: 0px 12px;
-															}
-															.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
-													      background:transparent !important;
-															}
-															`
-														}
-													</style>
-													{
-														shixunhoverData.map((item,key)=>{
-															return(
-																	<Dropdown overlay={overlaymenu(item.sub_repertoires,item.id)} key={key} placement={item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}>
-																		<li  key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id}  onClick={this.shixunsearchAll}>
-																			{item.name}
-																		</li>
-																	</Dropdown>
-															)
-														})
-													}
-
-
-                        </div>
-                        </div>
-                        <div className="clearfix">
-                        <span className="shaiTitle fl">筛选：</span>
-													{
-														<style>
-                                                            {`
-                                                            .shaiContent li.shaiItem{
-                                                                padding:0px 15px;
-                                                                line-height:32px;
-                                                                height:32px
-                                                            }
-                                                            .shaiTitle{
-                                                                height:32px;
-                                                                line-height:32px;
-                                                            }
-															  .shaiItems{
-                                                                padding:0px 15px;
-                                                                line-height:32px;
-                                                                height:32px;
-																		float: left;
-																		border-radius: 4px;
-																		color: #4C4C4C;
-																		cursor: pointer;
-																		margin-right: 15px;
-																		display: block;
-																		float:left;
-																	}
-																	.shaiItems.active {
-																			background-color: #4CACFF!important;
-																			color: #fff!important;
-																	}
-															`}
-														</style>
-													}
-													<div className="fl pr shaiAllItem mt1">
-														<li className={this.state.diff===0?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(0)}>全部难度</li>
-														<li className={this.state.diff===1?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(1)}>初级</li>
-														<li className={this.state.diff===2?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(2)}>中级</li>
-														<li className={this.state.diff===3?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(3)}>中高级</li>
-														<li className={this.state.diff===4?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(4)}>高级</li>
-													</div>
-
-                    </div>
-                </div>
-        </div>
-    </div>
-      );
-}
-}
-
-export default ShixunSearchBar;
diff --git a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
index 4e11537dc..be9be249b 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
@@ -1,115 +1,101 @@
 import React, { Component } from 'react';
-
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
 import axios from 'axios';
-
-import { Spin } from 'antd';
-
 import { TPMIndexHOC } from '../TPMIndexHOC';
-
-import { SnackbarHOC,getImageUrl} from 'educoder';
-
-import ShixunCardList from './ShixunCardList';
-
-import ShixunSearchBar from './ShixunSearchBar';
-
-import ShixunCard from './ShixunCard';
-
+import { SnackbarHOC, getImageUrl } from 'educoder';
+import ShixunCardList from './shixun-keyword-list';
+import ShixunSearchBar from './shixun-search-bar';
+import ShixunCard from './shixun-card';
 import UpgradeModals from '../../modals/UpgradeModals';
-
+import GotoQQgroup from '../../../modal/GotoQQgroup'
 const queryString = require('query-string');
-
-const $ = window.$;
-
+import btnUrl from './btn-new.png'
 class ShixunsIndex extends Component {
     constructor(props) {
         super(props)
-        this.state={
+        this.state = {
             order_by: "new",
-            page:1,
-            limit:16,
-            keyword:"",
-            status:0,
-            diff:0,
+            showQQ: false,
+            page: 1,
+            limit: 16,
+            keyword: "",
+            status: 0,
+            diff: 0,
             tag_level: 1,
-            tag_id:'',
-            middleshixundata:[],
-            typepvisible:true,
-            pages:1,
-            search_tags:null,
-            parsedid:undefined,
-            newtag_level:undefined,
-            newpalce:undefined,
-            sort:"desc"
+            tag_id: '',
+            middleshixundata: [],
+            typepvisible: true,
+            pages: 1,
+            search_tags: null,
+            parsedid: undefined,
+            newtag_level: undefined,
+            newpalce: undefined,
+            sort: "desc"
         }
     }
-    componentDidMount(){
+    componentDidMount() {
 
-			const upsystem=`/users/system_update.json`;
-			axios.get(upsystem).then((response)=>{
-				let updata=response.data;
-				this.setState({
-					updata:updata
-				})
-			}).catch((error)=>{
-				console.log(error);
-			})
+        const upsystem = `/users/system_update.json`;
+        axios.get(upsystem).then((response) => {
+            let updata = response.data;
+            this.setState({
+                updata: updata
+            })
+        }).catch((error) => {
+            console.log(error);
+        })
 
 
 
-			let _keyword;
+        let _keyword;
         if (window.__headSearchKeyword) {
             this.setState({ keyword: window.__headSearchKeyword })
             _keyword = window.__headSearchKeyword
             delete window.__headSearchKeyword
         }
         const parsed = queryString.parse(this.props.location.search);
-        if(parsed.id===undefined&&parsed.type===undefined){
-            let {order_by, tag_level, tag_id, page, limit, keyword, status, diff} = this.state;
-            let params={
-                order_by:order_by,
-                tag_level:tag_level,
-                tag_id:tag_id,
-                page:page,
-                limit:limit,
-                keyword: _keyword || keyword ,
-                status:status,
-                diff:diff,
+        if (parsed.id === undefined && parsed.type === undefined) {
+            let { order_by, tag_level, tag_id, page, limit, keyword, status, diff } = this.state;
+            let params = {
+                order_by: order_by,
+                tag_level: tag_level,
+                tag_id: tag_id,
+                page: page,
+                limit: limit,
+                keyword: _keyword || keyword,
+                status: status,
+                diff: diff,
                 sort: "desc"
             }
             this.shixunresultend(params);
-        }else{
-            let {order_by,page, limit, keyword, status, diff} = this.state;
-            let nawparsed=parsed.type;
-            let newpalce=parsed.palce;
-            if(nawparsed==="rep"){
-                nawparsed=1
+        } else {
+            let { order_by, page, limit, keyword, status, diff } = this.state;
+            let nawparsed = parsed.type;
+            let newpalce = parsed.palce;
+            if (nawparsed === "rep") {
+                nawparsed = 1
             }
-            else if(nawparsed==="sub"){
-                nawparsed=2
-            }else if(nawparsed==="tag"){
-                nawparsed=3
+            else if (nawparsed === "sub") {
+                nawparsed = 2
+            } else if (nawparsed === "tag") {
+                nawparsed = 3
             }
-            let params={
-                order_by:order_by,
-                tag_level:nawparsed,
-                tag_id:parsed.id,
-                page:page,
-                limit:limit,
+            let params = {
+                order_by: order_by,
+                tag_level: nawparsed,
+                tag_id: parsed.id,
+                page: page,
+                limit: limit,
                 keyword: _keyword || keyword,
-                status:status,
-                diff:diff,
+                status: status,
+                diff: diff,
                 sort: "desc"
             }
             this.setState({
-                parsedid:parsed.id,
-                newtag_level:nawparsed,
-                tag_level:nawparsed,
-                newpalce:newpalce,
-                tag_id:parsed.id,
+                parsedid: parsed.id,
+                newtag_level: nawparsed,
+                tag_level: nawparsed,
+                newpalce: newpalce,
+                tag_id: parsed.id,
                 keyword: _keyword || keyword,
             })
             this.shixunresultend(params);
@@ -117,221 +103,219 @@ class ShixunsIndex extends Component {
 
     }
 
-    allUpdatashixunlist=()=>{
-			let{sort,order_by}=this.state;
+    allUpdatashixunlist = () => {
+        let { sort, order_by } = this.state;
 
         this.setState({
             tag_level: 1,
-            tag_id:'',
+            tag_id: '',
             page: 1,
             limit: 16,
-            keyword:'',
+            keyword: '',
             status: 0,
             diff: 0,
         })
 
-        let params={
-            order_by:order_by,
+        let params = {
+            order_by: order_by,
             tag_level: 1,
-            tag_id:'',
+            tag_id: '',
             page: 1,
             limit: 16,
-            keyword:'',
+            keyword: '',
             status: 0,
             diff: 0,
-				  	sort:sort
+            sort: sort
         }
         this.shixunresultend(params)
     }
-    Updatasearchlist=(value)=>{
+    Updatasearchlist = (value) => {
         if (value[1].tag_id === " ") {
             this.setState({
                 keyword: ""
             })
         }
         this.setState({
-            tag_level:value[0].tag_level,
-            tag_id:value[1].tag_id,
-            typepvisible:true
+            tag_level: value[0].tag_level,
+            tag_id: value[1].tag_id,
+            typepvisible: true
         })
 
-        let {order_by, sort, limit, keyword, status, diff} = this.state;
-
-        let params={
-            order_by:order_by,
-            tag_level:value[0].tag_level,
-            tag_id:value[1].tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-					  sort:sort
+        let { order_by, sort, limit, keyword, status, diff } = this.state;
+
+        let params = {
+            order_by: order_by,
+            tag_level: value[0].tag_level,
+            tag_id: value[1].tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: sort
         }
 
         this.shixunresultend(params)
     }
 
-    StatusEnquiry=(key)=>{
-
-        let Vrl=`/shixuns.json`;
+    StatusEnquiry = (key) => {
         let newstatus;
         let newdiff;
-        if(key[0].type===1){
+        if (key[0].type === 1) {
             this.setState({
                 status: key[1].value,
-                typepvisible:true
+                typepvisible: true
             })
-            newstatus=key[1].value;
-            newdiff=this.state.diff;
-        }else if(key[0].type===2){
+            newstatus = key[1].value;
+            newdiff = this.state.diff;
+        } else if (key[0].type === 2) {
             this.setState({
                 diff: key[1].value,
-                typepvisible:true
+                typepvisible: true
             })
-            newdiff=key[1].value;
-            newstatus=this.state.status;
+            newdiff = key[1].value;
+            newstatus = this.state.status;
         }
-        let params= {
-            order_by:this.state.order_by,
-            tag_level:this.state.tag_level,
-            tag_id:this.state.tag_id,
-            page:1,
-            limit:this.state.limit,
-            keyword:this.state.keyword,
-            status:newstatus,
-            diff:newdiff,
+        let params = {
+            order_by: this.state.order_by,
+            tag_level: this.state.tag_level,
+            tag_id: this.state.tag_id,
+            page: 1,
+            limit: this.state.limit,
+            keyword: this.state.keyword,
+            status: newstatus,
+            diff: newdiff,
         }
         this.shixunresultend(params)
 
     }
 
-    OnSearchInput=(value,type)=>{
-      if(type===true){
-        this.setState({
-            keyword:value,
-            typepvisible:true,
-            pages:1
-        })
-        let {order_by, tag_level, tag_id, sort, limit, status, diff} = this.state;
-        let params= {
-            order_by:order_by,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:value,
-            status:status,
-            diff:diff,
-					  sort:sort
+    OnSearchInput = (value, type) => {
+        if (type === true) {
+            this.setState({
+                keyword: value,
+                typepvisible: true,
+                pages: 1
+            })
+            let { order_by, tag_level, tag_id, sort, limit, status, diff } = this.state;
+            let params = {
+                order_by: order_by,
+                tag_level: tag_level,
+                tag_id: tag_id,
+                page: 1,
+                limit: limit,
+                keyword: value,
+                status: status,
+                diff: diff,
+                sort: sort
+            }
+            this.shixunresultend(params)
+        } else {
+            this.setState({
+                keyword: value,
+                pages: 1
+            })
         }
-          this.shixunresultend(params)
-        }else{
-        this.setState({
-          keyword:value,
-          pages:1
-        })
-      }
 
 
     }
 
-    ShixunsSwitch=()=>{
+    ShixunsSwitch = () => {
         //types
         this.setState({
-            order_by:"mine",
-            typepvisible:true,
-            pages:1,
+            order_by: "mine",
+            typepvisible: true,
+            pages: 1,
         })
-        let{tag_level,tag_id,page,limit,keyword,status,diff,sort}=this.state;
-        let newsort=sort;
-        if(newsort===undefined){
-            newsort="desc"
+        let { tag_level, tag_id, page, limit, keyword, status, diff, sort } = this.state;
+        let newsort = sort;
+        if (newsort === undefined) {
+            newsort = "desc"
         }
-        let params= {
-            order_by:"mine",
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-            sort:newsort
+        let params = {
+            order_by: "mine",
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: newsort
         }
         this.shixunresultend(params)
     }
 
 
-    shixunsPage=(value)=>{
+    shixunsPage = (value) => {
         this.setState({
-            page:value,
-            typepvisible:true,
-            pages:value
+            page: value,
+            typepvisible: true,
+            pages: value
         })
-        let {order_by, tag_level, tag_id, limit, keyword, status, diff,sort} = this.state;
-        let params= {
-            order_by:order_by,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:value,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-			  		sort:sort
+        let { order_by, tag_level, tag_id, limit, keyword, status, diff, sort } = this.state;
+        let params = {
+            order_by: order_by,
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: value,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: sort
         }
 
-        let Url=`/shixuns.json`;
-        axios.get(Url,{
+        let Url = `/shixuns.json`;
+        axios.get(Url, {
             params
-        }).then((response)=> {
-            if(response.status===200){
+        }).then((response) => {
+            if (response.status === 200) {
                 this.setState({
                     middleshixundata: response.data,
-                    typepvisible:false,
+                    typepvisible: false,
                 });
             }
-        }).catch((error)=>{
+        }).catch((error) => {
             console.log(error)
         });
     }
-    ShixunsState=(val,type,sorts)=>{
+    ShixunsState = (type, sorts) => {
         // sort,
-        let {tag_level, tag_id, page, limit, keyword, status, diff,sort} = this.state;
-        let newsort=sorts?sorts:sort;
+        let { tag_level, tag_id, page, limit, keyword, status, diff, sort } = this.state;
+        let newsort = sorts ? sorts : sort;
         this.setState({
-            order_by:type,
-            typepvisible:true,
-            pages:1,
-            sort:sorts?sorts:sort
+            order_by: type,
+            typepvisible: true,
+            pages: 1,
+            sort: sorts ? sorts : sort
         })
 
         let params
         // let vals=false
-          if(newsort===undefined){
-              newsort="desc"
-          }else{
-              newsort=sorts?sorts:sort
-          }
-        params= {
-            order_by:type,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-            sort:newsort
+        if (newsort === undefined) {
+            newsort = "desc"
+        } else {
+            newsort = sorts ? sorts : sort
+        }
+        params = {
+            order_by: type,
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: newsort
         }
         this.shixunresultend(params)
     }
 
-    Shixunsupcircles=(sort)=>{
+    Shixunsupcircles = (sort) => {
         console.log(sort)
         this.setState({
-            sort:sort
+            sort: sort
         })
         let {
             order_by,
@@ -345,115 +329,139 @@ class ShixunsIndex extends Component {
 
 
 
-        let params= {
-            order_by:order_by,
-            tag_level:tag_level,
-            tag_id:tag_id,
-            page:1,
-            limit:limit,
-            keyword:keyword,
-            status:status,
-            diff:diff,
-            sort:sort
+        let params = {
+            order_by: order_by,
+            tag_level: tag_level,
+            tag_id: tag_id,
+            page: 1,
+            limit: limit,
+            keyword: keyword,
+            status: status,
+            diff: diff,
+            sort: sort
         }
         this.shixunresultend(params)
     }
 
+    onNewHandler() {
+        const { checkIfLogin, showLoginDialog, checkIfProfileCompleted, showProfileCompleteDialog, current_user } = this.props
+        if (!checkIfLogin()) {
+            showLoginDialog()
+            return
+        }
+        if (!checkIfProfileCompleted()) {
+            showProfileCompleteDialog()
+            return
+        }
+        if (current_user && current_user.is_shixun_marker === false) {
+            this.setState(
+                { showQQ: true }
+            )
+            return
+        }
+        window.location.href = '/shixuns/new'
+    }
 
+    setShowQQ(v) {
+        this.setState({
+            showQQ: v
+        })
+    }
 
-
-    shixunresultend=(params)=>{
-        let Url=`/shixuns.json`;
-        axios.get(Url,{
+    shixunresultend = (params) => {
+        let Url = `/shixuns.json`;
+        axios.get(Url, {
             params
-        }).then((response)=> {
+        }).then((response) => {
             // TODO 有keyword返回值时 显示一共有多少条记录
-            if(response.status===200){
+            if (response.status === 200) {
                 this.setState({
-                    search_tags:response.data.search_tags,
+                    search_tags: response.data.search_tags,
                     middleshixundata: response.data,
-                    typepvisible:false,
-                    pages:1
+                    typepvisible: false,
+                    pages: 1
                 });
             }
-        }).catch((error)=>{
+        }).catch((error) => {
             console.log(error)
         });
     }
     render() {
-        let {middleshixundata, typepvisible, pages, search_tags, keyword,parsedid,newtag_level,newpalce} = this.state;
+        let { middleshixundata, typepvisible, pages, search_tags, keyword, parsedid, newtag_level, newpalce, showQQ } = this.state;
 
         // console.log(this.state.updata)
         return (
             <div className="newMain clearfix  backFAFAFA">
-							{this.state.updata===undefined?"":<UpgradeModals
-								{...this.state}
-							/>}
-							<style>
-								{
-									`    ::-webkit-scrollbar {
+                {this.state.updata === undefined ? "" : <UpgradeModals
+                    {...this.state}
+                />}
+                <style>
+                    {
+                        `    ::-webkit-scrollbar {
                       width: 0px !important;
                     }
 										.myshixin-head{
 												width: 100%;
 												height: 240px;
-												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url === null ?`images/educoder/courses/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.shixun_banner_url)});
+												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url === null ? `images/educoder/courses/courses.jpg` : this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url)});
 											  background-color: #081C4B;
 												background-position: center;
 												background-repeat: no-repeat;
 										}
 
 									`
-								}
-							</style>
-							{
-								this.props.mygetHelmetapi&&this.props.mygetHelmetapi.shixun_banner_url?
-									<div className="myshixin-head pr" >
-										<div className="edu-txt-center pathNavLine">
-											<div className="inline path-nav">
-											</div>
-										</div>
-									</div>
-									:
-									""
-							}
-
-                {/*<Spin spinning={typepvisible}  size="large" style={{marginTop:'15%'}}>*/}
-                    <ShixunSearchBar
-                        Updatasearchlist={this.Updatasearchlist.bind(this)}
-                        allUpdatashixunlist={this.allUpdatashixunlist}
-                        StatusEnquiry={this.StatusEnquiry.bind(this)}
-                        OnSearchInput={this.OnSearchInput.bind(this)}
-                        keyword={keyword}
-                        parsedid={parsedid}
-                        newtag_level={newtag_level}
-                        newpalce={newpalce}
-                        {...this.props}
-                        {...this.state}
-                    />
-
-                    <ShixunCardList
-                        ShixunsState={this.ShixunsState.bind(this)}
-                        ShixunsSwitch={this.ShixunsSwitch.bind(this)}
-                        Shixunsupcircles={this.Shixunsupcircles.bind(this)}
-                        allUpdatashixunlist={this.allUpdatashixunlist}
-                        {...this.props}
-                        {...this.state}
-                        OnSearchInput={this.OnSearchInput.bind(this)}
-                    />
-                     {/*下方图片*/}
-                    <ShixunCard
-                        typepvisible={typepvisible}
-                        middleshixundata={middleshixundata.shixuns}
-                        totalcount={middleshixundata.total_count}
-                        pagination={middleshixundata.pagination}
-                        pages={pages}
-                        shixunsPage={this.shixunsPage.bind(this)}
-                    />
+                    }
+                </style>
+                {
+                    this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url ?
+                        <div className="myshixin-head pr" >
+                            <div className="edu-txt-center pathNavLine">
+                                <div className="inline path-nav">
+                                </div>
+                            </div>
+                        </div>
+                        :
+                        ""
+                }
+
+                <ShixunSearchBar
+                    Updatasearchlist={this.Updatasearchlist.bind(this)}
+                    allUpdatashixunlist={this.allUpdatashixunlist}
+                    StatusEnquiry={this.StatusEnquiry.bind(this)}
+                    OnSearchInput={this.OnSearchInput.bind(this)}
+                    keyword={keyword}
+                    parsedid={parsedid}
+                    newtag_level={newtag_level}
+                    newpalce={newpalce}
+                    {...this.props}
+                    {...this.state}
+                />
+
+                {
+                    showQQ ? <GotoQQgroup goshowqqgtounp={showQQ} setgoshowqqgtounp={this.setShowQQ.bind(this)}></GotoQQgroup> :
+                        ""
+                }
+                <ShixunCardList
+                    onChangeLabel={this.ShixunsState.bind(this)}
+                    ShixunsSwitch={this.ShixunsSwitch.bind(this)}
+                    Shixunsupcircles={this.Shixunsupcircles.bind(this)}
+                    onNewHandler={this.onNewHandler.bind(this)}
+                    btnUrl={btnUrl}
+                    OnSearchInput={this.OnSearchInput.bind(this)}
+                />
+                {/*下方图片*/}
+                <ShixunCard
+                    typepvisible={typepvisible}
+                    middleshixundata={middleshixundata.shixuns}
+                    totalcount={middleshixundata.total_count}
+                    pagination={middleshixundata.pagination}
+                    pages={pages}
+                    shixunsPage={this.shixunsPage.bind(this)}
+                />
                 {/*</Spin>*/}
             </div>
         );
     }
 }
 
-export default SnackbarHOC() (TPMIndexHOC  ( ShixunsIndex ));
+export default SnackbarHOC()(TPMIndexHOC(ShixunsIndex));
diff --git a/public/react/src/modules/tpm/shixuns/btn-new.png b/public/react/src/modules/tpm/shixuns/btn-new.png
new file mode 100644
index 000000000..4b584c548
Binary files /dev/null and b/public/react/src/modules/tpm/shixuns/btn-new.png differ
diff --git a/public/react/src/modules/tpm/shixuns/shixun-card.js b/public/react/src/modules/tpm/shixuns/shixun-card.js
new file mode 100644
index 000000000..5fe07d074
--- /dev/null
+++ b/public/react/src/modules/tpm/shixuns/shixun-card.js
@@ -0,0 +1,97 @@
+import React from 'react';
+import { getImageUrl, setImagesUrl, getUrl } from 'educoder';
+import { Spin, Tooltip, Rate, Pagination } from 'antd';
+import './shixunCss/shixunCard.scss';
+
+export default ({ middleshixundata, pagination, typepvisible, pages, totalcount, shixunsPage }) => {
+  function onPageChange(number) {
+    shixunsPage(number)
+  }
+
+  return (
+    <div className="educontent mb80 shixun-card">
+      <Spin spinning={typepvisible} tip="正在获取相关数据..." size="large" style={{ marginTop: '15%' }}>
+        {middleshixundata === undefined ? "" : middleshixundata.length === 0 ? <div className="edu-tab-con-box clearfix edu-txt-center">
+          <img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")} />
+          <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
+        </div> : ""}
+
+        <div className="mb20 clearfix">
+          <div className="shixun_list_content">
+            <div className="square-list clearfix">
+              {middleshixundata === undefined || middleshixundata.length === 0 ? " " : middleshixundata.map((item, key) => {
+                return (
+                  <div className="square-Item" key={item.id} id={item.id}>
+                    {
+                      item.tag_name === null ? "" :
+                        <div className="tag-green">
+                          <span className="tag-name"> {item.tag_name}</span>
+                        </div>
+                    }
+                    {
+                      item.is_jupyter === true ?
+                        <div className="tag-org">
+                          <p className="tag-org-name intermediatecenter"> <span className="tag-org-name-test">Jupyter</span></p>
+                        </div>
+                        : ""}
+
+                    <div className={item.power === false ? "closeSquare" : "none"}>
+                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                        className="mt80 mb25" />
+                      <p className="font-14 color-white">非试用内容，需要授权</p>
+                    </div>
+
+                    <a href={"/shixuns/" + item.identifier + "/challenges"} className="square-img" target="_blank">
+                      <img src={setImagesUrl(`${item.pic}`)} />
+                    </a>
+
+                    <div className="square-main">
+                      <p className="task-hide">
+                        <a href={"/shixuns/" + item.identifier + "/challenges"} className="justify color-grey-name" title={item.name} target="_blank">
+                          {item.name}
+                        </a>
+                      </p>
+
+                      <p className="clearfix mt8 ml-3">
+                        <span className="rateYoStar fl" style={{ padding: '0px', height: '20px', lineHeight: '19px', cursor: 'default' }} title="">
+                          <Rate key={key} allowHalf defaultValue={item.score_info === null ? 5 : item.score_info} disabled />
+                        </span>
+                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt5">{item.score_info === null ? "5分" : item.score_info + "分"}</span>
+                      </p>
+
+                      <p className="clearfix mt8 font-12 color-grey-B4">
+                        {item.is_jupyter === false ? <Tooltip placement="bottom" title={"关卡"}>
+                          <span className="mr10 fl squareIconSpan">
+                            <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
+                          </span>
+                        </Tooltip> : ""}
+
+                        <Tooltip placement="bottom" title={"学习人数"}>
+                          <span className="mr10 fl squareIconSpan" style={{ display: item.stu_num === 0 ? "none" : "block" }}>
+                            <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
+                          </span>
+                        </Tooltip>
+
+                        <span className="fr color-grey-B3 squareIconSpan">{item.level}</span>
+                      </p>
+
+                    </div>
+                  </div>
+                )
+              })
+              }
+
+            </div>
+            <div className="both"></div>
+            <div className={"ml425"}
+              style={{ display: pagination ? "block" : "none" }}>
+              <Pagination defaultCurrent={1} current={pages} total={totalcount || 1299} type="mini" pageSize={16} onChange={onPageChange} />
+            </div>
+
+          </div>
+
+        </div>
+      </Spin>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixuns/shixun-keyword-list.jsx b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.jsx
new file mode 100644
index 000000000..8f3ebf334
--- /dev/null
+++ b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.jsx
@@ -0,0 +1,61 @@
+import React, { useState, Fragment } from 'react';
+import { Input, Icon } from 'antd'
+import './shixun-keyword-list.scss'
+
+function AddonAfter({ callback }) {
+	return <a className='btn-search' onClick={callback}>
+		<Icon type='search' />
+		<span>搜索</span>
+	</a>
+}
+export default ({ onChangeLabel, btnUrl, OnSearchInput, onNewHandler, btnStyle =
+	{} }) => {
+	const [data, setData] = useState({
+		type: 'new',
+		keyword: '',
+	})
+
+	function onChangeTag(e) {
+		const id = e.target.id
+		setData({ ...data, type: id })
+		onChangeLabel(id, "desc")
+	}
+	function onSetKeyword(e) {
+		setData({ ...data, keyword: e.target.value })
+	}
+
+	function callback() {
+		if (keyword) {
+			OnSearchInput(keyword, true)
+		}
+	}
+
+	function onNewShiXun() {
+		if (onNewHandler) {
+			onNewHandler()
+			return
+		}
+	}
+
+	const { type, keyword } = data
+	return (
+		<Fragment>
+			<div className="wrapper">
+				<div className="educontent  search-keyword-container">
+					<div className="btn-groups">
+						<a id='new' className={type === 'new' ? 'active' : ''} onClick={onChangeTag} title='最新'>最新</a>
+						<a id='hot' className={type === 'hot' ? 'active' : ''} onClick={onChangeTag} title='最热'>最热</a>
+					</div>
+					<div className='search-container'>
+						<Input onChange={onSetKeyword} value={keyword} addonAfter={<AddonAfter callback={callback} />} defaultValue="" placeholder='请输入课程名称进行搜索' />
+					</div>
+				</div>
+				<a className="btn-new" onClick={onNewShiXun} style={btnStyle}>
+					<img src={btnUrl} width={40} alt="创建实训" />
+				</a>
+			</div>
+
+		</Fragment>
+
+	)
+}
diff --git a/public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss
new file mode 100644
index 000000000..d3ecd2008
--- /dev/null
+++ b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss
@@ -0,0 +1,70 @@
+.search-keyword-container {
+  display: flex;
+  flex-flow: row nowrap;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 0;
+
+  .ant-input-group-addon {
+    background-color: #4CACFF;
+  }
+
+  .ant-input:focus+.ant-input-group-addon {
+    background-color: #4CACFF !important;
+  }
+
+  .search-container {
+    width: 320px;
+  }
+
+  .btn-search {
+    display: block;
+    text-align: center;
+    color: #fff;
+
+    span {
+      margin-left: 5px;
+    }
+  }
+
+
+  .btn-groups {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: start;
+
+    a {
+      display: block;
+      width: 60px;
+      border-radius: 14px;
+      text-align: center;
+      height: 28px;
+      line-height: 28px;
+
+      &:first-child {
+        margin-right: 20px;
+      }
+
+      color: #999;
+      background-color: #eee;
+
+      &.active {
+        color: #fff;
+        background-color: #4CACFF;
+      }
+    }
+  }
+}
+
+.wrapper {
+  position: relative;
+}
+
+.btn-new {
+  position: absolute;
+  width: 40px;
+  right: 39px;
+  top: 76px;
+  z-index: 10;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx b/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx
new file mode 100644
index 000000000..7e933462e
--- /dev/null
+++ b/public/react/src/modules/tpm/shixuns/shixun-search-bar/A.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+export default ({
+  activeId, id, callback, text
+}) => {
+  function onClickHandler() {
+    callback(id)
+  }
+  return (
+    <a className={id === activeId ? "shaiItems shixun_repertoire active" : "shaiItems shixun_repertoire"} onClick={onClickHandler}>{text}</a>
+  )
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx b/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx
new file mode 100644
index 000000000..29a3b8485
--- /dev/null
+++ b/public/react/src/modules/tpm/shixuns/shixun-search-bar/index.jsx
@@ -0,0 +1,121 @@
+import React, { useState, useEffect } from 'react'
+import { Menu, Dropdown } from 'antd'
+import 'antd/lib/style/index.css';
+import '../shixunCss/shixun-search-bar.scss'
+import axios from 'axios'
+import A from './A.jsx'
+
+const DiffObject = [
+    { id: 0, text: '全部难度' },
+    { id: 1, text: '初级' },
+    { id: 2, text: '中级' },
+    { id: 3, text: '中高级' },
+    { id: 4, text: '高级' }
+]
+export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
+    const [data, setData] = useState({
+        diff: 0,
+        searchValue: 'a',
+        navs: [],
+        searchKey: '',
+        childValue: ''
+    })
+    const { diff, searchValue, navs, childValue, searchKey } = data
+    function diffSearch(diff) {
+        setData({
+            ...data,
+            diff
+        })
+        StatusEnquiry([{ 'type': 2 }, { 'value': diff }])
+    }
+    function onSearchAll() {
+        if (searchValue !== 'a') {
+            setData({ ...data, searchValue: 'a', childValue: '' })
+            allUpdatashixunlist()
+        }
+    }
+    function getChildValue(e) {
+        let id = e.target.name
+        let newid = e.target.id
+        if (id || newid) {
+            setData({ ...data, searchValue: newid })
+            Updatasearchlist([{ 'tag_level': 2 }, { 'tag_id': id }])
+        }
+    }
+    function getChildValues(e) {
+        let id = e.target.id;
+        let newid = e.target.name;
+        if (id || newid) {
+            setData({ ...data, searchValue: newid, childValue: id })
+            Updatasearchlist([{ 'tag_level': 3 }, { 'tag_id': id }])
+        }
+    }
+    function onSearchBranch(e) {
+        const id = e.target.value
+        if (id != searchValue) {
+            setData({ ...data, searchValue: id, childValue: '' })
+            Updatasearchlist([{ 'tag_level': 1 }, { 'tag_id': id }])
+        }
+
+    }
+    function overlayMenu(item, id) {
+        return <Menu>
+            {
+                item.map((list, k) => <Menu.Item>
+                    <div className="mt5 subshaicontent-part" key={k}>
+                        <a style={{ height: '20px' }} className={"mb15 shixun_repertoire color-dark"} name={list.id} id={id} onClick={getChildValue}>{list.name}</a>
+                        <div className="sub-Item clearfix">
+                            {
+                                list.tags.map((tag, e) => <a className={childValue === tag.id ? "shixun_repertoire active" : "shixun_repertoire"} key={e} id={tag.id} name={id} rel="subshaicontent" onClick={getChildValues}>{tag.name}</a>
+                                )
+                            }
+                        </div>
+                    </div>
+                </Menu.Item>
+                )
+            }
+        </Menu>
+
+    }
+    useEffect(() => {
+        async function init() {
+            const response = await axios.get('/shixuns/menus.json')
+            setData({ ...data, navs: response.data })
+        }
+        init()
+    }, [])
+    return (
+        <div className="edu-back-white shixun-search-bar" >
+            <div className="educontent">
+                <div className="pt_b_26">
+                    <div className="clearfix mb20 shaiContent">
+                        <span className="shaiTitle fl">方向：</span>
+                        <div className="fl pr shaiAllItem">
+                            <a className={searchValue === "a" ? "shaiItem shixun_repertoire active" : "shaiItem shixun_repertoire"} value="a" onClick={onSearchAll}>全部</a>
+                            {
+                                navs.map((item, key) => {
+                                    return (
+                                        <Dropdown overlay={overlayMenu(item.sub_repertoires, item.id)} key={key} placement={item.id < 4 ? "bottomRight" : item.id >= 8 ? "bottomLeft" : "bottomCenter"}>
+                                            <li key={item.id} className={searchValue == item.id ? "shaiItem shixun_repertoire active" : "shaiItem shixun_repertoire"} value={item.id} onClick={onSearchBranch}>
+                                                {item.name}
+                                            </li>
+                                        </Dropdown>
+                                    )
+                                })
+                            }
+
+
+                        </div>
+                    </div>
+                    <div className="clearfix">
+                        <span className="shaiTitle fl">筛选：</span>
+                        <div className="fl pr shaiAllItem mt1">
+                            {DiffObject.map(item => <A {...item} callback={diffSearch} activeId={diff} />)}
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    )
+}
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css b/public/react/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css
index 7ea80bd26..433bd4693 100644
--- a/public/react/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/ShixunSearchBar.css
@@ -1,23 +1,26 @@
-.iconfontShixunSearchBar{
-    z-index: 1000;
-    position: absolute;
-    right: 3px;
-    top: 0px;
+.iconfontShixunSearchBar {
+  z-index: 1000;
+  position: absolute;
+  right: 3px;
+  top: 0px;
 }
-.pt_b_26{
-    padding:26px 0px;
+
+.pt_b_26 {
+  padding: 26px 0px;
+}
+
+.diffSelect {
+  margin-left: 20px !important;
 }
 
-.diffSelect{
-    margin-left:20px !important;
- }
- .ant-input-search-button{
-     /*margin-right: 10px;*/
-    border: 1px solid transparent;
- }
-.Mousebox{
-    width: 800px !important;
+.ant-input-search-button {
+  border: 1px solid transparent;
 }
-.subshaicontent a{
-  height:30px;
+
+.Mousebox {
+  width: 800px !important;
+}
+
+.subshaicontent a {
+  height: 30px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixun-search-bar.scss b/public/react/src/modules/tpm/shixuns/shixunCss/shixun-search-bar.scss
new file mode 100644
index 000000000..1195598cd
--- /dev/null
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixun-search-bar.scss
@@ -0,0 +1,78 @@
+.iconfontShixunSearchBar {
+  z-index: 1000;
+  position: absolute;
+  right: 3px;
+  top: 0px;
+}
+
+.pt_b_26 {
+  padding: 26px 0px;
+}
+
+.diffSelect {
+  margin-left: 20px !important;
+}
+
+.ant-input-search-button {
+  border: 1px solid transparent;
+}
+
+.Mousebox {
+  width: 800px !important;
+}
+
+.subshaicontent a {
+  height: 30px;
+}
+
+.ant-dropdown {
+  width: 800px;
+}
+
+.shixun_repertoire {
+  cursor: pointer;
+  float: left;
+  margin-right: 20px;
+  color: #999;
+  cursor: pointer;
+  margin-bottom: 10px;
+}
+
+.ant-dropdown-menu-item,
+.ant-dropdown-menu-submenu-title {
+  padding: 0px 12px;
+}
+
+.ant-dropdown-menu-item:hover,
+.ant-dropdown-menu-submenu-title:hover {
+  background: transparent !important;
+}
+
+.shaiContent li.shaiItem {
+  padding: 0px 15px;
+  line-height: 32px;
+  height: 32px
+}
+
+.shaiTitle {
+  height: 32px;
+  line-height: 32px;
+}
+
+.shaiItems {
+  padding: 0px 15px;
+  line-height: 32px;
+  height: 32px;
+  float: left;
+  border-radius: 4px;
+  color: #4C4C4C;
+  cursor: pointer;
+  margin-right: 15px;
+  display: block;
+  float: left;
+}
+
+.shaiItems.active {
+  background-color: #4CACFF !important;
+  color: #fff !important;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
index 1ec00a26e..ccb51ed13 100644
--- a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
@@ -6,29 +6,32 @@
   margin-left: 32%;
 }
 
-.square-img{
-    min-height: 210px;
+.square-img {
+  min-height: 210px;
 }
-.task-hide{
+
+.task-hide {
   margin-bottom: 0em;
 }
-.backFAFAFA{
-  background:#FAFAFA;
+
+.backFAFAFA {
+  background: #FAFAFA;
 }
 
 .demo {
   width: 500px;
   background-color: #0dcecb;
   text-align: center;
-  padding:50px;
+  padding: 50px;
 }
+
 .next-loading {
   margin-bottom: 5px;
-  width:100%;
+  width: 100%;
 }
 
-.next-rating-overlay .next-icon{
-  color: #FFA800!important;
+.next-rating-overlay .next-icon {
+  color: #FFA800 !important;
 }
 
 .custom-pagination {
@@ -36,7 +39,7 @@
   margin-left: 10px;
 }
 
-.ml425{
-  margin-left:42.5%;
-  margin-top:20px;
+.ml425 {
+  margin-left: 42.5%;
+  margin-top: 20px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.scss b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.scss
new file mode 100644
index 000000000..8ff3390a3
--- /dev/null
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.scss
@@ -0,0 +1,101 @@
+.ml350 {
+  margin-left: 40%;
+}
+
+.ml32 {
+  margin-left: 32%;
+}
+
+.square-img {
+  min-height: 210px;
+}
+
+.task-hide {
+  margin-bottom: 0em;
+}
+
+.backFAFAFA {
+  background: #FAFAFA;
+}
+
+.demo {
+  width: 500px;
+  background-color: #0dcecb;
+  text-align: center;
+  padding: 50px;
+}
+
+.next-loading {
+  margin-bottom: 5px;
+  width: 100%;
+}
+
+.next-rating-overlay .next-icon {
+  color: #FFA800 !important;
+}
+
+.custom-pagination {
+  display: inline-block;
+  margin-left: 10px;
+}
+
+.ml425 {
+  margin-left: 42.5%;
+  margin-top: 20px;
+}
+
+.shixun-card {
+
+  .edu-tab-con-box {
+    padding: 100px 0px;
+  }
+
+  .ant-modal-body .edu-tab-con-box {
+    padding: 0px !important;
+  }
+
+  img.edu-nodata-img {
+    margin: 40px auto 20px;
+  }
+
+  .square-list {
+    margin-top: 5px;
+  }
+
+  .tag-green {
+    position: absolute;
+    left: 10px;
+    bottom: 125px;
+  }
+
+  .tag-org {
+    position: absolute;
+    left: 0px;
+    top: 20px;
+  }
+
+  .tag-org-name {
+    width: 66px;
+    height: 28px;
+    background: #FF6802;
+    width: 66px;
+    height: 28px;
+    border-radius: 0px 20px 20px 0px;
+  }
+
+  .tag-org-name-test {
+    width: 45px;
+    height: 23px;
+    font-size: 14px;
+    color: #FFFFFF;
+    line-height: 19px;
+    margin-right: 6px;
+  }
+
+  .intermediatecenter {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+}
\ No newline at end of file
diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js
index 87c877fa5..a5650d481 100644
--- a/public/react/src/redux/actions/ojForUser.js
+++ b/public/react/src/redux/actions/ojForUser.js
@@ -1,17 +1,17 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-27 13:42:11
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-02-10 18:17:00
  */
 import types from "./actionTypes";
 import { Base64 } from 'js-base64';
-import { 
+import {
   fetchStartProgram,
   fetchUserProgramDetail,
-  fetchDebuggerCode, 
+  fetchDebuggerCode,
   fetchCodeSubmit,
   fetchUserCommitRecord,
   fetchUserCommitRecordDetail,
@@ -26,7 +26,6 @@ import { notification } from "antd";
 export const startProgramQuestion = (id, props) => {
   return (dispatch, getState) => {
     const {searchParams} = getState().ojFormReducer;
-    console.log(searchParams);
     fetchStartProgram(id).then(res => {
       const { status, data } = res;
       if (status === 200) {
@@ -50,7 +49,7 @@ export const startProgramQuestion = (id, props) => {
           // console.log(path);
           // props.history.push(`/myproblems/${identifier}`);
           props.history.push({
-            pathname: `/myproblems/${identifier}?${searchParams}`,
+            pathname: `/myproblems/${identifier}`,
           });
         }
       }
@@ -90,7 +89,7 @@ export const getUserProgramDetail = (identifier, type) => {
           type: types.SAVE_USE_TEST_CASE_VALUE,
           payload: data.test_case || {}
         });
-        // 代码是否更新 
+        // 代码是否更新
         let _modify_code = false;
         if (data.hack) {
           _modify_code = data.hack.modify_code;
@@ -145,7 +144,7 @@ export const saveUserCodeForInterval = (identifier, code) => {
 
 /**
  * @description 保存或更新之前先更新代码
- * @param {*} identifier 
+ * @param {*} identifier
  * @param {*} inputValue 输入值: 自定义 | 系统返回的
  * @param {*} type 测评类型 debug | submit
  */
@@ -157,7 +156,7 @@ export const updateCode = (identifier, inputValue, type) => {
       fetchUpdateCode(identifier, {
         code: Base64.encode(userCode)
       }).then(res => {
-        // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现 
+        // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现
         // TODO 需要优化
         if (res.data.status === 401) {
           dispatch({ // 改变 loading 值
@@ -187,7 +186,7 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
   let count = 1;
   /**
    * @param {*} excuteTime 执行时间
-   * @param {*} finalTime  总时间 
+   * @param {*} finalTime  总时间
    * @param {*} count  执行次数
    * @param {*} timer  定时器
    */
@@ -199,7 +198,7 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
       if (+status === 0 || (excuteTime / 1000) > (finalTime + 1)) {
         clearInterval(timer); // 清除定时器
         timer = null;
-        let returnData = null;      
+        let returnData = null;
         if (status === 1) { // 结果没有返回
           returnData = {
             error_line: -1,
@@ -221,7 +220,7 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
           payload: {
             type,
             data: returnData
-          } 
+          }
         });
         if (!type || type === 'debug') {
           dispatch({ // 改变 loading 值
@@ -287,13 +286,13 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
 
 /**
  * @description 调试代码
- * @param {*} identifier 
+ * @param {*} identifier
  * @param {*} inputValue 输入值: 自定义 | 系统返回的
  * @param {*} type 测评类型 debug | submit
  */
 export const debuggerCode = (identifier,value, type) => {
   return (dispatch, getState) => {
-    // 调用之前 先保存 code 
+    // 调用之前 先保存 code
     // TODO
     // console.log(identifier, value);
     const { hack } = getState().ojForUserReducer;
@@ -398,7 +397,7 @@ export const changeUserCodeTab = (key) => {
 
 /**
  * @description 用户提交代码， 先调用保存代码接口，再调提交接口，成功后调用调试接口
- * @param {*} identifier 
+ * @param {*} identifier
  */
 export const submitUserCode = (identifier, inputValue, type) => {
   return (dispatch, getState) => {
@@ -430,7 +429,7 @@ export const submitUserCode = (identifier, inputValue, type) => {
       fetchUpdateCode(identifier, {
         code: userCode
       }).then(res => {
-        // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现 
+        // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现
         // TODO 需要优化
         if (res.data.status === 401) {
           dispatch({
@@ -495,7 +494,7 @@ export const saveOpacityType = (type) => {
     type: types.CLICK_OPERATE_TYPE,
     payload: type
   }
-} 
+}
 
 
 export const clearOjForUserReducer = () => {
diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index e6fe1309e..25e5bb43d 100644
--- a/public/react/src/redux/actions/ojForm.js
+++ b/public/react/src/redux/actions/ojForm.js
@@ -1,14 +1,14 @@
 /*
  * @Description: 开发者社区编辑模块
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-20 16:35:46
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-02-11 16:29:32
  */
 import types from './actionTypes';
 import CONST from '../../constants';
-import { 
+import {
   fetchPostOjForm,
   fetchGetOjById,
   publishTask,
@@ -18,7 +18,7 @@ import {
 } from '../../services/ojService';
 import { Base64 } from 'js-base64';
 import { notification } from 'antd';
-import { toStore } from 'educoder'; 
+import { toStore } from 'educoder';
 // import { startProgramQuestion } from ''
 const { jcLabel } = CONST;
 // 表单字段映射
@@ -124,7 +124,7 @@ export const validateOjForm = (props, type, cb) => {
           hasSuccess = false;
           dispatch(
             {
-              type: maps[key].type, 
+              type: maps[key].type,
               payload: payloadInfo(key, value, errMsg, validateResult[key])
             }
           )
@@ -142,7 +142,7 @@ export const validateOjForm = (props, type, cb) => {
         let validateResult = emptyValidate(key, value);
         const errMsg = validateResult[key].errMsg;
         if (errMsg) {
-          hasSuccess = false;
+          // hasSuccess = false;
         } else {
           // 唯一性校验
           const bool = testCases.some((item, j) => {
@@ -154,7 +154,7 @@ export const validateOjForm = (props, type, cb) => {
           });
 
           if (bool) {
-            hasSuccess = false;
+            // hasSuccess = false;
             validateResult = {
               [key]: {
                 validateStatus: 'error',
@@ -168,14 +168,14 @@ export const validateOjForm = (props, type, cb) => {
       tcValidResult.push(tempObj);
     });
 
-    if (testCases.length === 0) {
-      hasSuccess = false;
-      notification['error']({
-        message: '提示',
-        description: '测试用例必须输入!'
-      });
-    }
-    
+    // if (testCases.length === 0) {
+    //   hasSuccess = false;
+    //   notification['error']({
+    //     message: '提示',
+    //     description: '测试用例必须输入!'
+    //   });
+    // }
+
     // if (!code) {
     //   hasSuccess = false;
     //   notification['error']({
@@ -300,7 +300,7 @@ export const validateOjForm = (props, type, cb) => {
               cb && cb();
             } else {
               const {identifier} = res.data;
-              
+
               // message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功');
               notification.success({
                 message: '提示',
@@ -311,7 +311,7 @@ export const validateOjForm = (props, type, cb) => {
                 type: types.SAVE_OJ_FORM_ID,
                 payload: identifier
               });
-              
+
               // console.log(identifier , props.identifier);
               if (identifier || props.identifier) {
                 dispatch(getOJFormById(identifier || props.identifier));
@@ -443,7 +443,7 @@ export const saveOjFormCode = (value) => {
     payload: value
   };
 }
-// 验证任务名称 
+// 验证任务名称
 export const validateOJName = (value) => {
   const validate = emptyValidate('name', value)['name'];
   const errMsg = validate.errMsg;
@@ -735,9 +735,9 @@ export const saveKnowledge = (values) => {
 }
 
 /**
- * 新增时跳转到OJ时带的默认参数: 
- * @param {}} params 
- * { 
+ * 新增时跳转到OJ时带的默认参数:
+ * @param {}} params
+ * {
  *  difficult: '',  // 难易度
  *  sub_discipline_id: '' // 课程方向
  *  tag_discipline_id： [] 知识点
@@ -767,7 +767,7 @@ export const tagDisciplines = (params) => {
       }
     });
   }
-} 
+}
 
 // 保存地址栏参数
 export const saveSearchParams = (params) => {
diff --git a/public/react/src/redux/actions/static.js b/public/react/src/redux/actions/static.js
index 3159d35c2..2c57479fb 100644
--- a/public/react/src/redux/actions/static.js
+++ b/public/react/src/redux/actions/static.js
@@ -12,14 +12,15 @@ import { fetchStaticList } from "../../services/staticService";
 export const staticList = (id) => {
   return (dispatch, getState) => {
     const { params, total_count, other_info } = getState().staticReducer;
-
-    if (total_count !== 0 && total_count === other_info.length) return;
+        console.log('统计数据=====>>>>>', params);
+    //  if (total_count !== 0 && total_count === other_info.length) return;
     fetchStaticList(id, params).then(res => {
       // console.log('统计数据=====>>>>>', res);
       const {data} = res;
       if (data.status === 0) {
         dispatch({
           type: types.GET_STATIC_INFO,
+          other_info:data.data.other_info,
           payload: data.data
         });
       }
diff --git a/public/react/src/redux/reducers/staticReducer.js b/public/react/src/redux/reducers/staticReducer.js
index 7d2202d03..3790b2638 100644
--- a/public/react/src/redux/reducers/staticReducer.js
+++ b/public/react/src/redux/reducers/staticReducer.js
@@ -38,12 +38,14 @@ const initalState = {
 const staticReducer = (state = initalState, action) => {
   const { payload = {}, type } = action;
   const {subject_info, other_info = [], total = {}, total_count} = payload;
+  
   switch (type) {
     case types.GET_STATIC_INFO:
       return {
         ...state,
         subject_info,
-        other_info: state.other_info.concat(other_info),
+        other_info,
+        // other_info: state.other_info.concat(other_info),
         total,
         total_count,
         params: Object.assign({}, state.params, { page: state.params.page + 1 })
diff --git a/public/react/src/services/ojService.js b/public/react/src/services/ojService.js
index d0d0ae0ae..53d55f3f2 100644
--- a/public/react/src/services/ojService.js
+++ b/public/react/src/services/ojService.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 开发者社区接口
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-20 10:55:38
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-07 15:23:19
@@ -34,7 +34,7 @@ export async function fetchPostOjForm (paramsObj) {
   // if (identifier) {
   //   return axios.post(url, params);
   // } else {
-  //   return 
+  //   return
   // }
   return identifier ? axios.put(url, params) : axios.post(url, params);
 }
@@ -136,7 +136,7 @@ export async function fetchUploadImage (file) {
 export async function fetchUploadImageUrl (id) {
   const url = `/attachments/${id}`;
   return axios.get(url);
-} 
+}
 
 // 添加笔记
 export async function fetchAddNotes (identifier, params) {
@@ -154,4 +154,4 @@ export async function fetchQuestion (params) {
 export async function fetchTagDisciplines (params) {
   const url = `/tag_disciplines.json`;
   return axios.post(url, params);
-}
\ No newline at end of file
+}