diff --git a/app/assets/javascripts/common.js b/app/assets/javascripts/common.js
index fa7bef244..dc0818b64 100644
--- a/app/assets/javascripts/common.js
+++ b/app/assets/javascripts/common.js
@@ -1,5 +1,6 @@
 function createMDEditor(element, opts){
   var defaults = {
+    height: 600,
     path: '/editormd/lib/',
     syncScrolling: "single",
     tex: true,
diff --git a/app/controllers/admins/base_controller.rb b/app/controllers/admins/base_controller.rb
index 6f89e7afa..345df3e31 100644
--- a/app/controllers/admins/base_controller.rb
+++ b/app/controllers/admins/base_controller.rb
@@ -5,6 +5,8 @@ class Admins::BaseController < ApplicationController
 
   layout 'admin'
 
+  skip_before_action :verify_authenticity_token
+
   before_action :require_login, :require_admin!
 
   after_action :rebind_event_if_ajax_render_partial
diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index 8cb68b1d4..c21a493e0 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -191,21 +191,28 @@ class ChallengesController < ApplicationController
         sets_input = test_set.map(&:input)
         sets_open = test_set.map(&:is_public)
         set_score = test_set.map(&:score)
+        set_match_rule = test_set.map(&:match_rule)
         params_hidden = params[:test_set].map{|set| set[:hidden].to_i == 0}
         params_output = params[:test_set].map{|set| set[:output] }
         params_input = params[:test_set].map{|set| set[:input] }
         params_score = params[:test_set].map{|set| set[:score]}
+        params_test_set = params[:test_set].map{|set| set[:match_rule]}
         # 测试集变化则需要更新(输入、 输出、 是否隐藏)
-        if sets_output != params_output || sets_open != params_hidden || sets_input != params_input || set_score != params_score
+        if sets_output != params_output || sets_open != params_hidden || sets_input != params_input ||
+            set_score != params_score || params_test_set != set_match_rule
           test_set.delete_all unless test_set.blank?
-            params[:test_set].each_with_index do |set, index|
-                TestSet.create(:challenge_id => @challenge.id,
-                               :input => "#{set[:input]}",
-                               :output => "#{set[:output]}",
-                               :is_public => params_hidden[index],
-                               :score => set[:score],
-                               :position => (index + 1))
-            end
+          params[:test_set].each_with_index do |set, index|
+            # last： 末尾匹配， full: 全完匹配
+            logger.info("set: #{set}; match_rule : #{set[:match_rule]}")
+            match_rule = set[:match_rule] == 'last' ? 'last' : 'full'
+            TestSet.create(:challenge_id => @challenge.id,
+                           :input => "#{set[:input]}",
+                           :output => "#{set[:output]}",
+                           :is_public => params_hidden[index],
+                           :score => set[:score],
+                           :match_rule => "#{match_rule}",
+                           :position => (index + 1))
+          end
           @challenge.update_column(:modify_time, Time.now)
           # 测试集的
           @shixun.myshixuns.update_all(:system_tip => 0)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 2039dbc6f..f6fae91db 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -33,10 +33,11 @@ class CoursesController < ApplicationController
   before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
                                          :transfer_to_course_group, :delete_from_course, :export_member_scores_excel,
                                          :search_users, :add_students_by_search, :get_historical_courses, :add_teacher_popup,
-                                         :add_teacher, :export_couser_info, :export_member_act_score]
+                                         :add_teacher, :export_couser_info, :export_member_act_score,
+                                         :update_informs, :new_informs, :delete_informs]
   before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private, :change_course_admin,
-                                       :set_course_group, :create_group_by_importing_file, :update_informs, :new_informs,
-                                       :update_task_position, :tasks_list, :delete_informs]
+                                       :set_course_group, :create_group_by_importing_file,
+                                       :update_task_position, :tasks_list]
   before_action :teacher_or_admin_allowed, only: [:graduation_group_list, :create_graduation_group, :join_graduation_group,
                                                   :change_course_teacher, :course_group_list,
                                                   :teacher_application_review, :apply_teachers, :delete_course_teacher]
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index ac72577e0..b35f2996f 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -67,13 +67,19 @@ class GamesController < ApplicationController
         uri = "#{shixun_tomcat}/bridge/vnc/getvnc"
         params = {tpiID: @myshixun.id, :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(@shixun))}"}
         res = uri_post uri, params
+        logger.info("###############---- ")
         if res && res['code'].to_i != 0
           raise("实训云平台繁忙（繁忙等级：99）")
         end
-        # 无域名版本
-        #@vnc_url = "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless"
-        # 有域名版本
-        @vnc_url = "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless"
+
+        if request.subdomain == "pre-newweb"
+          # 无域名版本
+          @vnc_url = "http://#{service_host}:#{res['port']}/vnc_lite.html?password=headless"
+        else
+          # 有域名版本
+          @vnc_url = "https://#{res['port']}.#{service_host}/vnc_lite.html?password=headless"
+        end
+
         @vnc_evaluate = @shixun.vnc_evaluate
       rescue Exception => e
         Rails.logger.error(e.message)
@@ -531,10 +537,12 @@ class GamesController < ApplicationController
     game_challenge.test_sets.each do |test_set|
       input = test_set.input.nil? ? "" : test_set.input.gsub("\r\n", "\n")
       output = test_set.output.nil? ? "" : test_set.output.gsub("\r\n", "\n")
-      test_cases = {:input => input, :output => output}
+      test_cases = {:input => input, :output => output, :matchRule => test_set.match_rule}
       testSet << test_cases
     end
 
+    logger.info("##############testSet: #{testSet}")
+
     testCases = Base64.urlsafe_encode64(testSet.to_json) unless testSet.blank?
     # 评测类型： 0，1，2 用于webssh的评测， 3用于vnc
     podType = @shixun.vnc_evaluate ? 3 : @shixun.webssh
@@ -554,6 +562,15 @@ class GamesController < ApplicationController
     # needPortMapping： web类型需要pod端口映射
     br_params[:needPortMapping] = 8080 if @myshixun.mirror_name.include?("Web")
 
+    # 私密仓库的设置
+    secret_rep = @shixun.shixun_secret_repository
+    logger.info("############secret_rep: #{secret_rep}")
+    if secret_rep&.repo_name
+      secretGitUrl = repo_url secret_rep.repo_path
+      br_params.merge!({secretGitUrl:  Base64.urlsafe_encode64(secretGitUrl), secretDir: secret_rep.secret_dir_path})
+      logger.info("#######br_params:#{br_params}")
+    end
+
     # 中间层交互
     uri = "#{shixun_tomcat}/bridge/game/gameEvaluate"
     res = interface_post uri, br_params, 502, "gameEvaluate failed"
diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb
index 0242bff21..0e6135e8c 100644
--- a/app/controllers/graduation_topics_controller.rb
+++ b/app/controllers/graduation_topics_controller.rb
@@ -109,8 +109,8 @@ class GraduationTopicsController < ApplicationController
     @attachments = @graduation_topic.attachments
     left_banner_content = @course.course_modules.search_by_module_type("graduation")
     if left_banner_content.present?
-      @left_banner_id = left_banner_content.first.course_second_categories.first.id
-      @left_banner_name = left_banner_content.first.course_second_categories.first.name
+      @left_banner_id = left_banner_content.first.id
+      @left_banner_name = "毕设选题"
     end
   end
 
diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb
index e7be8b395..b4e98e05f 100644
--- a/app/controllers/question_banks_controller.rb
+++ b/app/controllers/question_banks_controller.rb
@@ -265,6 +265,7 @@ class QuestionBanksController < ApplicationController
       #   exercise.update_column(:quotes, exercise.quotes+1)
       # end
       new_exercise if new_exercise.save!
+      exercise.update_column(:quotes, exercise.quotes+1)
     end
   end
 
@@ -292,6 +293,7 @@ class QuestionBanksController < ApplicationController
       #   poll.update_column(:quotes, poll.quotes+1)
       # end
       new_poll if new_poll.save!
+      poll.update_column(:quotes, poll.quotes+1)
     end
   end
 
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 180c269b5..5f69f1b91 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -220,6 +220,16 @@ class ShixunsController < ApplicationController
 														 evaluate_script: @shixun.evaluate_script)
 				end
 
+				# 同步私密版本库
+				if @shixun.shixun_secret_repository
+					repo_name = "#{current_user.login}/secret_#{@shixun.identifier}"
+					fork_repository_name = "#{current_user.login}/secret_#{@new_shixun.identifier}"
+					ShixunSecretRepository.create!(shixun_id: @new_shixun.id,
+																				 repo_name: "#{repo_name}",
+																				 secret_dir_path: @shixun.shixun_secret_repository.secret_dir_path)
+					GitService.fork_repository(repo_path: "#{repo_name}.git", fork_repository_path: (fork_repository_name + ".git"))
+				end
+
 				# 同步镜像
 				if @shixun.mirror_repositories.present?
 					@shixun.mirror_repositories.each do |mirror|
@@ -448,6 +458,7 @@ class ShixunsController < ApplicationController
 						ShixunMirrorRepository.create(:shixun_id => @shixun.id, :mirror_repository_id => mirror)
 					end
 				end
+				logger.info("#########shixun_params#{shixun_params}")
 				@shixun.update_attributes(shixun_params)
 				logger.info("##########shixun_info_params: #{shixun_info_params}")
 				logger.info("##########params[:shixun_info][:evaluate_script]: #{params[:shixun_info][:evaluate_script]}")
@@ -472,8 +483,20 @@ class ShixunsController < ApplicationController
 						@shixun.shixun_service_configs.create!(config) if name.present?
 					end
 				end
+				# 添加第二仓库
+				if params[:is_secret_repository]
+					add_secret_repository
+				else
+					# 如果有仓库，就要删
+					if @shixun.shixun_secret_repository&.repo_name
+						@shixun.shixun_secret_repository.lock!
+						GitService.delete_repository(repo_path: @shixun.shixun_secret_repository.repo_path)
+						@shixun.shixun_secret_repository.destroy
+					end
+				end
+
 			rescue Exception => e
-				uid_logger_error(e.message)
+				uid_logger_error("实训保存失败--------#{e.message}")
 				tip_exception("实训保存失败")
 				raise ActiveRecord::Rollback
 			end
@@ -818,6 +841,30 @@ class ShixunsController < ApplicationController
 		end
 	end
 
+	# 设置私密版本库的在tpm中的目录
+	def set_secret_dir
+		raise("设置路径不能为空") if params[:secret_dir_path].blank?
+		raise("请先配置私密版本库") if @shixun.shixun_secret_repository.blank?
+		@shixun.shixun_secret_repository.update_attributes(:secret_dir_path => params[:secret_dir_path])
+		normal_status("设置成功")
+	end
+
+	def secret_repository
+		begin
+			@repo_path = @shixun.shixun_secret_repository&.repo_path
+			@repo_url = repo_url @repo_path
+			@trees = GitService.file_tree(repo_path: @repo_path, path: params[:path])
+			logger.info("#11@@#@#@#@111#@@@@###{@trees}")
+			if @trees
+				logger.info("#@@#@#@#@#@@@@###{@trees.try(:count)}")
+				@latest_commit = [GitService.commits(repo_path: @repo_path).first]
+				Rails.logger.info("########## #{@latest_commit}")
+			end
+		rescue Exception => e
+			logger.error(e.message)
+		end
+	end
+
 	include GitCommon
 
 	def update_file
@@ -954,7 +1001,13 @@ private
 	end
 
 	def find_repo_name
-		@repo_path = @shixun.try(:repo_path)
+		# 有私密版本库的参数时，需要拿私密仓库
+		@repo_path = if params[:secret_repository]
+									@shixun.shixun_secret_repository&.repo_path
+								else
+									@shixun.try(:repo_path)
+								 end
+		logger.info("######{@repo_path}")
 		@path = params[:path]
 	end
 
@@ -989,4 +1042,13 @@ private
 		modify_shixun = ShixunModify.exists?(:myshixun_id => current_myshixun.id, :shixun_id => @shixun.id, :status => 1)
 		games.size != min_challenges.size || modify_shixun
 	end
+
+	# 添加私密仓库
+	def add_secret_repository
+		# 防止跟tpm版本库重名，加了前缀secret
+		repo_path = repo_namespace(current_user.login, "secret_#{@shixun.identifier}")
+		GitService.add_repository(repo_path: repo_path)
+		ShixunSecretRepository.create!(repo_name: repo_path.split(".")[0], shixun_id: @shixun.id)
+	end
+
 end
diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index 526535157..ab62cbd45 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -458,7 +458,7 @@ class StudentWorksController < ApplicationController
     @shixun = @homework.shixuns.take
     # 提示： 这里如果includes outputs表的话： sum(:evaluate_count)会出现错误
     @games = @work.myshixun.games.joins(:challenge).reorder("challenges.position asc") if @work.myshixun
-    @comment = @work.student_works_scores.shixun_comment.first
+    @comment = @work.shixun_work_comments.find_by(challenge_id: 0)
 
     # 用户最大评测次数
     if @games
@@ -474,19 +474,37 @@ class StudentWorksController < ApplicationController
 
   # 实训作品的评阅
   def shixun_work_comment
-    tip_exception("评阅不能为空") if params[:comment].blank?
-    tip_exception("缺少is_hidden参数") if params[:is_hidden].blank? || ![1, 0].include?(params[:is_hidden])
-    comment = @work.student_works_scores.shixun_comment.first || StudentWorksScore.new(student_work_id: @work.id, user_id: current_user.id)
-    comment.comment = params[:comment]
-    comment.is_hidden = params[:is_hidden]
-    comment.save!
-    normal_status("评阅成功")
+    tip_exception("请至少输入一个评阅") if params[:comment].blank? && params[:hidden_comment].blank?
+    ActiveRecord::Base.transaction do
+      challenge = @homework.shixuns.first&.challenges.find_by(id: params[:challenge_id]) unless params[:challenge_id].blank?
+      if challenge.present?
+        @comment = @work.shixun_work_comments.find_by(challenge_id: challenge.id) ||
+          ShixunWorkComment.new(student_work_id: @work.id, user_id: current_user.id, challenge_id: challenge.id)
+      else
+        @comment = @work.shixun_work_comments.find_by(challenge_id: 0) ||
+          ShixunWorkComment.new(student_work_id: @work.id, user_id: current_user.id, challenge_id: 0)
+      end
+      @comment.comment = params[:comment]
+      @comment.hidden_comment = params[:hidden_comment]
+      @comment.save!
+    end
   end
 
   # 删除实训作品评阅
   def destroy_work_comment
-    @work.student_works_scores.shixun_comment.first.destroy! if @work.student_works_scores.shixun_comment.first.present?
-    normal_status("删除成功")
+    ActiveRecord::Base.transaction do
+      # tip_exception("visible_comment参数有误") if params[:visible_comment].nil?
+
+      comment = @work.shixun_work_comments.find_by!(id: params[:comment_id])
+      comment.destroy!
+      # params[:visible_comment] ? comment.comment = nil : comment.hidden_comment = nil
+      # if comment.comment.nil? && comment.hidden_comment.nil?
+      #   comment.destroy!
+      # else
+      #   comment.save!
+      # end
+      normal_status("删除成功")
+    end
   end
 
   def export_shixun_work_report
diff --git a/app/controllers/task_banks_controller.rb b/app/controllers/task_banks_controller.rb
index 82ce14b0c..2b1a400ef 100644
--- a/app/controllers/task_banks_controller.rb
+++ b/app/controllers/task_banks_controller.rb
@@ -12,7 +12,7 @@ class TaskBanksController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         @bank.update_attributes(gtask_bank_params)
-        Attachment.associate_container(params[:attachment_ids], @bank.id, @bank.class) if params[:attachment_ids].blank?
+        Attachment.associate_container(params[:attachment_ids], @bank.id, @bank.class) if params[:attachment_ids]
         normal_status(0, "更新成功")
       rescue Exception => e
         uid_logger(e.message)
diff --git a/app/controllers/users/question_banks_controller.rb b/app/controllers/users/question_banks_controller.rb
index 76523eca4..c5b837d0b 100644
--- a/app/controllers/users/question_banks_controller.rb
+++ b/app/controllers/users/question_banks_controller.rb
@@ -1,11 +1,12 @@
 class Users::QuestionBanksController < Users::BaseController
   before_action :require_login
-  before_action :private_user_resources!
+  skip_before_action :check_observed_user_exists!
+  # before_action :private_user_resources!
   before_action :check_query_params!
   before_action :check_user_permission!
 
   def index
-    service = Users::QuestionBankService.new(observed_user, query_params)
+    service = Users::QuestionBankService.new(User.current, query_params)
     question_banks = service.call
 
     @count          = question_banks.count
@@ -30,7 +31,7 @@ class Users::QuestionBanksController < Users::BaseController
           .where(commit_status: 1, exercises: { exercise_bank_id: question_bank_ids })
           .group('exercises.exercise_bank_id').count
       when 'poll' then
-        PollUser.joins(:poll).where(polls: { exercise_bank_id: question_bank_ids })
+        PollUser.joins(:poll).where(commit_status: 1, polls: { exercise_bank_id: question_bank_ids })
           .group('polls.exercise_bank_id').count
       when 'gtask' then
         GraduationWork.has_committed.joins(:graduation_task)
diff --git a/app/models/gtopic_bank.rb b/app/models/gtopic_bank.rb
index af5b267a6..609219711 100644
--- a/app/models/gtopic_bank.rb
+++ b/app/models/gtopic_bank.rb
@@ -1,7 +1,7 @@
 class GtopicBank < ApplicationRecord
   belongs_to :user
-  belongs_to :graduation_topic
-  belongs_to :course_list
+  belongs_to :graduation_topic, optional: true
+  belongs_to :course_list, optional: true
 
   has_many :attachments, as: :container, dependent: :destroy
   has_many :graduation_topics, dependent: :nullify
diff --git a/app/models/searchable/course.rb b/app/models/searchable/course.rb
index 5060d9ddd..794dec0e2 100644
--- a/app/models/searchable/course.rb
+++ b/app/models/searchable/course.rb
@@ -24,7 +24,7 @@ module Searchable::Course
       author_name: teacher&.real_name,
       author_school_name: teacher&.school_name,
       visits_count: visits,
-      members_count: members_count,
+      members_count: course_members_count,
       is_public: is_public == 1,
       first_category_url: ApplicationController.helpers.module_url(none_hidden_course_modules.first, self)
     }
diff --git a/app/models/shixun.rb b/app/models/shixun.rb
index 9ad3cbcdf..83d97f822 100644
--- a/app/models/shixun.rb
+++ b/app/models/shixun.rb
@@ -38,6 +38,9 @@ class Shixun < ApplicationRecord
 
   has_one :shixun_info, dependent: :destroy
 
+  # 第二版本库
+  has_one :shixun_secret_repository, dependent: :destroy
+
   belongs_to :user
   # 实训服务配置
   has_many :shixun_service_configs, :dependent => :destroy
diff --git a/app/models/shixun_secret_repository.rb b/app/models/shixun_secret_repository.rb
new file mode 100644
index 000000000..699c6dd30
--- /dev/null
+++ b/app/models/shixun_secret_repository.rb
@@ -0,0 +1,11 @@
+class ShixunSecretRepository < ApplicationRecord
+  # repo_name: 仓库名
+  # secret_dir_name: 在tpm仓库的那个目录下
+
+  belongs_to :shixun
+
+  def repo_path
+    "#{repo_name}.git"
+  end
+
+end
diff --git a/app/models/shixun_work_comment.rb b/app/models/shixun_work_comment.rb
new file mode 100644
index 000000000..7a67238ab
--- /dev/null
+++ b/app/models/shixun_work_comment.rb
@@ -0,0 +1,5 @@
+class ShixunWorkComment < ApplicationRecord
+  belongs_to :student_work
+  belongs_to :user
+  belongs_to :challenge, optional: true
+end
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 168cfeb68..9c9efa17c 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -7,6 +7,7 @@ class StudentWork < ApplicationRecord
   belongs_to :myshixun, optional: true
   has_many :student_works_evaluation_distributions, dependent: :destroy
   has_many :student_works_scores, dependent: :destroy
+  has_many :shixun_work_comments, dependent: :destroy
   belongs_to :project, optional: true
 
   # attachtype: 1（正常提交的附件）， 7（补交的附件）
diff --git a/app/models/test_set.rb b/app/models/test_set.rb
index 148cb8720..7772a3a00 100644
--- a/app/models/test_set.rb
+++ b/app/models/test_set.rb
@@ -1,2 +1,3 @@
 class TestSet < ApplicationRecord
+  # match_rule: 匹配规则： full： 完全匹配， last： 末尾匹配
 end
diff --git a/app/views/challenges/edit.json.jbuilder b/app/views/challenges/edit.json.jbuilder
index 5ae15cf67..3e7f5b425 100644
--- a/app/views/challenges/edit.json.jbuilder
+++ b/app/views/challenges/edit.json.jbuilder
@@ -16,7 +16,7 @@ elsif @tab == 1
   json.has_web_route @shixun.has_web_route?
   json.test_sets @challenge.test_sets do |set|
     json.hidden (set.is_public ? 0 : 1)
-    json.(set, :input, :output, :score)
+    json.(set, :input, :output, :score, :match_rule)
   end
 elsif @tab == 2
   # 参考答案
diff --git a/app/views/searchs/index.json.jbuilder b/app/views/searchs/index.json.jbuilder
index 5fa0c2744..e12ebbca8 100644
--- a/app/views/searchs/index.json.jbuilder
+++ b/app/views/searchs/index.json.jbuilder
@@ -6,6 +6,12 @@ json.results do
 
     json.title highlights.delete(:name)&.join('...') || obj.searchable_title
     # json.description highlights.values[0,5].each { |arr| arr.is_a?(Array) ? arr.join('...') : arr }.join('<br/>')
+
+    # 去除开头标点符号
+    reg = /^[，。？：；‘’！“”—……、]/
+    highlights[:description]&.first&.sub!(reg, '')
+    highlights[:content]&.first&.sub!(reg, '')
+
     json.content highlights
   end
 end
\ No newline at end of file
diff --git a/app/views/shixuns/secret_repository.json.jbuilder b/app/views/shixuns/secret_repository.json.jbuilder
new file mode 100644
index 000000000..482a683a8
--- /dev/null
+++ b/app/views/shixuns/secret_repository.json.jbuilder
@@ -0,0 +1,8 @@
+json.trees @trees
+
+if @trees.present?
+  json.partial! 'shixuns/commit', locals: { commits: @latest_commit }
+end
+
+json.git_url @repo_url
+json.secret_dir_path @shixun.shixun_secret_repository&.secret_dir_path
\ No newline at end of file
diff --git a/app/views/shixuns/settings.json.jbuilder b/app/views/shixuns/settings.json.jbuilder
index ad29f4176..c9142dab0 100644
--- a/app/views/shixuns/settings.json.jbuilder
+++ b/app/views/shixuns/settings.json.jbuilder
@@ -30,6 +30,8 @@ json.shixun do
   json.scope_partment @shixun.schools.map(&:name) # 公开范围
   json.opening_time @shixun.opening_time
   json.forbid_copy @shixun.forbid_copy
+  # 私密仓库
+  json.is_secret_repository @shixun.shixun_secret_repository.present?
 
   # 实训服务配置
   json.shixun_service_configs do
diff --git a/app/views/shixuns/show.json.jbuilder b/app/views/shixuns/show.json.jbuilder
index 8e49a99f4..4a0c3ebd6 100644
--- a/app/views/shixuns/show.json.jbuilder
+++ b/app/views/shixuns/show.json.jbuilder
@@ -2,3 +2,4 @@ json.fork_from @fork_from
 json.identity User.current.shixun_identity(@shixun)
 json.power @power
 json.partial! 'shixuns/top', locals: { shixun: @shixun, current_myshixun: @current_myshixun }
+json.secret_repository @shixun.shixun_secret_repository.present?
diff --git a/app/views/student_works/shixun_work_comment.json.jbuilder b/app/views/student_works/shixun_work_comment.json.jbuilder
new file mode 100644
index 000000000..f9f47cba5
--- /dev/null
+++ b/app/views/student_works/shixun_work_comment.json.jbuilder
@@ -0,0 +1,3 @@
+json.comment_id @comment.id
+json.status 0
+json.message "评阅成功"
\ No newline at end of file
diff --git a/app/views/student_works/shixun_work_report.json.jbuilder b/app/views/student_works/shixun_work_report.json.jbuilder
index 29a5c1874..2c9558fdc 100644
--- a/app/views/student_works/shixun_work_report.json.jbuilder
+++ b/app/views/student_works/shixun_work_report.json.jbuilder
@@ -36,6 +36,10 @@ if @shixun
       challenge_score = @homework.challenge_score game.challenge_id
       json.game_score_full challenge_score
       json.game_score @work.work_challenge_score game, challenge_score
+      challenge_comment = @work.shixun_work_comments.find_by(challenge_id: game.challenge_id)
+      json.challenge_comment challenge_comment&.comment
+      json.challenge_comment_hidden @user_course_identity < Course::STUDENT ? challenge_comment&.hidden_comment : nil
+      json.comment_id challenge_comment&.id
     end
   end
 
@@ -54,8 +58,9 @@ if @shixun
   json.passed_time @work.myshixun&.passed_time
 
   # 评阅信息
-  json.work_comment @user_course_identity < Course::STUDENT || !@comment&.is_hidden ? @comment&.comment : nil
-  json.work_comment_hidden @comment&.is_hidden
+  json.work_comment @comment&.comment
+  json.work_comment_hidden @user_course_identity < Course::STUDENT ? @comment&.hidden_comment : nil
+  json.comment_id @comment&.id
 
 # 图形统计
 # 1： 效率
diff --git a/config/initializers/session_extenstions.rb b/config/initializers/session_extenstions.rb
index 36a8ae8c7..cee3dfc06 100644
--- a/config/initializers/session_extenstions.rb
+++ b/config/initializers/session_extenstions.rb
@@ -1,35 +1,33 @@
-#coding=utf-8
-
-module  SessionExtenstions
-
-  module EntryExtension
-    def compressed?
-      @compressed
-    end
-
-    def value
-      if @value
-        begin
-          Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
-        rescue TypeError
-          compressed? ? Zlib::Inflate.inflate(@value) : @value
-        end
-      end
-    end
-
-    def size
-      if @value.nil?
-        0
-      else
-        @value.bytesize
-      end
-    end
-  end
-
-
-end
-
-ActiveSupport::Cache::Entry.const_set("DEFAULT_COMPRESS_LIMIT", 1)
-ActiveSupport::Cache::Entry.send(:prepend, SessionExtenstions::EntryExtension)
-
-
+#coding=utf-8
+
+module  SessionExtenstions
+
+  module EntryExtension
+    def compressed?
+      @compressed
+    end
+
+    def value
+      if @value
+        begin
+          Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
+        rescue TypeError
+          compressed? ? Zlib::Inflate.inflate(@value) : @value
+        end
+      end
+    end
+
+    def size
+      if @value.nil?
+        0
+      else
+        @value.bytesize
+      end
+    end
+  end
+
+
+end
+
+ActiveSupport::Cache::Entry.const_set("DEFAULT_COMPRESS_LIMIT", 1)
+ActiveSupport::Cache::Entry.send(:prepend, SessionExtenstions::EntryExtension)
diff --git a/config/routes.rb b/config/routes.rb
index 0d1b979b1..0d6e108ad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,12 +55,14 @@ Rails.application.routes.draw do
         get :homepage_info
       end
 
+      get :question_banks, on: :collection, to: 'users/question_banks#index'
+
       scope module: :users do
         resources :courses, only: [:index]
         resources :shixuns, only: [:index]
         resources :projects, only: [:index]
         resources :subjects, only: [:index]
-        resources :question_banks, only: [:index]
+        # resources :question_banks, only: [:index]
         resource :experience_records, only: [:show]
         resource :grade_records, only: [:show]
         resource :watch, only: [:create, :destroy]
@@ -195,6 +197,8 @@ Rails.application.routes.draw do
         get :get_script_contents
         get :get_custom_script
         post :repository
+        post :secret_repository
+        post :set_secret_dir
         post :commits
         post :file_content
         post :update_file
diff --git a/db/migrate/20190907021100_migrate_bank_reference_id.rb b/db/migrate/20190907021100_migrate_bank_reference_id.rb
new file mode 100644
index 000000000..c71034167
--- /dev/null
+++ b/db/migrate/20190907021100_migrate_bank_reference_id.rb
@@ -0,0 +1,31 @@
+class MigrateBankReferenceId < ActiveRecord::Migration[5.2]
+  def change
+    HomeworkBank.all.each do |bank|
+      if bank.homework_common
+        bank.homework_common.update_column("homework_bank_id", bank.id) if bank.homework_common.homework_bank_id.nil?
+      end
+    end
+
+    GtopicBank.all.each do |bank|
+      if bank.graduation_topic
+        bank.graduation_topic.update_column("gtopic_bank_id", bank.id) if bank.graduation_topic.gtopic_bank_id.nil?
+      end
+    end
+
+    GtaskBank.all.each do |bank|
+      if bank.graduation_task
+        bank.graduation_task.update_column("gtask_bank_id", bank.id) if bank.graduation_task.gtask_bank_id.nil?
+      end
+    end
+
+    ExerciseBank.all.each do |bank|
+      if bank.container_type == 'Exercise'
+        exercise = Exercise.find_by(id: bank.container_id)
+        exercise.update_column("exercise_bank_id", bank.id) if exercise && exercise.exercise_bank_id.nil?
+      elsif bank.container_type == 'Poll'
+        poll = Poll.find_by(id: bank.container_id)
+        poll.update_column("exercise_bank_id", bank.id) if poll && poll.exercise_bank_id.nil?
+      end
+    end
+  end
+end
diff --git a/db/migrate/20190907061918_migrate_bank_quotes.rb b/db/migrate/20190907061918_migrate_bank_quotes.rb
new file mode 100644
index 000000000..9f278860d
--- /dev/null
+++ b/db/migrate/20190907061918_migrate_bank_quotes.rb
@@ -0,0 +1,28 @@
+class MigrateBankQuotes < ActiveRecord::Migration[5.2]
+  def change
+    HomeworkBank.all.each do |bank|
+      task_count = bank.homework_commons.count
+      bank.update_column("quotes", task_count == 0 ? 1 : task_count)
+    end
+
+    GtopicBank.all.each do |bank|
+      task_count = bank.graduation_topics.count
+      bank.update_column("quotes", task_count == 0 ? 1 : task_count)
+    end
+
+    GtaskBank.all.each do |bank|
+      task_count = bank.graduation_tasks.count
+      bank.update_column("quotes", task_count == 0 ? 1 : task_count)
+    end
+
+    ExerciseBank.all.each do |bank|
+      if bank.container_type == 'Exercise'
+        task_count = bank.exercises.count
+        bank.update_column("quotes", task_count == 0 ? 1 : task_count)
+      elsif bank.container_type == 'Poll'
+        task_count = bank.polls.count
+        bank.update_column("quotes", task_count == 0 ? 1 : task_count)
+      end
+    end
+  end
+end
diff --git a/db/migrate/20190909061930_create_shixun_secret_repositories.rb b/db/migrate/20190909061930_create_shixun_secret_repositories.rb
new file mode 100644
index 000000000..5526869f8
--- /dev/null
+++ b/db/migrate/20190909061930_create_shixun_secret_repositories.rb
@@ -0,0 +1,10 @@
+class CreateShixunSecretRepositories < ActiveRecord::Migration[5.2]
+  def change
+    create_table :shixun_secret_repositories do |t|
+      t.references :shixun
+      t.string :repo_name
+      t.string :secret_dir_path
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20190909072626_add_match_rule_for_test_sets.rb b/db/migrate/20190909072626_add_match_rule_for_test_sets.rb
new file mode 100644
index 000000000..2d9d53f0f
--- /dev/null
+++ b/db/migrate/20190909072626_add_match_rule_for_test_sets.rb
@@ -0,0 +1,7 @@
+class AddMatchRuleForTestSets < ActiveRecord::Migration[5.2]
+  def change
+    add_column :test_sets, :match_rule, :string
+    TestSet.update_all(match_rule: 'full')
+
+  end
+end
diff --git a/db/migrate/20190909080508_create_shixun_work_comments.rb b/db/migrate/20190909080508_create_shixun_work_comments.rb
new file mode 100644
index 000000000..eb21f0d04
--- /dev/null
+++ b/db/migrate/20190909080508_create_shixun_work_comments.rb
@@ -0,0 +1,13 @@
+class CreateShixunWorkComments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :shixun_work_comments do |t|
+      t.references :student_work, index: true, type: :integer
+      t.references :challenge, index: true, type: :integer, default: 0
+      t.references :user, index: true, type: :integer
+      t.text :comment
+      t.text :hidden_comment
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20190909082555_migrate_shixun_work_comment.rb b/db/migrate/20190909082555_migrate_shixun_work_comment.rb
new file mode 100644
index 000000000..f58531b80
--- /dev/null
+++ b/db/migrate/20190909082555_migrate_shixun_work_comment.rb
@@ -0,0 +1,13 @@
+class MigrateShixunWorkComment < ActiveRecord::Migration[5.2]
+  def change
+    StudentWorksScore.where(is_ultimate: 0, score: nil).where("created_at > '2019-09-04 00:00:00'").each do |work_score|
+      if work_score.student_work && work_score.student_work.homework_common&.shixuns
+        if work_score.is_hidden
+          ShixunWorkComment.create!(student_work_id: work_score.student_work_id, user_id: work_score.user_id, hidden_comment: work_score.comment)
+        else
+          ShixunWorkComment.create!(student_work_id: work_score.student_work_id, user_id: work_score.user_id, comment: work_score.comment)
+        end
+      end
+    end
+  end
+end
diff --git a/public/javascripts/educoder/edu_application.js b/public/javascripts/educoder/edu_application.js
index 612a5a44b..7f8f8ac4d 100644
--- a/public/javascripts/educoder/edu_application.js
+++ b/public/javascripts/educoder/edu_application.js
@@ -218,7 +218,7 @@ function _initSider() {
     })
 }
 $(function() {
-    loadHeader();
+    // loadHeader();
     _initSider();
 
     $(window).scroll(function() {
@@ -436,86 +436,86 @@ function editormd_to_html(id, callback) {
 }
 
 function loadHeader() {
-    //头部导航条的----------显示搜索框
-    $("#search-open").on("click", function(e) {
-        $(this).hide();
-        //        $("#header-nav").animate({opacity:"0"},1000);
-        $(".posi-search").show()
-        // .animate({opacity:"1"},1000);
-        $("#header-nav").css("z-index", "2");
-        $(".posi-search").css("z-index", "3");
-        // $(".search-input").val("");  //  不清空
-        $(".search-input").focus();
-        $(".search-all .search-content").hide();
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    $(".search-input").on("click", function(e) {
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    //搜索框输入内容
-    $(".search-input").on("input", function(e) {
-        if ($(".search-input").val() == "") {
-            $(".search-all .search-content").hide();
-        } else {
-            $(".search-all .search-content").show();
-        }
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    //搜索
-    $("#header_keyword_search").on("click", header_search);
-    $("input[name='search_keyword']").on("keydown", function(event) {
-        var code;
-        if (!event) {
-            event = window.event;
-            //针对ie浏览器
-            code = event.keyCode;
-        } else {
-            code = event.keyCode;
-        }
-        if (code == 13) {
-            header_search();
-            return false;
-        }
-    });
-    $(".search-clear").click(function(e) {
-        e.stopPropagation();
-    });
-    //切换搜索条件
-    $("#searchkey li").click(function(e) {
-        var key = $($(this).children("a")[0]).html();
-        switch (key) {
-        case '实训':
-            $("#search_type").val('1');
-            break;
-        case '课堂':
-            $("#search_type").val('2');
-            break;
-        case '用户':
-            $("#search_type").val('3');
-            break;
-        }
-        $("#searchkey").siblings(".searchkey").html(key);
-        //        $("#searchkey").hide();
-        e.stopPropagation();
-        //阻止冒泡
-    });
-    //切换选择导航条
-    $("#header-nav li").click(function() {
-        $("#header-nav li").removeClass("active");
-        $(this).addClass("active");
-    });
-    //点击页面其它（与搜索框无关的地方）都会将搜索框隐藏，所以与搜索框有关的地方需要阻止冒泡
-    $("body").on("click", function() {
-        closeSearch();
-    });
-
-    $(".search_history").on("click", function() {
-        $("input[name='search_keyword']").val($(this).html());
-        header_search();
-    });
+    // //头部导航条的----------显示搜索框
+    // $("#search-open").on("click", function(e) {
+    //     $(this).hide();
+    //     //        $("#header-nav").animate({opacity:"0"},1000);
+    //     $(".posi-search").show()
+    //     // .animate({opacity:"1"},1000);
+    //     $("#header-nav").css("z-index", "2");
+    //     $(".posi-search").css("z-index", "3");
+    //     // $(".search-input").val("");  //  不清空
+    //     $(".search-input").focus();
+    //     $(".search-all .search-content").hide();
+    //     e.stopPropagation();
+    //     //阻止冒泡
+    // });
+    // $(".search-input").on("click", function(e) {
+    //     e.stopPropagation();
+    //     //阻止冒泡
+    // });
+    // //搜索框输入内容
+    // $(".search-input").on("input", function(e) {
+    //     if ($(".search-input").val() == "") {
+    //         $(".search-all .search-content").hide();
+    //     } else {
+    //         $(".search-all .search-content").show();
+    //     }
+    //     e.stopPropagation();
+    //     //阻止冒泡
+    // });
+    // //搜索
+    // $("#header_keyword_search").on("click", header_search);
+    // $("input[name='search_keyword']").on("keydown", function(event) {
+    //     var code;
+    //     if (!event) {
+    //         event = window.event;
+    //         //针对ie浏览器
+    //         code = event.keyCode;
+    //     } else {
+    //         code = event.keyCode;
+    //     }
+    //     if (code == 13) {
+    //         header_search();
+    //         return false;
+    //     }
+    // });
+    // $(".search-clear").click(function(e) {
+    //     e.stopPropagation();
+    // });
+    // //切换搜索条件
+    // $("#searchkey li").click(function(e) {
+    //     var key = $($(this).children("a")[0]).html();
+    //     switch (key) {
+    //     case '实训':
+    //         $("#search_type").val('1');
+    //         break;
+    //     case '课堂':
+    //         $("#search_type").val('2');
+    //         break;
+    //     case '用户':
+    //         $("#search_type").val('3');
+    //         break;
+    //     }
+    //     $("#searchkey").siblings(".searchkey").html(key);
+    //     //        $("#searchkey").hide();
+    //     e.stopPropagation();
+    //     //阻止冒泡
+    // });
+    // //切换选择导航条
+    // $("#header-nav li").click(function() {
+    //     $("#header-nav li").removeClass("active");
+    //     $(this).addClass("active");
+    // });
+    // //点击页面其它（与搜索框无关的地方）都会将搜索框隐藏，所以与搜索框有关的地方需要阻止冒泡
+    // $("body").on("click", function() {
+    //     closeSearch();
+    // });
+		//
+    // $(".search_history").on("click", function() {
+    //     $("input[name='search_keyword']").val($(this).html());
+    //     header_search();
+    // });
 }
 
 function header_search() {
diff --git a/public/react/public/images/share_logo_icon.jpg b/public/react/public/images/share_logo_icon.jpg
new file mode 100644
index 000000000..079ac4342
Binary files /dev/null and b/public/react/public/images/share_logo_icon.jpg differ
diff --git a/public/react/public/index.html b/public/react/public/index.html
index b252ccf36..de539ffba 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -22,6 +22,8 @@
     -->
     <title>EduCoder</title>
     <script type="text/javascript">
+      window.__testImageUrl = "https://pre-newweb.educoder.net/react/build/images/share_logo_icon.jpg"
+
       window.__isR = true;
       // 不支持ie9 ie10
       if (
diff --git a/public/react/src/App.js b/public/react/src/App.js
index d156bc241..194d8f22f 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -37,7 +37,7 @@ import {MuiThemeProvider, createMuiTheme} from 'material-ui/styles';
 
 import history from './history';
 
-import {SnackbarHOC} from 'educoder'
+import {SnackbarHOC, configShareForIndex} from 'educoder'
 import {initAxiosInterceptors} from './AppConfig'
 
 
@@ -326,22 +326,7 @@ class App extends Component {
 				});
 				wx.ready(function () {
 					console.log('wx is ready')
-					var shareData = {
-						title: 'EduCoder',
-						desc: '创新源于实践',
-						link: currentUrl,
-						imgUrl: window.__testImageUrl 
-							|| (currentUrl.endsWith('/') ? currentUrl : currentUrl + '/') + 'images/educoder/index/subject/subject15.jpg'
-					};
-			
-					wx.onMenuShareAppMessage(shareData);//分享给好友
-					wx.onMenuShareTimeline(shareData);//分享到朋友圈
-					wx.onMenuShareQQ(shareData);//分享给手机QQ
-					wx.onMenuShareWeibo(shareData);//分享腾讯微博
-					wx.onMenuShareQZone(shareData);//分享到QQ空间
-			
-			
-			
+					configShareForIndex()
 				});
 				wx.error(function (res) {
 					console.log('wx is error')
diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 5b1d7ac28..fcd0ba7e4 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -20,6 +20,8 @@ export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, ap
         downloadFile, sortDirections } from 	'./TextUtil'
 export { handleDateString, getNextHalfHourOfMoment,formatDuring } from 	'./DateUtil'
 
+export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from 	'./util/ShareUtil'
+
 export { isDev as isDev, isMobile } from 					'./Env'
 
 export { toStore as toStore, fromStore as fromStore } from 	'./Store'
diff --git a/public/react/src/common/util/ShareUtil.js b/public/react/src/common/util/ShareUtil.js
new file mode 100644
index 000000000..845297899
--- /dev/null
+++ b/public/react/src/common/util/ShareUtil.js
@@ -0,0 +1,78 @@
+const host = window.location.host
+const wx = window.wx
+function share(shareData) {
+    try {
+        wx.onMenuShareAppMessage(shareData);//分享给好友
+        wx.onMenuShareTimeline(shareData);//分享到朋友圈
+        wx.onMenuShareQQ(shareData);//分享给手机QQ
+        wx.onMenuShareWeibo(shareData);//分享腾讯微博
+        wx.onMenuShareQZone(shareData);//分享到QQ空间
+    } catch(e) {
+        console.log(e)
+    }
+}
+
+/**
+    实践课程	平台提供涵盖基础入门、案例实践和创新应用的完整实训项目体系，通过由浅入深的实训路径，帮助学生快速提升实战能力。
+    实训项目	覆盖不同专业的IT实验和实训，每周更新，无需配置本机实验环境，随时随地开启企业级真实实训。
+    翻转课堂	自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。
+    单个课程和实训	获取课程/实训的简介	该课程或者实训展示的缩略图
+
+ */
+export function configShareForIndex () {
+    if (!wx) return;
+    var shareData = {
+        title: 'EduCoder - 首页',
+        desc: 'Educoder是一个面向计算机类的互联网IT教育和实战平台，提供企业级工程实训，以实现工程化专业教学的自动化和智能化。高校和企业人员可以在此开展计算机实践性教学活动，将传统的知识传授和时兴的工程实战一体化。',
+        link: host,
+        imgUrl: window.__testImageUrl 
+            || host + '/react/build/images/share_logo_icon.jpg'
+    };
+    share(shareData)
+}
+export function configShareForPaths () {
+    if (!wx) return;
+    var shareData = {
+        title: 'EduCoder - 实践课程',
+        desc: '平台提供涵盖基础入门、案例实践和创新应用的完整实训项目体系，通过由浅入深的实训路径，帮助学生快速提升实战能力。',
+        link: `${host}/paths`,
+        imgUrl: window.__testImageUrl 
+            || host + '/react/build/images/share_logo_icon.jpg'
+    };
+    share(shareData)
+}
+export function configShareForShixuns () {
+    if (!wx) return;
+    var shareData = {
+        title: 'EduCoder - 实训项目',
+        desc: '覆盖不同专业的IT实验和实训，每周更新，无需配置本机实验环境，随时随地开启企业级真实实训。',
+        link: `${host}/shixuns`,
+        imgUrl: window.__testImageUrl 
+            || host + '/react/build/images/share_logo_icon.jpg'
+    };
+    share(shareData)
+}
+export function configShareForCourses () {
+    if (!wx) return;
+    var shareData = {
+        title: 'EduCoder - 翻转课堂',
+        desc: '自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。',
+        link: `${host}/courses`,
+        imgUrl: window.__testImageUrl 
+            || host + '/react/build/images/share_logo_icon.jpg'
+    };
+    share(shareData)
+}
+
+// detail
+export function configShareForCustom (title, desc, path, imgUrl) {
+    if (!wx) return;
+    var shareData = {
+        title: title,
+        desc: desc,
+        link: `${host}/${path}`,
+        imgUrl: imgUrl || window.__testImageUrl 
+            || host + '/react/build/images/share_logo_icon.jpg'
+    };
+    share(shareData)
+}
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 5693b3788..b5fb8b047 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -391,7 +391,7 @@ class CommonWorkDetailIndex extends Component{
 
                         { work_statuses && work_statuses.indexOf('补交作品') != -1 &&
                         <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                            onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}>
+                            onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}>
                         补交作品</a> }
 
                         {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
diff --git a/public/react/src/modules/courses/busyWork/NewWorkForm.js b/public/react/src/modules/courses/busyWork/NewWorkForm.js
index 6083252bc..f5d4d9eb4 100644
--- a/public/react/src/modules/courses/busyWork/NewWorkForm.js
+++ b/public/react/src/modules/courses/busyWork/NewWorkForm.js
@@ -100,6 +100,7 @@ class NewWorkForm extends Component{
     const courseId = this.state.course_id || this.props.match.params.coursesId ;
     
     this.props.form.validateFieldsAndScroll((err, values) => {
+      if(err && err.personNum) delete err.personNum;
       console.log(values)
       const mdContnet = this.contentMdRef.current.getValue().trim();
       console.log(mdContnet)
@@ -135,7 +136,7 @@ class NewWorkForm extends Component{
       }
 
       // const errKeys = Object.keys(err);  // || errKeys.length == 1 && errKeys[0] == 'content' && mdContnet
-      if (!err) {
+      if (!err || Object.keys(err).length == 0) {
         if (this.state.isEdit) {
           this.doEdit(courseId, values)
         } else {
@@ -450,12 +451,13 @@ class NewWorkForm extends Component{
                   className="AboutInputForm groupSetting"
                 > 
                 {getFieldDecorator('personNum', {
-                    rules: [{
+                    validateTrigger: 'onNone',
+                    // rules: [{
                       // required: true,
                       // message: '人数不能为空'
                       // validator: this.personNumValidator
                       // required: true, message: '请输入最小人数和最大人数'
-                    }],
+                    // }],
                   })(
                     <div>
                       <p className="clearfix">
diff --git a/public/react/src/modules/courses/common/ModalWrapper.js b/public/react/src/modules/courses/common/ModalWrapper.js
index 44495d336..e92a508d6 100644
--- a/public/react/src/modules/courses/common/ModalWrapper.js
+++ b/public/react/src/modules/courses/common/ModalWrapper.js
@@ -53,7 +53,7 @@ class ModalWrapper extends Component{
               {this.props.checkBoxValuestype===true?<div className={"mt10 color-red"}>
                       请先选择课堂
               </div>:""}
-              <div className="mt30 marginauto clearfix edu-txt-center">
+              <div className="mt20 marginauto clearfix edu-txt-center">
                 <a onClick={this.onCancel} className="pop_close task-btn mr30">{ cancelText || '取消' }</a>
                 <a onClick={this.onOk} className="task-btn task-btn-orange" id="submit_send_shixun">{ okText || "确定" }</a>
               </div>
diff --git a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
index ab67dddc6..120e57b2b 100644
--- a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
@@ -9,52 +9,71 @@ class AppraiseModal extends Component{
 		this.state={
 			group_ids:[],
 			fileList:[],
-			textareaval:undefined,
 			Inputsval:undefined,
-			valuetype:0,
-			textareavaltype:false
+			textareavaltype:false,
+			comment:undefined,
+			hidden_comment:undefined
 		}
 	}
 
 	componentDidMount() {
+		let{data,work_comment,work_comment_hidden}=this.props;
 
-		this.setState({
-			valuetype:this.props.work_type===undefined?0:this.props.work_type,
-			textareaval:this.props.work_comment,
-		})
+		if(this.props.showAppraisetype==="child"){
+				data.stage_list.map((item,key)=>{
+					if(this.props.challenge_id===item.challenge_id){
+						this.setState({
+							comment:item.challenge_comment,
+							hidden_comment:item.challenge_comment_hidden,
+						})
+					}
+				})
+		}else{
+			this.setState({
+				comment:work_comment,
+				hidden_comment:work_comment_hidden,
+			})
+		}
 
 	}
 
-	onChanges=(e)=>{
-    this.setState({
-			valuetype:e.target.value
+	comment=(e)=>{
+		this.setState({
+			comment:e.target.value
 		})
 	}
 
-	settextarea=(e)=>{
+	hidden_comment=(e)=>{
 		this.setState({
-			textareaval:e.target.value
+			hidden_comment:e.target.value
 		})
 	}
-
 	Saves=()=>{
-		let{textareaval,valuetype}=this.state;
+		let{comment,hidden_comment}=this.state;
+    let commenttype=comment===undefined||comment===null||comment==="";
+		let hidden_commenttype=hidden_comment===undefined||hidden_comment===null||hidden_comment==="";
 
-		if(textareaval===undefined||textareaval===null||textareaval===""){
+		if(commenttype===true&&hidden_commenttype===true){
 			this.setState({
 				textareavaltype:true
 			})
 			return
 		}
 
+		//comment	是	text	可见的评阅内容
+		// hidden_comment	是	text	不可见的评阅内容
+		// challenge_id	否	int	关卡id（关卡评阅才需传关卡id）
+   let challenge_id=this.props.showAppraisetype==="child"?this.props.challenge_id:undefined
+
 		let url=`/student_works/${this.props.match.params.homeworkid}/shixun_work_comment.json`
 		axios.post(url, {
-			comment:textareaval,
-			is_hidden:valuetype
+			comment:comment,
+			hidden_comment:hidden_comment,
+			challenge_id:challenge_id
 		}).then((response) => {
      if(response.data.status===0){
+			 this.props.showCancel(comment,hidden_comment,challenge_id,response.data.comment_id)
 			 this.props.showNotification(response.data.message)
-			 this.props.showCancel(textareaval,valuetype)
 		 }else{
 			 this.props.showNotification(response.data.message)
 		 }
@@ -64,15 +83,41 @@ class AppraiseModal extends Component{
 	}
 
 	render(){
-		let {textareaval,Inputsval,textareavaltype,Inputsvaltype}=this.state;
-		const radioStyle = {
-			display: 'block',
-			height: '30px',
-			lineHeight: '30px',
-		};
-
+		let {textareavaltype,comment,hidden_comment}=this.state;
 		return(
 			<div>
+
+				<style>
+					{
+						`
+								@media (max-width: 2000px) {
+											.WordNumberTextarea{
+											  height: 130px !important;
+											}
+									}
+
+								 @media (max-width: 1350px) {
+										.HomeworkModal{
+ 										  top:10px !important;
+ 										}
+ 											.WordNumberTextarea{
+											  height: 80px !important;
+											}
+									}
+
+	 								@media (max-width: 1250px) {
+ 										.HomeworkModal{
+ 										  top:0px !important;
+ 										}
+
+ 										.WordNumberTextarea{
+											  height: 40px !important;
+									  }
+									}
+
+									`
+					}
+				</style>
 				<Modal
 					keyboard={false}
 					className={"HomeworkModal"}
@@ -91,12 +136,9 @@ class AppraiseModal extends Component{
 								    padding: 0px 15px 15px 15px;
 								}
 								.font{
-								    width: 48px;
-										height: 16px;
-										font-size: 16px;
-										font-weight: 400;
-										color: rgba(5,16,26,1);
-										line-height: 16px;
+									font-size: 14px;
+									font-weight: 400;
+									color: rgba(5,16,26,1);
 								}
 								.newfont{
 								    height: 16px;
@@ -110,25 +152,31 @@ class AppraiseModal extends Component{
 							}
 						</style>
 						<div className="clearfix">
-							<p className={"font mt10 mb10"}>
-								权限：
+							<p className={"font mt10 mb10 ml10"}>
+								可见:(学生可查看老师的评阅内容）
 							</p>
-							<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>
-								<Radio value={0} style={radioStyle} className={"newfont"}>可见  (学生查看老师的评阅内容）</Radio>
-								<Radio value={1} style={radioStyle} className={"newfont"}>不可见  (仅对课堂老师可见）</Radio>
-							</Radio.Group>
+							{/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/}
+								{/*<Radio value={0} style={radioStyle} className={"newfont"}>可见  (学生查看老师的评阅内容）</Radio>*/}
+								{/*<Radio value={1} style={radioStyle} className={"newfont"}>不可见  (仅对课堂老师可见）</Radio>*/}
+							{/*</Radio.Group>*/}
+							<WordNumberTextarea
+								placeholder={"请填写评阅内容"}
+								onInput={(e)=>this.comment(e)}
+								value={comment}
+								maxlength={500}
+							/>
 
-							<p className={"font mt10 mb20"}>
-								内容：
+							<p className={"font mt10 mb10 ml10"}>
+								不可见:(仅对课堂老师可见）
 							</p>
 							<WordNumberTextarea
 								placeholder={"请填写评阅内容"}
-								onInput={(e)=>this.settextarea(e)}
-								value={textareaval}
+								onInput={(e)=>this.hidden_comment(e)}
+								value={hidden_comment}
 								maxlength={500}
 							/>
 
-							<li style={{height:"20px",lineHeight:"20px"}} className={textareavaltype===true?"color-red mt20 mb10":"none"}><span>评阅内容不能为空</span></li>
+							<li style={{height:"20px",lineHeight:"20px"}} className={textareavaltype===true?"color-red mt20 mb10":"none"}><span>评阅内容至少有一个不为空</span></li>
 						</div>
 
 						<div className={textareavaltype===false?"mt20 clearfix edu-txt-center":"clearfix edu-txt-center"}>
diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
index 0deddfacf..35556da54 100644
--- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
+++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
@@ -157,6 +157,42 @@ class Ecerciseallbackagain extends Component{
         console.log()
         return(
             <div>
+							<style>
+								{
+									`
+								@media (max-width: 2000px) {
+											.newupload_select_box{
+											  height: 265px !important;
+											}
+									}
+
+								 @media (max-width: 1350px) {
+										.HomeworkModal{
+ 										  top:10px !important;
+ 										}
+ 											.newupload_select_box{
+											  height: 220px !important;
+											}
+									}
+
+	 								@media (max-width: 1250px) {
+ 										.HomeworkModal{
+ 										  top:0px !important;
+ 										}
+
+ 										.newupload_select_box{
+											  height: 150px !important;
+									  }
+									}
+									.eerxisbox:hover {
+											background: #e4eaf6;
+									}
+									.upload_select_box li:hover {
+										background:transparent;
+									}
+									`
+								}
+							</style>
                 <Modal
                     className={"HomeworkModal"}
                     title={this.props.modalname}
@@ -169,11 +205,12 @@ class Ecerciseallbackagain extends Component{
                     <div className="task-popup-content">
 
                         <style>{`
-                .greybackHead{
-                  padding:0px 30px;
-                }
-                .fontlefts{text-align: left;}
-              `}</style>
+												.greybackHead{
+													padding:0px 30px;
+												}
+												.fontlefts{text-align: left;}
+											`}</style>
+
                         <div className="clearfix edu-txt-center mb10" style={{color:"#333333",fontSize: '15px'}}>学生将得到一次重新答题的机会，现有的答题情况将被清空</div>
                         <ul className="clearfix edu-txt-center ml35">
                             <li className="fl paddingleft22 fontlefts" style={{width:'160px'}}>姓名</li>
@@ -182,7 +219,7 @@ class Ecerciseallbackagain extends Component{
                         </ul>
 
                         {datalist===undefined?"":
-                            <ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto",height: "319px"}}
+                            <ul className="upload_select_box fl clearfix mt10 mb10 newupload_select_box" style={{"overflow-y":"auto"}}
                                 id="search_not_members_list"
                                 onScroll={this.contentViewScroll}
                             >
@@ -190,7 +227,7 @@ class Ecerciseallbackagain extends Component{
 
                                     { datalist.map((item,key)=>{
                                                 return(
-                                                    <div className="clearfix edu-txt-center lineh-40" key={key}>
+                                                    <div className="clearfix edu-txt-center lineh-40 eerxisbox" key={key}>
                                                         <li className="fl" style={{width: '158px'}}>
                                                             <Checkbox
                                                                 className="fl task-hide edu-txt-left"
@@ -198,8 +235,12 @@ class Ecerciseallbackagain extends Component{
                                                                 value={item.user_id}
 																																key={item.user_id}
                                                             >
-                                                                <label style={{"textAlign": "left", "color": "#05101A"}}
-                                                                       className="task-hide color-grey-name" title="frerere">{item.user_name}</label>
+                                                                <a style={{"textAlign": "left"}}
+                                                                   className="task-hide color-grey-name"
+																																	 href={`/users/${item.user_id}/courses`}
+																																	 target={'_blank'}
+																																	 title={item.user_name}
+																																>{item.user_name}</a>
                                                             </Checkbox>
                                                         </li>
                                                         <li className="fl" style={{width: '150px'}}>
@@ -220,7 +261,7 @@ class Ecerciseallbackagain extends Component{
                             <Checkbox checked={onChangetype} onChange={this.onChange}>{onChangetype===true?"清除":"全选"}</Checkbox>
                         </div>
 
-                        <div className="clearfix mt30 edu-txt-center mb10">
+                        <div className="clearfix edu-txt-center">
                             <a  className="task-btn color-white mr30" onClick={this.issCancel}>取消</a>
                             <a className="task-btn task-btn-orange" onClick={this.isSave}>确认</a>
                         </div>
diff --git a/public/react/src/modules/courses/exercise/ExerciseDisplay.js b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
index cbaf38c80..42702e9cb 100644
--- a/public/react/src/modules/courses/exercise/ExerciseDisplay.js
+++ b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
@@ -62,6 +62,8 @@ class ExerciseDisplay extends Component{
             response.data.exercise.exercise_status = response.data.exercise.exercise_status == undefined ? 1 : response.data.exercise.exercise_status
             this.setState({...response.data})
             this.props.detailFetchCallback && this.props.detailFetchCallback(response);
+          } else {
+            this.props.detailFetchCallback && this.props.detailFetchCallback(response);
           }
         })
         .catch(function (error) {
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 33fd0a748..60065f43e 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -19,6 +19,7 @@ import '../css/busyWork.css'
 import '../poll/pollStyle.css'
 import moment from 'moment';
 import 'moment/locale/zh-cn';
+import './yslexercisetable.css';
 import {getImageUrl, toPath} from 'educoder';
 import CheckBoxGroup from "../../page/component/CheckBoxGroup";
 
@@ -70,12 +71,13 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					width:'100px',
 					render: (text, record) => (
 						<span>
 							{record.number === "--" ?
-								<span style={{"color": '#999999', "text-align": "center"}}>{record.number}</span>
+								<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.number}</span>
 								:
-								<span style={{"color": '#07111B', "text-align": "center" }}>{record.number}</span>
+								<span style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.number}</span>
 
 							}
         </span>
@@ -86,13 +88,16 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: 'center',
-					className: "edu-txt-center font-14",
+					className: "edu-txt-center font-14 maxnamewidth110",
+					width:'100px',
 					render: (text, record) => (
-						<span>
+						<span className="maxnamewidth110 font-14" style={{
+							width:'100px'
+						}}>
 								{record.name === "--" ?
-									<span style={{"color": '#999999', "text-align": "center" }}>{record.name}</span>
+									<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
 									:
-									<span style={{"color": '#07111B', "text-align": "center" }}>{record.name}</span>
+									<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}} title={record.name}>{record.name}</a>
 
 								}
         </span>
@@ -103,24 +108,30 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: 'center',
-					className: "edu-txt-center font-14",
+					className: "edu-txt-center font-14 maxnamewidth175",
+					width:'175px',
 					render: (text, record) => (
-						<span>
+						<span className="maxnamewidth175" style={{
+							width:'175px',
+						}}>
 							{record.stduynumber === null ?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center",
+									width:'175px',
 								}}>--</span> :
 								record.stduynumber ===
 								"" ?
 									<span style={{
-										"color": '#999999',
-										"text-align": "center"
+										color: '#999999',
+										textAlign: "center",
+										width:'175px',
 									}}>--</span> :
-									<span style={{
-										"color": '#9A9A9A',
-										"text-align": "center"
-									}}>{record.stduynumber}</span>
+									<a className="maxnamewidth175" style={{
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'175px',
+									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
         </span>
@@ -131,25 +142,28 @@ class Studentshavecompletedthelist extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: 'center',
-					className: "edu-txt-center font-14",
-					width:"260px",
+					className: "edu-txt-center font-14 maxnamewidth255",
+					width:'255px',
 					render: (text, record) => (
-						<span>
+						<span className="maxnamewidth255" style={{width:'255px'}}>
 								{record.classroom === null ?
 									<span style={{
-										"color": '#999999',
-										"text-align": "center"
+										color: '#999999',
+										textAlign: "center",
+										width:'255px',
 									}}>--</span> :
 									record.classroom ===
 									"" ?
 										<span style={{
-											"color": '#999999',
-											"text-align": "center"
+											color: '#999999',
+											textAlign: "center",
+											width:'255px',
 										}}>--</span> :
-										<span style={{
-											"color": '#07111B',
-											"text-align": "center"
-										}}>{record.classroom}</span>
+										<a className="maxnamewidth255" style={{
+											color: '#07111B',
+											textAlign: "center",
+											width:'255px',
+										}} title={record.classroom}>{record.classroom}</a>
 								}
 
         </span>
@@ -161,14 +175,19 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					width:'98px',
 					render: (text, record) => (
-						<span>
+						<span style={{
+							width:'98px',
+						}}>
              <span style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
+							 color: '#999999',
+							 textAlign: "center",
+							 width:'98px',
+						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",	width:'98px'} : {
+							 color: '#29BD8B',
+							 textAlign: "center",
+							 width:'98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -180,12 +199,15 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					width:'175px',
 					render: (text, record) => (
-						<span>
+						<span style={{
+							width:'175px',
+						}}>
 							{record.updatetime === "--" ?
-								<span style={{"color": '#999999', "text-align": "center" }}>{record.updatetime}</span>
+								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
 								:
-								<span style={{"color": '#9A9A9A', "text-align": "center" }}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -196,29 +218,35 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					width:'98px',
 					render: (text, record) => (
 						<span>   {
 							record.completion === "--" ?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center",
+									width:'98px',
 								}}>
 									{record.completion}
 								</span>
 								:
 								<span style={parseInt(record.completion) > 90 ? {
-									"color": '#DD1717',
-									"text-align": "center"
+									color: '#DD1717',
+									textAlign: "center",
+									width:'98px',
 								} : parseInt(record.completion) <= 90 ? {
-									"color": '#FF6800',
-									"text-align": "center"
+									color: '#FF6800',
+									textAlign: "center",
+									width:'98px',
 								} : parseInt(record.completion) <= 60 ? {
-										"color": '#747A7F',
-										"text-align": "center"
+										color: '#747A7F',
+										textAlign: "center",
+										width:'98px',
 									} :
 									{
-										"color": '#747A7F',
-										"text-align": "center"
+										color: '#747A7F',
+										textAlign: "center",
+										width:'98px',
 									}}>{record.completion}</span>
 						}
 
@@ -231,26 +259,31 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center font-14",
+					width:'99px',
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--" ?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center",
+									width:'99px',
 								}}>
 									{record.levelscore}
 								</span>
 								:
 								<span style={parseInt(record.levelscore) > 90 ? {
-									"color": '#DD1717',
-									"text-align": "center"
+									color: '#DD1717',
+									textAlign: "center",
+									width:'99px',
 								} : parseInt(record.levelscore) <= 90 ? {
-									"color": '#FF6800',
-									"text-align": "center"
+									color: '#FF6800',
+									textAlign: "center",
+									width:'99px',
 								} : parseInt(record.levelscore) <= 60 ? {
-									"color": '#747A7F',
-									"text-align": "center"
-								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
+									color: '#747A7F',
+									textAlign: "center",
+									width:'99px',
+								} : {color: '#747A7F', textAlign: "center",width:'99px'}}>{record.levelscore}</span>
 							}
         </span>
 					)
@@ -268,25 +301,25 @@ class Studentshavecompletedthelist extends Component {
 									<div>未评分</div>
 								</div>}>
 									<a style={{
-										"color": '#999999',
-										"text-align": "center"
+										color: '#999999',
+										textAlign: "center"
 									}}>
 										{record.efficiencyscore}
 									</a>
 								</Tooltip>
 								:
 								<span style={parseInt(record.efficiencyscore) > 90 ? {
-									"color": '#DD1717',
-									"text-align": "center"
+									color: '#DD1717',
+									textAlign: "center"
 								} : parseInt(record.efficiencyscore) <= 90 ? {
-									"color": '#FF6800',
-									"text-align": "center"
+									color: '#FF6800',
+									textAlign: "center"
 								} : parseInt(record.efficiencyscore) <= 60 ? {
-									"color": '#747A7F',
-									"text-align": "center",
+									color: '#747A7F',
+									textAlign: "center",
 								} : {
-									"color": '#747A7F',
-									"text-align": "center"
+									color: '#747A7F',
+									textAlign: "center"
 								}}>{record.efficiencyscore}</span>
 							}
         </span>
@@ -300,15 +333,11 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
+					width:'100px',
 					render: (text, record) => (
 						<span>
 							{
-								record.number === "--" ?
-									<span style={{"color": '#999999', "text-align": "center" }}>{record.number}</span>
-
-									:
-									<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
-
+									<span style={{color: '#999999', textAlign: "center",width:'100px'}}>我</span>
 							}
         </span>
 					)
@@ -318,14 +347,15 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: 'center',
-					className: "edu-txt-center tabletd font-14",
+					className: "edu-txt-center tabletd font-14 maxnamewidth110",
+					width:'100px',
 					render: (text, record) => (
-						<span>
+						<span className="maxnamewidth110 font-14">
 							{
 								record.name === "--" ?
-									<span style={{"color": '#999999', "text-align": "center" }}>{record.name}</span>
+									<span className="maxnamewidth110" style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
 									:
-									<span style={{"color": '#07111B', "text-align": "center" }}>{record.name}</span>
+									<span className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.name}</span>
 
 							}
         </span>
@@ -336,25 +366,31 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: 'center',
-					className: "edu-txt-center tabletd font-14",
+					className: "edu-txt-center tabletd font-14 maxnamewidth175",
+					width:'175px',
 					render: (text, record) => (
-						<span>
+						<span className="maxnamewidth175" style={{
+							width:'175px',
+						}}>
 							{record.stduynumber === null ?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center",
+									width:'175px',
 								}}>--</span>
 								:
 								record.stduynumber === "" ?
 									<span style={{
-										"color": '#999999',
-										"text-align": "center"
+										color: '#999999',
+										textAlign: "center",
+										width:'175px',
 									}}>--</span>
 									:
-									<span style={{
-										"color": '#9A9A9A',
-										"text-align": "center"
-									}}>{record.stduynumber}</span>
+									<a className="maxnamewidth175 font-14" style={{
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'175px',
+									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
         </span>
@@ -365,23 +401,28 @@ class Studentshavecompletedthelist extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: 'center',
-					className: "edu-txt-center tabletd font-14",
-					width:"260px",
+					className: "edu-txt-center tabletd font-14 maxnamewidth255",
+					width:'255px',
 					render: (text, record) => (
-						<span>
+						<span className="font-14 maxnamewidth255" style={{
+							width:'255px',
+						}}>
 							{record.classroom === null ?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center",
+									width:'255px',
 								}}>--</span>: record.classroom === "" ?
 									<span style={{
-										"color": '#999999',
-										"text-align": "center"
+										color: '#999999',
+										textAlign: "center",
+										width:'255px',
 									}}>--</span>:
-									<span tyle={{
-										"color": '#07111B',
-										"text-align": "center"
-									}}>{record.classroom}</span>
+									<a className="maxnamewidth255" tyle={{
+										color: '#07111B',
+										textAlign: "center",
+										width:'255px',
+									}} title={record.classroom}>{record.classroom}</a>
 							}
 
         </span>
@@ -393,14 +434,17 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
+					width:'98px',
 					render: (text, record) => (
-						<span>
+						<span style={{width:'98px',}}>
              <span style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center",
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center",
+							 color: '#999999',
+							 textAlign: "center",
+							 width:'98px',
+						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",		 width:'98px',} : {
+							 color: '#29BD8B',
+							 textAlign: "center",
+							 width:'98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -412,12 +456,15 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
+					width:'175px',
 					render: (text, record) => (
-						<span>
+						<span style={{
+							width:'175px',
+						}}>
 							{record.updatetime === "--"?
-								<span style={{"color": '#999999', "text-align": "center", }}>--</span>
+								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>--</span>
 								:
-								<span style={{"color": '#9A9A9A', "text-align": "center",  }}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -428,29 +475,35 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
+					width:'98px',
 					render: (text, record) => (
 						<span>
 							             			{record.completion === "--" ?
 																	<span style={{
-																		"color": '#999999',
-																		"text-align": "center"
+																		color: '#999999',
+																		textAlign: "center",
+																		width:'98px',
 																	}}>
 																		--
 																	</span>
 
 																	:
 																	<span style={parseInt(record.completion) > 90 ? {
-																		"color": '#DD1717',
-																		"text-align": "center"
+																		color: '#DD1717',
+																		textAlign: "center",
+																		width:'98px',
 																	} : parseInt(record.completion) <= 90 ? {
-																		"color": '#FF6800',
-																		"text-align": "center"
+																		color: '#FF6800',
+																		textAlign: "center",
+																		width:'98px',
 																	} : parseInt(record.completion) <= 60 ? {
-																		"color": '#747A7F',
-																		"text-align": "center"
+																		color: '#747A7F',
+																		textAlign: "center",
+																		width:'98px',
 																	} : {
-																		"color": '#747A7F',
-																		"text-align": "center"
+																		color: '#747A7F',
+																		textAlign: "center",
+																		width:'98px',
 																	}}>{record.completion}</span>
 																}
         </span>
@@ -462,26 +515,31 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
+					width:'99px',
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--"?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center",
+									width:'99px',
 								}}>
 									--
 								</span>
 								:
 								<span style={parseInt(record.levelscore) > 90 ? {
-									"color": '#DD1717',
-									"text-align": "center"
+									color: '#DD1717',
+									textAlign: "center",
+									width:'99px'
 								} : parseInt(record.levelscore) <= 90 ? {
-									"color": '#FF6800',
-									"text-align": "center"
+									color: '#FF6800',
+									textAlign: "center",
+									width:'99px'
 								} : parseInt(record.levelscore) <= 60 ? {
-									"color": '#747A7F',
-									"text-align": "center"
-								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
+									color: '#747A7F',
+									textAlign: "center",
+									width:'99px'
+								} : {color: '#747A7F', textAlign: "center",	width:'99px'}}>{record.levelscore}</span>
 							}
         </span>
 					)
@@ -500,23 +558,23 @@ class Studentshavecompletedthelist extends Component {
 										<div>未评分</div>
 									</div>}>
 										<a style={{
-											"color": '#DD1717',
-											"text-align": "center"
+											color: '#DD1717',
+											textAlign: "center",
 										}}>--</a>
 									</Tooltip>
 									:
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
-										"color": '#DD1717',
-										"text-align": "center"
+										color: '#DD1717',
+										textAlign: "center",
 									} : parseInt(record.efficiencyscore) <= 90 ? {
-										"color": '#FF6800',
-										"text-align": "center"
+										color: '#FF6800',
+										textAlign: "center",
 									} : parseInt(record.efficiencyscore) <= 60 ? {
-										"color": '#747A7F',
-										"text-align": "center",
+										color: '#747A7F',
+										textAlign: "center",
 									} : {
-										"color": '#747A7F',
-										"text-align": "center"
+										color: '#747A7F',
+										textAlign: "center",
 									}}>{record.efficiencyscore}</span>
 							}
 
@@ -535,9 +593,9 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 							{
 								record.number=== "--"?
-									<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+									<span style={{color: '#999999', textAlign: "center"}}>--</span>
 									:
-									<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
+									<span style={{color: '#07111B', textAlign: "center"}}>{record.number}</span>
 							}
 
         </span>
@@ -553,9 +611,9 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 											{
 												record.name === "--" ?
-													<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+													<span style={{color: '#999999', textAlign: "center"}}>--</span>
 													:
-													<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
+													<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
 											}
         </span>
 					)
@@ -570,18 +628,18 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 							{record.stduynumber === null ?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center"
 								}}>--</span>
 								: record.stduynumber === "" ?
 									<span style={{
-										"color": '#999999',
-										"text-align": "center"
+										color: '#999999',
+										textAlign: "center"
 									}}>--</span>
 									:
 									<span style={{
-										"color": '#9A9A9A',
-										"text-align": "center"
+										color: '#9A9A9A',
+										textAlign: "center"
 									}}>{record.stduynumber}</span>
 							}
 
@@ -599,16 +657,16 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 							{record.classroom === null ?
 								<span style={{
-									"color": '#999999',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center"
 								}}>--</span>  : record.classroom === "" ?
 									<span style={{
-										"color": '#999999',
-										"text-align": "center"
+										color: '#999999',
+										textAlign: "center"
 									}}>--</span> :
 									<span style={{
-										"color": '#07111B',
-										"text-align": "center"
+										color: '#07111B',
+										textAlign: "center"
 									}}>{record.classroom}</span>
 							}
 
@@ -624,11 +682,11 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
              <span style={record.submitstate === "未提交" ? {
-							 "color": '#999999',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#29BD8B',
-							 "text-align": "center"
+							 color: '#999999',
+							 textAlign: "center"
+						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center"} : {
+							 color: '#29BD8B',
+							 textAlign: "center"
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -644,10 +702,10 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 							{
 								record.updatetime === "--" ?
-									<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+									<span style={{color: '#999999', textAlign: "center"}}>--</span>
 
 									:
-									<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+									<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span>
 
 							}
         </span>
@@ -664,22 +722,22 @@ class Studentshavecompletedthelist extends Component {
 							{
 								record.completion === "--"?
 									<span style={{
-										"color": '#999999',
-										"text-align": "center",
+										color: '#999999',
+										textAlign: "center",
 									}}>--</span>
 									:
 									<span style={parseInt(record.completion) > 90 ? {
-										"color": '#DD1717',
-										"text-align": "center",
+										color: '#DD1717',
+										textAlign: "center",
 									} : parseInt(record.completion) <= 90 ? {
-										"color": '#FF6800',
-										"text-align": "center",
+										color: '#FF6800',
+										textAlign: "center",
 									} : parseInt(record.completion) <= 60 ? {
-										"color": '#747A7F',
-										"text-align": "center",
+										color: '#747A7F',
+										textAlign: "center",
 									} : {
-										"color": '#747A7F',
-										"text-align": "center",
+										color: '#747A7F',
+										textAlign: "center",
 									}}>{record.completion}</span>
 							}
 
@@ -697,19 +755,19 @@ class Studentshavecompletedthelist extends Component {
 									{
 										record.levelscore === "--" ?
 											<span style={{
-												"color": '#999999',
-												"text-align": "center",
+												color: '#999999',
+												textAlign: "center",
 											}}>--</span> :
 											<span style={parseInt(record.levelscore) > 90 ? {
-												"color": '#DD1717',
-												"text-align": "center",
+												color: '#DD1717',
+												textAlign: "center",
 											} : parseInt(record.levelscore) <= 90 ? {
-												"color": '#FF6800',
-												"text-align": "center",
+												color: '#FF6800',
+												textAlign: "center",
 											} : parseInt(record.levelscore) <= 60 ? {
-												"color": '#747A7F',
-												"text-align": "center",
-											} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</span>
+												color: '#747A7F',
+												textAlign: "center",
+											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}</span>
 									}
 
         </span>
@@ -729,23 +787,23 @@ class Studentshavecompletedthelist extends Component {
 																	<div>未评分</div>
 																</div>}>
 																	<a style={{
-																		"color": '#999999',
-																		"text-align": "center",
+																		color: '#999999',
+																		textAlign: "center",
 																	}}>--</a>
 																</Tooltip>
 																:
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
-																	"color": '#DD1717',
-																	"text-align": "center",
+																	color: '#DD1717',
+																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 90 ? {
-																	"color": '#FF6800',
-																	"text-align": "center",
+																	color: '#FF6800',
+																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
-																	"color": '#747A7F',
-																	"text-align": "center",
+																	color: '#747A7F',
+																	textAlign: "center",
 																} : {
-																	"color": '#747A7F',
-																	"text-align": "center",
+																	color: '#747A7F',
+																	textAlign: "center",
 																}}>{record.efficiencyscore}</span>
 														}
 						</span>
@@ -760,11 +818,11 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							       {record.operating==="--"?
-											 <span style={{"text-align": "center","color": '#999999',}}>{record.operating}</span>
+											 <span style={{textAlign: "center",color: '#999999',}}>{record.operating}</span>
 											 :record.submitstate === "未提交"?
-												 <span style={{"text-align": "center","color": '#999999',}}>--</span>
+												 <span style={{textAlign: "center",color: '#999999',}}>--</span>
 												 :
-												 <a style={{"text-align": "center"}} className="color-blue"
+												 <a style={{textAlign: "center"}} className="color-blue"
 														href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.operating}</a>
 										 }
 
@@ -789,9 +847,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							 {record.number === "--" ?
-								 <span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								 <span style={{color: '#999999', textAlign: "center"}}>--</span>
 								 :
-								 <span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
+								 <span style={{color: '#07111B', textAlign: "center"}}>{record.number}</span>
 							 }
         </span>
 					)
@@ -805,9 +863,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.name==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>{record.name}</span>
+								<span style={{color: '#999999', textAlign: "center"}}>{record.name}</span>
 								:
-								<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
+								<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
 							}
         </span>
 					)
@@ -821,9 +879,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 						{record.stduynumber === "--" ?
-							<span style={{"color": '#999999', "text-align": "center"}}>{record.stduynumber}</span>
+							<span style={{color: '#999999', textAlign: "center"}}>{record.stduynumber}</span>
 							:
-							<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</span>
+							<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.stduynumber}</span>
 						}
         </span>
 					),
@@ -838,9 +896,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.classroom==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>{record.classroom}</span>
+								<span style={{color: '#999999', textAlign: "center"}}>{record.classroom}</span>
 								:
-								<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
+								<span style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>
 							}
         </span>
 					)
@@ -854,11 +912,11 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 								<span style={record.submitstate === "未提交" ? {
-									"color": '#999999',
-									"text-align": "center"
-								} : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-									"color": '#29BD8B',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center"
+								} : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center"} : {
+									color: '#29BD8B',
+									textAlign: "center"
 								}}>{record.submitstate}</span>
 
         </span>
@@ -874,9 +932,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.updatetime==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
-								<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -890,9 +948,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.completion=== "--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
-								<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</span>
+								<span style={{color: '#07111B', textAlign: "center"}}>{record.completion}</span>
 							}
         </span>
 					)
@@ -906,9 +964,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.levelscore==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
-								<span style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</span>
+								<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
 							}
         </span>
 					)
@@ -925,22 +983,22 @@ class Studentshavecompletedthelist extends Component {
 																<Tooltip  placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
-																	<a style={{"color": '#999999',
-																		"text-align": "center",}}>--</a>
+																	<a style={{color: '#999999',
+																		textAlign: "center",}}>--</a>
 																</Tooltip>
 																:
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
-																	"color": '#DD1717',
-																	"text-align": "center",
+																	color: '#DD1717',
+																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 90 ? {
-																	"color": '#FF6800',
-																	"text-align": "center",
+																	color: '#FF6800',
+																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
-																	"color": '#747A7F',
-																	"text-align": "center",
+																	color: '#747A7F',
+																	textAlign: "center",
 																} : {
-																	"color": '#747A7F',
-																	"text-align": "center",
+																	color: '#747A7F',
+																	textAlign: "center",
 																}}>{record.efficiencyscore}</span>
 															}
         </span>
@@ -955,13 +1013,13 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.finalscore==="--"?
-								<span style={{"text-align": "center","color": '#999999'}}
+								<span style={{textAlign: "center",color: '#999999'}}
 								>--</span>
 								:record.submitstate === "未提交"?
-									<span style={{"text-align": "center","color": '#999999'}}
+									<span style={{textAlign: "center",color: '#999999'}}
 									>--</span>
 									:
-									<a style={{"text-align": "center"}} className="color-blue"
+									<a style={{textAlign: "center"}} className="color-blue"
 										 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
 							}
 
@@ -979,9 +1037,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							 {record.number === "--" ?
-								 <span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								 <span style={{color: '#999999', textAlign: "center"}}>--</span>
 								 :
-								 <span style={{"color": '#07111B', "text-align": "center"}}>{record.number}</span>
+								 <span style={{color: '#07111B', textAlign: "center"}}>{record.number}</span>
 							 }
         </span>
 					)
@@ -995,9 +1053,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.name==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>{record.name}</span>
+								<span style={{color: '#999999', textAlign: "center"}}>{record.name}</span>
 								:
-								<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
+								<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
 							}
         </span>
 					)
@@ -1011,9 +1069,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 						{record.stduynumber === "--" ?
-							<span style={{"color": '#999999', "text-align": "center"}}>{record.stduynumber}</span>
+							<span style={{color: '#999999', textAlign: "center"}}>{record.stduynumber}</span>
 							:
-							<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</span>
+							<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.stduynumber}</span>
 						}
         </span>
 					),
@@ -1028,9 +1086,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.classroom==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>{record.classroom}</span>
+								<span style={{color: '#999999', textAlign: "center"}}>{record.classroom}</span>
 								:
-								<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
+								<span style={{color: '#07111B', textAlign: "center"}}>{record.classroom}</span>
 							}
         </span>
 					)
@@ -1044,11 +1102,11 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 								<span style={record.submitstate === "未提交" ? {
-									"color": '#999999',
-									"text-align": "center"
-								} : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-									"color": '#29BD8B',
-									"text-align": "center"
+									color: '#999999',
+									textAlign: "center"
+								} : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center"} : {
+									color: '#29BD8B',
+									textAlign: "center"
 								}}>{record.submitstate}</span>
 
         </span>
@@ -1064,9 +1122,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.updatetime==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
-								<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -1080,9 +1138,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.completion=== "--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
-								<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</span>
+								<span style={{color: '#07111B', textAlign: "center"}}>{record.completion}</span>
 							}
         </span>
 					)
@@ -1096,9 +1154,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.levelscore==="--"?
-								<span style={{"color": '#999999', "text-align": "center"}}>--</span>
+								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
-								<span style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</span>
+								<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
 							}
         </span>
 					)
@@ -1115,22 +1173,22 @@ class Studentshavecompletedthelist extends Component {
 																<Tooltip  placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
-																	<a style={{"color": '#999999',
-																		"text-align": "center",}}>--</a>
+																	<a style={{color: '#999999',
+																		textAlign: "center",}}>--</a>
 																</Tooltip>
 																:
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
-																	"color": '#DD1717',
-																	"text-align": "center",
+																	color: '#DD1717',
+																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 90 ? {
-																	"color": '#FF6800',
-																	"text-align": "center",
+																	color: '#FF6800',
+																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
-																	"color": '#747A7F',
-																	"text-align": "center",
+																	color: '#747A7F',
+																	textAlign: "center",
 																} : {
-																	"color": '#747A7F',
-																	"text-align": "center",
+																	color: '#747A7F',
+																	textAlign: "center",
 																}}>{record.efficiencyscore}</span>
 															}
         </span>
@@ -1145,13 +1203,13 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.finalscore==="--"?
-								<span style={{"text-align": "center","color": '#999999'}}
+								<span style={{textAlign: "center",color: '#999999'}}
 								>--</span>
 								:record.submitstate === "未提交"?
-									<span style={{"text-align": "center","color": '#999999'}}
+									<span style={{textAlign: "center",color: '#999999'}}
 									>--</span>
 									:
-									<a style={{"text-align": "center"}} className="color-blue"
+									<a style={{textAlign: "center"}} className="color-blue"
 										 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
 							}
 
@@ -2554,7 +2612,7 @@ class Studentshavecompletedthelist extends Component {
 								<div className="clearfix">
                                 <span
 																	className="fl color-grey-6 font-12"><span
-																	style={{"color": '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.total_users}</span><span
+																	style={{color: '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.total_users}</span><span
 																	className="color-orange-tip"></span>个检索结果（{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_all_users}学生） </span>
 
 									<div className="fr color-grey-6 edu-menu-panel">
@@ -2565,11 +2623,11 @@ class Studentshavecompletedthelist extends Component {
 												<i className="iconfont icon-xiajiantou ml5 font-12"></i>
 												<ul className="edu-position-hide undis mt10">
 													<li><a onClick={(e) => this.funordersy("end_at")} data-remote="true"
-																 className=" font-12" style={{"text-align": "center "}}>提交时间</a></li>
+																 className=" font-12" style={{textAlign: "center "}}>提交时间</a></li>
 													<li><a onClick={(e) => this.funordersy("score")} data-remote="true"
-																 className=" font-12" style={{"text-align": "center "}}>最终成绩</a></li>
+																 className=" font-12" style={{textAlign: "center "}}>最终成绩</a></li>
 													<li><a onClick={(e) => this.funordersy("student_id")} data-remote="true"
-																 className=" font-12" style={{"text-align": "center "}}>学生学号</a></li>
+																 className=" font-12" style={{textAlign: "center "}}>学生学号</a></li>
 												</ul>
 											</li>
 										</ul>
@@ -2645,15 +2703,15 @@ class Studentshavecompletedthelist extends Component {
 										<div className="clearfix ">
                               <span className="fl color-grey-6 font-12 mt10">
                                   <span className="color-orange-tip"
-																				style={{"color": '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users}</span><span
-																style={{"color": "#666666"}}>已交</span>
+																				style={{color: '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users}</span><span
+																style={{color: "#666666"}}>已交</span>
                                   <span
 																		className="ml10"></span><span
-																style={{"color": "#666666"}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交</span>
+																style={{color: "#666666"}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交</span>
 																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
-																	<span className="ml20" style={{"color": "#9A9A9A"}}>     剩余提交时间：</span>}
+																	<span className="ml20" style={{color: "#9A9A9A"}}>     剩余提交时间：</span>}
 																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
-																	<span style={{"color": '#FF6800'}}>
+																	<span style={{color: '#FF6800'}}>
 																		{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}
 																	</span>}
                                </span>
@@ -2709,21 +2767,36 @@ class Studentshavecompletedthelist extends Component {
 								" min-width": " 1200px"
 							}}>
 								<div className={"educontent mb20 edu-back-white"}>
-									<div className={"justify break_full_word new_li edu-back-white"}
+									<style>
+										{
+											`
+												.edu-table .ant-table-tbody > tr > td {
+														height: 58px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 58px;
+														 }
+													.ysltableows .ant-table-thead > tr > th{
+																 	height: 58px;
+														 }
+														 	.ysltableows .ant-table-tbody > tr > td{
+																 	height: 58px;
+														 }
+													 .ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+													 padding: 9px;
+															}
+												`
+										}
+									</style>
+									<div className={"justify break_full_word new_li edu-back-white ysltableows"}
 									>
-										<style>{`
-                                .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
-                          top: 72%;}
-                }
-						              `}</style>
 										{data === undefined ? "" : <Table
 											dataSource={data}
 											columns={columnstwo}
-											// showHeader={false}
 											className="mysjysltable3"
 											pagination={false}
 											loading={false}
-
+											showHeader={false}
 										/>}
 									</div>
 									{JSON.stringify(datas) === "[]" ?
@@ -2749,15 +2822,15 @@ class Studentshavecompletedthelist extends Component {
 												<div className="clearfix">
                               <span className="fl color-grey-6 font-12"><span
 																className="color-orange-tip"
-																style={{"color": '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users}</span><span
-																style={{"color": "#666666"}}>已交</span><span
+																style={{color: '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.answer_users}</span><span
+																style={{color: "#666666"}}>已交</span><span
 																className="ml10"></span> <span
-																style={{"color": "#666666"}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交</span>
+																style={{color: "#666666"}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交</span>
 																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
-																	<span className="ml20" style={{"color": "#9A9A9A"}}> 剩余提交时间：</span>}
+																	<span className="ml20" style={{color: "#9A9A9A"}}> 剩余提交时间：</span>}
 																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
 																	<span
-																		style={{"color": '#FF6800'}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}</span>}
+																		style={{color: '#FF6800'}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}</span>}
 																	</span>
 													<div className="fr color-grey-6 edu-menu-panel">
 														<ul>
@@ -2767,13 +2840,13 @@ class Studentshavecompletedthelist extends Component {
 																<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
 																<ul className="edu-position-hide undis mt10">
 																	<li><a onClick={(e) => this.funorder("end_at")} data-remote="true"
-																				 className=" font-12" style={{"text-align": "center "}}>提交时间</a>
+																				 className=" font-12" style={{textAlign: "center "}}>提交时间</a>
 																	</li>
 																	<li><a onClick={(e) => this.funorder("score")} data-remote="true"
-																				 className=" font-12" style={{"text-align": "center "}}>最终成绩</a>
+																				 className=" font-12" style={{textAlign: "center "}}>最终成绩</a>
 																	</li>
 																	<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
-																				 className=" font-12" style={{"text-align": "center "}}>学生学号</a>
+																				 className=" font-12" style={{textAlign: "center "}}>学生学号</a>
 																	</li>
 																</ul>
 															</li>
@@ -2788,8 +2861,23 @@ class Studentshavecompletedthelist extends Component {
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
+						                .edu-table .ant-table-tbody > tr > td {
+														height: 58px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 58px;
+														 }
+						                			.ysltableowss .ant-table-thead > tr > th{
+																 	height: 58px;
+														 }
+														 	.ysltableowss .ant-table-tbody > tr > td{
+																 	height: 58px;
+														 }
+														 .ysltableowss .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+													 padding: 9px;
+															}
 						              `}</style>
-												<div className="edu-table edu-back-white minH-560">
+												<div className="edu-table edu-back-white minH-560 ysltableowss">
 													{datas === undefined ? "" : <Table
 														dataSource={datas}
 														columns={columns}
diff --git a/public/react/src/modules/courses/exercise/yslexercisetable.css b/public/react/src/modules/courses/exercise/yslexercisetable.css
index e69de29bb..2727ca2ff 100644
--- a/public/react/src/modules/courses/exercise/yslexercisetable.css
+++ b/public/react/src/modules/courses/exercise/yslexercisetable.css
@@ -0,0 +1,49 @@
+.maxnamewidth100{
+    max-width: 100px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.maxnamewidth110{
+    max-width: 100px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.maxnamewidth200{
+    max-width: 200px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.maxnamewidth145{
+    max-width: 145px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.maxnamewidth215{
+    max-width: 215px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.maxnamewidth255{
+    max-width: 255px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.maxnamewidth175{
+    max-width: 175px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
index bc45eeece..496423f73 100644
--- a/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
+++ b/public/react/src/modules/courses/gradinforms/Bullsubdirectory.js
@@ -6,6 +6,7 @@ import axios from 'axios';
 import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
 import moment from "../new/CoursesNew";
 import Fileslistitem from "../Resource/Fileslistitem";
+import Modals from "../../modals/Modals";
 // 公告栏
 class Bullsubdirectory extends Component{
 	constructor(props){
@@ -19,6 +20,10 @@ class Bullsubdirectory extends Component{
 			addonAfter:0,
 			eduintits:"",
 			informs:[],
+			Modalstype:false,
+			Modalstopval:"是否确认删除?",
+			ModalCancel:"",
+			ModalSave:"",
 
 
 		}
@@ -47,6 +52,61 @@ class Bullsubdirectory extends Component{
 
 	}
 
+	setModeltrue=()=>{
+	 this.setState({
+		 Modalstype:true,
+		 Modalstopval:"是否确认删除?",
+		 ModalCancel:this.cancelmodel,
+		 ModalSave:this.saveonOpen,
+	 })
+	}
+
+	 cancelmodel=()=>{
+     //取消
+		 this.setState({
+			 Modalstype:false,
+			 Modalstopval:"是否确认删除?",
+			 ModalCancel:"",
+			 ModalSave:"",
+		 })
+	 }
+
+	 saveonOpen=()=>{
+      //确认
+		 // /
+		 // 删除公告
+		 var  id=this.props.match.params.coursesId
+			 const url =`/courses/${id}/delete_informs.json`;
+		 axios.delete(url, { data: {
+				 inform_id: this.props.id
+				 }})
+			 .then((response) => {
+			 	if(response){
+			 		if(response.data){
+			 			 if(response.data.status===0){
+							 this.setState({
+								 Modalstype:false,
+								 Modalstopval:"是否确认删除?",
+								 ModalCancel:"",
+								 ModalSave:"",
+							 })
+							 this.props.showNotification(`删除成功`);
+							 this.props.getinputdata();
+						 }else{
+							 this.props.showNotification(`删除失败`);
+						 }
+					}else{
+						this.props.showNotification(`删除失败`);
+					}
+				}
+
+			 })
+			 .catch(function (error) {
+				 console.log(error);
+				 this.props.showNotification(`删除失败`);
+			 });
+		}
+
 
 	bianji = (bians)=>{
 		this.setState({
@@ -113,7 +173,7 @@ class Bullsubdirectory extends Component{
 				}
 				var  url = `/courses/${id}/update_informs.json`;
 				axios.post(url,{
-					inform_id:this.state.id,
+					inform_id:this.props.id,
 					name:titname,
 					description:values.description,
 				}).then((result) => {
@@ -154,12 +214,20 @@ class Bullsubdirectory extends Component{
 
 	render(){
 		let{description,whethertoeditysl,addonAfter,eduintits,informs,isSpinysl} =this.state;
-		let{myname,mydescription}=this.props;
+		let{myname,mydescription,id}=this.props;
 		const {getFieldDecorator} = this.props.form;
-
+		// console.log("Bullsubdirectory");
+		// console.log(this.props.isAdmin());
+		// console.log(this.props.yslbool);
 		return(
 			<React.Fragment  >
 				<div >
+					{this.state.Modalstype&&this.state.Modalstype===true?<Modals
+						modalsType={this.state.Modalstype}
+						modalsTopval={this.state.Modalstopval}
+						modalCancel={this.state.ModalCancel}
+						modalSave={this.state.ModalSave}
+					/>:""}
 					<Spin size="large" spinning={isSpinysl}  >
 										<div  className="edu-back-white ">
 											{
@@ -171,11 +239,30 @@ class Bullsubdirectory extends Component{
 																	<span className="ysltitbt">{myname}</span>
 																</div>
 																<div>
-																	<span className="fr pr25  yslbianji">
+																	<span className="fr yslbianji" style={{marginRight:"17px"}}>
 																	{
 																		this.props.isAdmin() === true ?
 																			(this.props.yslbool===false?
+																				<Tooltip  placement="bottom" title={<div>
+																					编辑
+																				</div>}>
 																					<i className="iconfont icon-bianji1 newbianji1" onClick={()=>this.bianji(true)}></i>
+																				</Tooltip>
+																					:
+																					""
+																			)
+																			:""
+																	}
+																</span>
+																	<span className="fr yslbianji" style={{marginRight:"22px"}}>
+																	{
+																		this.props.isAdmin() === true ?
+																			(this.props.yslbool===false?
+																				<Tooltip  placement="bottom" title={<div>
+																					删除
+																				</div>}>
+																					<i className="iconfont icon-shanchu newbianji1" style={{ color: "#4CACFF"}} onClick={()=>this.setModeltrue(true)}></i>
+																				</Tooltip>
 																					:
 																					""
 																			)
diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
index da48f3404..63fae45f8 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
@@ -67,10 +67,22 @@ class GroupPackage extends Component {
 								<span className="ysltextcolor05">{datas&&datas.min_num}~ {datas&&datas.max_num} 人（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
 							</p>
 					}
-					<p>
-						<span className="ysltextcolor66">基于项目实施</span>
-						<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
-					</p>
+
+						{
+							datas===undefined?"":datas.base_on_project===undefined?"":
+								datas.base_on_project===true?
+									<p>
+										<span className="ysltextcolor66">基于项目实施</span>
+										<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
+									</p>
+									:datas.base_on_project===false?
+									<p>
+										<span className="ysltextcolor66">不基于项目</span>
+										<span className="ysltextcolor05">（无需在平台创建项目，任意小组成员均可以提交作品）</span>
+									</p>
+									:""
+						}
+
 				</div>
 				:<div className="ml47text">
 					{
@@ -82,11 +94,16 @@ class GroupPackage extends Component {
 								</p>
 					}
 					{
-						datas&&datas.group_info&&datas.group_info.base_on_project?
+						datas&&datas.group_info&&datas.group_info.base_on_project===1?
 							<p>
 								<span className="ysltextcolor66">基于项目实施</span>
 								<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
 							</p>
+							:datas&&datas.group_info&&datas.group_info.base_on_project===0?
+							<p>
+								<span className="ysltextcolor66">不基于项目</span>
+								<span className="ysltextcolor05">（无需在平台创建项目，任意小组成员均可以提交作品）</span>
+							</p>
 							:""
 					}
 				</div>
diff --git a/public/react/src/modules/courses/members/CourseGroupChooser.js b/public/react/src/modules/courses/members/CourseGroupChooser.js
index ba9c64bb1..125f10b51 100644
--- a/public/react/src/modules/courses/members/CourseGroupChooser.js
+++ b/public/react/src/modules/courses/members/CourseGroupChooser.js
@@ -41,7 +41,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
      console.log('arg_course_groups', arg_course_groups)
      
 
-    const urlStyle = {"lef":"tunset", minWidth: '262px'};
+    const urlStyle = {"left":"unset", minWidth: '262px'};
     if (alwaysShow == true) {
         urlStyle.display = 'block'
     }
@@ -89,7 +89,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
             <p className="drop_down_btn">
                 <a href="javascript:void(0)" className="color-grey-6"
                     onClick={() => trigger('groupAdd')}
-                >添加分班...</a>
+                >添加分班</a>
             </p>
         </ul>
     )
diff --git a/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js b/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
index 2f08d08a1..f5365433d 100644
--- a/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
+++ b/public/react/src/modules/courses/members/modal/CourseGroupChooserModal.js
@@ -65,22 +65,34 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
             className="courseGroupChooserModal"
         >   
             <style>{`
+                .courseGroupChooserModal .ant-modal-body{
+                    padding:20px 30px;
+                }
                 .courseGroupChooserModal .description {
                     font-size: 16px;
                     text-align: center;
                     margin-bottom: 20px;
                 }
-                .courseGroupChooserModal .drop_down_menu {
+                .courseGroupChooserModal .marginauto{
+                    margin-top:10px!important;
+                }
+                .courseGroupChooserModal .drop_down_menu  {
                     position: relative;
                     top: auto;
                     box-shadow: none;
+                    padding:0px;
+                }
+                .courseGroupChooserModal .drop_down_menu .mainGroup{
+                    background: #f2f9ff;
                     padding: 0 20px;
+                }
+                .courseGroupChooserModal .drop_down_menu li:hover,.courseGroupChooserModal  .drop_down_normal li:hover{
                     background: #f2f9ff;
-                    padding-top: 12px;
                 }
                 .courseGroupChooserModal .drop_down_menu .mainGroup.ant-checkbox-group {
                     width: 100%;
-                    max-height: 300px
+                    max-height: 300px!important;
+                    height: 300px;
                 }
                 .courseGroupChooserModal .drop_down_search {
                     margin: 0;
@@ -90,9 +102,15 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
                     padding: 0px;
                 }
                 .courseGroupChooserModal .drop_down_menu .drop_down_btn {
+                    height: 26px;
+                    line-height: 26px;
                     padding: 0px 20px;
                     margin: 0;
                 }
+                .mainGroup .drop_down_menu .drop_down_btn{
+                    height: 26px;
+                    line-height: 26px;
+                }
             `}</style>
             {/* <React.Fragment>
             <React.Fragment> */}
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 70b1e3bd6..18d9a1adf 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -663,7 +663,7 @@ class studentsList extends Component{
         <style>{`
           /* CourseGroupChooser */
           .drop_down_menu .mainGroup.ant-checkbox-group {
-            max-height: 380px;
+            max-height: 170px;
             overflow-y: auto;
           }
           .task_menu_ul .ant-menu-item, .task_menu_ul .ant-menu-submenu-title{
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 4c020d7d4..b2b42dad3 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -48,7 +48,8 @@ class CoursesNew extends Component {
             addonAfteronelenone:0,
             addonAfteronelentwo:0,
             bordebool:false,
-					  smallspinning:false
+					  smallspinning:false,
+					  bottonloading:false
         }
     }
     componentDidMount() {
@@ -217,7 +218,9 @@ class CoursesNew extends Component {
 
 
                 if (!err) {
-
+									this.setState({
+										bottonloading:true
+									})
 
 
                     // console.log('Received values of form: ', values);
@@ -240,7 +243,7 @@ class CoursesNew extends Component {
                         if (response.data.status === 0) {
 													// this.goback()
 
-													window.location.href=first_category_url;
+												  	window.location.href=first_category_url;
                             if(this.state.boolxinjian===true) {
                                 var yslGuideone = window.localStorage.getItem('yslGuideone');
                                 try {
@@ -257,11 +260,19 @@ class CoursesNew extends Component {
                                 }
                             }
 
-                        }
+                        }else{
+                        	this.setState({
+														bottonloading:false
+													})
+												}
                     }).catch((error) => {
                         console.log(error)
                     })
-                }
+                }else{
+                	this.setState({
+										bottonloading:false
+									})
+								}
             });
         } else {
             this.props.form.validateFields((err, values) => {
@@ -283,6 +294,9 @@ class CoursesNew extends Component {
                     // debugger
                     //新建
                     // console.log('Received values of form: ', values);
+									this.setState({
+										bottonloading:true
+									})
 
                     let url = "/courses.json";
                     axios.post(url, {
@@ -300,6 +314,7 @@ class CoursesNew extends Component {
                     ).then((response) => {
                         if (response.status === 200) {
 													// this.goback
+
 													window.location.href=response.data.first_category_url;
 													if(this.state.boolxinjian===true){
                               var yslGuideone = window.localStorage.getItem('yslGuideone');
@@ -318,11 +333,19 @@ class CoursesNew extends Component {
 
                           }
 
-                        }
+                        }else{
+													this.setState({
+														bottonloading:false
+													})
+												}
                     }).catch((error) => {
                         console.log(error)
                     })
-                }
+                }else{
+									this.setState({
+										bottonloading:false
+									})
+								}
             });
         }
 
@@ -934,7 +957,7 @@ class CoursesNew extends Component {
                                 <div className={"FAFAFA"}>
                                 <Form.Item >
                                     <div className="clearfix mt40 mb30">
-                                        <Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20">
+                                        <Button type="primary" htmlType="submit" loading={this.state.bottonloading} className="defalutSubmitbtn fl mr20">
                                             提交
                                         </Button>
                                         {/*<a className="defalutSubmitbtn fl mr20">提交</a>*/}
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index 0924a6563..35a83ed94 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -55,7 +55,8 @@ class Goldsubject extends Component {
 			addonAfteronelentwo:"",
 			Whethertocreateanewclassroom:true,
 			bordebool:false,
-			smallspinning:false
+			smallspinning:false,
+			bottonloading:false
 		}
 	}
 	// disabledEndDate= endValue => {
@@ -351,7 +352,9 @@ class Goldsubject extends Component {
 					}catch (e) {
 
 					}
-
+					this.setState({
+						bottonloading:true
+					})
 					let url = "/courses/" + coursesId + ".json";
 					axios.put(url,
 						datasysl
@@ -372,12 +375,21 @@ class Goldsubject extends Component {
 									return
 								}
 							}catch (e) {
-
+								this.setState({
+									bottonloading:false
+								})
 							}
 
+						}else{
+							this.setState({
+								bottonloading:false
+							})
 						}
 					}).catch((error) => {
 						console.log(error)
+						this.setState({
+							bottonloading:false
+						})
 					})
 				}
 
@@ -424,20 +436,15 @@ class Goldsubject extends Component {
 						course_module_types: values.checkboxgroup,
 						school:values.school
 					};
-					try {
-						// console.log("提交的ysldatas数据");
-						// console.log(ysldatas);
-						// console.log(JSON.stringify(ysldatas));
-						// console.log(moment(values.starttime).format("YYYY-MM-DD"));
-						// console.log(moment(values.endtime).format("YYYY-MM-DD"));
-					}catch (e) {
-
-					}
 
+					this.setState({
+						bottonloading:true
+					})
 					axios.post(url,
 						ysldatas
 					).then((response) => {
 						if (response.status === 200) {
+
 							// this.goback
 							window.location.href=response.data.first_category_url;
 							var yslGuideone = window.localStorage.getItem('yslGuideone');
@@ -451,11 +458,16 @@ class Goldsubject extends Component {
 									return
 								}
 							}catch (e) {
-
+								this.setState({
+									bottonloading:false
+								})
 							}
 						}
 					}).catch((error) => {
 						console.log(error)
+						this.setState({
+							bottonloading:false
+						})
 					})
 				}
 			});
@@ -1074,9 +1086,11 @@ class Goldsubject extends Component {
 								<div className={"FAFAFA"}>
 									<Form.Item >
 										<div className="clearfix mt40 mb30">
-											<Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20">
+
+											<Button type="primary" htmlType="submit" loading={this.state.bottonloading} className="defalutSubmitbtn fl mr20">
 												提交
 											</Button>
+
 											{/*<a className="defalutSubmitbtn fl mr20">提交</a>*/}
 											<a className="defalutCancelbtn fl" onClick={this.goback}>取消</a>
 										</div>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 71ce6a4ea..40ec74ae8 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -93,27 +93,32 @@ class Listofworksstudentone extends Component {
 					key: 'number',
 					align: "center",
 					className:'font-14',
+					width:'100px',
 					render: (text, record) => (
-						<span>
+						<span style={{width:'100px'}}>
 						{record.number === undefined ?
 							<span style={{
 								color: '#9A9A9A',
-								textAlign: "center"
+								textAlign: "center",
+								width:'100px'
 							}}> --</span>
 							: record.number === "" ?
 								<span style={{
 									color: '#9A9A9A',
-									textAlign: "center"
+									textAlign: "center",
+									width:'100px'
 								}}>--</span>
 								: record.number === "--" ?
 									<span style={{
 										color: '#9A9A9A',
-										textAlign: "center"
+										textAlign: "center",
+										width:'100px'
 									}}>--</span>
 									:
 									<span style={{
 										color: '#07111B',
-										textAlign: "center"
+										textAlign: "center",
+										width:'100px'
 									}}>  {record.number}</span>
 						}
         </span>
@@ -124,37 +129,42 @@ class Listofworksstudentone extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: "center",
-					className:'font-14 maxnamewidth100',
+					className:'font-14 maxnamewidth110',
 					width:'100px',
 					render: (text, record) => (
-						<span className="maxnamewidth100">
+						<span className="maxnamewidth110">
 						{record.name === undefined ?
 							<span style={{
-								"color": '#9A9A9A',
-								textAlign: "center"
+								color: '#9A9A9A',
+								textAlign: "center",
+								width:'100px'
 							}}>--</span>
 							:
 							record.name === "" ?
 								<span style={{
-									"color": '#9A9A9A',
-									textAlign: "center"
+									color: '#9A9A9A',
+									textAlign: "center",
+									width:'100px'
 								}}>--</span>
 								:
 								record.name === null ?
 									<span style={{
-										"color": '#9A9A9A',
-										textAlign: "center"
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'100px'
 									}}>--</span>
 									:
 									record.name === "--" ?
 										<span style={{
-											"color": '#9A9A9A',
-											textAlign: "center"
+											color: '#9A9A9A',
+											textAlign: "center",
+											width:'100px'
 										}}>--</span>
 										:
-										<a className="maxnamewidth100" title={record.name} style={{
-											"color": '#07111B',
-											textAlign: "center"
+										<a className="maxnamewidth110" title={record.name} style={{
+											color: '#07111B',
+											textAlign: "center",
+											width:'100px'
 										}}>{record.name}</a>
 						}
 
@@ -166,34 +176,41 @@ class Listofworksstudentone extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: "center",
-					className:'font-14 maxnamewidth110',
+					className:'font-14 maxnamewidth145',
+					width:'145px',
 					render: (text, record) => (
-						<span className="maxnamewidth110">
+						<span className="maxnamewidth145" style={{
+							width:'145px',
+						}}>
 							{record.stduynumber === undefined ?
 								<span style={{
-									"color": '#9A9A9A',
-									textAlign: "center"
+									color: '#9A9A9A',
+									textAlign: "center",
+									width:'145px',
 								}}>--
 									</span>
 								: record.stduynumber === null ?
 									<span style={{
-										"color": '#9A9A9A',
-										textAlign: "center"
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'145px',
 									}}>--
 									</span>
 									: record.stduynumber === "" ?
 										<span style={{
-											"color": '#9A9A9A',
-											textAlign: "center"
+											color: '#9A9A9A',
+											textAlign: "center",
+											width:'145px',
 										}}>--
 									</span>
 										:
 										<a
 											title={record.stduynumber}
-											className="maxnamewidth110"
+											className="maxnamewidth145"
 											style={{
-											"color": '#9A9A9A',
-												textAlign: "center"
+											  color:'#9A9A9A',
+												textAlign: "center",
+												width:'145px',
 										}}>{
 											record.stduynumber
 										}
@@ -209,13 +226,390 @@ class Listofworksstudentone extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: "center",
+					className:'font-14 maxnamewidth145',
+					width:'145px',
+					render: (text, record) => (
+						<span className="font-14 maxnamewidth145" style={{width:'145px'}}>
+        {record.classroom === undefined ?
+					<a  className=" font-14 maxnamewidth145"
+							style={{
+								color: '#9A9A9A',
+								textAlign: "center",
+								width:'145px',
+							}}>--</a> : record.classroom === "" ?
+						<a  className=" font-14 maxnamewidth145"
+								style={{
+									color: '#9A9A9A',
+									textAlign: "center",
+									width:'145px',
+								}}>--</a> : record.classroom === null ?
+							<a  className=" font-14 maxnamewidth145"
+									style={{
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'145px',
+									}}>--</a>
+							:
+							<a  className=" font-14 maxnamewidth145"
+									title={record.classroom}
+									style={{
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'145px',
+									}}>{record.classroom}</a>
+				}
+        </span>
+					),
+				},
+				{
+					title: '提交状态',
+					dataIndex: 'submitstate',
+					key: 'submitstate',
+					align: "center",
+					className:'font-14',
+					width:'98px',
+					render: (text, record) => (
+						<span style={{width:'98px',}}>
+				 <span style={record.submitstate === "延时提交" ? {
+					 color: '#DD1717',
+					 textAlign: "center",
+					 width:'98px',
+				 } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
+					 color: '#747A7F',
+					 textAlign: "center",
+					 width:'98px',
+				 }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
+
+        </span>
+					),
+				},
+				{
+					title: '实战耗时',
+					dataIndex: 'cost_time',
+					key: 'cost_time',
+					align: 'center',
+					className:'font-14',
+					width:'145px',
+					render: (text, record) => (
+						<span style={
+							{
+								color: '#747A7F',
+								textAlign: "center",
+								width:'145px',
+							}
+						}>
+							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
+								<Tooltip  placement="bottom" title={<div>
+									学员在EduCoder做实训花费的时间
+								</div>}>
+									<span style={
+										{
+											color: '#747A7F',
+											textAlign: "center",
+											width:'145px',
+										}
+									}
+									>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+									</span>
+								</Tooltip>
+							}
+						</span>
+					)
+
+				},
+				// {
+				// 	title: '更新时间',
+				// 	dataIndex: 'updatetime',
+				// 	key: 'updatetime',
+				// 	align: "center",
+				// 	className:'font-14',
+				// 	render: (text, record) => (
+				// 		<span>
+        //      <span style={{
+				// 			 color: '#9A9A9A',
+				// 			 "text-align": "center"
+				// 		 }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
+        // </span>
+				// 	),
+				// },
+				{
+					title: '完成情况',
+					dataIndex: 'completion',
+					key: 'completion',
+					align: "center",
+					className:'font-14',
+					width:'99px',
+					render: (text, record) => (
+						<span style={{
+							width:'99px',
+						}}>
+											<span style={{color: '#07111B',textAlign: "center",	width:'99px'}}>{record.completion+"/"+this.state.challenges_count}</span>
+        </span>
+					),
+				},
+				{
+					title: '关卡得分',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: 'center',
+					className:'font-14',
+					width:'99px',
+					render: (text, record) => (
+						<span style={{
+							width:'99px',
+						}}>
+       	<span style={parseInt(record.levelscore) <= 60 ? {
+					color: '#747A7F',
+					textAlign: "center",
+					width:'99px',
+				} : parseInt(record.levelscore) < 90 ? {
+					color: '#FF6800',
+					textAlign: "center",
+					width:'99px',
+				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center",		width:'99px',} : {
+					color: '#747A7F',
+					textAlign: "center",
+					width:'99px',
+				}}>{record.levelscore}</span>
+        </span>
+					)
+				},
+				{
+					title: '效率分',
+					dataIndex: 'efficiencyscore',
+					key: 'efficiencyscore',
+					align: 'center',
+					className:'font-14',
+					width:'80px',
+					render: (text, record) => (
+						<span style={{
+							width:'80px',
+						}}>
+            {
+							record.efficiencyscore&& record.efficiencyscore=== "--"?(
+									<span style={{color:"#9A9A9A",	width:'80px',}}>
+												--
+											</span>
+								)
+								:
+								<span style={parseInt(record.efficiencyscore) <= 60 ? {
+									color: '#747A7F',
+									textAlign: "center",
+									width:'80px',
+								} : parseInt(record.efficiencyscore) < 90 ? {
+									color: '#FF6800',
+									textAlign: "center",
+									width:'80px',
+								} : parseInt(record.efficiencyscore) >= 90 ? {
+									color: '#DD1717',
+									textAlign: "center",
+									width:'80px',
+								} : {color: '#747A7F', textAlign: "center",	width:'80px',}}>{record.efficiencyscore}</span>
+						}
+
+        </span>
+					)
+				},
+				{
+					title: '最终成绩',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: "center",
+					className:'font-14',
+					width:'99px',
+					render: (text, record) => (
+						<span style={{width:'99px',}}>
+						{
+							record.levelscore && record.levelscore === "--"?
+								<span style={{color: '#9A9A9A', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
+								:
+								<span style={parseInt(record.levelscore) >=90 ? {
+									color: '#DD1717',
+									textAlign: "center",
+									width:'99px',
+								} : parseInt(record.levelscore) <= 60?{
+									color: '#FF6800',
+									textAlign: "center",
+									width:'99px',
+								}: {color: '#747A7F', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
+						}
+
+        </span>
+					),
+				},
+				{
+					title: '操作',
+					dataIndex: 'operating',
+					key: 'operating',
+					align: "center",
 					className:'font-14',
 					render: (text, record) => (
 						<span>
-             <span  className="ysltable" style={{
-							 "color": '#9A9A9A',
-							 textAlign: "center"
-						 }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
+                        {
+													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
+														:
+														<a style={{textAlign: "center"}}
+																	className="color-blue"
+																	onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+												}
+
+        </span>
+					),
+				},
+			],
+			orders: "",
+			columnsstu2: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: "center",
+					className:'font-14',
+					width:'100px',
+					render: (text, record) => (
+						<span style={{width:'100px'}}>
+									<span style={{
+										color: '#07111B',
+										textAlign: "center",
+										width:'100px'
+									}}> 我</span>
+            </span>
+					),
+				},
+				{
+					title: '姓名',
+					dataIndex: 'name',
+					key: 'name',
+					align: "center",
+					className:'font-14 maxnamewidth110',
+					width:'100px',
+					render: (text, record) => (
+						<span className="maxnamewidth110">
+						{record.name === undefined ?
+							<span style={{
+								color: '#9A9A9A',
+								textAlign: "center",
+								width:'100px'
+							}}>--</span>
+							:
+							record.name === "" ?
+								<span style={{
+									color: '#9A9A9A',
+									textAlign: "center",
+									width:'100px'
+								}}>--</span>
+								:
+								record.name === null ?
+									<span style={{
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'100px'
+									}}>--</span>
+									:
+									record.name === "--" ?
+										<span style={{
+											color: '#9A9A9A',
+											textAlign: "center",
+											width:'100px'
+										}}>--</span>
+										:
+										<a className="maxnamewidth110" title={record.name} style={{
+											color: '#07111B',
+											textAlign: "center",
+											width:'100px'
+										}}>{record.name}</a>
+						}
+
+        </span>
+					),
+				},
+				{
+					title: '学号',
+					dataIndex: 'stduynumber',
+					key: 'stduynumber',
+					align: "center",
+					className:'font-14 maxnamewidth145',
+					width:'145px',
+					render: (text, record) => (
+						<span className="maxnamewidth145" style={{
+							width:'145px',
+						}}>
+							{record.stduynumber === undefined ?
+								<span style={{
+									color: '#9A9A9A',
+									textAlign: "center",
+									width:'145px',
+								}}>--
+									</span>
+								: record.stduynumber === null ?
+									<span style={{
+										color: '#9A9A9A',
+										textAlign: "center",
+										width:'145px',
+									}}>--
+									</span>
+									: record.stduynumber === "" ?
+										<span style={{
+											color: '#9A9A9A',
+											textAlign: "center",
+											width:'145px',
+										}}>--
+									</span>
+										:
+										<a
+											title={record.stduynumber}
+											className="maxnamewidth145"
+											style={{
+												color:'#9A9A9A',
+												textAlign: "center",
+												width:'145px',
+											}}>{
+											record.stduynumber
+										}
+										</a>
+
+							}
+
+        </span>
+					),
+				},
+				{
+					title: '分班',
+					key: 'classroom',
+					dataIndex: 'classroom',
+					align: "center",
+					className:'font-14 maxnamewidth145',
+					width:'145px',
+					render: (text, record) => (
+						<span className="font-14 maxnamewidth145" style={{width:'145px'}}>
+							{record.classroom === undefined ?
+								<a  className=" font-14 maxnamewidth145"
+										style={{
+											color: '#9A9A9A',
+											textAlign: "center",
+											width:'145px',
+										}}>--</a> : record.classroom === "" ?
+									<a  className=" font-14 maxnamewidth145"
+											style={{
+												color: '#9A9A9A',
+												textAlign: "center",
+												width:'145px',
+											}}>--</a> : record.classroom === null ?
+										<a  className=" font-14 maxnamewidth145"
+												style={{
+													color: '#9A9A9A',
+													textAlign: "center",
+													width:'145px',
+												}}>--</a>
+										:
+										<a  className=" font-14 maxnamewidth145"
+												title={record.classroom}
+												style={{
+													color: '#9A9A9A',
+													textAlign: "center",
+													width:'145px',
+												}}>{record.classroom}</a>
+							}
         </span>
 					),
 				},
@@ -225,14 +619,17 @@ class Listofworksstudentone extends Component {
 					key: 'submitstate',
 					align: "center",
 					className:'font-14',
+					width:'98px',
 					render: (text, record) => (
-						<span>
+						<span style={{width:'98px',}}>
 				 <span style={record.submitstate === "延时提交" ? {
-					 "color": '#DD1717',
-					 textAlign: "center"
-				 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', textAlign: "center"} : {
-					 "color": '#747A7F',
-					 textAlign: "center"
+					 color: '#DD1717',
+					 textAlign: "center",
+					 width:'98px',
+				 } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
+					 color: '#747A7F',
+					 textAlign: "center",
+					 width:'98px',
 				 }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
 
         </span>
@@ -244,23 +641,25 @@ class Listofworksstudentone extends Component {
 					key: 'cost_time',
 					align: 'center',
 					className:'font-14',
+					width:'145px',
 					render: (text, record) => (
 						<span style={
 							{
 								color: '#747A7F',
-								textAlign: "center"
+								textAlign: "center",
+								width:'145px',
 							}
 						}>
-							{record.cost_time === null? "--":record.cost_time === undefined?"--":
-								<a style={
+							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
+								<span style={
 									{
 										color: '#747A7F',
-										textAlign: "center"
+										textAlign: "center",
+										width:'145px',
 									}
 								}
-									 title={"学员在EduCoder做实训花费的时间"}
 								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
-								</a>
+									</span>
 							}
 						</span>
 					)
@@ -274,11 +673,11 @@ class Listofworksstudentone extends Component {
 				// 	className:'font-14',
 				// 	render: (text, record) => (
 				// 		<span>
-        //      <span style={{
-				// 			 "color": '#9A9A9A',
+				//      <span style={{
+				// 			 color: '#9A9A9A',
 				// 			 "text-align": "center"
 				// 		 }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
-        // </span>
+				// </span>
 				// 	),
 				// },
 				{
@@ -287,9 +686,12 @@ class Listofworksstudentone extends Component {
 					key: 'completion',
 					align: "center",
 					className:'font-14',
+					width:'99px',
 					render: (text, record) => (
-						<span>
-											<span style={{color: '#07111B',textAlign: "center"}}>{record.completion+"/"+this.state.challenges_count}</span>
+						<span style={{
+							width:'99px',
+						}}>
+											<span style={{color: '#07111B',textAlign: "center",	width:'99px'}}>{record.completion+"/"+this.state.challenges_count}</span>
         </span>
 					),
 				},
@@ -299,17 +701,23 @@ class Listofworksstudentone extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className:'font-14',
+					width:'99px',
 					render: (text, record) => (
-						<span>
+						<span style={{
+							width:'99px',
+						}}>
        	<span style={parseInt(record.levelscore) <= 60 ? {
 					color: '#747A7F',
-					textAlign: "center"
+					textAlign: "center",
+					width:'99px',
 				} : parseInt(record.levelscore) < 90 ? {
 					color: '#FF6800',
-					textAlign: "center"
-				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+					textAlign: "center",
+					width:'99px',
+				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center",		width:'99px',} : {
 					color: '#747A7F',
-					textAlign: "center"
+					textAlign: "center",
+					width:'99px',
 				}}>{record.levelscore}</span>
         </span>
 					)
@@ -320,25 +728,31 @@ class Listofworksstudentone extends Component {
 					key: 'efficiencyscore',
 					align: 'center',
 					className:'font-14',
+					width:'80px',
 					render: (text, record) => (
-						<span>
+						<span style={{
+							width:'80px',
+						}}>
             {
 							record.efficiencyscore&& record.efficiencyscore=== "--"?(
-									<span style={{color:"#9A9A9A"}}>
+									<span style={{color:"#9A9A9A",	width:'80px',}}>
 												--
 											</span>
 								)
 								:
 								<span style={parseInt(record.efficiencyscore) <= 60 ? {
 									color: '#747A7F',
-									textAlign: "center"
+									textAlign: "center",
+									width:'80px',
 								} : parseInt(record.efficiencyscore) < 90 ? {
 									color: '#FF6800',
-									textAlign: "center"
+									textAlign: "center",
+									width:'80px',
 								} : parseInt(record.efficiencyscore) >= 90 ? {
 									color: '#DD1717',
-									textAlign: "center"
-								} : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore}</span>
+									textAlign: "center",
+									width:'80px',
+								} : {color: '#747A7F', textAlign: "center",	width:'80px',}}>{record.efficiencyscore}</span>
 						}
 
         </span>
@@ -350,19 +764,22 @@ class Listofworksstudentone extends Component {
 					key: 'levelscore',
 					align: "center",
 					className:'font-14',
+					width:'99px',
 					render: (text, record) => (
-						<span>
+						<span style={{width:'99px',}}>
 						{
 							record.levelscore && record.levelscore === "--"?
-								<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.levelscore}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
 								:
 								<span style={parseInt(record.levelscore) >=90 ? {
 									color: '#DD1717',
-									textAlign: "center"
+									textAlign: "center",
+									width:'99px',
 								} : parseInt(record.levelscore) <= 60?{
 									color: '#FF6800',
 									textAlign: "center",
-								}: {color: '#747A7F', textAlign: "center"}}>{record.levelscore}</span>
+									width:'99px',
+								}: {color: '#747A7F', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
 						}
 
         </span>
@@ -380,16 +797,14 @@ class Listofworksstudentone extends Component {
 													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
 														:
 														<a style={{textAlign: "center"}}
-																	className="color-blue"
-																	onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+															 className="color-blue"
+															 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
 												}
 
         </span>
 					),
 				},
 			],
-
-			orders: "",
 			b_order:"desc",
 			allow_late:false,
 			checkedValuesine: undefined,
@@ -405,8 +820,8 @@ class Listofworksstudentone extends Component {
 			course_group: null,
 			publish_immediately: undefined,
 			end_immediately: undefined,
-			mystyle: {"display": "block", "color": '#07111B', textAlign: "center"},
-			mystyles: {"display": "none", "color": '#07111B', textAlign: "center"},
+			mystyle: {"display": "block", color: '#07111B', textAlign: "center"},
+			mystyles: {"display": "none", color: '#07111B', textAlign: "center"},
 			mystyle1: {"display": "block"},
 			mystyles1: {"display": "none"},
 			unlimited: 0,
@@ -423,7 +838,7 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						<span style={{"color": '#07111B', textAlign: "center"}}>{record.number}
+						<span style={{color: '#07111B', textAlign: "center"}}>{record.number}
         </span>
 					)
 				},
@@ -435,7 +850,7 @@ class Listofworksstudentone extends Component {
 					className:'font-14 maxnamewidth100',
 					width:'100px',
 					render: (text, record) => (
-						<a  className="maxnamewidth100" title={record.name} style={{"color": '#07111B', textAlign: "center"}}>{record.name}</a>
+						<a  className="maxnamewidth100" title={record.name} style={{color: '#07111B', textAlign: "center"}}>{record.name}</a>
 					)
 				},
 				{
@@ -489,7 +904,7 @@ class Listofworksstudentone extends Component {
 					className:'font-14',
 					render: (text, record) => (
 						<span>
-							{record.classroom === undefined ?<span className="ysltable" style={{"color": '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{"color": '#07111B',textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{"color": '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{"color": '#07111B',textAlign: "center"}}>{record.classroom}</span>}
+							{record.classroom === undefined ?<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{color: '#07111B',textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{color: '#07111B',textAlign: "center"}}>{record.classroom}</span>}
 						</span>
 					)
 				},
@@ -524,21 +939,21 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null? "--":record.cost_time === undefined?"--":
+							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
+
 								<a style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
-									 title={"学员在EduCoder做实训花费的时间"}
 								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
 								</a>
 							}
 						</span>
 				// 		<a style={
 				// 			{
-				// 				"color": '#747A7F',
+				// 				color: '#747A7F',
 				// 				"text-align": "center"
 				// 			}
 				// 		}
@@ -555,7 +970,7 @@ class Listofworksstudentone extends Component {
 				// 	align: 'center',
 				// 	className:'font-14',
 				// 	render: (text, record) => (
-				// 		<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+				// 		<span style={{color: '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
 				// 	),
 				// },
 				{
@@ -570,7 +985,7 @@ class Listofworksstudentone extends Component {
 										<Tooltip  placement="bottom" title={<div>
 											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
 										</div>}>
-											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
+											<span style={{color: '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
 										</Tooltip>
 
         </span>
@@ -585,13 +1000,13 @@ class Listofworksstudentone extends Component {
 					render: (text, record) => (
 						<span>
        	<span style={parseInt(record.levelscore) <= 60 ? {
-					"color": '#747A7F',
+					color: '#747A7F',
 					"text-align": "center"
 				} : parseInt(record.levelscore) < 90 ? {
-					"color": '#FF6800',
+					color: '#FF6800',
 					"text-align": "center"
-				} : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-					"color": '#747A7F',
+				} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
+					color: '#747A7F',
 					"text-align": "center"
 				}}>{record.levelscore}</span>
         </span>
@@ -631,15 +1046,15 @@ class Listofworksstudentone extends Component {
 								)
 								:
 								<span style={parseInt(record.efficiencyscore) <= 60 ? {
-									"color": '#747A7F',
+									color: '#747A7F',
 									"text-align": "center"
 								} : parseInt(record.efficiencyscore) < 90 ? {
-									"color": '#FF6800',
+									color: '#FF6800',
 									"text-align": "center"
 								} : parseInt(record.efficiencyscore) >= 90 ? {
-									"color": '#DD1717',
+									color: '#DD1717',
 									"text-align": "center"
-								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
+								} : {color: '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
 						}
 
         </span>
@@ -663,18 +1078,18 @@ class Listofworksstudentone extends Component {
 													record.finalscore&&record.finalscore==="--"?
 														<span style=
 																		{{
-																			"color": '#9A9A9A',
+																			color: '#9A9A9A',
 																			"text-align": "center"
 																		}}>{record.finalscore}</span>
 														:
 														<span style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
+															color: '#747A7F',
 															"text-align": "center"
 														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
+															color: '#FF6800',
 															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
+														} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
+															color: '#747A7F',
 															"text-align": "center"
 														}}>{record.finalscore}</span>
 												}
@@ -691,18 +1106,18 @@ class Listofworksstudentone extends Component {
 													record.finalscore&&record.finalscore==="--"?
 														<span style=
 																		{{
-																			"color": '#9A9A9A',
+																			color: '#9A9A9A',
 																			"text-align": "center"
 																		}}>{record.finalscore}</span>
 														:
 														<span style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
+															color: '#747A7F',
 															"text-align": "center"
 														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
+															color: '#FF6800',
 															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
+														} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
+															color: '#747A7F',
 															"text-align": "center"
 														}}>{record.finalscore}</span>
 												}
@@ -736,7 +1151,7 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}
+						<span style={{color: '#07111B', "text-align": "center"}}>{record.number}
         </span>
 					)
 				},
@@ -748,7 +1163,7 @@ class Listofworksstudentone extends Component {
 					className:'font-14 maxnamewidth100',
 					width:'100px',
 					render: (text, record) => (
-						<a  className="maxnamewidth100" title={record.name}  style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+						<a  className="maxnamewidth100" title={record.name}  style={{color: '#07111B', "text-align": "center"}}>{record.name}</a>
 					)
 				},
 				{
@@ -761,19 +1176,19 @@ class Listofworksstudentone extends Component {
 						<span className="maxnamewidth110">
 							{record.stduynumber === undefined ?
 								<span style={{
-									"color": '#9A9A9A',
+									color: '#9A9A9A',
 									"text-align": "center"
 								}}>--
 									</span>
 								: record.stduynumber === null ?
 									<span style={{
-										"color": '#9A9A9A',
+										color: '#9A9A9A',
 										"text-align": "center"
 									}}>--
 									</span>
 									: record.stduynumber === "" ?
 										<span style={{
-											"color": '#9A9A9A',
+											color: '#9A9A9A',
 											"text-align": "center"
 										}}>--
 									</span>
@@ -831,7 +1246,7 @@ class Listofworksstudentone extends Component {
 				// 	align: 'center',
 				// 	className:'font-14',
 				// 	render: (text, record) => (
-				// 		<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+				// 		<span style={{color: '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
 				// 	),
 				// },
 				{
@@ -847,16 +1262,19 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null ? "--":record.cost_time === undefined ?"--":
+							{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time === "--" ?"--":
+								<Tooltip  placement="bottom" title={<div>
+									学员在EduCoder做实训花费的时间
+								</div>}>
 								<a style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
-									 title={"学员在EduCoder做实训花费的时间"}
 								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
 								</a>
+								</Tooltip>
 							}
 						</span>
 					)
@@ -1035,10 +1453,6 @@ class Listofworksstudentone extends Component {
 			datajs:[],
 
 		}
-		// console.log("902");
-		// console.log("902");
-		// console.log(this.props);
-
 	}
 	componentDidCatch(error, info){
 		console.log("-----------------------------905错误信息");
@@ -1239,6 +1653,7 @@ class Listofworksstudentone extends Component {
 		let datalists = [];
 		var styletable = {"display": "none"}
 		var arr =[];
+		var arr2=[];
 		for(var i=0;i<this.state.columnsstu.length;i++){
 			var item = this.state.columnsstu[i];
 			if(this.props.isNotMember()===true){
@@ -1275,7 +1690,48 @@ class Listofworksstudentone extends Component {
 
 			}
 		}
+		try {
+			for(var i=0;i<this.state.columnsstu2.length;i++){
+				var item = this.state.columnsstu2[i];
+				if(this.props.isNotMember()===true){
+					if(item.title==="关卡得分") {
+						continue
+					}
+					if(item.title==="效率分") {
+						continue
+					}
+					if(item.title==="最终成绩") {
+						continue
+					}
+					if(item.title==="学号") {
+						continue
+					}
+					else{
+						arr2.push(item);
+					}
+				}
+				else{
+					if (work_efficiency === false) {
+						if(item.title==="关卡得分"){
+							continue
+						}
+						else if(item.title==="效率分"){
+							continue
+
+						}else{
+							arr2.push(item);
+						}
+					}else{
+						arr2.push(item);
+					}
+
+				}
+			}
+		}catch (e) {
+			arr2=this.state.columnsstu2;
+		}
 		let columns2=	arr;
+		let columns3= arr2;
 		var teacherlists = undefined;
 		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
@@ -1360,7 +1816,10 @@ class Listofworksstudentone extends Component {
 
 		}
 		// console.log("554");
+		// console.log("Listofworksstudentone.js45666");
 		// console.log(columns2);
+		// console.log(columns3);
+
 		// console.log(arr);
 		this.setState({
 			data: datalist,
@@ -1369,6 +1828,8 @@ class Listofworksstudentone extends Component {
 			loadingstate: false,
 			styletable: styletable,
 			columnsstu:columns2,
+			columnsstu2:columns3,
+
 		})
 	}
 	// 设置数据
@@ -1379,6 +1840,7 @@ class Listofworksstudentone extends Component {
 
 
 		var arr =[];
+		var arr2 =[];
 		for(var i=0;i<this.state.columnsstu.length;i++){
 			var item = this.state.columnsstu[i];
 
@@ -1413,8 +1875,47 @@ class Listofworksstudentone extends Component {
 
 			}
 		}
-		let columns2=	arr;
+		try {
+			for(var i=0;i<this.state.columnsstu2.length;i++){
+				var item = this.state.columnsstu2[i];
+
+				if(this.props.isNotMember()===true){
+					if(item.title==="关卡得分") {
+						continue
+					}
+					if(item.title==="效率分") {
+						continue
+					}
+					if(item.title==="最终成绩") {
+						continue
+					}
+					if(item.title==="学号") {
+						continue
+					}else{
+						arr2.push(item);
+					}
+				}else{
+					if (this.state.work_efficiency === false) {
+						if (item.title === "关卡得分") {
+							continue
+						} else if (item.title === "效率分") {
+							continue
+						}else{
+							arr2.push(item);
 
+						}
+					}else{
+						arr2.push(item);
+					}
+
+				}
+			}
+
+		}catch (e) {
+			arr2=this.state.columnsstu2;
+		}
+		let columns2=	arr;
+		let columns3=	arr2;
 		if (teacherdata !== undefined) {
 			// console.log("seacthdata设置数据")
 			// console.log(this.state.teacherdata.id )
@@ -1472,12 +1973,15 @@ class Listofworksstudentone extends Component {
 		// console.log("datalistdatalist文件");
 		// console.log(datalist);
 		// console.log("645");
+		// console.log("Listofworksstudentone12314.js");
 		// console.log(columns2);
+		// console.log(columns3);
 		this.setState({
 			data: datalist,
 			teacherlist: teacherlist,
 			loadingstate: false,
 			columnsstu:columns2,
+			columnsstu2:columns3,
 		})
 	}
 	// 查看学员实训信息
@@ -2528,7 +3032,7 @@ class Listofworksstudentone extends Component {
 		})
 	}
 	render() {
-		let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
+		let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		// console.log(this.state.student_works);
@@ -2543,15 +3047,21 @@ class Listofworksstudentone extends Component {
 		// console.log(this.props.isAdmin());
 
 	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
-	 // if(this.props.isAdmin() === false){
-	 // 	if(teacherdata.student_works!==undefined){
-	 // 		if(teacherdata.student_works.length>0){
-   //
-	 //
-		// 	}
-		// }
-	 //
-	 // }
+	 try {
+		 if(this.props.isAdmin() === false){
+			 if(teacherdata&&teacherdata.student_works){
+				 if(teacherdata&&teacherdata.student_works.length>0){
+					 console.log("这是双层页面。。。。");
+
+				 }
+			 }
+
+		 }
+	 }catch (e) {
+	 	console.log("Listofworksstudentone123");
+    console.log(e);
+	 }
+
 		return (
 			this.props.isAdmin() === true ?
 				(
@@ -3149,8 +3659,9 @@ class Listofworksstudentone extends Component {
 											{data === undefined ? "" : <Table
 												style={styletable}
 												dataSource={data}
-												columns={columnsstu}
+												columns={columnsstu2}
 												pagination={false}
+												showHeader={false}
 												loading={false}
 											/>}
 										</div>
@@ -3192,18 +3703,18 @@ class Listofworksstudentone extends Component {
 													font-weight:400;
 													color:rgba(255,104,0,1);
 													}
-												.computeTime {
-														width: 122px;
-														height: 31px;
-														display: inline-block;
-														padding: 5px;
-														text-align: center;
-														line-height: 20px;
-														color: #FE6B21;
-														border: 1px solid #FE6B21;
-														cursor: pointer;
-														border-radius: 4px;
-												}
+													.computeTime {
+															width: 122px;
+															height: 31px;
+															display: inline-block;
+															padding: 5px;
+															text-align: center;
+															line-height: 20px;
+															color: #FE6B21;
+															border: 1px solid #FE6B21;
+															cursor: pointer;
+															border-radius: 4px;
+													}
 
 													.computeTimes{
 														width: 122px;
@@ -3234,42 +3745,9 @@ class Listofworksstudentone extends Component {
 																		</div>:"")
 																}
 												 			</span>}
-													{/*		{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
-													{/*{computeTimetype===true?*/}
-													{/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTime}>*/}
-													{/*		查看最新成绩*/}
-													{/*	</div>:""):*/}
-													{/*	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
-													{/*		(this.props.isNotMember()===false?<div className="computeTimes font-16">*/}
-													{/*			查看最新成绩*/}
-													{/*		</div>:"")*/}
-													{/*}*/}
-												 {/*</span>}*/}
-
 														</div>
-														{/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}
-														{/*<div className="fr  edu-menu-panel">*/}
-														{/*<ul>*/}
-														{/*<li className="edu-position edu-position-hidebox">*/}
-														{/*<a className="font-12 ">*/}
-														{/*{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>*/}
-														{/*<i className="iconfont icon-xiajiantou ml5 font-12 "></i>*/}
-														{/*<ul className="edu-position-hide undis mt10">*/}
-														{/*<li><a onClick={(e) => this.funorder("updated_at")} data-remote="true"*/}
-														{/*className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>*/}
-														{/*<li><a onClick={(e) => this.funorder("work_score")} data-remote="true"*/}
-														{/*className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>*/}
-														{/*<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"*/}
-														{/*className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>*/}
-														{/*</ul>*/}
-														{/*</li>*/}
-														{/*</ul>*/}
-														{/*</div>*/}
-
-													</div>
-
 												</div>
-
+												</div>
 												<div className={"justify break_full_word new_li"}
 														 style={{minHeight: "480px"}}>
 													<style>{`
@@ -3300,7 +3778,6 @@ class Listofworksstudentone extends Component {
 															loading={loadingstate}
 														/>}
 													</div>
-
 												</div>
 												{
 													teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
@@ -3321,18 +3798,10 @@ class Listofworksstudentone extends Component {
 														<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 													</div>
 												</div>
-
 											</div>
 										}
-
-
-										{/*///*/}
-
-
 									</div>
-
 								</div>
-
 							</div>
 					}
 				</div>
@@ -3342,49 +3811,4 @@ class Listofworksstudentone extends Component {
 	}
 }
 
-export default Listofworksstudentone;
-{/*<div className="stud-class-set bor-bottom-greyE ">*/}
-{/*	<div className=" clearfix edu-back-white poll_list">*/}
-{/*		<a className="active" onClick={(e)=>this.ChangeTab(0)}>作品列表</a>*/}
-{/*		<a onClick={(e)=>this.ChangeTab(1)}>作业问答</a>*/}
-{/*		<a*/}
-{/*			onClick={(e)=>this.ChangeTab(3)}*/}
-{/*		>设置</a>*/}
-{/*		{this.state.view_report===true?<a className="fr color-blue font-16" target={"_blank"}*/}
-{/*																			href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/shixun_work_report`}>*/}
-{/*			查看实训报告*/}
-{/*		</a>:""}*/}
-{/*		/!*<a className="fr color-blue font-16">查看实训报告</a>*!/*/}
-{/*		{*/}
-{/*			teacherdata === undefined ? ""*/}
-{/*				: teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" :*/}
-{/*				<a className="fr color-blue font-16"*/}
-{/*					 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{teacherdata.commit_des}</a>*/}
-{/*		}*/}
-{/*		{teacherdata === undefined ? "" : <Startshixuntask*/}
-{/*			{...this.props}*/}
-{/*			data={teacherdata}*/}
-{/*		/>}*/}
-{/*	</div>*/}
-{/*</div>*/}
-{/*<div className="stud-class-set bor-bottom-greyE ">*/}
-{/*	<div className=" clearfix edu-back-white poll_list">*/}
-{/*		<Link className="active" onClick={(e)=>this.ChangeTab(0)}>作品列表</Link>*/}
-{/*		<Link onClick={(e)=>this.ChangeTab(1)}>作业问答</Link>*/}
-{/*		<Link onClick={(e)=>this.ChangeTab(3)}>设置</Link>*/}
-{/*		{this.state.view_report===true?<Link className="fr color-blue font-16" target={"_blank"}*/}
-{/*																				 to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/shixun_work_report`}>*/}
-{/*			查看实训报告*/}
-{/*		</Link>:""}*/}
-{/*		{*/}
-{/*			teacherdata === undefined ? ""*/}
-{/*				: teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" :*/}
-{/*				<a className="fr color-blue font-16"*/}
-{/*					 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{teacherdata.commit_des}</a>*/}
-{/*		}*/}
-{/*		{teacherdata === undefined ? "" : <Startshixuntask*/}
-{/*			{...this.props}*/}
-{/*			data={teacherdata}*/}
-{/*		/>}*/}
-{/*	</div>*/}
-{/*</div>*/}
\ No newline at end of file
+export default Listofworksstudentone;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index d5ab535e2..bb8ccae4a 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -11,6 +11,7 @@ import Coursesshixundetails from './shixunreport/Coursesshixundetails';
 import Shixunechart from './shixunreport/Shixunechart';
 import DownloadMessageysl from "../../modals/DownloadMessageysl"
 import AppraiseModal from "../coursesPublic/AppraiseModal";
+import ShowAppraiseList from './ShowAppraiseList';
 import {UnControlled as CodeMirror} from 'react-codemirror2';
 import 'codemirror/mode/cmake/cmake';
 import 'codemirror/mode/xml/xml';
@@ -34,9 +35,8 @@ class ShixunWorkReport extends Component {
 			DownloadMessageval:undefined,
 			isspinning:false,
 			showAppraiseModaltype:false,
-			work_comment_hidden:false,
-			showAppraiseModalsshow:true,
-			work_comment:null
+			work_comment_hidden:undefined,
+			work_comment:undefined,
 		}
 
 	}
@@ -102,7 +102,7 @@ class ShixunWorkReport extends Component {
 		let homeworkid=this.props.match.params.homeworkid;
 		let url = `/student_works/${homeworkid}/shixun_work_report.json`
 		axios.get(url).then((result) => {
-			if (result.data.status === 403||result.data.status === 401||result.data.status === 407||result.data.status === 408||result.data.status === 409) {
+			if (result.data.status === 403 || result.data.status === 401 || result.data.status === 407 || result.data.status === 408|| result.data.status === 409 || result.data.status === 500) {
 
 			}else{
 				this.setState({
@@ -155,85 +155,153 @@ class ShixunWorkReport extends Component {
 		})
 	}
 
-	showAppraiseModal=(sum)=>{
-		 // if(sum===undefined){
-			//  this.setState({
-			// 	 showAppraiseModaltype:true,
-			//  })
-		 // }else{
-			//  this.setState({
-			// 	 showAppraiseModaltype:true,
-			// 	 work_comment:undefined,
-			// 	 work_type:0,
-			//  })
-		 //
-		 // }
-		let{work_comment,work_comment_hidden}=this.state;
-		this.setState({
-			showAppraiseModaltype:true,
-			work_comment_hidden:work_comment===null||work_comment===undefined?this.state.work_type?true:false:work_comment_hidden,
-		})
+	showAppraiseModal=(type,id,show,hidden)=>{
+    let{data}=this.state;
+
+		if(type==="child"){
+		 data.stage_list.forEach((item,key)=>{
+				if(item.challenge_id===id){
+					item.challenge_comment=show;
+				  item.challenge_comment_hidden=hidden;
+				}
+			})
+			this.setState({
+				showAppraiseModaltype:true,
+				showAppraisetype:type,
+				challenge_id:id,
+				data:data
+			})
+		}else{
+			this.setState({
+				showAppraiseModaltype:true,
+				showAppraisetype:type,
+				challenge_id:undefined,
+				work_comment:show,
+				work_comment_hidden:hidden
+			})
+		}
+
 	}
 
 	hideAppraiseModal=()=>{
-		let{work_comment,work_comment_hidden}=this.state;
 		this.setState({
 			showAppraiseModaltype:false,
-			work_comment_hidden:work_comment===null||work_comment===undefined?this.state.work_type===1?true:false:work_comment_hidden,
 		})
 	}
-	showAppraiseModals=(list,type)=>{
+	showAppraiseModals=(show,hidden,id,comment_id)=>{
+
+		let{data,showAppraisetype}=this.state;
+
+		if(showAppraisetype==="child"){
+			data.stage_list.forEach((item,key)=>{
+				if(item.challenge_id===id){
+					item.challenge_comment=show;
+					item.challenge_comment_hidden=hidden;
+					item.comment_id=comment_id
+				}
+			})
+			this.setState({
+				showAppraiseModaltype:false,
+				data:data
+			})
+		}else{
+			data.comment_id=comment_id;
+			this.setState({
+				showAppraiseModaltype:false,
+				work_comment:show,
+				work_comment_hidden:hidden,
+				data:data
+			})
+		}
 
-		this.setState({
-			showAppraiseModaltype:false,
-			work_comment_hidden:type===0?false:true,
-			work_comment:list,
-			work_type:type,
-			showAppraiseModals:true,
-			showAppraiseModalsshow:true,
-		})
 	}
-	isdeleteModal=()=>{
+	isdeleteModal=(comment_id,visible_comment,type)=>{
+		let newcomment_id=comment_id;
+		let newvisible_comment=visible_comment;
+		let newtype=type;
 		this.setState({
 			modalsType: true,
 			modalsTopval:"是否确认删除？",
-			modalSave: ()=>this.isdeleteModals(),
-			modalCancel:()=>this.hideisdeleteModal(),
+			modalSave: ()=>this.isdeleteModals(newcomment_id,newvisible_comment,newtype),
+			modalCancel:()=>this.hideisdeleteModals(),
 		})
 	}
 
-	hideisdeleteModal=()=>{
+	hideisdeleteModals=()=>{
 		this.setState({
-			modalsType: false,
+			modalsType:false,
 			modalsTopval:"是否确认删除？",
-			modalSave: ()=>this.isdeleteModals(),
-			modalCancel:()=>this.hideisdeleteModal(),
+			modalSave: "",
+			modalCancel:"",
 		})
 	}
 
-	isdeleteModals=()=>{
-		let url =`/student_works/${this.props.match.params.homeworkid}/destroy_work_comment.json`
-		axios.delete(url).then((response) => {
-				// const { status } = response.data;
-				if(response.data.status===0){
-					this.props.showNotification(response.data.message)
-					this.setState({
-						 showAppraiseModalsshow:false,
-						 work_comment_hidden:false,
-					   work_comment:undefined,
-						 work_type:0,
-					})
-					this.hideisdeleteModal()
-				}else{
-					this.props.showNotification(response.data.message)
+
+	hideisdeleteModal=(comment_id,visible_comment,type)=>{
+
+
+		let{data,work_comment,work_comment_hidden}=this.state;
+
+		if(type==="child"){
+			data.stage_list.map((item,key)=>{
+				console.log(item)
+				if(item.comment_id!=null){
+					if(item.comment_id===comment_id){
+						item.challenge_comment=null;
+						item.challenge_comment_hidden=null;
+					}
 				}
 			})
-			.catch(function (error) {
-				console.log(error);
-			});
+
+			this.setState({
+				modalsType:false,
+				modalsTopval:"是否确认删除？",
+				modalSave: "",
+				modalCancel:"",
+				data:data
+			})
+
+		}else{
+
+				this.setState({
+					modalsType:false,
+					modalsTopval:"是否确认删除？",
+					modalSave: "",
+					modalCancel:"",
+					work_comment:null,
+					work_comment_hidden:null
+				})
+
+
+		}
+
+	}
+
+	isdeleteModals=(comment_id,visible_comment,type)=>{
+     let newcomment_id=comment_id;
+     let newvisible_comment=visible_comment;
+     let newtype=type;
+			if(comment_id!=null){
+				let url =`/student_works/${this.props.match.params.homeworkid}/destroy_work_comment.json`
+				axios.delete(url, { data: {
+						comment_id:comment_id,
+					}}).then((response) => {
+						// const { status } = response.data;
+						if(response.data.status===0){
+							this.props.showNotification(response.data.message)
+							this.hideisdeleteModal(newcomment_id,newvisible_comment,newtype)
+						}else{
+							this.props.showNotification(response.data.message)
+						}
+					})
+					.catch(function (error) {
+						console.log(error);
+					});
+			}
+
 	}
 	render() {
-		let{data,showAppraiseModaltype,work_comment_hidden,showAppraiseModalsshow,work_comment} =this.state;
+		let{data,showAppraiseModaltype,work_comment_hidden,work_comment} =this.state;
 
 		let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
 		let homework_common_id=data===undefined?"":data.homework_common_id;
@@ -242,7 +310,7 @@ class ShixunWorkReport extends Component {
 
 		// let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true;
 		let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
-   console.log(showAppraiseModals)
+
 		return (
 
 				data===undefined?"":<Spin indicator={antIcon} spinning={this.state.spinning}>
@@ -253,15 +321,20 @@ class ShixunWorkReport extends Component {
 						modalSave={this.state.modalSave}
 						modalCancel={this.state.modalCancel}
 					></Modals>
+
+
+
 				{showAppraiseModaltype===true?<AppraiseModal
 					{...this.props}
 					{...this.state}
 					visible={showAppraiseModaltype}
 					Cancel={()=>this.hideAppraiseModal()}
-					showCancel={(list,type)=>this.showAppraiseModals(list,type)}
+					showCancel={(show,hidden,id,comment_id)=>this.showAppraiseModals(show,hidden,id,comment_id)}
 					work_comment={this.state.work_comment}
 					work_type={work_comment===null||work_comment===undefined?this.state.work_type:work_comment_hidden===true?1:0}
 				 />:""}
+
+
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20" }>
 					<div className="educontent">
@@ -299,9 +372,11 @@ class ShixunWorkReport extends Component {
 						{/*>评阅</a> : ""}*/}
 						{this.props.isAdmin() ?<a
 							className=" color-blue font-14 fr  ml20 mt15"
-							onClick={()=>this.showAppraiseModal(1)}
+							onClick={()=>this.showAppraiseModal("main",undefined,work_comment,work_comment_hidden)}
 						>评阅</a>:""}
 					</div>
+
+
 					{/*{work_comment===null||work_comment===undefined?"评阅":"编辑评阅"}*/}
 					<style>{
 						`
@@ -421,6 +496,7 @@ class ShixunWorkReport extends Component {
 								jumptopic={this.jumptopic}
 								getdatalist={()=>this.getdatalist()}
 								setupdalist={(challenge_score,overall_appraisal,work_score)=>this.setupdalist(challenge_score,overall_appraisal,work_score)}
+								showAppraiseModal={(type,id,show,hidden)=>this.showAppraiseModal(type,id,show,hidden)}
 							/>
 
 						</div>
@@ -472,33 +548,12 @@ class ShixunWorkReport extends Component {
 					</div>
 
 
-					{showAppraiseModals===true&&showAppraiseModalsshow===true?<div className="stud-class-set mt17">
-						<div className="clearfix edu-back-white poll_list">
-
-							<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
-								老师评阅<span>{work_comment_hidden===true||this.state.work_type===1?"（仅对课堂老师可见）":""}</span>
-
-								{this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr ml20"
-														onClick={()=>this.isdeleteModal()}
-								>删除</a>:""}
-
-								{this.props&&this.props.isAdminOrTeacher()===true?<a className="color-blue font-14 fr"
-									 onClick={()=>this.showAppraiseModal()}
-								>编辑</a>:""}
-
-							</div>
-
-							<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
-								<div style={{minHeight:'50px'}}>
-										<div className={"personalsummary"}>
-											<div className={"markdown-body"}
-													 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
-										</div>
-								</div>
-							</div>
-
-						</div>
-					</div>:""}
+          <ShowAppraiseList
+						{...this.props}
+						{...this.state}
+						isdeleteModal={(comment_id,visible_comment,type)=>this.isdeleteModal(comment_id,visible_comment,type)}
+						showAppraiseModal={(type,id,show,hidden)=>this.showAppraiseModal(type,id,show,hidden)}
+					/>
 
 
 					<div className="stud-class-set bor-bottom-greyE mt17">
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index ec245c29b..22a97ed21 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -273,7 +273,7 @@ class ShixunWorkModal extends Component{
 
 								</div>
 								:
-							<ul className="upload_select_box fl clearfix mt10 mb10" tyle={{"overflow-y":"auto"}}id="search_not_members_list"
+							<ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto"}} id="search_not_members_list"
 									onScroll={this.contentViewScroll}
 							>
 
@@ -286,7 +286,7 @@ class ShixunWorkModal extends Component{
 											group_list&&group_list.length===0?"":group_list.map((item,key)=>{
 												return(
 													 <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
-														<li className="fl task-hide" style={{width: '240px'}}>
+														<li className="fl task-hide" style={{width: '240px',paddingLeft: '10px'}}>
 															<Checkbox
 																className="fl task-hide edu-txt-left"
 																name="shixun_homework[]"
@@ -294,7 +294,7 @@ class ShixunWorkModal extends Component{
 																key={item=== undefined?"":item.id}
 															>
 																<label style={{"textAlign": "left", "color": "#05101A"}}
-																			 className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>
+																			 className="task-hide color-grey-name" title={item===undefined?"":item.name}>{item===undefined?"":item.name}</label>
 															</Checkbox>
 														</li>
 														<li className="fl" style={{width: '100px'}}>
diff --git a/public/react/src/modules/courses/shixunHomework/ShowAppraiseList.js b/public/react/src/modules/courses/shixunHomework/ShowAppraiseList.js
new file mode 100644
index 000000000..d1da44e39
--- /dev/null
+++ b/public/react/src/modules/courses/shixunHomework/ShowAppraiseList.js
@@ -0,0 +1,176 @@
+import React,{ Component } from "react";
+import { Modal,Checkbox,Upload,Button,Icon,message,Input,Radio} from "antd";
+import { WordNumberTextarea,markdownToHTML } from 'educoder';
+import axios from 'axios';
+import './style.css';
+
+class ShowAppraiseList extends Component{
+	constructor(props){
+		super(props);
+		this.state={
+
+		}
+	}
+
+
+
+	render(){
+		let {data, work_comment,work_comment_hidden}=this.props;
+		let work_commenttype=work_comment===undefined||work_comment===null||work_comment==="";
+		let work_comment_hiddentype=work_comment_hidden===undefined||work_comment_hidden===null||work_comment_hidden==="";
+
+		return(
+			<div>
+				<style>
+					{
+						`
+							.appraisebox{
+										width: 65px;
+									height: 22px;
+									background: rgba(76,172,255,1);
+									border-radius: 2px;
+									display: inline-block;
+									margin-right: 20px;
+									color: #fff;
+									font-size: 14px;
+									text-align: center;
+									line-height: 22px;
+							}
+
+							.markdown-body{
+    							padding-bottom: 10px;
+							}
+							.borderbom{
+							    margin-bottom: 15px;
+       						border-bottom: 2px solid #fafafa;
+							}
+
+						`
+					}
+				</style>
+				{data===undefined?"":work_commenttype===true&&work_comment_hiddentype===true?"":
+					<div className="stud-class-set mt17">
+						<div className="clearfix edu-back-white poll_list">
+
+							<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
+								<span className={"appraisebox"}>总体评阅</span>评阅内容
+
+								{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr ml20"
+																																		 onClick={()=>this.props.isdeleteModal(data.comment_id,true,"main")}
+								>删除</a>:""}
+
+								{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr"
+																																		 onClick={()=>this.props.showAppraiseModal("main",undefined,work_comment,work_comment_hidden)}
+								>编辑</a>:""}
+
+							</div>
+
+							{this.props&&this.props.isAdmin()===true?
+								<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
+
+									{work_commenttype===true?"":<div>
+										<span className={"z000"}>学生可见<span className={"z666"}>（学生可查看老师的评阅内容）</span></span>
+									</div>}
+
+									{work_commenttype===true?"":<div className={work_comment_hiddentype===true?"":"borderbom"} style={{minHeight:'40px'}}>
+										<div className={"personalsummary"}>
+											<div className={"markdown-body"}
+													 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
+										</div>
+									</div>}
+
+									{work_comment_hiddentype===true?"":<div>
+									<span className={"z000"}>学生不可见<span className={"z666"}>（仅对课堂老师可见）</span></span>
+							  	</div>}
+
+									{work_comment_hiddentype===true?"":<div  style={{minHeight:'40px'}}>
+									<div className={"personalsummary"}>
+										<div className={"markdown-body"}
+												 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
+									</div>
+								</div>}
+
+
+							</div>:<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
+								<div style={{minHeight:'40px'}}>
+									<div className={"personalsummary"}>
+										<div className={"markdown-body"}
+												 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
+									</div>
+								</div>
+							</div>}
+
+						</div>
+					</div>}
+
+
+
+
+
+				{data===undefined?"":data.stage_list.map((item,key)=>{
+					let challenge_comment_hidden=item.challenge_comment_hidden===undefined||item.challenge_comment_hidden===null||item.challenge_comment_hidden==="";
+					let challenge_comment=item.challenge_comment===undefined||item.challenge_comment===null||item.challenge_comment==="";
+
+					return(
+						<div key={key}>
+							{challenge_comment===false||challenge_comment_hidden==false?<div className="stud-class-set mt17" >
+							<div className="clearfix edu-back-white poll_list">
+
+								<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
+									<span className={"appraisebox"}>第{key+1}关</span>{item.name}
+									{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr ml20"
+																																			 onClick={()=>this.props.isdeleteModal(item.comment_id,true,"child")}
+									>删除</a>:""}
+
+									{this.props&&this.props.isAdmin()===true?<a className="color-blue font-14 fr"
+																																			 onClick={()=>this.props.showAppraiseModal("child",item.challenge_id,item.challenge_comment,item.challenge_comment_hidden)}
+									>编辑</a>:""}
+								</div>
+
+								{this.props&&this.props.isAdmin()===true?
+									<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
+
+										{challenge_comment===true?"":<div>
+											<span className={"z000"}>学生可见<span className={"z666"}>（学生可查看老师的评阅内容）</span></span>
+										</div>}
+
+										{challenge_comment===true?"":<div className={challenge_comment_hidden===true?"":"borderbom"} style={{minHeight:'40px'}}>
+											<div className={"personalsummary"}>
+												<div className={"markdown-body"}
+														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div>
+											</div>
+										</div>}
+
+										{challenge_comment_hidden===true?"":<div>
+											<span className={"z000"}>学生不可见<span className={"z666"}>（仅对课堂老师可见）</span></span>
+										</div>}
+										{challenge_comment_hidden===true?"":<div style={{minHeight:'40px'}}>
+											<div className={"personalsummary"}>
+												<div className={"markdown-body"}
+														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
+											</div>
+										</div>}
+
+									</div>:	<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
+										<div style={{minHeight:'40px'}}>
+											<div className={"personalsummary"}>
+												<div className={"markdown-body"}
+														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div>
+											</div>
+										</div>
+									</div>}
+
+							</div>
+						</div>:""}
+
+						</div>)
+				})
+				}
+
+
+			</div>
+		)
+	}
+}
+export default ShowAppraiseList;
+
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index 2a79ce829..be99c7035 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -15,29 +15,7 @@ class OfficialAcademicTranscript extends Component {
 	}
 
 	componentDidMount() {
-		let {data}=this.props;
-
-		let datas=[];
-		if(data!=undefined){
-			data.stage_list===undefined?"":data.stage_list.forEach((item,key)=>{
-				datas.push({
-					customs: key+1,
-					taskname:{name:item.name,complete_status:item.complete_status},
-					openingtime:item.open_time,
-					evaluating: item.evaluate_count,
-					finishtime:item.finished_time,
-					elapsedtime:item.time_consuming,
-					empvalue:{myself:item.myself_experience,experience:item.experience},
-					game_scores:{game_score:item.game_score,game_score_full:item.game_score_full},
-					challenge_id:{id:item.challenge_id}
-					// adjustmentminute:asdasd
-				})
-			})
 
-			this.setState({
-				datas:datas
-			})
-		}
 	}
 	myjumptopic=(e)=>{
 		console.log("获取到值");
@@ -96,7 +74,28 @@ class OfficialAcademicTranscript extends Component {
 	}
 
 	render() {
-    let {datas,customsids}=this.state;
+    let {customsids}=this.state;
+		let {data}=this.props;
+
+		let datas=[];
+		if(data!=undefined){
+			data.stage_list===undefined?"":data.stage_list.forEach((item,key)=>{
+				datas.push({
+					customs: key+1,
+					taskname:{name:item.name,complete_status:item.complete_status},
+					openingtime:item.open_time,
+					evaluating: item.evaluate_count,
+					finishtime:item.finished_time,
+					elapsedtime:item.time_consuming,
+					empvalue:{myself:item.myself_experience,experience:item.experience},
+					game_scores:{game_score:item.game_score,game_score_full:item.game_score_full},
+					challenge_id:{id:item.challenge_id},
+					challenge_comment: item.challenge_comment,
+					challenge_comment_hidden: item.challenge_comment_hidden,
+					// adjustmentminute:asdasd
+				})
+			})
+		}
 
 		let columns=[{
 			title: '关卡',
@@ -196,6 +195,20 @@ class OfficialAcademicTranscript extends Component {
 							   // min={0} max={record.game_scores.game_score_full}
 						 /></a>
 						 {/*<a style={{textAlign: "center"}} className="color-blue font-14 mr20">查看</a>*/}
+        </span>
+			),
+		},{
+			title: '操作',
+			key: 'operation',
+			dataIndex: 'operation',
+
+			render: (text, record) => (
+				<span>
+
+			     <a
+						 className=" color-blue font-14 fr mr22"
+						 onClick={()=>this.props.showAppraiseModal("child",record.challenge_id.id,record.challenge_comment,record.challenge_comment_hidden)}
+					 >评阅</a>
         </span>
 			),
 		}];
@@ -210,6 +223,13 @@ class OfficialAcademicTranscript extends Component {
 				 }
 			 }
 		 )
+		 columns.some((item,key)=> {
+				 if (item.title === "操作") {
+					 columns.splice(key, 1)
+					 return true
+				 }
+			 }
+		 )
 	 }
 		return (
 			<div>
@@ -276,6 +296,9 @@ class OfficialAcademicTranscript extends Component {
 					.linhe15{
 					    line-height: 15px;
 					}
+					.mr22{
+					    margin-right: 22px;
+					}
 			`}
 				</style>
 				{datas===undefined?"":<Table
diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css
index c2affa32c..1af39e7ce 100644
--- a/public/react/src/modules/courses/shixunHomework/style.css
+++ b/public/react/src/modules/courses/shixunHomework/style.css
@@ -38,13 +38,34 @@
 .TopicDetailTable .bottomBody li:last-child{border-bottom: none;}
 
 .maxnamewidth100{
-  max-width: 145px;
+  max-width: 100px;
   overflow:hidden;
   text-overflow:ellipsis;
   white-space:nowrap;
   cursor: default;
 }
 .maxnamewidth110{
+  max-width: 100px;
+  overflow:hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  cursor: default;
+}
+.maxnamewidth200{
+  max-width: 200px;
+  overflow:hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  cursor: default;
+}
+.maxnamewidth145{
+  max-width: 145px;
+  overflow:hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  cursor: default;
+}
+.maxnamewidth145{
   max-width: 145px;
   overflow:hidden;
   text-overflow:ellipsis;
@@ -53,4 +74,17 @@
 }
 .ysyslxh{
   background: #fafafa;
+}
+
+.z666{
+    color: #666;
+    font-size:14px;
+}
+.z000{
+    color: #000;
+    font-size:16px;
+}
+
+.pd30bt{
+    padding: 10px 30px 0px 30px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/help/AboutUs.js b/public/react/src/modules/help/AboutUs.js
index 85e8366c0..06198418c 100644
--- a/public/react/src/modules/help/AboutUs.js
+++ b/public/react/src/modules/help/AboutUs.js
@@ -16,6 +16,7 @@ class AboutUs extends React.Component {
   }
 
   componentDidMount(){
+    window.document.title = "关于我们";
     this.getContent();
   }
 
diff --git a/public/react/src/modules/help/Agreement.js b/public/react/src/modules/help/Agreement.js
index c9a778360..4e483b719 100644
--- a/public/react/src/modules/help/Agreement.js
+++ b/public/react/src/modules/help/Agreement.js
@@ -16,6 +16,7 @@ class Agreement extends React.Component {
   }
 
   componentDidMount(){
+    window.document.title = "服务协议";
     this.getContent();
   }
 
diff --git a/public/react/src/modules/help/ContactUs.js b/public/react/src/modules/help/ContactUs.js
index 00cb7b880..04e3404fe 100644
--- a/public/react/src/modules/help/ContactUs.js
+++ b/public/react/src/modules/help/ContactUs.js
@@ -17,6 +17,7 @@ class ContactUs extends React.Component {
   }
 
   componentDidMount(){
+    window.document.title = "联系我们";
     this.getData();
   }
 
diff --git a/public/react/src/modules/help/Cooperatives.js b/public/react/src/modules/help/Cooperatives.js
index dbc0ffc4b..b64657488 100644
--- a/public/react/src/modules/help/Cooperatives.js
+++ b/public/react/src/modules/help/Cooperatives.js
@@ -21,6 +21,7 @@ class Cooperatives extends React.Component {
   }
 
   componentDidMount(){
+    window.document.title = "合作伙伴";
     this.getCooperatives();
   }
 
diff --git a/public/react/src/modules/help/Feedback.js b/public/react/src/modules/help/Feedback.js
index d8a94bea9..c7f13f809 100644
--- a/public/react/src/modules/help/Feedback.js
+++ b/public/react/src/modules/help/Feedback.js
@@ -13,6 +13,10 @@ class Feedback extends React.Component {
     super(props);
   }
 
+  componentDidMount() {
+    window.document.title = "意见反馈";
+  }
+
   componentDidUpdate(prevProps) {
     if (prevProps.current_user !== this.props.current_user) {
       if(!this.props.checkIfLogin()) {
diff --git a/public/react/src/modules/help/HelpCenter.js b/public/react/src/modules/help/HelpCenter.js
index 86cce49ce..077f4b90e 100644
--- a/public/react/src/modules/help/HelpCenter.js
+++ b/public/react/src/modules/help/HelpCenter.js
@@ -16,6 +16,7 @@ class HelpCenter extends React.Component {
   }
 
   componentDidMount(){
+    window.document.title = "帮助中心";
     this.getContent();
   }
 
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 690baf28b..a60080379 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -12,7 +12,7 @@ import SiderBar from '../tpm/SiderBar';
 
 import UpgradeModals from '../modals/UpgradeModals';
 
-import { SnackbarHOC , getImageUrl} from 'educoder';
+import { SnackbarHOC , getImageUrl, configShareForIndex} from 'educoder';
 
 import Slider from '@icedesign/base/lib/slider';
 
@@ -37,6 +37,7 @@ class ShixunsHome extends Component {
         }
     }
     componentDidMount(){
+        configShareForIndex()
 			const upsystem=`/users/system_update.json`;
 			axios.get(upsystem).then((response)=>{
 				let updata=response.data;
diff --git a/public/react/src/modules/modals/WordNumberTextarea.css b/public/react/src/modules/modals/WordNumberTextarea.css
index b1a7ef6a4..7599f46ea 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.css
+++ b/public/react/src/modules/modals/WordNumberTextarea.css
@@ -10,9 +10,8 @@
     resize:none; /*禁止拉伸*/
     border: none; /*去掉默认边框*/
     width: 100%;
-    height:150px;
+    height:130px;
     border:none;
-    padding: 10px;
     display: block;
 }
 
@@ -26,12 +25,9 @@
     height: auto;
     border: 1px solid rgba(234,234,234,1);
     border-radius: 0.125rem;
-    margin: 0.31rem;
-    padding: 0.19rem;
+    margin: 10px 10px 0px 10px;
+    padding: 10px 10px 5px 10px;
     backgroud:rgba(234,234,234,1);
-    padding-bottom: 10px;
-    padding-right: 10px;
-
 }
 .WordNumberTextarea-count {
     display: inline-block;
diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js
index 21524e627..596da84af 100644
--- a/public/react/src/modules/page/MainContent.js
+++ b/public/react/src/modules/page/MainContent.js
@@ -31,8 +31,22 @@ class MainContent extends Component {
 	onResizeButtonClick = () => {
 		// console.log('onResizeButtonClick')
 	}
+	onRunCodeTest = () => {
+		const vncContainer = this.refs['vncContainer']
+		if (vncContainer) {
+			vncContainer.showCodeEvaluate  && vncContainer.showCodeEvaluate()
+		}
+		this.props.onRunCodeTest();
+	}
+	hideCodeEvaluate = () => {
+		const vncContainer = this.refs['vncContainer']
+		if (vncContainer) {
+			vncContainer.onBottomDrawerClose  && vncContainer.onBottomDrawerClose()
+		}
+	}
   	render() {
-  		const { challenge, output_sets, onRunCodeTest, latest_output, record, st, readRepoTimeout,
+		const onRunCodeTest = this.onRunCodeTest
+  		const { challenge, output_sets, latest_output, record, st, readRepoTimeout,
   				onTestSetHeaderClick, loading, codeLoading, shixun, vnc_url} = this.props
 
   		// if (output_sets && output_sets.test_sets) {
@@ -97,11 +111,23 @@ class MainContent extends Component {
 						{ showIframeContent && vnc_url ? 
 						<CodeRepositoryViewContainer { ...this.props } isOnlyContainer={true}>
 							<VNCContainer
+								ref="vncContainer"
 								vnc_url={vnc_url}
 								{...this.props}
+								codeEvaluate={
+									<div id="games_valuation_contents">
+										<CodeEvaluateView output_sets={output_sets} latest_output={latest_output}
+											record={record} onTestSetHeaderClick={onTestSetHeaderClick} 
+											{...this.props} inDrawer={true}
+											hideCodeEvaluate={this.hideCodeEvaluate}
+											></CodeEvaluateView>
+									</div>
+								}
 							></VNCContainer>
 							<div id="actionView" className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack" style={{height:'48px'}}>
-								<ActionView onRunCodeTest={onRunCodeTest} {...this.props}></ActionView>
+								<ActionView  {...this.props}
+									onRunCodeTest={onRunCodeTest}
+								></ActionView>
 							</div>
 						</CodeRepositoryViewContainer>
 						:
@@ -158,7 +184,7 @@ class MainContent extends Component {
     					</div>
 
     					<div id="actionView" className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack" style={{height:'48px'}}>
-    						<ActionView onRunCodeTest={onRunCodeTest} {...this.props}></ActionView>
+    						<ActionView  {...this.props} onRunCodeTest={onRunCodeTest}></ActionView>
     					</div>
 
 						</React.Fragment>
diff --git a/public/react/src/modules/page/VNCContainer.js b/public/react/src/modules/page/VNCContainer.js
index a9329d099..ecc2c8a41 100644
--- a/public/react/src/modules/page/VNCContainer.js
+++ b/public/react/src/modules/page/VNCContainer.js
@@ -10,6 +10,8 @@ import RepoTree from './component/repo/RepoTree'
 import TPIMonaco from './component/monaco/TPIMonaco'
 import notEditablePathImg from '../../images/tpi/notEditablePath.png'
 
+import { Drawer } from "antd";
+
 import './VNC.css'
 const $ = window.$;
 const firstDrawerWidth = 260;
@@ -103,6 +105,16 @@ class VNCContainer extends Component {
 			}
 		}
 	}
+	onBottomDrawerClose = () => {
+		this.setState({ bottomDrawer: false })
+	}
+	swtichBottomDrawer = () => {
+		this.setState({ bottomDrawer: !this.state.bottomDrawer })
+	}
+	showCodeEvaluate = () => {
+		this.setState({ bottomDrawer: true })
+	}
+	
 	/*
 	selectedKeys={fileTreeSelectedKeys}
 	onSelect={onTreeSelect}
@@ -125,6 +137,28 @@ class VNCContainer extends Component {
 					secondDrawerClassName="codeInDrawer"
                 >
 					<style>{`
+						/* 评测结果 */
+						.codeEvaluateDrawer #game_test_set_results {
+							height: 198px;
+						}					    
+						.codeEvaluateDrawer .ant-drawer-body {
+							padding: 0px;
+						}
+						.codeEvaluateDrawer .ant-drawer-content-wrapper, .codeEvaluateDrawer .ant-drawer-mask {
+							position: absolute;
+						}
+
+
+						.codeEvaluateFloatButton {
+							bottom: 180px !important;
+							left: unset;
+							right: 0px;
+							top: unset;
+						}
+						.codeEvaluateFloatButton .text {
+							left: 10px;
+						}
+						
 						.vncDrawer .ant-drawer-body {
 							padding: 0px;
 						}
@@ -173,10 +207,36 @@ class VNCContainer extends Component {
 
 					></RepoTree>
 				</SecondDrawer>
-                <FloatButton></FloatButton>
+                {/* <FloatButton></FloatButton> */}
                 <VNCDisplay
                     {...this.props}
-                ></VNCDisplay>
+                >
+				
+					<Drawer
+						mask={true}
+						title=""
+						width={firstDrawerWidth}
+						closable={false}
+						onClose={this.onBottomDrawerClose}
+						visible={this.state.bottomDrawer}
+						className={'codeEvaluateDrawer'}
+						placement="bottom"
+						getContainer={false}
+						style={{ position: 'absolute', bottom: '25px', zIndex: 1 }}
+						afterVisibleChange={(visible) => {
+							if (visible) {
+								const canvas = $('.vncDisply canvas')[0]
+								canvas && canvas.focus()
+							}
+							
+						}}
+					>
+						{ this.props.codeEvaluate }
+					</Drawer>
+					<FloatButton onClick={this.swtichBottomDrawer}
+						className="codeEvaluateFloatButton"
+					>测试集</FloatButton>
+				</VNCDisplay>
 
                 
 		    </React.Fragment>
diff --git a/public/react/src/modules/page/VNCDisplay.js b/public/react/src/modules/page/VNCDisplay.js
index ea7dccb17..53f8c09d9 100644
--- a/public/react/src/modules/page/VNCDisplay.js
+++ b/public/react/src/modules/page/VNCDisplay.js
@@ -165,7 +165,10 @@ class VNCDisplay extends Component {
                     <div id="status">Loading</div>
                     <div id="sendCtrlAltDelButton">Send CtrlAltDel</div>
                 </div>
-                <div id="screen"></div>
+                <div id="screen">
+                    
+                </div>
+                {this.props.children}
 		    </div>
 	    );
   	}
diff --git a/public/react/src/modules/page/component/FloatButton.js b/public/react/src/modules/page/component/FloatButton.js
index 1b9e191f2..4e7f794c6 100644
--- a/public/react/src/modules/page/component/FloatButton.js
+++ b/public/react/src/modules/page/component/FloatButton.js
@@ -8,10 +8,10 @@ class FloatButton extends Component {
 	}
 	
   	render() {
-  		const { challenge,  vnc_url, children } = this.props
+  		const { challenge,  vnc_url, children, className } = this.props
 
 	    return (
-            <div className="float_button" onClick={this.props.onClick}>
+            <div className={`float_button ${className}` } onClick={this.props.onClick}>
                 <style>{`
                     
                 `}</style>
diff --git a/public/react/src/modules/page/main/ActionView.js b/public/react/src/modules/page/main/ActionView.js
index 4933ba0ac..5504b5e7e 100644
--- a/public/react/src/modules/page/main/ActionView.js
+++ b/public/react/src/modules/page/main/ActionView.js
@@ -1,204 +1,206 @@
-import React, { Component } from 'react';
-import { Link } from 'react-router-dom'
-
-import { withStyles } from 'material-ui/styles';
-import Button from 'material-ui/Button';
-
-import Tooltip from 'material-ui/Tooltip';
-
-import './ActionView.css'
-
-/*
-
-    color: #1B4061 !important;
-    background-color: transparent;
-    border: 1px solid #1B4061 !important;
-    */
-const styles = theme => ({
-  button: {
-    margin: theme.spacing.unit,
-    border: '1px solid #1B4061',
-    color: '#1B4061',
-    height: '30px',
-    padding: '0 16px',
-    '&:hover': {
-    	color: '#4CACFF',
-    	border: '1px solid #4CACFF'
-    }
-  },
-  hoverButton: {
-	margin: theme.spacing.unit,
-    height: '30px',
-    padding: '0 16px',
-
-	color: '#4CACFF',
-	border: '1px solid #4CACFF'
-  },
-  buttonText: {
-  	color: '#1B4061 !important',
-  	'&:hover': {
-  		color: '#1B4061',
-  	}
-  }
-});
-
-class ActionView extends Component {
-
-	constructor(props) {
-		super(props)
-		
-	}
-
-	componentDidMount() {
-		// request
-		window._tpiWidthResize = () => {
-			const _w = window.$('#actionView').width();
-			// if (_w < 446) {
-			// 	window.$('#time-consuming').hide()
-			// 	// window.$('#time-consuming').hide()
-			// } else if (_w < 746) {
-			// 	// 文字放出来之前是 580
-			// 	window.$('#time-consuming').show()
-			// 	window.$('.time_limit').hide()
-			// } else {
-			// 	window.$('#time-consuming').show()
-			// 	window.$('.time_limit').show()
-			// }
- 		}
-	}
-
-	showWebDisplay(challenge) {
-		window.open(challenge.webDisplayUrl, '_blank');
-	}
-	/*<span className="mt10 -flex c_grey ml15" id="time-consuming">耗时：0 天 3 小时 11 分钟 57 秒 </span>*/
-  	render() {
-  		const { onRunCodeTest, onShowPrevStage, onShowNextStage, gameBuilding
-  			, game, classes, st, shixun, record, challenge, time_limit, real_time_limit } = this.props;
-	    return (
-	      	<div className="-flex -layout-h" id="game_operate_action">
-			  	<style>{`
-				  #game_operate_action {
-					width: 100%;
-				  }
-				  .time_limit {
-					  margin-right: 0px;
-				  }
-				  .spliter {
-						border-right: 1px solid;
-						padding-right: 8px;
-						margin-right: 8px;
-						height: 14px;
-						display: inline-block;
-						position: relative;
-						top: 3px;
-				  }
-				  #time-consuming {
-					  flex: auto;
-					  overflow: hidden;
-					  white-space: nowrap;  
-				  }
-				  #game_operate_action .act_btn {
-					  flex: 0 0 90px;
-				  }
-				  `}</style>
-	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
-				  	{!!time_limit && 
-					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}
-					  	{!gameBuilding && record && <span className="spliter"></span>}
-					  </span>} 
-	      			{!gameBuilding && record ? 
-	      				// <Tooltip title={ "本次评测耗时(编译、运行总时间)" }></Tooltip>
-	      					<span>本次评测耗时(编译、运行总时间)：{ record } 秒</span>
-	      				
-	      			: ""}
-	      		</span>
-
-	      		{/*将第一个按钮改为visibility方式隐藏，不然加载时测评按钮会出现没有垂直居中的情况*/}
-				  	<Tooltip title={ "倒计时为0时，服务将被关闭" }>
-						<Button size="small" className={classes.button + ' actionViewfirstButton'} onClick={()=>this.showWebDisplay(challenge)}
-								style={{ visibility: challenge.showWebDisplayButton ? '': 'hidden',
-									minWidth: challenge.showWebDisplayButton ? '': '1px',
-									width: challenge.showWebDisplayButton ? '': '1px',
-									flex: `0 0 ${challenge.showWebDisplayButton ? '110px': '1px'}`
-								}} 
-								id="showWebDisplayButton"
-							// style={{ display: challenge.showWebDisplayButton ? 'flex': 'none'}} 
-						>
-							查看效果
-						</Button>
-					</Tooltip>
-
-				{
-					!gameBuilding && 
-					(game && !!game.prev_game) ? 
-				<Link to={`/tasks/${game.prev_game}`}  className={classes.buttonText + ' act_btn'}>
-					<Button size="small" className={classes.button}>
-						上一关
-					</Button>
-				</Link>
-					: ''}
-
-				{/*未发布的都能跳转*/}
-				{	!gameBuilding && 
-					((game && (game.status === 2 || shixun.status < 2) || shixun && shixun.task_pass ) && !!game.next_game) ? 
-				<Link to={`/tasks/${game.next_game}`} className={classes.buttonText + ' act_btn'}>
-					<Button size="small" className={classes.button}>
-						下一关
-					</Button>
-				</Link>
-					: ''}
-
-				
-				
-				<div id="code_test" className="act_btn">
-					{
-						st === 1 && game.status === 2 ? 
-							<Tooltip title={ "已通关的选择题任务无法再次测评" }>
-							<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
-						      		>
-				      			<i className="fa fa-play-circle font-16"></i> 
-						      	测评
-						    </a>
-						    </Tooltip>
-						:
-						gameBuilding ?
-						
-				    	<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
-					      		>
-			      			<i className="fa fa-play-circle font-16"></i> 
-					      	测评
-					    </a>
-				    	: 
-					    <a href="javascript:void(0)" className="shixun-task-btn mr15 " 
-					      		onClick={onRunCodeTest}>
-			      			<i className="fa fa-play-circle font-16"></i> 
-					      	测评
-					    </a>}
-				</div>
-	      	</div>	
-	    );
-	    /*	
-	    	<a href="/shixuns/8arufxzl" id="exit_shixun" className="shixun-task-btn task-newbtn-grey mt8 mr15">离开</a>
-
-	    	<a href="javascript:void(0)" className="shixun-task-btn task-btn-blue mr15 mt8" id="prev_step"
-						onClick={onShowNextStage}>下一关 </a>
-
-			onclick="training_task_submmit();"
-
-
-			{game && !!game.prev_game ? 
-				<div id="prev_step_area">
-					<Link to={`/tasks/${game.prev_game}`} className="shixun-task-btn task-btn-blue mr15 mt8">上一关</Link>
-				</div>
-					: ''}
-
-				{game && !!game.next_game ? 
-				<div id="next_step_area">	
-					<Link to={`/tasks/${game.next_game}`} className="shixun-task-btn task-btn-blue mr15 mt8">下一关</Link>
-				</div>
-					: ''}
-	    */ 
-  	}
-}
-
-export default withStyles(styles)( ActionView );
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom'
+
+import { withStyles } from 'material-ui/styles';
+import Button from 'material-ui/Button';
+
+import Tooltip from 'material-ui/Tooltip';
+
+import './ActionView.css'
+
+/*
+
+    color: #1B4061 !important;
+    background-color: transparent;
+    border: 1px solid #1B4061 !important;
+    */
+const styles = theme => ({
+  button: {
+    margin: theme.spacing.unit,
+    border: '1px solid #1B4061',
+    color: '#1B4061',
+    height: '30px',
+    padding: '0 16px',
+    '&:hover': {
+    	color: '#4CACFF',
+    	border: '1px solid #4CACFF'
+    }
+  },
+  hoverButton: {
+	margin: theme.spacing.unit,
+    height: '30px',
+    padding: '0 16px',
+
+	color: '#4CACFF',
+	border: '1px solid #4CACFF'
+  },
+  buttonText: {
+  	color: '#1B4061 !important',
+  	'&:hover': {
+  		color: '#1B4061',
+  	}
+  }
+});
+
+class ActionView extends Component {
+
+	constructor(props) {
+		super(props)
+		
+	}
+
+	componentDidMount() {
+		// request
+		window._tpiWidthResize = () => {
+			const _w = window.$('#actionView').width();
+			// if (_w < 446) {
+			// 	window.$('#time-consuming').hide()
+			// 	// window.$('#time-consuming').hide()
+			// } else if (_w < 746) {
+			// 	// 文字放出来之前是 580
+			// 	window.$('#time-consuming').show()
+			// 	window.$('.time_limit').hide()
+			// } else {
+			// 	window.$('#time-consuming').show()
+			// 	window.$('.time_limit').show()
+			// }
+ 		}
+	}
+
+	showWebDisplay(challenge) {
+		window.open(challenge.webDisplayUrl, '_blank');
+	}
+	/*<span className="mt10 -flex c_grey ml15" id="time-consuming">耗时：0 天 3 小时 11 分钟 57 秒 </span>*/
+  	render() {
+  		const { onRunCodeTest, onShowPrevStage, onShowNextStage, gameBuilding
+  			, game, classes, st, shixun, record, challenge, time_limit, real_time_limit } = this.props;
+
+  		console.log(shixun)
+	    return (
+	      	<div className="-flex -layout-h" id="game_operate_action">
+			  	<style>{`
+				  #game_operate_action {
+					width: 100%;
+				  }
+				  .time_limit {
+					  margin-right: 0px;
+				  }
+				  .spliter {
+						border-right: 1px solid;
+						padding-right: 8px;
+						margin-right: 8px;
+						height: 14px;
+						display: inline-block;
+						position: relative;
+						top: 3px;
+				  }
+				  #time-consuming {
+					  flex: auto;
+					  overflow: hidden;
+					  white-space: nowrap;  
+				  }
+				  #game_operate_action .act_btn {
+					  flex: 0 0 90px;
+				  }
+				  `}</style>
+	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
+				  	{!!time_limit && 
+					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}
+					  	{!gameBuilding && record && <span className="spliter"></span>}
+					  </span>} 
+	      			{!gameBuilding && record ? 
+	      				// <Tooltip title={ "本次评测耗时(编译、运行总时间)" }></Tooltip>
+	      					<span>本次评测耗时(编译、运行总时间)：{ record } 秒</span>
+	      				
+	      			: ""}
+	      		</span>
+
+	      		{/*将第一个按钮改为visibility方式隐藏，不然加载时测评按钮会出现没有垂直居中的情况*/}
+				  	<Tooltip title={ "倒计时为0时，服务将被关闭" }>
+						<Button size="small" className={classes.button + ' actionViewfirstButton'} onClick={()=>this.showWebDisplay(challenge)}
+								style={{ visibility: challenge.showWebDisplayButton ? '': 'hidden',
+									minWidth: challenge.showWebDisplayButton ? '': '1px',
+									width: challenge.showWebDisplayButton ? '': '1px',
+									flex: `0 0 ${challenge.showWebDisplayButton ? '110px': '1px'}`
+								}} 
+								id="showWebDisplayButton"
+							// style={{ display: challenge.showWebDisplayButton ? 'flex': 'none'}} 
+						>
+							查看效果
+						</Button>
+					</Tooltip>
+
+				{
+					!gameBuilding && 
+					(game && !!game.prev_game) ? 
+				<Link to={`/tasks/${game.prev_game}`}  className={classes.buttonText + ' act_btn'}>
+					<Button size="small" className={classes.button}>
+						上一关
+					</Button>
+				</Link>
+					: ''}
+
+				{/*未发布的都能跳转*/}
+				{	!gameBuilding && 
+					((game && (game.status === 2 || shixun.status < 2) || shixun && shixun.task_pass ) && !!game.next_game) ? 
+				<Link to={`/tasks/${game.next_game}`} className={classes.buttonText + ' act_btn'}>
+					<Button size="small" className={classes.button}>
+						下一关
+					</Button>
+				</Link>
+					: ''}
+
+				
+				
+				{(shixun&&!shixun.vnc || shixun&&shixun.vnc_evaluate) && <div id="code_test" className="act_btn">
+					{
+						st === 1 && game.status === 2 ? 
+							<Tooltip title={ "已通关的选择题任务无法再次测评" }>
+							<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
+						      		>
+				      			<i className="fa fa-play-circle font-16"></i> 
+						      	测评
+						    </a>
+						    </Tooltip>
+						:
+						gameBuilding ?
+						
+				    	<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
+					      		>
+			      			<i className="fa fa-play-circle font-16"></i> 
+					      	测评
+					    </a>
+				    	: 
+					    <a href="javascript:void(0)" className="shixun-task-btn mr15 " 
+					      		onClick={onRunCodeTest}>
+			      			<i className="fa fa-play-circle font-16"></i> 
+					      	测评
+					    </a>}
+				</div>}
+	      	</div>	
+	    );
+	    /*	
+	    	<a href="/shixuns/8arufxzl" id="exit_shixun" className="shixun-task-btn task-newbtn-grey mt8 mr15">离开</a>
+
+	    	<a href="javascript:void(0)" className="shixun-task-btn task-btn-blue mr15 mt8" id="prev_step"
+						onClick={onShowNextStage}>下一关 </a>
+
+			onclick="training_task_submmit();"
+
+
+			{game && !!game.prev_game ? 
+				<div id="prev_step_area">
+					<Link to={`/tasks/${game.prev_game}`} className="shixun-task-btn task-btn-blue mr15 mt8">上一关</Link>
+				</div>
+					: ''}
+
+				{game && !!game.next_game ? 
+				<div id="next_step_area">	
+					<Link to={`/tasks/${game.next_game}`} className="shixun-task-btn task-btn-blue mr15 mt8">下一关</Link>
+				</div>
+					: ''}
+	    */ 
+  	}
+}
+
+export default withStyles(styles)( ActionView );
diff --git a/public/react/src/modules/page/main/CodeEvaluateView.css b/public/react/src/modules/page/main/CodeEvaluateView.css
index 137174d95..9c07c4541 100644
--- a/public/react/src/modules/page/main/CodeEvaluateView.css
+++ b/public/react/src/modules/page/main/CodeEvaluateView.css
@@ -127,4 +127,11 @@
     height: 10px;
     margin: 5px 0;
     float: right;
+}
+
+.-task-ces-info .inputTitle {
+    line-height: 16px;
+}
+.-task-ces-info .inputTitle .input{
+    white-space: pre-wrap;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/page/main/CodeEvaluateView.js b/public/react/src/modules/page/main/CodeEvaluateView.js
index a121a53d5..44a98ae77 100644
--- a/public/react/src/modules/page/main/CodeEvaluateView.js
+++ b/public/react/src/modules/page/main/CodeEvaluateView.js
@@ -227,7 +227,12 @@ class CodeEvaluateView extends Component {
                                     <div className="clearfix df inputTitle">
                                         <span className="fl fb color-grey">测试输入：</span>
 
-                                        <div className="fl color-blue" style={{flex:1}} dangerouslySetInnerHTML={{__html: item.input.replace(/\r\n/g,"</br>")}}></div>
+                                        <div className="fl color-blue input" style={{flex:1}} 
+											// dangerouslySetInnerHTML={{__html: (item.input.replace(/\r\n/g,"</br>"))}}
+
+										>
+											{item.input}
+										</div>
 
                                     </div>
                                 </div>
@@ -307,14 +312,21 @@ class CodeEvaluateView extends Component {
 				    <a href="javascript:void(0);" className="tab_type tab_color">测试结果</a>
 				  </li>
 				  	
-				  	<Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}>
+				  	{this.props.inDrawer ? <Tooltip id="tooltip-icon-expand" title={ "收起" }>
+				  		{/*TODO 按钮大小改造，css*/}
+					  	{/* icon-guanbi */}
+					  	<a className="iconButton fr mr15 mt4" onClick={this.props.hideCodeEvaluate} id="extend_and_zoom" >
+					  		<i className={  "font-18 iconfont icon-guanbi" }></i>
+					  	</a>
+					  	
+				  	</Tooltip> : <Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}>
 				  		{/*TODO 按钮大小改造，css*/}
 					  	
 					  	<a className="iconButton fr mr15" onClick={this.onEvaluateViewExpand} id="extend_and_zoom" >
 					  		<i className={ evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i>
 					  	</a>
 					  	
-				  	</Tooltip>
+				  	</Tooltip>}
 				  
 				  <div className="cl"></div>
 				</ul>
diff --git a/public/react/src/modules/page/main/CodeRepositoryViewContainer.js b/public/react/src/modules/page/main/CodeRepositoryViewContainer.js
index 0a5be59e0..5d6be306f 100644
--- a/public/react/src/modules/page/main/CodeRepositoryViewContainer.js
+++ b/public/react/src/modules/page/main/CodeRepositoryViewContainer.js
@@ -1,309 +1,312 @@
-
-import React, { Component } from 'react';
-
-import CodeRepositoryView from './CodeRepositoryView'
-
-import axios from 'axios'
-
-import './CodeRepositoryView.css'
-
-// 自己处理path，加上父节点的path, 这里是处理树节点了，所以是set key
-function addPrePath(treeData, parentNodePath) {
-	return treeData.map(item => {
-		return {
-			...item,
-			key: `${parentNodePath}/${item.name}`
-		}
-	})
-}
-function getNewTreeData(treeData, curKey, child, level) {
-  const loop = (data) => {
-    data.forEach((item) => {
-    	// 这里不能用indexOf 同一级可能出现test目录和test.py文件
-      if (item.key == curKey) {
-		  child = addPrePath(child, curKey);
-          item.children = child;
-      } else {
-      	if (item.children) {
-          loop(item.children);
-        }
-      }
-    });
-  };
-  loop(treeData);
-}
-
-function fileData2TreeData(repoFilesData) {
-	const fileTreeData = [];
-    repoFilesData.forEach((item) => {
-        if (item.kind === 'file') {
-            fileTreeData.push({
-                key: item.path,
-                name: item.name,
-                isLeaf: true
-            })
-        } else {
-            fileTreeData.push({
-                key: item.path,
-                name: item.name,
-                // isLeaf: false
-            })
-        }
-    })
-    return fileTreeData;
-}
-
-class CodeRepositoryViewContainer extends Component {
-
-	constructor(props) {
-		super(props)
-
-		this.showFilesDrawer = this.showFilesDrawer.bind(this)
-		this.onRepositoryViewExpand = this.onRepositoryViewExpand.bind(this)
-
-		this.state = {
-			drawerOpen: false,
-			loadingFirstRepoFiles: false,
-			fileTreeData: "",
-			fileTreeSelectedKeys: [],
-			codeRepositoryViewExpanded: false,
-			tabIndex: 0,
-
-			settingDrawerOpen: false
-		}
-	}
-	showSettingDrawer = (open) => {
-		this.setState({settingDrawerOpen: open})
-	}
-	tabIndexChange = (index) => {
-		this.setState({tabIndex: index});
-	}
-	onRepositoryViewExpand() {
-		window.repository_extend_and_zoom();
-		this.setState({
-			evaluateViewExpanded: !this.state.evaluateViewExpanded
-		}, () => {
-			setTimeout(()=>{
-				window.__tpiOnResize()
-			}, 300)
-		})
-	}
-
-	showFilesDrawer(open) {
-		if (this.props.loading === true) {
-			return;
-		}
-		if (!this.state.fileTreeData) {
-			this.fetchRepoFiles();
-		}
-
-		this.setState({
-            drawerOpen: open,
-        })
-	}
-	loadRepoFiles = () => {
-		if (!this.state.fileTreeData) {
-			this.fetchRepoFiles();
-		}
-	}
-
-	componentWillReceiveProps(newProps, oldProps) {
-		
-	}
-	componentDidMount() {
-	
-	}
-
-	componentDidUpdate(prevProps, prevState, snapshot) {
-		const { game, challenge } = this.props
-		if (this.props.game && (!prevProps.game || prevProps.game.identifier !== this.props.game.identifier) ) {
-			this.setState({
-				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[0] : challenge.path ]
-			})
-			// 初始化
-		} else if (this.state.fileTreeSelectedKeys.length === 0 && challenge && challenge.path) {
-			this.setState({
-				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[0] : challenge.path ]
-			})
-		} else if (challenge && prevProps && prevProps.challenge
-				&& challenge.pathIndex != prevProps.challenge.pathIndex
-				&& challenge.pathIndex !== -1) {
-			this.setState({
-				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[challenge.pathIndex] : challenge.path ]
-			})
-		}
-	}
-
-	handleDialogClose() {
-		this.setState({
-			dialogOpen: false
-		})
-	}
-	onLoadData = (treeNode) => {
-	    if (treeNode.props.children && treeNode.props.children.length) {
-	      return new Promise((resolve) => {
-	        resolve();
-	      });
-	    }
-	    return new Promise((resolve, reject) => {
-    		this.fetchRepoFiles(treeNode, resolve, reject)
-   		});
-  	}
-	map2OldData = (treeData) => {
-		if (!treeData || treeData.length === 0) return treeData;
-		treeData = treeData.map(item => {
-			return {
-				kind: item.type == "blob" ? "file" : "dir",		// blob->file tree->dir
-				path: item.name,
-				name: item.name
-			}
-		})
-		return treeData;
-	}
-	
-	fetchRepoFiles(treeNode, resolve, reject) {
-		// http://localhost:3000/api/v1/games/829al3mst4fy/entries?path=src/step1&rev=master
-		if (!this.props.challenge || !this.props.game) {
-			return;
-		}
-		// var ar = this.props.challenge.path.split('/');
-		// ar.length = ar.length - 2;
-		// var _path = ar.join('/');
-		var _path = treeNode ? treeNode.props.eventKey : '' ;
-		if (_path.charAt(0) === '/') {
-			_path = _path.substring(1)
-		}
-		// var url = `/api/v1/games/${this.props.game.identifier}/entries?path=${_path}&rev=master&gpid=${this.props.myshixun.gpid}`
-		let url = `/myshixuns/${this.props.myshixun.identifier}/repository.json`
-
-		
-		if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {
-			this.setState({
-				loadingFirstRepoFiles: true,
-			})
-		}
-		var that = this;
-		axios.post(url, {
-				path: _path
-				// withCredentials: true,
-			})
-		  	.then((response) => {
-		  		const repoFilesData = this.map2OldData(response.data.trees)
-			    if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {  	// 还没树节点，没加载过
-			 
-				    const fileTreeData = fileData2TreeData(repoFilesData)
-			        this.setState({ 
-				    	fileTreeData, 
-				    	loadingFirstRepoFiles: false,
-				    });
-			    } else {
-			    	var _treeNode = treeNode;
-			    	var _eventKey = _treeNode.props.eventKey;
-			    	
-			    	const fileTreeData = that.state.fileTreeData;
-			    	// 新的数组放置到treenode下
-			    	
-			    	const tempFileTreeData = fileData2TreeData(repoFilesData)
-
-			    	getNewTreeData(fileTreeData, _eventKey, tempFileTreeData, 2);
-			    	this.setState({
-			    		fileTreeData,
-			    	})
-			    }
-			    
-			    resolve && resolve();
-
-		  	})
-		  	.catch(function (error) {
-		    	console.log(error);
-		    	reject && reject();
-		  	});
-	}
-	onTreeSelect = (selectedKeys, info) => {
-		const isLeaf = info.node.props.isLeaf;
-		if (isLeaf) {		// 叶子节点
-			selectedKeys.length && this.setState({
-				fileTreeSelectedKeys: selectedKeys
-			})
-			const { fetchRepositoryCode, onPathChange, showSnackbar, challenge } = this.props;
-			
-			const nodePath = info.node.props.eventKey;
-			// 设置pathIndex为-1，那么代码文件下拉可以切回可编辑的文件
-			if (!challenge.multiPath) {	// 单path任务  多path任务 path是数组
-				if (challenge.path.trim() == nodePath.trim()) {
-					if (challenge.pathIndex === 0) {
-						showSnackbar(`当前编辑文件已经是${nodePath}`)
-					} else {
-						onPathChange(0)
-					}
-					return;
-				} else {
-					onPathChange(-1)
-				}
-			} else {
-				let isCurrentFile = false;
-				let cur_index = -1;
-				if (challenge.path && challenge.path.forEach) {
-					challenge.path.forEach((item, index) => {
-						if (nodePath == item) {
-							isCurrentFile = true;
-							cur_index = index;
-						}
-					})
-				}
-				if (isCurrentFile) {
-					onPathChange(cur_index)
-					showSnackbar(`当前编辑文件已经是${nodePath}`)
-				} else {
-					onPathChange(-1)
-				}
-			}
-			if (nodePath) {
-				const filetype = nodePath.split('.').pop().toLowerCase();
-				if (filetype == 'jpg' || filetype == 'png' || filetype == 'gif' || filetype == 'jpeg'
-						|| filetype == 'jar'
-						|| filetype == 'doc' || filetype == 'pdf' || filetype == 'xsl' || filetype == 'ppt') {
-					showSnackbar(`不支持加载${filetype}类型的文件。`)
-					return;
-				}
-				fetchRepositoryCode(null, nodePath, 1);	
-			} else {
-				console.error('no eventKey:', info.node)
-			}
-		}
-	}
-//  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
-  	render() {
-		  
-	    return (
-			<React.Fragment>
-				{this.props.isOnlyContainer == true ? 
-					React.Children.map(this.props.children, child => {
-						if(!child) {
-							return ''
-						}
-						return React.cloneElement(child, Object.assign({...this.state}, { 
-							loadRepoFiles: this.loadRepoFiles,
-							onTreeSelect: this.onTreeSelect,
-							onLoadData: this.onLoadData,
-						}))
-					})
-
-				 : 
-			
-				<CodeRepositoryView {...this.props} 
-					{...this.state} 
-					showFilesDrawer={this.showFilesDrawer}
-					loadRepoFiles={this.loadRepoFiles}
-					onLoadData={this.onLoadData}
-					onTreeSelect={ this.onTreeSelect }
-					onRepositoryViewExpand={this.onRepositoryViewExpand}
-					tabIndexChange={this.tabIndexChange}
-					showSettingDrawer={this.showSettingDrawer}
-				></CodeRepositoryView> }
-			</React.Fragment>
-	    );
-  	}
-}
-
-export default CodeRepositoryViewContainer;
+
+import React, { Component } from 'react';
+
+import CodeRepositoryView from './CodeRepositoryView'
+
+import axios from 'axios'
+
+import './CodeRepositoryView.css'
+
+// 自己处理path，加上父节点的path, 这里是处理树节点了，所以是set key
+function addPrePath(treeData, parentNodePath) {
+	return treeData.map(item => {
+		return {
+			...item,
+			key: `${parentNodePath}/${item.name}`
+		}
+	})
+}
+function getNewTreeData(treeData, curKey, child, level) {
+  const loop = (data) => {
+    data.forEach((item) => {
+    	// 这里不能用indexOf 同一级可能出现test目录和test.py文件
+      if (item.key == curKey) {
+		  child = addPrePath(child, curKey);
+          item.children = child;
+      } else {
+      	if (item.children) {
+          loop(item.children);
+        }
+      }
+    });
+  };
+  loop(treeData);
+}
+
+function fileData2TreeData(repoFilesData) {
+	if(repoFilesData!=null){
+		const fileTreeData = [];
+		repoFilesData.forEach((item) => {
+			if (item.kind === 'file') {
+				fileTreeData.push({
+					key: item.path,
+					name: item.name,
+					isLeaf: true
+				})
+			} else {
+				fileTreeData.push({
+					key: item.path,
+					name: item.name,
+					// isLeaf: false
+				})
+			}
+		})
+		return fileTreeData;
+	}
+
+}
+
+class CodeRepositoryViewContainer extends Component {
+
+	constructor(props) {
+		super(props)
+
+		this.showFilesDrawer = this.showFilesDrawer.bind(this)
+		this.onRepositoryViewExpand = this.onRepositoryViewExpand.bind(this)
+
+		this.state = {
+			drawerOpen: false,
+			loadingFirstRepoFiles: false,
+			fileTreeData: "",
+			fileTreeSelectedKeys: [],
+			codeRepositoryViewExpanded: false,
+			tabIndex: 0,
+
+			settingDrawerOpen: false
+		}
+	}
+	showSettingDrawer = (open) => {
+		this.setState({settingDrawerOpen: open})
+	}
+	tabIndexChange = (index) => {
+		this.setState({tabIndex: index});
+	}
+	onRepositoryViewExpand() {
+		window.repository_extend_and_zoom();
+		this.setState({
+			evaluateViewExpanded: !this.state.evaluateViewExpanded
+		}, () => {
+			setTimeout(()=>{
+				window.__tpiOnResize()
+			}, 300)
+		})
+	}
+
+	showFilesDrawer(open) {
+		if (this.props.loading === true) {
+			return;
+		}
+		if (!this.state.fileTreeData) {
+			this.fetchRepoFiles();
+		}
+
+		this.setState({
+            drawerOpen: open,
+        })
+	}
+	loadRepoFiles = () => {
+		if (!this.state.fileTreeData) {
+			this.fetchRepoFiles();
+		}
+	}
+
+	componentWillReceiveProps(newProps, oldProps) {
+		
+	}
+	componentDidMount() {
+	
+	}
+
+	componentDidUpdate(prevProps, prevState, snapshot) {
+		const { game, challenge } = this.props
+		if (this.props.game && (!prevProps.game || prevProps.game.identifier !== this.props.game.identifier) ) {
+			this.setState({
+				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[0] : challenge.path ]
+			})
+			// 初始化
+		} else if (this.state.fileTreeSelectedKeys.length === 0 && challenge && challenge.path) {
+			this.setState({
+				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[0] : challenge.path ]
+			})
+		} else if (challenge && prevProps && prevProps.challenge
+				&& challenge.pathIndex != prevProps.challenge.pathIndex
+				&& challenge.pathIndex !== -1) {
+			this.setState({
+				fileTreeSelectedKeys: [ challenge.multiPath ? challenge.path[challenge.pathIndex] : challenge.path ]
+			})
+		}
+	}
+
+	handleDialogClose() {
+		this.setState({
+			dialogOpen: false
+		})
+	}
+	onLoadData = (treeNode) => {
+	    if (treeNode.props.children && treeNode.props.children.length) {
+	      return new Promise((resolve) => {
+	        resolve();
+	      });
+	    }
+	    return new Promise((resolve, reject) => {
+    		this.fetchRepoFiles(treeNode, resolve, reject)
+   		});
+  	}
+	map2OldData = (treeData) => {
+		if (!treeData || treeData.length === 0) return treeData;
+		treeData = treeData.map(item => {
+			return {
+				kind: item.type == "blob" ? "file" : "dir",		// blob->file tree->dir
+				path: item.name,
+				name: item.name
+			}
+		})
+		return treeData;
+	}
+	
+	fetchRepoFiles(treeNode, resolve, reject) {
+		// http://localhost:3000/api/v1/games/829al3mst4fy/entries?path=src/step1&rev=master
+		if (!this.props.challenge || !this.props.game) {
+			return;
+		}
+		// var ar = this.props.challenge.path.split('/');
+		// ar.length = ar.length - 2;
+		// var _path = ar.join('/');
+		var _path = treeNode ? treeNode.props.eventKey : '' ;
+		if (_path.charAt(0) === '/') {
+			_path = _path.substring(1)
+		}
+		// var url = `/api/v1/games/${this.props.game.identifier}/entries?path=${_path}&rev=master&gpid=${this.props.myshixun.gpid}`
+		let url = `/myshixuns/${this.props.myshixun.identifier}/repository.json`
+
+		
+		if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {
+			this.setState({
+				loadingFirstRepoFiles: true,
+			})
+		}
+		var that = this;
+		axios.post(url, {
+				path: _path
+				// withCredentials: true,
+			})
+		  	.then((response) => {
+		  		const repoFilesData = this.map2OldData(response.data.trees)
+			    if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {  	// 还没树节点，没加载过
+			 
+				    const fileTreeData = fileData2TreeData(repoFilesData)
+			        this.setState({ 
+				    	fileTreeData, 
+				    	loadingFirstRepoFiles: false,
+				    });
+			    } else {
+			    	var _treeNode = treeNode;
+			    	var _eventKey = _treeNode.props.eventKey;
+			    	
+			    	const fileTreeData = that.state.fileTreeData;
+			    	// 新的数组放置到treenode下
+			    	
+			    	const tempFileTreeData = fileData2TreeData(repoFilesData)
+
+			    	getNewTreeData(fileTreeData, _eventKey, tempFileTreeData, 2);
+			    	this.setState({
+			    		fileTreeData,
+			    	})
+			    }
+			    
+			    resolve && resolve();
+
+		  	})
+		  	.catch(function (error) {
+		    	console.log(error);
+		    	reject && reject();
+		  	});
+	}
+	onTreeSelect = (selectedKeys, info) => {
+		const isLeaf = info.node.props.isLeaf;
+		if (isLeaf) {		// 叶子节点
+			selectedKeys.length && this.setState({
+				fileTreeSelectedKeys: selectedKeys
+			})
+			const { fetchRepositoryCode, onPathChange, showSnackbar, challenge } = this.props;
+			
+			const nodePath = info.node.props.eventKey;
+			// 设置pathIndex为-1，那么代码文件下拉可以切回可编辑的文件
+			if (!challenge.multiPath) {	// 单path任务  多path任务 path是数组
+				if (challenge.path.trim() == nodePath.trim()) {
+					if (challenge.pathIndex === 0) {
+						showSnackbar(`当前编辑文件已经是${nodePath}`)
+					} else {
+						onPathChange(0)
+					}
+					return;
+				} else {
+					onPathChange(-1)
+				}
+			} else {
+				let isCurrentFile = false;
+				let cur_index = -1;
+				if (challenge.path && challenge.path.forEach) {
+					challenge.path.forEach((item, index) => {
+						if (nodePath == item) {
+							isCurrentFile = true;
+							cur_index = index;
+						}
+					})
+				}
+				if (isCurrentFile) {
+					onPathChange(cur_index)
+					showSnackbar(`当前编辑文件已经是${nodePath}`)
+				} else {
+					onPathChange(-1)
+				}
+			}
+			if (nodePath) {
+				const filetype = nodePath.split('.').pop().toLowerCase();
+				if (filetype == 'jpg' || filetype == 'png' || filetype == 'gif' || filetype == 'jpeg'
+						|| filetype == 'jar'
+						|| filetype == 'doc' || filetype == 'pdf' || filetype == 'xsl' || filetype == 'ppt') {
+					showSnackbar(`不支持加载${filetype}类型的文件。`)
+					return;
+				}
+				fetchRepositoryCode(null, nodePath, 1);	
+			} else {
+				console.error('no eventKey:', info.node)
+			}
+		}
+	}
+//  /shixuns/mnf6b7z3/shixun_discuss?challenge_id=88
+  	render() {
+		  
+	    return (
+			<React.Fragment>
+				{this.props.isOnlyContainer == true ? 
+					React.Children.map(this.props.children, child => {
+						if(!child) {
+							return ''
+						}
+						return React.cloneElement(child, Object.assign({...this.state}, { 
+							loadRepoFiles: this.loadRepoFiles,
+							onTreeSelect: this.onTreeSelect,
+							onLoadData: this.onLoadData,
+						}))
+					})
+
+				 : 
+			
+				<CodeRepositoryView {...this.props} 
+					{...this.state} 
+					showFilesDrawer={this.showFilesDrawer}
+					loadRepoFiles={this.loadRepoFiles}
+					onLoadData={this.onLoadData}
+					onTreeSelect={ this.onTreeSelect }
+					onRepositoryViewExpand={this.onRepositoryViewExpand}
+					tabIndexChange={this.tabIndexChange}
+					showSettingDrawer={this.showSettingDrawer}
+				></CodeRepositoryView> }
+			</React.Fragment>
+	    );
+  	}
+}
+
+export default CodeRepositoryViewContainer;
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index f3c9d514b..10c78dddf 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -518,7 +518,7 @@ class DetailCardsEditAndAdd extends Component{
                                     style={{"width":"298px"}}
                                     name="shixun_homework[]"
                                   >
-                                    <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.shixun_name}</label>
+                                    <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.shixun_name}>{item.shixun_name}</label>
                                   </Checkbox>
                                 </li>
                                 <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li>
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
index b4b8cb536..30859d962 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
@@ -554,7 +554,7 @@ class DetailCardsEditAndEdit extends Component{
                                   style={{"width":"298px"}}
                                   name="shixun_homework[]"
                                 >
-                                  <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.shixun_name}</label>
+                                  <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.shixun_name}>{item.shixun_name}</label>
                                 </Checkbox>
                               </li>
                               <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li>
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index f1b0a3bbb..bd7b02e7d 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -14,24 +14,24 @@ import TPMRightSection from "../../tpm/component/TPMRightSection";
 import styled from "styled-components";
 
 const getItemStyle = (isDragging, draggableStyle) => ({
-  // change background colour if dragging
-  background: isDragging ? '#dceeff' : '',
-  // styles we need to apply on draggables
-  ...draggableStyle,
+	// change background colour if dragging
+	background: isDragging ? '#dceeff' : '',
+	// styles we need to apply on draggables
+	...draggableStyle,
 });
 const getItems = count =>
-    Array.from({ length: count }, (v, k) => k).map(k => ({
-      id: `item-${k}`,
-      content: `item ${k}`
-    }));
+	Array.from({ length: count }, (v, k) => k).map(k => ({
+		id: `item-${k}`,
+		content: `item ${k}`
+	}));
 
 // a little function to help us with reordering the result
 const reorder = (list, startIndex, endIndex) => {
-  const result = Array.from(list);
-  const [removed] = result.splice(startIndex, 1);
-  result.splice(endIndex, 0, removed);
+	const result = Array.from(list);
+	const [removed] = result.splice(startIndex, 1);
+	result.splice(endIndex, 0, removed);
 
-  return result;
+	return result;
 };
 
 const List = styled.div`
@@ -66,90 +66,90 @@ const DragHandle = styled.div`
 `;
 const $ =window.$
 class PathDetailIndex extends Component{
-  constructor(props){
-    super(props)
-    this.state={
+	constructor(props){
+		super(props)
+		this.state={
 			progress:undefined,
 			tags:undefined,
 			members:undefined,
-      detailInfoList:undefined,
-      clickdetailInfoListtype:false,
-      Modalstype:false,
-      Modalstopval:undefined,
-      Modalsbottomval:undefined,
-      cardsModalcancel:this.cardsModalcancel,
-      cardsModalsave:this.cardsModalsave,
-      user_id:undefined,
-      loadtype:false,
+			detailInfoList:undefined,
+			clickdetailInfoListtype:false,
+			Modalstype:false,
+			Modalstopval:undefined,
+			Modalsbottomval:undefined,
+			cardsModalcancel:this.cardsModalcancel,
+			cardsModalsave:this.cardsModalsave,
+			user_id:undefined,
+			loadtype:false,
 			courses:undefined,
-      items: getItems(10),
+			items: getItems(10),
 			pathtopskey:1
-    }
-    this.onDragEnd = this.onDragEnd.bind(this);
+		}
+		this.onDragEnd = this.onDragEnd.bind(this);
 
-  }
-  onDragEnd(result) {
-    // dropped outside the list
-    if (!result.destination) {
-      return;
-    }
+	}
+	onDragEnd(result) {
+		// dropped outside the list
+		if (!result.destination) {
+			return;
+		}
 
-    try {
+		try {
 
-    }catch (e) {
+		}catch (e) {
 
-    }
-    const items = reorder(
-        this.state.members,
-        result.source.index,
-        result.destination.index
-    );
+		}
+		const items = reorder(
+			this.state.members,
+			result.source.index,
+			result.destination.index
+		);
 
-    this.setState({
-      detailInfoList:this.state.detailInfoList,
+		this.setState({
+			detailInfoList:this.state.detailInfoList,
 			members:items,
-      items
-    });
-    console.log(this.state.members)
-    console.log("items 数组数组数组数组")
-    console.log(items)
-  }
-  cardsModalcancel=()=>{
-    this.setState({
-      Modalstype:false,
-    })
-    // TODO 这个是临时处理，还需要优化，这里要看怎么区分处理
-    if (this.state.Modalstopval == '你确定要删除该成员吗？') {
-      return;
-    }
+			items
+		});
+		console.log(this.state.members)
+		console.log("items 数组数组数组数组")
+		console.log(items)
+	}
+	cardsModalcancel=()=>{
+		this.setState({
+			Modalstype:false,
+		})
+		// TODO 这个是临时处理，还需要优化，这里要看怎么区分处理
+		if (this.state.Modalstopval == '你确定要删除该成员吗？') {
+			return;
+		}
 		this.props.history.goBack()
-  }
+	}
 
-  cardsModalsave=()=>{
-    this.setState({
-      Modalstype:false,
-    })
+	cardsModalsave=()=>{
+		this.setState({
+			Modalstype:false,
+		})
 		this.props.history.goBack()
-  }
-  // 加载markdown
-  updatamakedown=(id)=>{
-    setTimeout(()=>{
-        var shixunDescr = window.editormd.markdownToHTML(id, {
-            htmlDecode: "style,script,iframe",
-            taskList: true,
-            tex: true,
-            flowChart: true,
-            sequenceDiagram: true
-        });
-        $("#"+id+" p:first").addClass("ReactMarkdown");
-    }, 200)
-  }
+	}
+	// 加载markdown
+	updatamakedown=(id)=>{
+		setTimeout(()=>{
+			var shixunDescr = window.editormd.markdownToHTML(id, {
+				htmlDecode: "style,script,iframe",
+				taskList: true,
+				tex: true,
+				flowChart: true,
+				sequenceDiagram: true
+			});
+			$("#"+id+" p:first").addClass("ReactMarkdown");
+		}, 200)
+	}
 
-  componentDidMount(){
- 		this.getdatasindex()
-  }
+	componentDidMount(){
+		this.getdatasindex()
+	}
 
-  getdatasindex=(key)=>{
+	getdatasindex=(key)=>{
 
 		let pathid=this.props.match.params.pathId;
 		let url="/paths/"+pathid+".json";
@@ -168,7 +168,7 @@ class PathDetailIndex extends Component{
 			if(result.data.allow_visit===true){
 				this.setState({
 					detailInfoList:result.data,
-				  courses:result.data.courses,
+					courses:result.data.courses,
 					pathtopskey:key===undefined?1:key,
 					// items:  getItems(result.data.members.length),
 				})
@@ -205,157 +205,157 @@ class PathDetailIndex extends Component{
 		})
 	}
 
-  updatadetailInfoList=()=>{
-			this.getdatasindex();
-  }
-  
-  clickNewsubscript=(val)=>{
-    if(val===0){
-      this.setState({
-        clickdetailInfoListtype:true
-      })
-    }else{
-      this.setState({
-        clickdetailInfoListtype:false
-      })
-    }
+	updatadetailInfoList=()=>{
+		this.getdatasindex();
+	}
 
-  }
+	clickNewsubscript=(val)=>{
+		if(val===0){
+			this.setState({
+				clickdetailInfoListtype:true
+			})
+		}else{
+			this.setState({
+				clickdetailInfoListtype:false
+			})
+		}
 
-  timeStamp=(value)=>{
-    var secondTime = parseInt(value);// 秒
-    var minuteTime = 0;// 分
-    var hourTime = 0;// 小时
-    if(secondTime > 60) {//如果秒数大于60，将秒数转换成整数
-      //获取分钟，除以60取整数，得到整数分钟
-      minuteTime = parseInt(secondTime / 60);
-      //获取秒数，秒数取佘，得到整数秒数
-      secondTime = parseInt(secondTime % 60);
-      //如果分钟大于60，将分钟转换成小时
-      if(minuteTime > 60) {
-        //获取小时，获取分钟除以60，得到整数小时
-        hourTime = parseInt(minuteTime / 60);
-        //获取小时后取佘的分，获取分钟除以60取佘的分
-        minuteTime = parseInt(minuteTime % 60);
-      }
-    }
-    var result = "" + parseInt(secondTime) + "秒";
-
-    if(minuteTime > 0) {
-      result = "" + parseInt(minuteTime) + "分" + result;
-    }
-    if(hourTime > 0) {
-      result = "" + parseInt(hourTime) + "小时" + result;
-    }
-    return result;
-  }
+	}
 
+	timeStamp=(value)=>{
+		var secondTime = parseInt(value);// 秒
+		var minuteTime = 0;// 分
+		var hourTime = 0;// 小时
+		if(secondTime > 60) {//如果秒数大于60，将秒数转换成整数
+			//获取分钟，除以60取整数，得到整数分钟
+			minuteTime = parseInt(secondTime / 60);
+			//获取秒数，秒数取佘，得到整数秒数
+			secondTime = parseInt(secondTime % 60);
+			//如果分钟大于60，将分钟转换成小时
+			if(minuteTime > 60) {
+				//获取小时，获取分钟除以60，得到整数小时
+				hourTime = parseInt(minuteTime / 60);
+				//获取小时后取佘的分，获取分钟除以60取佘的分
+				minuteTime = parseInt(minuteTime % 60);
+			}
+		}
+		var result = "" + parseInt(secondTime) + "秒";
+
+		if(minuteTime > 0) {
+			result = "" + parseInt(minuteTime) + "分" + result;
+		}
+		if(hourTime > 0) {
+			result = "" + parseInt(hourTime) + "小时" + result;
+		}
+		return result;
+	}
 
-  shanchuallow=(id)=>{
-    this.setState({
-      user_id:id,
-      Modalstype:true,
-      Modalstopval:"你确定要删除该成员吗？",
-      cardsModalsave:this.delectshanchuallow,
-      loadtype:false
-    })
-  }
 
-  delectshanchuallow=()=>{
-    let{user_id}=this.state;
-    let pathid=this.props.match.params.pathId;
-    let url="/paths/"+pathid+"/delete_member.json";
-    let param={user_id:user_id};
-    axios.delete(url,{data:param}).then((response) => {
-      if(response.data.status===1){
-        if (this.props.current_user.user_id == user_id) {
-          this.props.history.push('/paths')
-          return;
-        }
-        this.props.showNotification(response.data.message)
-        this.setState({
-          Modalstype:false,
-          // Modalstopval:response.data.message,
-          loadtype:false,
-          // cardsModalsave:this.cardsModalsave,
-        })
-        this.updatadetailInfoList();
-      }
-    }).catch((error) => {
-      console.log(error)
-    })
-  }
+	shanchuallow=(id)=>{
+		this.setState({
+			user_id:id,
+			Modalstype:true,
+			Modalstopval:"你确定要删除该成员吗？",
+			cardsModalsave:this.delectshanchuallow,
+			loadtype:false
+		})
+	}
 
-  //上移
-  moveup=(data)=>{
-    // console.log(data);
-    let pathid=this.props.match.params.pathId;
-    let url=`/paths/${pathid}/up_member_position.json`;
-    axios.post(url,{
-      user_id:data.id
-    }).then((response) => {
-      if(response.status === 200){
-        console.log("上移");
-        // console.log(this.state.detailInfoList.members);
-        // console.log(response);
-
-        this.setState({
-          detailInfoList:this.state.detailInfoList,
+	delectshanchuallow=()=>{
+		let{user_id}=this.state;
+		let pathid=this.props.match.params.pathId;
+		let url="/paths/"+pathid+"/delete_member.json";
+		let param={user_id:user_id};
+		axios.delete(url,{data:param}).then((response) => {
+			if(response.data.status===1){
+				if (this.props.current_user.user_id == user_id) {
+					this.props.history.push('/paths')
+					return;
+				}
+				this.props.showNotification(response.data.message)
+				this.setState({
+					Modalstype:false,
+					// Modalstopval:response.data.message,
+					loadtype:false,
+					// cardsModalsave:this.cardsModalsave,
+				})
+				this.updatadetailInfoList();
+			}
+		}).catch((error) => {
+			console.log(error)
+		})
+	}
+
+	//上移
+	moveup=(data)=>{
+		// console.log(data);
+		let pathid=this.props.match.params.pathId;
+		let url=`/paths/${pathid}/up_member_position.json`;
+		axios.post(url,{
+			user_id:data.id
+		}).then((response) => {
+			if(response.status === 200){
+				console.log("上移");
+				// console.log(this.state.detailInfoList.members);
+				// console.log(response);
+
+				this.setState({
+					detailInfoList:this.state.detailInfoList,
 					members:response.data.members
-        });
-        // console.log(this.state.detailInfoList.members);
+				});
+				// console.log(this.state.detailInfoList.members);
 
-      }
+			}
 
-    }).catch((error) => {
-      console.log(error)
-    })
-  }
+		}).catch((error) => {
+			console.log(error)
+		})
+	}
 
-  //下移
-  movedown =(data) => {
-    // console.log(data);
-    let pathid=this.props.match.params.pathId;
-    let url=`/paths/${pathid}/down_member_position.json`;
-    axios.post(url,{
-      user_id:data.id
-    }).then((response) => {
-       if( response.status === 200){
-         console.log("下移");
-         // console.log(this.state.detailInfoList.members);
-         // console.log(response);
-         this.setState({
-           detailInfoList:this.state.detailInfoList,
-					 members:response.data.members
-         });
-         // console.log(this.state.detailInfoList.members);
-       }
-
-    }).catch((error) => {
-      console.log(error)
-    })
-  }
-    render(){
-
-    this.updatamakedown("shixuns_propaedeutics");
-    this.updatamakedown("subject_learning_notes");
-    let {detailInfoList,
-      clickdetailInfoListtype,
-      Modalstype,
-      Modalstopval,
-      Modalsbottomval,
-      cardsModalcancel,
-      cardsModalsave,
-      loadtype,
+	//下移
+	movedown =(data) => {
+		// console.log(data);
+		let pathid=this.props.match.params.pathId;
+		let url=`/paths/${pathid}/down_member_position.json`;
+		axios.post(url,{
+			user_id:data.id
+		}).then((response) => {
+			if( response.status === 200){
+				console.log("下移");
+				// console.log(this.state.detailInfoList.members);
+				// console.log(response);
+				this.setState({
+					detailInfoList:this.state.detailInfoList,
+					members:response.data.members
+				});
+				// console.log(this.state.detailInfoList.members);
+			}
+
+		}).catch((error) => {
+			console.log(error)
+		})
+	}
+	render(){
+
+		this.updatamakedown("shixuns_propaedeutics");
+		this.updatamakedown("subject_learning_notes");
+		let {detailInfoList,
+			clickdetailInfoListtype,
+			Modalstype,
+			Modalstopval,
+			Modalsbottomval,
+			cardsModalcancel,
+			cardsModalsave,
+			loadtype,
 			progress,
 			members,
 			tags,
 			courses,
-    } = this.state
+		} = this.state
 
 
-    return(
-      <div className="newContainer">
+		return(
+			<div className="newContainer">
 				<style>
 					{
 						`
@@ -365,206 +365,206 @@ class PathDetailIndex extends Component{
 						`
 					}
 				</style>
-        <Modals
-          modalsType={Modalstype}
-          modalsTopval={Modalstopval}
-          modalsBottomval={Modalsbottomval}
-          modalCancel={cardsModalcancel}
-          modalSave={cardsModalsave}
-          loadtype={loadtype}
-        >
-        </Modals>
-          <div className="newMain clearfix">
-            <DetailTop {...this.state} {...this.props} getdatasindex={(key)=>this.getdatasindex(key)}></DetailTop>
-            <div className="educontent clearfix mb80">
-              <div className="with65 fl"> 
-                <div className="produce-content mb10">
-                  <p className="clearfix mb20">
-                    <span className="fl font-18 font-bd">简介</span>
-                    {/*{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?*/}
-											{/*<Tooltip placement="bottom" title={"编辑"}>*/}
-                      {/*<Link className="fr" to={"/paths/"+this.props.match.params.pathId+"/edit"}>*/}
-                        {/*<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>*/}
-                      {/*</Link>*/}
-											{/*</Tooltip>*/}
-                      {/*:""*/}
-                    {/*}*/}
-                  </p>
-                  <div className="color-grey-6 clearfix">
-                    <div id="shixuns_propaedeutics" className="new_li fl" style={{"padding":" 0px","textAlign": "justify;"}}>
-                      {detailInfoList === undefined ? "" :detailInfoList.description===null?"":
-												<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{__html: markdownToHTML(detailInfoList.description).replace(/▁/g,"▁▁▁")}}></div>
-                      }
-                    </div>
-                  </div>
-                </div>
-                
-                <DetailCards
-                  {...this.props}
-                  {...this.state}
-                  updatadetailInfoLists={this.updatadetailInfoList}
-                ></DetailCards>
-              </div>
-              <div className="with35 fr pl20">
-                <div className="edu-back-white mustlearn mb10">
-                  <p className="clearfix mb30">
-                    <span className="font-16">课程须知</span>
-                    {/*{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?*/}
-											{/*<Tooltip placement="bottom" title={"编辑"}>*/}
-                      {/*<Link to={"/paths/"+this.props.match.params.pathId+"/edit#learning_notes"} className="fr mtf5">*/}
-                        {/*<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>*/}
-                      {/*</Link>*/}
-											{/*</Tooltip>*/}
-                      {/*:""*/}
-                    {/*}*/}
-                  </p>
-                  <div id="subject_learning_notes" className="color-grey-6 new_li markdown-body editormd-html-preview justify">
-                    {detailInfoList === undefined ? "" :detailInfoList.learning_notes===null?"":
-											<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{__html: markdownToHTML(detailInfoList.learning_notes).replace(/▁/g,"▁▁▁")}}></div>
+				<Modals
+					modalsType={Modalstype}
+					modalsTopval={Modalstopval}
+					modalsBottomval={Modalsbottomval}
+					modalCancel={cardsModalcancel}
+					modalSave={cardsModalsave}
+					loadtype={loadtype}
+				>
+				</Modals>
+				<div className="newMain clearfix">
+					<DetailTop {...this.state} {...this.props} getdatasindex={(key)=>this.getdatasindex(key)}></DetailTop>
+					<div className="educontent clearfix mb80">
+						<div className="with65 fl">
+							<div className="produce-content mb10">
+								<p className="clearfix mb20">
+									<span className="fl font-18 font-bd">简介</span>
+									{/*{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?*/}
+									{/*<Tooltip placement="bottom" title={"编辑"}>*/}
+									{/*<Link className="fr" to={"/paths/"+this.props.match.params.pathId+"/edit"}>*/}
+									{/*<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>*/}
+									{/*</Link>*/}
+									{/*</Tooltip>*/}
+									{/*:""*/}
+									{/*}*/}
+								</p>
+								<div className="color-grey-6 clearfix">
+									<div id="shixuns_propaedeutics" className="new_li fl" style={{"padding":" 0px","textAlign": "justify;"}}>
+										{detailInfoList === undefined ? "" :detailInfoList.description===null?"":
+											<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{__html: markdownToHTML(detailInfoList.description).replace(/▁/g,"▁▁▁")}}></div>
 										}
-                  </div>
-                </div>
-                {tags === undefined ? "" :tags === null ? "":
-                  <div className="edu-back-white padding40-20 mb10 relative">
-                    <p className="font-16 mb20">技能标签 <span className="color-grey-c">{tags.length}</span></p>
-
-                      <div className={clickdetailInfoListtype===false?"newedbox newedboxheight":"newedbox newminheight"}>
-                          <div className="clearfix" id="boxheight">
-                            {
-                             tags && tags.map((item,key)=>{
-                                return(
-                                  <span value={key} className = {item.status == true ? "edu-filter-btn29BD8B fl" : "newedu-filter-btn fl"}>{item.tag_name}</span>
-                                )
-                              })
-                            }
-                          </div>
-                      </div>
-
-										<Tooltip placement="bottom" title={"显示全部"}>
-                    <div className={tags.length>20&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
-                         onClick={()=>this.clickNewsubscript(0)}
-                    ><span className="mr8">...</span><Icon type="caret-down" />
-                    </div>
-										</Tooltip>
-
-										<Tooltip placement="bottom" title={"收起"}>
-                    <div className={clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9 fr"}
-                         onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
-                    </div>
-										</Tooltip>
-
-                  </div>
-                }
-                {
-									this.props.checkIfLogin()===false?"":progress === undefined ? "" : progress === null ? "" :
-                  <div className="edu-back-white myProgress padding40-20 mb10">
-                    <p className="mb20">
-                      <span className="font-16 mr10">我的进展</span>
-                      <Tooltip placement="bottom" title="获得经验值/总经验值">
-                          <span className="color-green"  >{progress.my_score} / {progress.all_score}</span>
-                      </Tooltip>
-                    </p>
-                    <p className="clearfix mb10">
-                      <span className="fl color-green">已学 {progress.learned}%</span>
-                      <span className="fr color-grey-9" id="time-consuming">学习耗时{this.timeStamp(progress.time)} </span>
-                    </p>
-                    <div className="myProgressNav"><div className="myProgressGreen" style={{"width":`${progress.learned+"%"}`}}></div></div>
-                  </div>
-                }
-
-                {
-									members ===undefined ?"":members === null ?"":
-                  <div className="teacherTeam edu-back-white clearfix" id="subject_members">  
-                    <p className="font-16 clearfix">教学团队</p>
-
-                    { members===undefined?
-                       members && members.map((item,key)=>{
-                        return(
-                            <div className="teacherTeamItem clearfix df" key={key}>
-                              <a href={item.user_url} target="_blank" className="fl">
-                                <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
-                              </a>
-
-                              <div className="fl ml15 flex1">
-                                <p className="mb10 mt5">{item.name}
-                                  {/*{*/}
-                                  {/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
-                                  {/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
-                                  {/*}*/}
-                                </p>
-                                <div className="clearfix">
-                                  <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
-                                </div>
-                              </div>
-                            </div>
-                        )
-                      })
-                    :detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
-                            members && members.map((item,key)=>{
-                              return(
-                                  <div className="teacherTeamItem clearfix df" key={key}>
-                                    <a href={item.user_url} target="_blank" className="fl">
-                                      <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
-                                    </a>
-
-                                    <div className="fl ml15 flex1">
-                                      <p className="mb10 mt5">{item.name}
-                                        {/* 新增role 判断是否能删除  1 管理员   2 合作者 */}
-
-                                        {
-                                          detailInfoList===undefined?"":detailInfoList.allow_add_member===true && item.role == 2?
-                                          <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""
-                                        }
-                                      </p>
-                                      <div className="clearfix">
-                                        <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
-                                      </div>
-                                      {
-                                        detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
-																						{key!=0?<div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>:""}
-																						{key+1== members.length?"":<div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>}
-                                            </div>
-                                              :""
-                                      }
-
-                                    </div>
-                                  </div>
-                              )
-                            })
-                            : members && members.map((item,key)=>{
-                          return(
-                              <div className="teacherTeamItem clearfix df" key={key}>
-                                <a href={item.user_url} target="_blank" className="fl">
-                                  <img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
-                                </a>
-
-                                <div className="fl ml15 flex1">
-                                  <p className="mb10 mt5">{item.name}
-                                    {/*{*/}
-                                    {/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
-                                    {/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
-                                    {/*}*/}
-                                  </p>
-                                  <div className="clearfix">
-                                    <p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
-                                  </div>
-                                </div>
-                              </div>
-                          )
-                        })}
-
-                  </div>
-                }  
-                
-                
-                <AddCollaborators {...this.props} {...this.state} updatadetailInfoLists={this.updatadetailInfoList}></AddCollaborators>
-                
-              </div>
-            </div>            
-          </div>
-          
-      </div>
-    )
-  }
+									</div>
+								</div>
+							</div>
+
+							<DetailCards
+								{...this.props}
+								{...this.state}
+								updatadetailInfoLists={this.updatadetailInfoList}
+							></DetailCards>
+						</div>
+						<div className="with35 fr pl20">
+							<div className="edu-back-white mustlearn mb10">
+								<p className="clearfix mb30">
+									<span className="font-16">课程须知</span>
+									{/*{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?*/}
+									{/*<Tooltip placement="bottom" title={"编辑"}>*/}
+									{/*<Link to={"/paths/"+this.props.match.params.pathId+"/edit#learning_notes"} className="fr mtf5">*/}
+									{/*<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>*/}
+									{/*</Link>*/}
+									{/*</Tooltip>*/}
+									{/*:""*/}
+									{/*}*/}
+								</p>
+								<div id="subject_learning_notes" className="color-grey-6 new_li markdown-body editormd-html-preview justify">
+									{detailInfoList === undefined ? "" :detailInfoList.learning_notes===null?"":
+										<div className={"markdown-body font-14"} dangerouslySetInnerHTML={{__html: markdownToHTML(detailInfoList.learning_notes).replace(/▁/g,"▁▁▁")}}></div>
+									}
+								</div>
+							</div>
+							{tags === undefined ? "" :tags === null ? "":
+								<div className="edu-back-white padding40-20 mb10 relative">
+									<p className="font-16 mb20">技能标签 <span className="color-grey-c">{tags.length}</span></p>
+
+									<div className={clickdetailInfoListtype===false?"newedbox newedboxheight":"newedbox newminheight"}>
+										<div className="clearfix" id="boxheight">
+											{
+												tags && tags.map((item,key)=>{
+													return(
+														<span value={key} className = {item.status == true ? "edu-filter-btn29BD8B fl" : "newedu-filter-btn fl"}>{item.tag_name}</span>
+													)
+												})
+											}
+										</div>
+									</div>
+
+									<Tooltip placement="bottom" title={"显示全部"}>
+										<div className={tags.length>20&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
+												 onClick={()=>this.clickNewsubscript(0)}
+										><span className="mr8">...</span><Icon type="caret-down" />
+										</div>
+									</Tooltip>
+
+									<Tooltip placement="bottom" title={"收起"}>
+										<div className={clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9 fr"}
+												 onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
+										</div>
+									</Tooltip>
+
+								</div>
+							}
+							{
+								this.props.checkIfLogin()===false?"":progress === undefined ? "" : progress === null ? "" :
+									<div className="edu-back-white myProgress padding40-20 mb10">
+										<p className="mb20">
+											<span className="font-16 mr10">我的进展</span>
+											<Tooltip placement="bottom" title="获得经验值/总经验值">
+												<span className="color-green"  >{progress.my_score} / {progress.all_score}</span>
+											</Tooltip>
+										</p>
+										<p className="clearfix mb10">
+											<span className="fl color-green">已学 {progress.learned}%</span>
+											<span className="fr color-grey-9" id="time-consuming">学习耗时{this.timeStamp(progress.time)} </span>
+										</p>
+										<div className="myProgressNav"><div className="myProgressGreen" style={{"width":`${progress.learned+"%"}`}}></div></div>
+									</div>
+							}
+
+							{
+								members ===undefined ?"":members === null ?"":
+									<div className="teacherTeam edu-back-white clearfix" id="subject_members">
+										<p className="font-16 clearfix">教学团队</p>
+
+										{ members===undefined?
+											members && members.map((item,key)=>{
+												return(
+													<div className="teacherTeamItem clearfix df" key={key}>
+														<a href={item.user_url} target="_blank" className="fl">
+															<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+														</a>
+
+														<div className="fl ml15 flex1">
+															<p className="mb10 mt5">{item.name}
+																{/*{*/}
+																{/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
+																{/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
+																{/*}*/}
+															</p>
+															<div className="clearfix">
+																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+															</div>
+														</div>
+													</div>
+												)
+											})
+											:detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
+												members && members.map((item,key)=>{
+													return(
+														<div className="teacherTeamItem clearfix df" key={key}>
+															<a href={item.user_url} target="_blank" className="fl">
+																<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+															</a>
+
+															<div className="fl ml15 flex1">
+																<p className="mb10 mt5">{item.name}
+																	{/* 新增role 判断是否能删除  1 管理员   2 合作者 */}
+
+																	{
+																		detailInfoList===undefined?"":detailInfoList.allow_add_member===true && item.role == 2?
+																			<a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""
+																	}
+																</p>
+																<div className="clearfix">
+																	<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+																</div>
+																{
+																	detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
+																			{key!=0?<div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>:""}
+																			{key+1== members.length?"":<div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>}
+																		</div>
+																		:""
+																}
+
+															</div>
+														</div>
+													)
+												})
+												: members && members.map((item,key)=>{
+												return(
+													<div className="teacherTeamItem clearfix df" key={key}>
+														<a href={item.user_url} target="_blank" className="fl">
+															<img alt="头像" className="radius" height="80" src={getImageUrl(`${"images/"+item.image_url}`)} width="80"/>
+														</a>
+
+														<div className="fl ml15 flex1">
+															<p className="mb10 mt5">{item.name}
+																{/*{*/}
+																{/* detailInfoList===undefined?"":detailInfoList.allow_add_member===true?*/}
+																{/*  <a className="fr" onClick={()=>this.shanchuallow(item.id)}><i className="iconfont icon-shanchu color-grey-c font-14 font-n"></i></a>:""*/}
+																{/*}*/}
+															</p>
+															<div className="clearfix">
+																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+															</div>
+														</div>
+													</div>
+												)
+											})}
+
+									</div>
+							}
+
+
+							<AddCollaborators {...this.props} {...this.state} updatadetailInfoLists={this.updatadetailInfoList}></AddCollaborators>
+
+						</div>
+					</div>
+				</div>
+
+			</div>
+		)
+	}
 }
 export default PathDetailIndex;
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathNew.js b/public/react/src/modules/paths/PathNew.js
index 95e343b13..7dcef663b 100644
--- a/public/react/src/modules/paths/PathNew.js
+++ b/public/react/src/modules/paths/PathNew.js
@@ -1,7 +1,7 @@
 import React,{ Component } from "react";
 
 import {getUrl,markdownToHTML} from 'educoder';
-import {Input} from 'antd';
+import {Input,Button} from 'antd';
 import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
 
 import axios from 'axios';
@@ -86,7 +86,8 @@ class PathNew extends Component{
       pathName:"",
       description:"",
       point:"",
-      flag_name:true
+      flag_name:true,
+			bottonloading:false
     }
   }
 
@@ -124,6 +125,9 @@ class PathNew extends Component{
       return;
     }
     if (this.isEditPage == true) {
+			this.setState({
+				bottonloading:true
+			})
       let pathId = this.props.match.params.pathId;
 
       const editUrl = `/paths/${pathId}.json`
@@ -135,11 +139,21 @@ class PathNew extends Component{
         // console.log(response.data.subject_id);
         if (response.data.subject_id) {
           this.props.history.push(`/paths/${response.data.subject_id}`)
-        }
+        }else{
+					this.setState({
+						bottonloading:false
+					})
+				}
       }).catch((error)=>{
         console.log(error);
+				this.setState({
+					bottonloading:false
+				})
       })
     } else {
+			this.setState({
+				bottonloading:true
+			})
       let url="/paths.json"
       axios.post(url,{
         name:pathName,
@@ -149,9 +163,16 @@ class PathNew extends Component{
         // console.log(response.data.subject_id);
         if (response.data.subject_id) {
           this.props.history.push(`/paths/${response.data.subject_id}`)
-        }
+        }else{
+					this.setState({
+						bottonloading:false
+					})
+				}
       }).catch((error)=>{
         console.log(error);
+				this.setState({
+					bottonloading:false
+				})
       })
     }
     
@@ -267,7 +288,7 @@ class PathNew extends Component{
             </div>
             
             <div className="clearfix mb30 mt30">
-              <a href="javascript:void(0)" className="defalutSubmitbtn fl mr20" onClick={this.submitNewPath}>提交</a>
+              <Button className="defalutSubmitbtn fl mr20" loading={this.state.bottonloading} onClick={this.submitNewPath}>提交</Button>
               {this.isEditPage ? 
                 <Link to={`/paths/${this.props.match.params.pathId}`} 
                     className="defalutCancelbtn fl">取消</Link>
diff --git a/public/react/src/modules/paths/ShixunPaths.css b/public/react/src/modules/paths/ShixunPaths.css
index 5ff18c917..0f7ad114e 100644
--- a/public/react/src/modules/paths/ShixunPaths.css
+++ b/public/react/src/modules/paths/ShixunPaths.css
@@ -76,8 +76,7 @@
   -o-transition: all 1s;
   width: 100%;
   position: absolute;
-  top: -50%;
-  margin-top: 67.5px;
+  top: -17.5px;
 }
 .squareCard .squareImg img:hover{
   transform: scale(1.05);
diff --git a/public/react/src/modules/paths/ShixunPaths.js b/public/react/src/modules/paths/ShixunPaths.js
index 3d20c86eb..c2bc0d869 100644
--- a/public/react/src/modules/paths/ShixunPaths.js
+++ b/public/react/src/modules/paths/ShixunPaths.js
@@ -1,12 +1,16 @@
 import React, { Component } from 'react';
 
 import PathSearch from './ShixunPathSearch.js';
-
+import { configShareForPaths } from 'educoder'
 
 class ShixunPath extends Component{
   constructor(props) {
       super(props)
   }
+  componentDidMount() {
+    configShareForPaths()
+  }
+  
   render(){
     return(
       <div>
diff --git a/public/react/src/modules/tpm/TPMIndex.js b/public/react/src/modules/tpm/TPMIndex.js
index 00a88cd21..67779af8d 100644
--- a/public/react/src/modules/tpm/TPMIndex.js
+++ b/public/react/src/modules/tpm/TPMIndex.js
@@ -190,6 +190,8 @@ class TPMIndex extends Component {
                     identity: response.data.identity,
                     propaedeutics:response.data.propaedeutics,
                     status: response.data.shixun_status,
+                    secret_repository: response.data.secret_repository,
+                    
                 });
             }
         }).catch((error) => {
@@ -285,6 +287,10 @@ class TPMIndex extends Component {
                       (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props}
                         />)
                     }></Route>
+                 <Route path="/shixuns/:shixunId/secret_repository/:repoId/commits" render={
+                      (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} secret_repository_tab={true}
+                        />)
+                    }></Route>
 
                     <Route exact path="/shixuns/:shixunId/challenges" render={
                       (props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props}
@@ -300,6 +306,11 @@ class TPMIndex extends Component {
                         (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props}
                         />)
                     }></Route>
+                    <Route path="/shixuns/:shixunId/secret_repository" render={
+                        (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} secret_repository_tab={true}
+                        />)
+                    }></Route>
+                    
                     {/* <Route exact path="/shixuns/:shixunId/propaedeutics" component={TPMPropaedeuticsComponent}></Route> */}
 
                     <Route exact path="/shixuns/:shixunId/propaedeutics" render={
diff --git a/public/react/src/modules/tpm/TPMRepository.js b/public/react/src/modules/tpm/TPMRepository.js
index e9bfbf51d..0f8e31258 100644
--- a/public/react/src/modules/tpm/TPMRepository.js
+++ b/public/react/src/modules/tpm/TPMRepository.js
@@ -11,6 +11,8 @@ import Repository from './shixunchild/Repository/Repository'
 import TPMRightSection from './component/TPMRightSection'
 import TPMNav from './component/TPMNav'
 
+// import RepositoryChooseModal from './component/modal/RepositoryChooseModal'
+
 class TPMRepository extends Component {
     constructor(props) {
       super(props)
@@ -34,6 +36,7 @@ class TPMRepository extends Component {
                 shixun={shixun}
                 {...this.props}
             ></TPMNav>
+            {/* <RepositoryChooseModal {...this.props}></RepositoryChooseModal> */}
         { loadingContent ?
           <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }}/> :
           <Repository
diff --git a/public/react/src/modules/tpm/TPMRepositoryComponent.js b/public/react/src/modules/tpm/TPMRepositoryComponent.js
index a9c2e6854..f4c90b3b4 100644
--- a/public/react/src/modules/tpm/TPMRepositoryComponent.js
+++ b/public/react/src/modules/tpm/TPMRepositoryComponent.js
@@ -30,6 +30,12 @@ class TPMRepositoryComponent extends Component {
         isContentWidth100: this._isFileInPathArray(pathArray)
       }
     }
+    componentDidUpdate(prevProps, prevState) {
+      if (this.props.secret_repository_tab != prevProps.secret_repository_tab) {
+        this.fetchRepo()
+      }
+    }
+    
 
     componentDidMount = () => {
       this.fetchRepo()
@@ -72,7 +78,8 @@ class TPMRepositoryComponent extends Component {
       let id = this.props.match.params.shixunId;
       let url = `/shixuns/${id}/file_content.json`;
       axios.post(url, {
-        path: path
+        path: path,
+        secret_repository: this.props.secret_repository_tab
       }).then((response) => {
         trace_collapse('repository res: ', response)
 
@@ -138,7 +145,7 @@ class TPMRepositoryComponent extends Component {
       const path = urlNewPathArray.join('/')
 
       let id = this.props.match.params.shixunId;
-      let url = `/shixuns/${id}/repository.json`;
+      let url = `/shixuns/${id}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}.json`;
       // this.props.setLoadingContent(true)
       axios.post(url, {
         path: path ? path : ''
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 1ee36f488..a46654fe6 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -353,6 +353,8 @@ export default class TPMsettings extends Component {
           test_set_permission: response.data.shixun.test_set_permission,
           hide_code: response.data.shixun.hide_code,
           code_hidden: response.data.shixun.code_hidden,
+          is_secret_repository: response.data.shixun.is_secret_repository,
+		  init_is_secret_repository: response.data.shixun.is_secret_repository,
           forbid_copy: response.data.shixun.forbid_copy,
           vnc: response.data.shixun.vnc,
           vnc_evaluate: response.data.shixun.vnc_evaluate,
@@ -439,20 +441,52 @@ export default class TPMsettings extends Component {
 
   SelectshixunCommand=(e)=>{
     // console.log( e.target.value)
-    this.setState({
-      webssh: e.target.value,
-    });
-    if(e.target.value===2){
-      this.setState({
-        SelectTheCommandtype: true,
-        multi_webssh:false
-      });
-    }else{
-      this.setState({
-        SelectTheCommandtype: false,
-        multi_webssh:false
-      });
-    }
+	const webssh = e.target.value
+	if (webssh == 2) {
+		this.setState({
+			webssh: webssh,
+			SelectTheCommandtype: true,
+			multi_webssh:false
+		});
+	} else {
+		if (this.state.init_is_secret_repository && !this.state.vnc && this.state.is_secret_repository == true) {
+			this.confirmDeleteSecretRepo({
+				onOk: () => {
+					this.setState({
+						webssh: webssh,
+						SelectTheCommandtype: false,
+						multi_webssh:false
+					});
+				}
+			})
+		} else {
+			if (!this.state.vnc) {
+				this.setState({
+					is_secret_repository: false,
+				})
+			}
+			this.setState({
+				webssh: webssh,
+				SelectTheCommandtype: false,
+				multi_webssh:false
+			});
+		}
+	}
+
+    // this.setState({
+    //   webssh: webssh,
+    // });
+    // if(webssh===2){
+    //   this.setState({
+    //     SelectTheCommandtype: true,
+    //     multi_webssh:false
+    //   });
+    // }else{
+    //   this.setState({
+    //     SelectTheCommandtype: false,
+    //     multi_webssh:false
+    //   });
+    // }
   }
 
   SelectOpenpublic=(e)=>{
@@ -525,6 +559,35 @@ export default class TPMsettings extends Component {
     });
 
   }
+  confirmDeleteSecretRepo = ({title, onOk}) => {
+	  confirm({
+		title: title || <div>
+			<div>已创建的私密版本库及其内容，将在“保存”时被删除。</div>
+			<div>是否确认取消勾选？</div>
+		</div>,
+		okText: '确定',
+		cancelText: '取消',
+		onOk: () => {
+			this.setState({ is_secret_repository: false })
+			onOk && onOk()
+		},
+		onCancel() {
+		},
+	});
+  }
+  is_secret_repository = (e) => {
+	const checked = e.target.checked
+	if (!checked) {
+		if (this.state.init_is_secret_repository) {
+			this.confirmDeleteSecretRepo({
+			})
+		} else {
+			this.setState({ is_secret_repository: false })
+		}
+	} else {
+		this.setState({ is_secret_repository: true })
+	}
+  }
   forbid_copy = (e) => {
     let sum = ""
     if (e.target.checked === false) {
@@ -550,11 +613,34 @@ export default class TPMsettings extends Component {
     // } else if (e.target.checked === true) {
     //   sum = 1
     // }
-    this.setState({
-      vnc: e.target.checked,
-	  vnc_evaluate: false,
-    });
-
+	const vnc = e.target.checked;
+	if (!vnc) {
+		if (this.state.init_is_secret_repository && this.state.webssh != 2 && this.state.is_secret_repository == true) {
+			this.confirmDeleteSecretRepo({
+				onOk: () => {
+					this.setState({
+						vnc: e.target.checked,
+						vnc_evaluate: false,
+					});
+				}
+			})
+		} else {
+			if (this.state.webssh != 2) {
+				this.setState({
+					is_secret_repository: false
+				})
+			}
+			this.setState({
+				vnc: e.target.checked,
+				vnc_evaluate: false,
+			});
+		}
+	} else {
+		this.setState({
+			vnc: e.target.checked,
+			vnc_evaluate: false,
+		});
+	}
   }
   shixunsname = (e) => {
     // let {shixunsstatus}=this.state;
@@ -773,7 +859,8 @@ export default class TPMsettings extends Component {
   //     });
   // }
   submit_edit_shixun = () => {
-
+	if (this.saving == true) return;
+    this.saving = true;
 		if(this.state.status===-1){
 			this.props.showSnackbar("该实训已被删除，保存失败！");
 			return
@@ -782,7 +869,7 @@ export default class TPMsettings extends Component {
     let {
       name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, vnc_evaluate,
       evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
-      opening_time,shixunmemoMDvalue,shixun_service_configlist
+      opening_time,shixunmemoMDvalue,shixun_service_configlist, is_secret_repository
     } = this.state;
 
 		let newshixun_service_configlist = shixun_service_configlist.map(v => {
@@ -886,6 +973,7 @@ export default class TPMsettings extends Component {
     let Url = `/shixuns/` + id + `.json`;
     let data = {
     	shixun:{
+				
 				name: name,
 				webssh: webssh,
 				use_scope: use_scope,
@@ -906,6 +994,7 @@ export default class TPMsettings extends Component {
 				description: description_editormd,
 				evaluate_script: evaluate_script_editormd,
 			},
+			is_secret_repository: is_secret_repository,
 			main_type: choice_main_type,
 			small_type: choice_small_type,
 			scope_partment: scope_partment,
@@ -914,6 +1003,7 @@ export default class TPMsettings extends Component {
 
     axios.put(Url, data).then((response) => {
       // console.log(response)
+	  this.saving = false;
       if(response.status){
         if (response.data.status === -1) {
           this.props.showSnackbar(response.data.message);
@@ -925,6 +1015,7 @@ export default class TPMsettings extends Component {
 
     }).catch((error) => {
       console.log(error)
+	  this.saving = false;
     })
 
 
@@ -1460,6 +1551,7 @@ export default class TPMsettings extends Component {
       name,
       settingsData,
       webssh,
+	  is_secret_repository,
       use_scope,
       shixunsID,
       can_copy,
@@ -1653,8 +1745,6 @@ export default class TPMsettings extends Component {
 													// onMouseEnter={operateauthority?this.bigopen:""}
 													onSelect={operateauthority?this.bigopens:""}
 													// open={opers}
-
-													showSearch
 													optionFilterProp="children"
 													filterOption={(input, option) =>
 														option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -2201,6 +2291,15 @@ export default class TPMsettings extends Component {
 													</span>
 						</div>
 
+						{ (vnc || webssh == 2) && <div className="clearfix mt20 ml30">
+							<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>私密版本库:</span>
+							<span className="fl mt5">
+															<Checkbox checked={is_secret_repository === undefined ? false : is_secret_repository}
+																				onChange={this.is_secret_repository}></Checkbox>
+															<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则启用私密版本库，学员页面不能查看该版本库目录</label>
+													</span>
+						</div>}
+
 						<div className="clearfix mt20 ml30">
 							<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>禁用复制粘贴:</span>
 							<span className="fl mt5">
@@ -2241,7 +2340,7 @@ export default class TPMsettings extends Component {
 						<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化评测:</span>
 							<span className="fl mt5 ml5">
 								<Checkbox checked={vnc_evaluate === undefined ? false : vnc_evaluate} onChange={this.shixun_vnc_evaluate}></Checkbox>
-								<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则在VNC图形化实训中，给学员开启评测</label>
+								<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则在学员的VNC图形化页面中，开启评测功能</label>
 							</span>
 						</div>:""}
 
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 491751b6a..dd074fc0d 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -240,6 +240,7 @@ export default class TPMevaluation extends Component {
 		this.setState({
 			evaluationlist:newevaluationlist
 		})
+		console.log(newevaluationlist)
 	}
 
 
@@ -539,6 +540,14 @@ export default class TPMevaluation extends Component {
 		this.setevaluationlist(newevaluationlist);
 	}
 
+	// 修改测试集的匹配规则
+	changeEvaluationRule=(e,key)=>{
+		let {evaluationlist}=this.state;
+		let newevaluationlist=evaluationlist;
+		newevaluationlist[key].match_rule=e.target.value
+		this.setevaluationlist(newevaluationlist);
+	}
+
 	evaluationoninputvalue=(e,key,type)=>{
 		$.fn.autoHeight = function(){
 			function autoHeight(elem){
@@ -1159,6 +1168,13 @@ export default class TPMevaluation extends Component {
 																		autoHeight="true"
 																		onInput={(e)=>this.evaluationoninputvalue(e,key,"yq")}
 													></textarea>
+													<div className="clearfix lineh-30">
+														<span className="fl mr10 color-grey-6">匹配规则：</span>
+														<RadioGroup className="fl" value={item.match_rule} onChange={(e)=>this.changeEvaluationRule(e,key)}>
+															<Radio value='full'>完全匹配</Radio>
+															<Radio value='last'>末尾匹配</Radio>
+														</RadioGroup>
+													</div>
 												</div>
 											)
 										})}
diff --git a/public/react/src/modules/tpm/component/TPMNav.js b/public/react/src/modules/tpm/component/TPMNav.js
index 1683c59a0..ce74be13b 100644
--- a/public/react/src/modules/tpm/component/TPMNav.js
+++ b/public/react/src/modules/tpm/component/TPMNav.js
@@ -5,7 +5,7 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 class TPMNav extends Component {
 
   	render() {
-      const { user, match, shixun } = this.props;
+      const { user, match, shixun, secret_repository } = this.props;
   		let isAdminOrCreator = false;
       	if (user) {
 	        isAdminOrCreator = user.admin || user.manager
@@ -30,7 +30,10 @@ class TPMNav extends Component {
 
 		        <Link to={`/shixuns/${shixunId}/repository`}
                       style={{display:  this.props.identity >4||this.props.identity===undefined ? "none" : 'block'}}
-                      className={`${match.url.indexOf('repository') != -1 ? 'active' : ''} fl mr40`}>版本库</Link>
+                      className={`${match.url.indexOf('/repository') != -1 ? 'active' : ''} fl mr40`}>版本库</Link>
+				{secret_repository && <Link to={`/shixuns/${shixunId}/secret_repository`}
+                      style={{display:  this.props.identity >4||this.props.identity===undefined ? "none" : 'block'}}
+                      className={`${match.url.indexOf('secret_repository') != -1 ? 'active' : ''} fl mr40`}>私密版本库</Link>}
 
 		        <Link to={`/shixuns/${shixunId}/collaborators`}
 		        	className={`${match.url.indexOf('collaborators') != -1 ? 'active' : ''} fl mr40`}>合作者</Link>
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index fd96454c4..5fb9fadc4 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -13,192 +13,193 @@ import {Icon,Tooltip} from 'antd';
 // import "antd/dist/antd.css";
 
 class TPMRightSection extends Component {
-  constructor(props) {
-    super(props)
-    this.state = {
-
-        TPMRightSection:false,
-        clickNewsubscripttype:false
-    }
-  }
-
-  // componentDidMount() {
-  //   let id=this.props.match.params.shixunId;
-  //
-  //   let shixunsDetailsURL=`/shixuns/`+id+`/show_right.json`;
-  //
-  //   axios.get(shixunsDetailsURL).then((response)=> {
-  //         if(response.status===200){
-  //             this.setState({
-  //               TPMRightSectionData: response.data
-  //           });
-  //         }
-  //     }).catch((error)=>{
-  //       console.log(error)
-  //     });
-  // }
-
-    // shouldComponentUpdate(nextProps, nextState) {
-    //      return nextProps.TPMRightSectionData !== this.state.TPMRightSectionData
-    // }
-    clickNewsubscript=(val)=>{
-      if(val===0){
-          this.setState({
-              TPMRightSection:true,
-              clickNewsubscripttype:true
-          })
-      }else{
-          this.setState({
-              TPMRightSection:false,
-              clickNewsubscripttype:false
-          })
-      }
-
-    }
-  	render() {
-      let {TPMRightSection,clickNewsubscripttype}=this.state;
-      let {TPMRightSectionData}=this.props
-
-        return (
-                <div>
-                  {
-                     TPMRightSectionData===undefined?"":
-                    <div>
-                        <div className="edu-back-white padding40-20 mb10">
-                              <p className="font-16 mb20">创建者</p>
-                              <div className="df">
-                                  <a href={TPMRightSectionData===undefined?"":TPMRightSectionData.creator===undefined?"":`/users/${TPMRightSectionData.creator.login}/courses`}>
-                                <img alt="头像" className="radius mr10" height="80" src={getImageUrl(TPMRightSectionData===undefined?"":TPMRightSectionData.creator===undefined?"":'images/'+TPMRightSectionData.creator.image_url+"?1532489442")} width="80" />
-                              </a>
-                                <div className="flex1">
-
-                                    <p className="mb20">{TPMRightSectionData===undefined?"":TPMRightSectionData.creator===undefined?"":TPMRightSectionData.creator.name}</p>
-                                    <div className="clearfix">
-                                      <span>发布 {TPMRightSectionData.user_shixuns_count}</span>
-                                        {/*<span className="ml20">粉丝 <span id="user_h_fan_count">{TPMRightSectionData.fans_count}</span></span>*/}
-                                          {/* <a href="/watchers/unwatch?className=fr+user_watch_btn+edu-default-btn+edu-focus-btn&amp;object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr edu-default-btn user_watch_btn edu-focus-btn" data-method="post" data-remote="true" id="cancel_watch" rel="nofollow">取消关注</a> */}
-                                    </div>
-
-                                </div>
-                              </div>
-                          </div>
-                        {
-                            TPMRightSectionData === undefined ? "" :TPMRightSectionData.tags===undefined?"": TPMRightSectionData.tags.length === 0 ? "" :
-                                        <div className="edu-back-white padding40-20 mb10 relative">
-                                            <p className="font-16 mb20">技能标签 <span className="color-grey-c">{TPMRightSectionData.tags.length}</span></p>
-                                            <div className={TPMRightSection===false?"newedbox newedboxheight":"newedbox newminheight"}>
-                                                <div className="clearfix" id="boxheight">
-                                                 { TPMRightSectionData.tags.map((item,key)=>{
-                                                    return(
-                                                    <span className={item.status===false?"newedu-filter-btn fl":"edu-filter-btn29BD8B fl"}
-                                                          style={{display:item.tag_name===" "||item.tag_name===""?"none":""}}
-                                                          key={key}>{item.tag_name}</span>
-                                                    )})
-                                                 }
-                                                </div>
-                                            </div>
-
-
-                                            <div className={TPMRightSectionData.tags.length>15&&clickNewsubscripttype===false?"newsubscript mb9 color-grey-9":"newsubscript mb9 color-grey-9 none"}
-
-                                                 data-tip-down="显示全部"
-                                                 onClick={()=>this.clickNewsubscript(0)}><span className="mr8">...</span><Icon type="caret-down" />
-                                            </div>
-
-
-                                            <div className={clickNewsubscripttype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9"}
-
-                                                 data-tip-down="显示全部"
-                                                 onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
-                                            </div>
-
-                                        </div>
-
-
-                        }
-
-
-                        <div className="padding20 edu-back-white mb10 mt10" style={{
-                            display: TPMRightSectionData === undefined?"none":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "none" : "block"
-                        }}>
-                              <p className="mb20 font-16 clearfix">相关实践课程</p>
-                            <div className="recommend-list" >
-                              {
-                                  TPMRightSectionData===undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.map((i,k)=>{
-
-                                      return(
-
-                                            <div  className="recomments clearfix df" key={k}>
-
-                                              <a href={"/paths/"+i.id} height="96" width="128" target="_blank">
-                                                <img alt="实训" height="96" src={"/"+i.image_url} width="128" />
-                                              </a>
-
-                                              <div className="ml10 flex1">
-                                                <a href={"/paths/"+i.id}  target="_blank" data-tip-down={i.name} className="color-grey-6 task-hide mb12 recomment-name">{i.name}</a>
-                                                <p className="clearfix mt8 font-12 color-grey-B4">
-
-                                                  <Tooltip placement="bottom" title={"章节"}>
-                                                    <span className="mr10 fl squareIconSpan"><i className="iconfont icon-shixun fl mr3"></i>{i.stages_count}</span>
-                                                  </Tooltip>
-
-                                                  {/*<Tooltip placement="bottom" title={"经验值"}>*/}
-                                                    {/*<span className="mr10 fl squareIconSpan"><i className="iconfont icon-jingyan fl mr3"></i>{i.score_count}</span>*/}
-                                                  {/*</Tooltip>*/}
-
-                                                  <Tooltip placement="bottom" title={"学习人数"}>
-                                                    <span className="mr10 fl squareIconSpan"><i className="iconfont icon-chengyuan fl mr3"></i>{i.members_count}</span>
-                                                  </Tooltip>
-
-                                                </p>
-                                               </div>
-
-                                            </div>
-
-                                      )
-                                 })
-                              }
-                            </div>
-                            </div>
-
-														<div className="padding20 edu-back-white"
-																 style={{
-																	 display:
-																		 TPMRightSectionData === undefined?"none":TPMRightSectionData.recommands===undefined?"none":TPMRightSectionData.recommands.length === 0 ? "none" : "block"
-																 }}
-														>
-															<p className="mb20 font-16 clearfix">推荐实训</p>
-															<div className="recommend-list">
-																{
-																	TPMRightSectionData===undefined?"":TPMRightSectionData.recommands===undefined?"":TPMRightSectionData.recommands.map((item,key)=>{
-																		return(
-																			<div className="recomments clearfix df" key={key}>
-																				<a href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">
-																					<img alt="69?1526971094" height="96" src={"/"+item.pic} width="128"/>
-																				</a>
-																				<div className="ml10 flex1">
-																					<Tooltip placement="bottom" title={item.name}>
-																						<a href={"/shixuns/"+item.identifier+"/challenges"}  target="_blank"  className="color-grey-6 task-hide mb12 recomment-name">{item.name}</a>
-																					</Tooltip>
-																					<p className="clearfix mt8 font-12 color-grey-B4">
-																						{item.stu_num} 人学习
-																					</p>
-																					<p className="edu-txt-right color-orange pr10">{item.level}</p>
-																				</div>
-																			</div>
-																		)
-																	})
-																}
-															</div>
-														</div>
-
-                    </div>
-                      }
-                </div>
-            )
+	constructor(props) {
+		super(props)
+		this.state = {
+
+			TPMRightSection:false,
+			clickNewsubscripttype:false
+		}
+	}
+
+	// componentDidMount() {
+	//   let id=this.props.match.params.shixunId;
+	//
+	//   let shixunsDetailsURL=`/shixuns/`+id+`/show_right.json`;
+	//
+	//   axios.get(shixunsDetailsURL).then((response)=> {
+	//         if(response.status===200){
+	//             this.setState({
+	//               TPMRightSectionData: response.data
+	//           });
+	//         }
+	//     }).catch((error)=>{
+	//       console.log(error)
+	//     });
+	// }
+
+	// shouldComponentUpdate(nextProps, nextState) {
+	//      return nextProps.TPMRightSectionData !== this.state.TPMRightSectionData
+	// }
+	clickNewsubscript=(val)=>{
+		if(val===0){
+			this.setState({
+				TPMRightSection:true,
+				clickNewsubscripttype:true
+			})
+		}else{
+			this.setState({
+				TPMRightSection:false,
+				clickNewsubscripttype:false
+			})
+		}
+
+	}
+	render() {
+		let {TPMRightSection,clickNewsubscripttype}=this.state;
+		let {TPMRightSectionData}=this.props
+
+		return (
+			<div>
+				{
+					TPMRightSectionData===undefined?"":
+						<div>
+							<div className="edu-back-white padding40-20 mb10">
+								<p className="font-16 mb20">创建者</p>
+								<div className="df">
+									<a href={TPMRightSectionData===undefined?"":TPMRightSectionData.creator===undefined?"":`/users/${TPMRightSectionData.creator.login}/courses`}>
+										<img alt="头像" className="radius mr10" height="80" src={getImageUrl(TPMRightSectionData===undefined?"":TPMRightSectionData.creator===undefined?"":'images/'+TPMRightSectionData.creator.image_url+"?1532489442")} width="80" />
+									</a>
+									<div className="flex1">
+
+										<p className="mb20">{TPMRightSectionData===undefined?"":TPMRightSectionData.creator===undefined?"":TPMRightSectionData.creator.name}</p>
+										<div className="clearfix">
+											<span>发布 {TPMRightSectionData.user_shixuns_count}</span>
+											{/*<span className="ml20">粉丝 <span id="user_h_fan_count">{TPMRightSectionData.fans_count}</span></span>*/}
+											{/* <a href="/watchers/unwatch?className=fr+user_watch_btn+edu-default-btn+edu-focus-btn&amp;object_id=3039&amp;object_type=user&amp;shixun_id=61&amp;target_id=3039" className="fr edu-default-btn user_watch_btn edu-focus-btn" data-method="post" data-remote="true" id="cancel_watch" rel="nofollow">取消关注</a> */}
+										</div>
+
+									</div>
+								</div>
+							</div>
+							{
+								TPMRightSectionData === undefined ? "" :TPMRightSectionData.tags===undefined?"": TPMRightSectionData.tags.length === 0 ? "" :
+									<div className="edu-back-white padding40-20 mb10 relative">
+										<p className="font-16 mb20">技能标签 <span className="color-grey-c">{TPMRightSectionData.tags.length}</span></p>
+										<div className={TPMRightSection===false?"newedbox newedboxheight":"newedbox newminheight"}>
+											<div className="clearfix" id="boxheight">
+												{ TPMRightSectionData.tags.map((item,key)=>{
+													return(
+														<span className={item.status===false?"newedu-filter-btn fl":"edu-filter-btn29BD8B fl"}
+																	style={{display:item.tag_name===" "||item.tag_name===""?"none":""}}
+																	key={key}>{item.tag_name}</span>
+													)})
+												}
+											</div>
+										</div>
+
+
+										<div className={TPMRightSectionData.tags.length>15&&clickNewsubscripttype===false?"newsubscript mb9 color-grey-9":"newsubscript mb9 color-grey-9 none"}
+
+												 data-tip-down="显示全部"
+												 onClick={()=>this.clickNewsubscript(0)}><span className="mr8">...</span><Icon type="caret-down" />
+										</div>
+
+
+										<div className={clickNewsubscripttype===false?"newsubscript mb9 color-grey-9 none":"newsubscript mb9 color-grey-9"}
+
+												 data-tip-down="显示全部"
+												 onClick={()=>this.clickNewsubscript(1)}><Icon type="caret-up" />
+										</div>
+
+									</div>
+
+
+							}
+
+
+							<div className="padding20 edu-back-white mb10 mt10" style={{
+								display: TPMRightSectionData === undefined?"none":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "none" : "block"
+							}}>
+								<p className="mb20 font-16 clearfix">所属课程</p>
+								<div className="recommend-list" >
+									{
+										TPMRightSectionData===undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.map((i,k)=>{
+
+											return(
+
+												<div  className="recomments clearfix df" key={k}>
+
+													<a href={"/paths/"+i.id} height="96" width="128" target="_blank">
+														<img alt="实训" height="96" src={"/"+i.image_url} width="128" />
+													</a>
+
+													<div className="ml10 flex1">
+														<a href={"/paths/"+i.id}  target="_blank" data-tip-down={i.name} className="color-grey-6 task-hide mb12 recomment-name">{i.name}</a>
+														<p className="clearfix mt8 font-12 color-grey-B4">
+
+															<Tooltip placement="bottom" title={"章节"}>
+																<span className="mr10 fl squareIconSpan"><i className="iconfont icon-shixun fl mr3"></i>{i.stages_count}</span>
+															</Tooltip>
+
+															{/*<Tooltip placement="bottom" title={"经验值"}>*/}
+															{/*<span className="mr10 fl squareIconSpan"><i className="iconfont icon-jingyan fl mr3"></i>{i.score_count}</span>*/}
+															{/*</Tooltip>*/}
+
+															<Tooltip placement="bottom" title={"学习人数"}>
+																<span className="mr10 fl squareIconSpan"><i className="iconfont icon-chengyuan fl mr3"></i>{i.members_count}</span>
+															</Tooltip>
+
+														</p>
+													</div>
+
+												</div>
+
+											)
+										})
+									}
+								</div>
+							</div>
+
+		       {TPMRightSectionData === undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "" :
+							<div className="padding20 edu-back-white"
+									 style={{
+										 display:
+											 TPMRightSectionData === undefined?"none":TPMRightSectionData.recommands===undefined?"none":TPMRightSectionData.recommands.length === 0 ? "none" : "block"
+									 }}
+							>
+								<p className="mb20 font-16 clearfix">推荐实训</p>
+								<div className="recommend-list">
+									{
+										TPMRightSectionData===undefined?"":TPMRightSectionData.recommands===undefined?"":TPMRightSectionData.recommands.map((item,key)=>{
+											return(
+												<div className="recomments clearfix df" key={key}>
+													<a href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">
+														<img alt="69?1526971094" height="96" src={"/"+item.pic} width="128"/>
+													</a>
+													<div className="ml10 flex1">
+														<Tooltip placement="bottom" title={item.name}>
+															<a href={"/shixuns/"+item.identifier+"/challenges"}  target="_blank"  className="color-grey-6 task-hide mb12 recomment-name">{item.name}</a>
+														</Tooltip>
+														<p className="clearfix mt8 font-12 color-grey-B4">
+															{item.stu_num} 人学习
+														</p>
+														<p className="edu-txt-right color-orange pr10">{item.level}</p>
+													</div>
+												</div>
+											)
+										})
+									}
+								</div>
+							</div> }
+
+						</div>
+				}
+			</div>
+		)
 
-
-  	}
+
+	}
 }
 
 export default TPMRightSection;
diff --git a/public/react/src/modules/tpm/component/modal/RepositoryChooseModal.js b/public/react/src/modules/tpm/component/modal/RepositoryChooseModal.js
new file mode 100644
index 000000000..4b72ae2bd
--- /dev/null
+++ b/public/react/src/modules/tpm/component/modal/RepositoryChooseModal.js
@@ -0,0 +1,153 @@
+// import React, { useState, useEffect, memo } from 'react';
+// import axios from 'axios'
+// import { Modal, Input } from 'antd';
+
+// function RepositoryChooseModal(props) {
+//     const [trees, setTrees] = useState([])
+//     const [path, setPath] = useState('')
+//     const [pathArray, setPathArray] = useState([{val: "根目录/", path: ""}])
+//     const [modalVisible, setModalVisible] = useState(true)
+
+//     useEffect(() => {
+//         repository('')
+//     }, [])
+//     function onOk() {
+
+//     }
+//     function onCancel() {
+
+//     }
+//     /**
+//         点nav  会传入key
+//         点item 会传入 newPath
+
+//         item => name, type              type tree/leaf
+//      */
+//     const repository=(item, key, newPath)=>{
+//         let newPathArray = [] // 
+//         // 
+//         if (key) {
+//             for(var i=0; i<=key; i++){
+//                 newPathArray.push(pathArray[i])
+//             }
+//         } else if (item) {
+//             newPathArray = pathArray.slice(0)
+//             newPathArray.push({val: item.name, path: pathArray[pathArray.length - 1] + "/" + item.name})
+//         }
+        
+//         const path = item || key ? newPathArray[newPathArray.length - 1] : ''
+        
+// 		let id = props.match.params.shixunId;
+// 		let url ="/shixuns/"+id+"/repository.json";
+// 		axios.post(url,{
+// 			path: path
+// 		}).then((response) => {
+// 			if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+// 			}else{
+//                 setTrees(response.data.trees)
+//                 setPath(path)
+//                 pathArray(newPathArray)
+// 			}
+
+// 		}).catch((error) => {
+// 			console.log(error)
+// 		});
+// 	}
+//     const savegetfilepath=(value)=>{
+//         const state = {}
+// 		let {selectpath,saveshixunfilepath,pathtype} = state
+
+// 		if(pathtype===1){
+// 			let newselectpath;
+
+// 			if(saveshixunfilepath==="shixunfilepathplay"){
+// 				newselectpath=value
+// 			}else{
+// 				const type = selectpath.split('；');
+// 				let types=false;
+// 				for(var i=0; i<type.length; i++){
+// 					if(type[i]===value){
+// 						types=true
+// 						return
+// 					}
+// 				}
+
+// 				if(types===false){
+// 					newselectpath=selectpath+value+ "；"
+// 				}else{
+// 					newselectpath=selectpath
+// 				}
+// 			}
+// 			// this.setState({
+// 			// 	// selectpatharr:newarr,
+// 			// 	selectpath: newselectpath,
+
+// 			// })
+// 		}
+        
+//     }
+//     const goblakepath=(path,key)=>{
+
+//     }
+//     function sendgetfilepath() {
+
+//     }
+//     return (
+//         <Modal
+//             keyboard={false}
+//             title="文件路径"
+//             visible={modalVisible}
+//             closable={false}
+//             footer={false}
+//         >
+//             <div className="task_popup_con">
+//                 <div className="newupload_conbox clearfix">
+//                     <ul id="directory_file">
+//                         {/*文件导航*/}
+//                         {
+//                             pathArray.length===0?"":pathArray.map((item,key)=>{
+//                                 return(
+//                                     <a className="f14 fb" onClick={()=>goblakepath(item.path,key,item)}>{item.val}</a>
+//                                 )
+//                             })
+//                         }
+//                         {/*文件*/}
+//                         {trees === undefined || trees === null ? "" : trees.map((item, key) => {
+//                             return(
+//                                 <li className="entry" key={key}>
+//                                     <div className="filename_no_report hidden">{
+//                                         item.type==="tree"?<a onClick={()=>sendgetfilepath(item.name,item.type,path+item.name)} data-remote="true">
+//                                             <i className="iconfont icon-wenjianjia color-blue mr2"></i>
+//                                             {path+item.name}</a>:<a data-remote="true">
+//                                             <i className="iconfont icon-zuoye color-blue mr2"></i>
+//                                             <span onClick={()=>savegetfilepath(path+item.name,item.type)}>{path+item.name}</span>
+//                                         </a>
+//                                     }
+//                                     </div>
+//                                 </li>
+
+//                             )
+//                         })}
+
+//                     </ul>
+//                     <div className="clearfix mt20">
+//                         <label className="fl mt5 directory_filepath">选中的文件路径：</label>
+//                         <Input id="points_tusi" placeholder="选中的文件路径" className="fl input-60-40"
+//                                         style={{width:"400px"}}
+//                                         onInput={(e)=>saveselectpath(e)}
+//                                         value={path}/>
+//                     </div>
+
+//                     <a className="task-btn task-btn-orange fr"
+//                             style={{marginTop: '20px',marginLeft:'20px'}} id="add_path"  onClick={()=>onOk()}>确定</a>
+//                     <a  className="pop_close task-btn mb10 fr"
+//                             style={{marginTop: '20px'}} id="back_page" onClick={()=>onCancel()}>取消</a>
+//                 </div>
+//             </div>
+//         </Modal>
+//     )
+
+// }
+
+// export default RepositoryChooseModal
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index d2e26d58b..c2c464618 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -233,7 +233,8 @@ class Newshixuns extends Component {
 						systemenvironmenttype:false,
 						testcoderunmodetype:false,
 					  attachmentidstype:false,
-				  	datalisttype:false
+				  	datalisttype:false,
+					  bottonloading:false
         }
     }
 
@@ -494,6 +495,9 @@ class Newshixuns extends Component {
         } else {
             newmulti_webssh = ""
         }
+			this.setState({
+				bottonloading:true
+			})
         axios.post(Url, {
                 name: name,
                 can_copy: can_copy,
@@ -513,9 +517,16 @@ class Newshixuns extends Component {
             if (response.status === 200) {
                 window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
                 // window.open("/shixuns/"+response.data.shixun_identifier+"/challenges");
-            }
+            }else{
+            	this.setState({
+								bottonloading:false
+							})
+						}
         }).catch((error) => {
             console.log(error)
+					this.setState({
+						bottonloading:false
+					})
         })
     }
 
@@ -1321,7 +1332,9 @@ class Newshixuns extends Component {
 
 
                         <div className="clearfix mt30">
-                            <a className="defalutSubmitbtn fl mr20" onClick={this.submit_new_shixun}>提交</a>
+														<Button className="defalutSubmitbtn fl mr20" loading={this.state.bottonloading}  onClick={this.submit_new_shixun}>
+															提交
+														</Button>
                             <a href="/shixuns" className="defalutCancelbtn fl">取消</a>
                         </div>
 
diff --git a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
index da0924b94..e241dcf0d 100644
--- a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
+++ b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
@@ -384,4 +384,14 @@ a.white-btn.use_scope-btn:hover{
 
 .ml82{
     margin-left: 82px;
+}
+
+.ant-btn-primary.active, .ant-btn-primary:active {
+    color: #fff;
+    background-color: #096dd9;
+    border-color: #096dd9;
+}
+
+.ant-btn:hover, .ant-btn:focus, .ant-btn:active, .ant-btn.active{
+    background-color: #4CACFF;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
index a62151126..58379b1e8 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
@@ -15,7 +15,7 @@ import { trace, trace_collapse ,getImageUrl, toPath} from "educoder";
 import RepositoryDirectories from './RepositoryDirectories'
 
 import { ActionBtn , NoneData } from 'educoder'
-
+import RepositoryCombinePath from './RepositoryCombinePath'
 const $ = window.$;
 
 // 点击按钮复制功能
@@ -85,10 +85,13 @@ class Repository extends Component {
                        className=" guideBtn" >Git使用指南</a>
                     {
                       this.props.current_user && (this.props.current_user.admin ==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?
-                      <ActionBtn style="orangeLine" className="ml20" to={`/shixuns/${match.params.shixunId}/repository/add_file`}>+添加文件</ActionBtn>:""
+                      !this.props.secret_repository_tab && 
+                        <ActionBtn style="orangeLine" className="ml20" to={`/shixuns/${match.params.shixunId}/repository/add_file`}>+添加文件</ActionBtn>
+                      :""
                     }
                     
                     
+                    
                     <div className="fr font-12 color-grey-9 pr">
                       <label className="fl mt2">网址克隆：</label>
                       <input type="text" id="copy_rep_content" className="fl url-input mt2"
@@ -155,6 +158,10 @@ class Repository extends Component {
                     </div>
                   </div>
 
+                  {this.props.secret_repository_tab && <RepositoryCombinePath {...this.props}>
+
+                  </RepositoryCombinePath>}
+
                 </div>
               </div>
 
@@ -181,7 +188,7 @@ class Repository extends Component {
                                   {commits===undefined?"":commits[0].time}
                                 </acronym> ：{commits===undefined?"":commits[0].title}
                               </span>
-                      <a href={`/shixuns/${match.params.shixunId}/repository/${match.params.shixunId}/commits`}
+                      <a href={`/shixuns/${match.params.shixunId}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}/${match.params.shixunId}/commits`}
                          className="color-grey-6 fr font-16 ">
                         <i className="iconfont icon-tijiaojilu font-18 fl mr5"></i>
                         <span className="fl mt2">提交记录</span>
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
index bd7c8355b..51f6e35f2 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCodeEditor.js
@@ -121,6 +121,7 @@ class RepositoryCodeEditor extends Component {
         const path = pathArray.join('/')
         this.setState({ codeSaving: true })
         axios.post(url, {
+                secret_repository: this.props.secret_repository_tab,
                 content: this.extend_editor.getValue(),
                 // type: forTest === true ? 1 : 0,
                 path: path
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
new file mode 100644
index 000000000..aba008e20
--- /dev/null
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
@@ -0,0 +1,82 @@
+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 axios from 'axios';
+
+import { trace_collapse, WordsBtn } from 'educoder'
+
+import { message, Input } from 'antd';
+
+
+const $ = window.$;
+
+
+class RepositoryCombinePath extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            value: this.props.secret_dir_path || '',
+            isEdit: false,
+        }
+	}
+    
+    onSave = () => {
+        const { shixunId, pathArray } = this.props;
+        const url = `/shixuns/${shixunId}/set_secret_dir.json`
+        
+        this.setState({ codeSaving: true })
+        axios.post(url, {
+            secret_dir_path: this.state.value
+        }
+        ).then((response) => {
+            if (response.data) {
+                message.success('保存成功');
+                this.setState({isEdit: false})
+            }
+        })
+    }
+    onChange = (e) => {
+        const { value } = e.target;
+        this.setState({ value })
+    }
+    onEdit = () => {
+        this.setState({isEdit: true}, () => {
+            window.$('.combinePathEditRow input')[0].focus()
+        });
+    }
+    render() {
+        const { fileContent, match, saveCode } = this.props;
+        const { isEdit, value } = this.state;
+        return (
+            
+            <div className="df combinePathEditRow">
+                <style>{`
+                    .combinePathEditRow {
+                        margin: 4px 0;
+                    }
+                    .combinePathEditRow input {
+                        flex: 0 0 300px;
+                        border: none;
+                    }
+                    .combinePathEditRow .wordsBtn {
+                        margin-left: 24px;
+                    }
+                `}</style>
+                <span>第一版本库合并路径：</span>
+                <Input disabled={!isEdit} value={value} onChange={this.onChange}></Input>
+                {!isEdit && <WordsBtn className="wordsBtn" onClick={this.onEdit} style="blue">修改</WordsBtn>}
+                {isEdit && <WordsBtn className="wordsBtn" onClick={this.onSave} style="blue">保存</WordsBtn>}
+            </div>
+
+
+    );
+  }
+}
+export default RepositoryCombinePath;
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js b/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
index d0499a76c..663c5fcf3 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js
@@ -34,7 +34,9 @@ class TPMRepositoryCommits extends Component {
     let id = this.props.match.params.shixunId;
 
     let collaborators=`/shixuns/`+id+`/commits.json`;
-    axios.post(collaborators).then((response)=> {
+    axios.post(collaborators, {
+        secret_repository: this.props.secret_repository_tab
+    }).then((response)=> {
 
         if(response.status===200){
             this.setState({
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
index 4470aaec1..1ec00a26e 100644
--- a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
@@ -6,9 +6,6 @@
   margin-left: 32%;
 }
 
-.square-Item{
-    /*min-height: 324px;*/
-}
 .square-img{
     min-height: 210px;
 }
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index 99afce1d0..4e6492c7f 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -31,8 +31,8 @@ class InfosBanner extends Component{
 		let user_type=this.props.current_user&&this.props.current_user.user_identity;
 		let targetuserid=this.props.data&&this.props.data.id;
 
-		// console.log(is_current)
-		// console.log(current_user)
+		 // console.log(is_current)
+		 // console.log(current_user)
 		// console.log(current_user.is_teacher)
 		// console.log(current_user.admin)
     return(
@@ -124,7 +124,7 @@ class InfosBanner extends Component{
             </li>}
 
             {/*自己的主页且不是学生显示题库按钮*/}
-						{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+						{(is_current && current_user)
 						&&<li className={`${moduleName == 'topics' ? 'active' : '' }`}>
 							<Link
 								onClick={() => this.setState({moduleName: 'topics'})}
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index 0f6abc61b..f90b35d09 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -103,7 +103,7 @@ class InfosCourse extends Component{
     } = this.state;
     let  is_current=this.props.is_current;
 
-      console.log(this.props.current_user&&this.props.current_user.user_identity==="学生")
+      // console.log(this.props.current_user&&this.props.current_user.user_identity==="学生")
     return(
       <div className="educontent">
         <Spin size="large" spinning={isSpin}>
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js
index 565f42a3d..8da80aad3 100644
--- a/public/react/src/modules/user/usersInfo/InfosTopics.js
+++ b/public/react/src/modules/user/usersInfo/InfosTopics.js
@@ -31,33 +31,34 @@ class InfosTopics extends Component{
 	}
 
 	componentDidMount(){
-		let types=this.props.match.params.topicstype;
-    let professional_certification=this.props.current_user&&this.props.current_user.professional_certification;
-
-		if(professional_certification===false&&types==="publicly"){
-      this.setState({
-				isshowprofes:true
-			})
-		}else{
-			this.updataslist()
-		}
-	}
-	componentDidUpdate(prevProps) {
-
-		if(prevProps.current_user!=this.props.current_user){
-			let types=this.props.match.params.topicstype;
-			let professional_certification=this.props.current_user&&this.props.current_user.professional_certification;
-
-			console.log(professional_certification)
-			if(professional_certification===false&&types==="publicly"){
-				this.setState({
-					isshowprofes:true
-				})
-			}else{
-				this.updataslist()
-			}
-		}
+		// let types=this.props.match.params.topicstype;
+    // let professional_certification=this.props.current_user&&this.props.current_user.professional_certification;
+		//
+		// if(professional_certification===false&&types==="publicly"){
+    //   this.setState({
+		// 		isshowprofes:true
+		// 	})
+		// }else{
+		// 	this.updataslist()
+		// }
+		this.updataslist()
 	}
+	// componentDidUpdate(prevProps) {
+	//
+	// 	if(prevProps.current_user!=this.props.current_user){
+	// 		let types=this.props.match.params.topicstype;
+	// 		let professional_certification=this.props.current_user&&this.props.current_user.professional_certification;
+	//
+	// 		console.log(professional_certification)
+	// 		if(professional_certification===false&&types==="publicly"){
+	// 			this.setState({
+	// 				isshowprofes:true
+	// 			})
+	// 		}else{
+	// 			this.updataslist()
+	// 		}
+	// 	}
+	// }
 	updataslist=()=>{
 		let types=this.props.match.params.topicstype;
 		let { category,course_list_id,sort_by,sort_direction,page}=this.state;
@@ -65,55 +66,49 @@ class InfosTopics extends Component{
 	}
 	searchAlldata=(type,category,course_list_id,sort_by,sort_direction,page)=>{
 
-		// if(this.props.current_user.login!=this.props.match.params.username){
-		// 	return
-		// }else{
-		//
-		// }
 			this.setState({
 				isSpin:true
 			})
-			let types=this.props.match.params.topicstype;
-			let user_id="";
-
-			if(types==="publicly"){
-					user_id=this.props.current_user&&this.props.current_user.login;
-			}else{
-					user_id=this.props.match.params&&this.props.match.params.username;
-			}
-
 
-			if(user_id===undefined){
-				user_id=this.props.match.params&&this.props.match.params.username;
-			}
-
-			
-			if(user_id!=undefined){
-				let {per_page}=this.state;
-				let url=`/users/${user_id}/question_banks.json`;
-
-				axios.get(encodeURI(url),{params:{
-						type,
-						object_type:category,
-						course_list_id,
-						sort_by,
-						sort_direction,
-						page,
-						per_page
+			let {per_page}=this.state;
+			let url=`/users/question_banks.json`;
+
+			axios.get(encodeURI(url),{params:{
+					type,
+					object_type:category,
+					course_list_id,
+					sort_by,
+					sort_direction,
+					page,
+					per_page
+				}
+			}).then((response) => {
+      if(response){
+      	if(response.status){
+      		if(response.data.status == -2){
+ 						this.setState({
+							isshowprofes:true,
+							isSpin:false
+						})
+					}else if(response.data.status === 403||response.data.status === 401||response.data.status === 500){
+						this.setState({
+							isSpin:false
+						})
+					}else{
+						this.setState({
+							data:response.data,
+							checkBoxValues:[],
+							isSpin:false
+						})
 					}
-				}).then((response) => {
-					this.setState({
-						data:response.data,
-						checkBoxValues:[],
-						isSpin:false
-					})
-				}).catch((error) => {
-					this.setState({
-						isSpin:false
-					})
-				});
+				}
 			}
 
+			}).catch((error) => {
+				this.setState({
+					isSpin:false
+				})
+			});
 
 	}
 
diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
index e921022c3..121119a0d 100644
--- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
+++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
@@ -127,7 +127,7 @@ class BanksIndex extends Component{
           {
             crumbData &&
             <Breadcrumb separator=">" className="breadcrumb mt22">
-              <Breadcrumb.Item href={crumbData && crumbData.is_public == true ?`/topicbank/${this.props.current_user && this.props.current_user.login}/publicly`:`/users/${this.props.current_user && this.props.current_user.login}/topics/personal`}>{ crumbData && crumbData.is_public == true ? '公共' : '我的' }题库</Breadcrumb.Item>
+              <Breadcrumb.Item href={crumbData && crumbData.is_public == true ?`/topicbank/publicly`:`/users/${this.props.current_user && this.props.current_user.login}/topics/personal`}>{ crumbData && crumbData.is_public == true ? '公共' : '我的' }题库</Breadcrumb.Item>
               {
                 crumbData.crumbArray && crumbData.crumbArray.map((item,key)=>{
                   return(
diff --git a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js
index 8b4cc8dbb..8c0f6474c 100644
--- a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js
+++ b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js
@@ -115,6 +115,9 @@ class NewGtaskForms extends Component{
     let {data}=this.props;
     let task_type=data.task_type
 		let topicId=this.props.topicId
+		let attachment_ids = contentFileList.map(item => {
+			return item.response ? item.response.id : item.id
+		})
 		this.props.form.validateFields((err, values) => {
 
 			const mdContnet = this.contentMdRef.current.getValue().trim();
@@ -132,7 +135,7 @@ class NewGtaskForms extends Component{
 								max_num:task_type===1?undefined:max_num,
 								base_on_project: task_type===1?task_type:base_on_project===true?1:0
 							},
-							attachment_ids:contentFileList
+							attachment_ids:attachment_ids
 						}
 					).then((response) => {
 						if(response.data.status===0){
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css
index 2a72fcfd1..a0cd3ba21 100644
--- a/public/react/src/modules/user/usersInfo/usersInfo.css
+++ b/public/react/src/modules/user/usersInfo/usersInfo.css
@@ -227,10 +227,6 @@
   left:0px;
   background: #4CACFF;
 }
-.square-Item{
-  height: 295px;
-}
-
 /* 题库相关 */
 .breadcrumb{
   height: 18px;
diff --git a/spec/models/shixun_secret_repository_spec.rb b/spec/models/shixun_secret_repository_spec.rb
new file mode 100644
index 000000000..ed06914ae
--- /dev/null
+++ b/spec/models/shixun_secret_repository_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ShixunSecretRepository, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/shixun_work_comment_spec.rb b/spec/models/shixun_work_comment_spec.rb
new file mode 100644
index 000000000..0c40ede68
--- /dev/null
+++ b/spec/models/shixun_work_comment_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ShixunWorkComment, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end