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

Gemfile

@@ -103,3 +103,6 @@ gem 'diffy'
 # oauth2
 gem 'omniauth', '~> 1.9.0'
 gem 'omniauth-oauth2', '~> 1.6.0'
+
+# global var
+gem 'request_store'

app/controllers/admins/shixuns_controller.rb

@@ -8,6 +8,9 @@ class Admins::ShixunsController < Admins::BaseController
     @pending_shixuns = shixuns.where(status:1).size
     @processed_shixuns = shixuns.where(status:2).size
     @closed_shixuns = shixuns.where(status:3).size
+    @none_public_shixuns = shixuns.where(public:0).size
+    @pending_public_shixuns = shixuns.where(public:1).size
+    @processed_pubic_shixuns = shixuns.where(public:2).size
     @shixuns_type_check = MirrorRepository.pluck(:type_name,:id)
     @params_page = params[:page] || 1
     @shixuns = paginate shixuns.preload(:user,:challenges)

app/controllers/application_controller.rb

@@ -303,7 +303,7 @@ class ApplicationController < ActionController::Base
 		current_domain_session = session[:"#{default_yun_session}"]
 		if current_domain_session
 			# existing session
-			(User.active.find(current_domain_session) rescue nil)
+			User.current = (User.active.find(current_domain_session) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?

app/controllers/courses_controller.rb

@@ -29,7 +29,7 @@ class CoursesController < ApplicationController
                                      :informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
                                     :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs,
                                     :delete_informs, :change_member_role, :course_groups, :join_course_group, :statistics,
-                                    :work_score, :act_score]
+                                    :work_score, :act_score, :calculate_all_shixun_scores]
   before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
                                                 :search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
   before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
@@ -48,7 +48,7 @@ class CoursesController < ApplicationController
   before_action :validate_page_size, only: :mine
   before_action :course_tasks, only: [:tasks_list, :update_task_position]
   before_action :validate_inform_params, only: [:update_informs, :new_informs]
-  before_action :course_member_allowed, only: [:statistics, :work_score, :act_score]
+  before_action :course_member_allowed, only: [:statistics, :work_score, :act_score, :calculate_all_shixun_scores]
 
   if RUBY_PLATFORM =~ /linux/
     require 'simple_xlsx_reader'
@@ -1334,6 +1334,16 @@ class CoursesController < ApplicationController
     end
   end
 
+  # 计算课堂所有已发布的实训作业成绩
+  def calculate_all_shixun_scores
+    tip_exception(-1, "课堂已结束") if @course.is_end
+    shixun_homeworks = @course.homework_commons.homework_published.where(homework_type: 4)
+    shixun_homeworks.includes(:homework_challenge_settings, :published_settings, :homework_commons_shixun).each do |homework|
+      homework.update_homework_work_score
+    end
+    normal_status(0, "更新成功")
+  end
+
   def search_slim
     courses = current_user.manage_courses.not_deleted.processing
 

app/controllers/hacks_controller.rb

@@ -1,8 +1,8 @@
 class HacksController < ApplicationController
   before_action :require_login, except: [:index]
-  before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set, :destroy]
+  before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set, :destroy, :cancel_publish]
   before_action :require_teacher_identity, only: [:create]
-  before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set, :destroy]
+  before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set, :destroy, :cancel_publish]
 
 
   # 开启编程，如果第一次开启，创建一条记录，如果已经开启过的话，直接返回标识即可
@@ -99,6 +99,12 @@ class HacksController < ApplicationController
     render_ok
   end
 
+  # 取消发布
+  def cancel_publish
+    @hack.update_attribute(:status, 0)
+    render_ok
+  end
+
   # 发布列表
   def unpulished_list
     limit = params[:limit] || 16

app/controllers/myshixuns_controller.rb

@@ -217,7 +217,8 @@ class MyshixunsController < ApplicationController
       shixun_tomcat = edu_setting('tomcat_webssh')
       uri = "#{shixun_tomcat}/bridge/webssh/getConnectInfo"
       # 由于中间层采用混合云的方式，因为local参数表示在有文件生成的实训是在本地生成，还是在其他云端生成评测文件
-      params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh), local: @myshixun.shixun.show_type != -1,
+      local = @myshixun.shixun.challenges.where.not(show_type: -1).count == 0
+      params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh), local: local,
                 containers:(Base64.urlsafe_encode64(shixun_container_limit @myshixun.shixun))}
       res = uri_post uri, params
       if res && res['code'].to_i != 0

app/controllers/shixuns_controller.rb

@@ -18,16 +18,16 @@ class ShixunsController < ApplicationController
 	before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy,
 																				:add_file, :jupyter_exec]
 
-	before_action :allowed, only:  [:update, :close, :update_propaedeutics, :settings, :publish,
+	before_action :allowed, only:  [:update, :close, :update_propaedeutics, :settings, :publish, :apply_public,
 																  :shixun_members_added, :change_manager, :collaborators_delete,
-																	:cancel_publish, :add_collaborators, :add_file]
+																	:cancel_apply_public, :cancel_publish, :add_collaborators, :add_file]
 	before_action :portion_allowed, only: [:copy]
 
 	before_action :special_allowed, only: [:send_to_course, :search_user_courses]
 
 	## 获取课程列表
   def index
-		@shixuns = current_laboratory.shixuns.unhidden
+		@shixuns = current_laboratory.shixuns.unhidden.publiced
 
 		## 方向
 		if params[:tag_level].present? && params[:tag_id].present?
@@ -365,12 +365,7 @@ class ShixunsController < ApplicationController
 	end
 
 	def create
-		begin
 		@shixun = CreateShixunService.call(current_user, shixun_params, params)
-		rescue => e
-			logger_error("shixun_create_error: #{e.message}")
-			tip_exception("创建实训失败！")
-		end
 	end
 
 	# 保存jupyter到版本库
@@ -730,6 +725,7 @@ class ShixunsController < ApplicationController
 		@status = 0
 		@position = []
 		begin
+			unless @shixun.is_jupyter?
 				if @shixun.challenges.count == 0
 					@status = 4
 				else
@@ -748,24 +744,27 @@ class ShixunsController < ApplicationController
 						end
 					end
 				end
+			end
 			if @status == 0
-				@shixun.update_attributes!(:status => 1)
+				@shixun.update_attributes!(:status => 2)
+			end
+		rescue Exception => e
+			logger.error("pushlish game #{e}")
+		end
+	end
+
+	def apply_public
+		tip_exception(-1, "请先发布实训再申请公开") if @shixun.status != 2
+		ActiveRecord::Base.transaction do
+			@shixun.update_attributes!(public: 1)
 			apply = ApplyAction.where(:container_type => "ApplyShixun", :container_id => @shixun.id).order("created_at desc").first
 			if apply && apply.status == 0
 				@status = 0
 			else
 				ApplyAction.create(:container_type => "ApplyShixun", :container_id => @shixun.id, :user_id => current_user.id, :status => 0)
-					#begin
-					#	status = Trustie::Sms.send(mobile: '18711011226', send_type:'publish_shixun' , name: '管理员')
-					#rescue => e
-					#	Rails.logger.error "发送验证码出错: #{e}"
-					#end
-					@status = 1
 			end
 		end
-		rescue Exception => e
+		normal_status(0, "申请成功")
-			logger.error("pushlish game #{e}")
-		end
 	end
 
 	# 设置私密版本库的在tpm中的目录
@@ -905,14 +904,24 @@ class ShixunsController < ApplicationController
 							:disposition => 'attachment'    #inline can open in browser
 	end
 
-	# 撤销发布
+	# 撤销申请公开
-	def cancel_publish
+	def cancel_apply_public
-		tip_exception("实训已经发布，无法撤销") if @shixun.status == 2
+		tip_exception("实训已经公开，无法撤销") if @shixun.public == 2
+		ActiveRecord::Base.transaction do
 			apply = ApplyAction.where(:container_type => "ApplyShixun", :container_id => @shixun.id).order("created_at desc").first
 			if apply && apply.status == 0
-			apply.update_attribute(:status, 3)
+				apply.update_attributes!(status: 3)
-			apply.tidings.destroy_all
+				apply.tidings&.destroy_all
 			end
+			@shixun.update_column(:public, 0)
+		end
+		normal_status(0, "成功撤销申请")
+	end
+
+	# 撤销发布
+	def cancel_publish
+		tip_exception("请先撤销申请公开，再撤销发布") if @shixun.public == 1
+		tip_exception("实训已经公开，无法撤销") if @shixun.public == 2
 		@shixun.update_column(:status, 0)
 	end
 

app/helpers/shixuns_helper.rb

@@ -27,6 +27,17 @@ module ShixunsHelper
 		end
 	end
 
+	def shixun_public_status shixun
+		case shixun.try(:public)
+		when 0,nil
+			"未公开"
+		when 1
+			"待审核"
+		when 2
+			"已公开"
+		end
+	end
+
 	# 已完成实训所获得的经验值
 	def myshixun_exp myshixun
 		score = 0

app/models/game.rb

@@ -119,6 +119,12 @@ class Game < ApplicationRecord
   #  self.outputs.pluck(:query_index).first
   #end
 
+  # 是否查看了答案(通关的是否在通关前看的答案)
+  def view_answer
+    answer_exists = Grade.exists?("container_type = 'Answer' and container_id = #{id} and created_at < '#{end_time}'")
+    answer_open != 0 ? (status == 2 ? answer_exists : true) : false
+  end
+
   # 用户关卡得分
   def get_user_final_score
 

app/models/laboratory.rb

@@ -38,12 +38,20 @@ class Laboratory < ApplicationRecord
     find_by_identifier(subdomain)
   end
 
-  def self.current=(laboratory)
+  # def self.current=(laboratory)
-    Thread.current[:current_laboratory] = laboratory
+  #   Thread.current[:current_laboratory] = laboratory
+  # end
+  #
+  # def self.current
+  #   Thread.current[:current_laboratory] ||= Laboratory.find(1)
+  # end
+
+  def self.current=(user)
+    RequestStore.store[:current_laboratory] = user
   end
 
   def self.current
-    Thread.current[:current_laboratory] ||= Laboratory.find(1)
+    RequestStore.store[:current_laboratory] ||= User.anonymous
   end
 
   def shixuns

app/models/myshixun.rb

@@ -88,9 +88,10 @@ class Myshixun < ApplicationRecord
     self.games.select{|game| game.status == 2}.size
   end
 
-  # 查看答案的关卡数
+  # 查看答案的关卡数，只统计通关前看的关卡
   def view_answer_count
-    self.games.select{|game| game.status == 2 && game.answer_open != 0}.size
+    answer_ids = user.grades.joins("join games on grades.container_id = games.id").where("container_type = 'Answer' and games.status=2 and games.end_time > grades.created_at").pluck(:container_id)
+    self.games.select{|game| game.status == 2 && game.answer_open != 0 && answer_ids.include?(game.id)}.size
   end
 
   # 通关时间

app/models/shixun.rb

@@ -3,6 +3,7 @@ class Shixun < ApplicationRecord
   attr_accessor :page_no  #管理员页面 实训配置更新状态时，需要接受page_no参数
 
   # status: 0：编辑   1：申请发布   2：正式发布  3：关闭  -1：软删除
+  # public: 0：未公开   1：申请公开   2：公开
   # hide_code： 隐藏代码窗口
   # code_hidden: 隐藏代码目录
   # task_pass: 跳关
@@ -79,6 +80,7 @@ class Shixun < ApplicationRecord
   scope :published_closed, lambda{ where(status: [2, 3]) }
   scope :none_closed, lambda{ where(status: [0, 1, 2]) }
   scope :unhidden, lambda{ where(hidden: 0, status: 2) }
+  scope :publiced, lambda{ where(public: 2) }
   scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) }
   scope :find_by_ids,lambda{|k| where(id:k)}
 

app/models/shixun_info.rb

@@ -1,8 +1,6 @@
 class ShixunInfo < ApplicationRecord
   belongs_to :shixun
   validates_uniqueness_of :shixun_id
-  validates_presence_of :shixun_id, :description
-
   after_commit :create_diff_record
 
   private

app/models/user.rb

@@ -540,12 +540,20 @@ class User < ApplicationRecord
     mail.present?
   end
 
+  # def self.current=(user)
+  #   Thread.current[:current_user] = user
+  # end
+  #
+  # def self.current
+  #   Thread.current[:current_user] ||= User.anonymous
+  # end
+
   def self.current=(user)
-    Thread.current[:current_user] = user
+    RequestStore.store[:current_user] = user
   end
 
   def self.current
-    Thread.current[:current_user] ||= User.anonymous
+    RequestStore.store[:current_user] ||= User.anonymous
   end
 
   def self.anonymous

app/queries/admins/shixun_query.rb

@@ -21,7 +21,17 @@ class Admins::ShixunQuery < ApplicationQuery
           [0,1,2,3]
         end
 
+    public =
+      case params[:public]
+      when "editing" then [0]
+      when "pending" then [1]
+      when "processed" then [2]
+      else
+        [0,1,2]
+      end
+
     all_shixuns = all_shixuns.where(status: status) if status.present?
+    all_shixuns = all_shixuns.where(public: public) if public.present?
 
     if params[:tag].present?
       all_shixuns = all_shixuns.joins(:mirror_repositories).where("mirror_repositories.id = ?",params[:tag].to_i)

app/services/admins/shixun_auths/agree_apply_service.rb

@@ -10,7 +10,7 @@ class Admins::ShixunAuths::AgreeApplyService < ApplicationService
   def call
     ActiveRecord::Base.transaction do
       apply.update!(status: 1, dealer_id: user.id)
-      shixun.update!(status: 2, publish_time: Time.now)
+      shixun.update!(public: 2, publish_time: Time.now)
 
       # 奖励金币、经验
       reward_grade_and_experience!

app/services/admins/shixun_auths/refuse_apply_service.rb

@@ -10,7 +10,7 @@ class Admins::ShixunAuths::RefuseApplyService < ApplicationService
 
   def call
     ActiveRecord::Base.transaction do
-      shixun.update!(status: 0)
+      shixun.update!(public: 0)
       apply.update!(status: 2, reason: reason, dealer_id: user.id)
 
       deal_tiding!

app/services/jupyter_service.rb

@@ -89,7 +89,7 @@ module JupyterService
             raise("获取文件内容失败：#{response.status}")
         end
 
-        content = response.body
+        content = response.body.force_encoding('utf-8')
         
         c = GitService.update_file(repo_path: shixun.repo_path,
             file_path: "01.ipynb",
@@ -117,7 +117,7 @@ module JupyterService
             raise("获取文件内容失败：#{response.status}")
         end
 
-        content = response.body
+        content = response.body.force_encoding('utf-8')
         
         c = GitService.update_file(repo_path: myshixun.repo_path,
             file_path: "01.ipynb",

app/services/search_service.rb

@@ -30,7 +30,6 @@ class SearchService < ApplicationService
     model_options = {
       includes: modal_name.searchable_includes
     }
-    model_options.deep_merge!(where: { status: 2 }) if modal_name == Shixun
     model_options.deep_merge!(extra_options)
 
     model_options.deep_merge!(default_options)
@@ -40,7 +39,7 @@ class SearchService < ApplicationService
   def extra_options
     case params[:type].to_s.strip
     when 'shixun' then
-      { where: { id: Laboratory.current.shixuns.pluck(:id) } }
+      { where: { id: Laboratory.current.shixuns.where(public: 2, status: 2, fork_from: nil).or(Laboratory.current.shixuns.where(status: 2, id: User.current.shixuns)).pluck(:id) } }
     when 'subject' then
       { where: { id: Laboratory.current.subjects.pluck(:id) } }
     when 'course' then

app/services/shixun_search_service.rb

@@ -25,7 +25,7 @@ class ShixunSearchService < ApplicationService
       else
         none_shixun_ids = ShixunSchool.where("school_id != #{User.current.school_id}").pluck(:shixun_id)
 
-        @shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0)
+        @shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0, status: 2, public: 2).or(@shixuns.where(id: current_user.shixuns))
       end
     end
 

app/services/shixuns/create_shixun_service.rb

@@ -14,6 +14,7 @@ class CreateShixunService < ApplicationService
     shixun.user_id = user.id
     main_mirror = MirrorRepository.find params[:main_type]
     sub_mirrors = MirrorRepository.where(id: params[:sub_type])
+    begin
       ActiveRecord::Base.transaction do
         shixun.save!
         # 获取脚本内容
@@ -43,6 +44,10 @@ class CreateShixunService < ApplicationService
         end
         return shixun
       end
+    rescue => e
+      Rails.logger.error("shixun_create_error: #{e.message}")
+      raise("创建实训失败！")
+    end
   end
 
   private

app/views/admins/shixuns/index.html.erb

@@ -4,25 +4,31 @@
 
 <div class="box search-form-container shixuns-list-form">
   <%= form_tag(admins_shixuns_path, method: :get, class: 'form-inline search-form',id:"shixuns-search-form",remote:true) do %>
-    <div class="form-group mr-2">
+    <div class="form-group">
       <label for="status">状态：</label>
       <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %>
       <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
     </div>
 
+    <div class="form-group">
+      <label for="status">公开：</label>
+      <% public_options = [['全部', ''], ["未公开(#{@none_public_shixuns})", "editing"], ["待审核(#{@pending_public_shixuns})", 'pending'], ["已公开(#{@processed_pubic_shixuns})", 'processed']] %>
+      <%= select_tag(:public, options_for_select(public_options), class: 'form-control') %>
+    </div>
+
     <div class="form-group mr-2">
       <label for="tag-choosed">技术平台：</label>
       <%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"tag-choosed") %>
     </div>
 
-    <div class="form-group ml-3">
+    <div class="form-group">
       <label>搜索类型：</label>
       <% auto_trial_options = [['创建者姓名', 0], ['实训名称', 1], ['学校名称', 2]] %>
       <%= select_tag(:search_type, options_for_select(auto_trial_options), class: 'form-control') %>
     </div>
-    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '输入关键字搜索') %>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2', placeholder: '输入关键字搜索') %>
-    <%= submit_tag('搜索', class: 'btn btn-primary ml-3','data-disable-with': '搜索中...') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary','data-disable-with': '搜索中...') %>
-    <%= link_to "清除",admins_shixuns_path,class: "btn btn-default",id:"shixuns-clear-search",'data-disable-with': '清除中...' %>
+    <%= link_to "清除", admins_shixuns_path,class: "btn btn-default",id:"shixuns-clear-search",'data-disable-with': '清除中...' %>
 <% end %>
   <a href="javascript:void(0)" class="btn btn-primary" id="shixuns-export" data-disable-with = '导出中...'>导出</a>
 </div>

app/views/admins/shixuns/shared/_list.html.erb

@@ -2,14 +2,15 @@
   <thead class="thead-light">
   <th width="4%">序号</th>
   <th width="8%">ID</th>
-  <th width="28%" class="text-left">实训名称</th>
+  <th width="24%" class="text-left">实训名称</th>
   <th width="8%">技术平台</th>
   <th width="5%">Fork源</th>
   <th width="5%">实践</th>
   <th width="5%">选择</th>
   <th width="6%">状态</th>
+  <th width="6%">公开</th>
   <th width="7%">创建者</th>
-  <th width="13%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %></th>
+  <th width="11%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %></th>
   <th width="5%">单测</th>
   <th width="6%">操作</th>
   </thead>
@@ -33,6 +34,7 @@
         <td><%= shixun.challenges.where(:st => 0).size %></td>
         <td><%= shixun.challenges.where(:st => 1).size %></td>
         <td class="shixuns-status-<%= shixun.status %>"><%= shixun_authentication_status shixun %></td>
+        <td class="shixuns-status-<%= shixun.public %>"><%= shixun_public_status shixun %></td>
         <td><%= link_to shixun.user.try(:real_name),"/users/#{shixun.user.try(:login)}",target:'_blank' %></td>
         <td><%= format_time shixun.created_at %></td>
         <td class="homepage_teacher">

app/views/hack_user_lastest_codes/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.hack do
-  json.(@hack, :name, :difficult, :time_limit, :description, :score, :identifier)
+  json.(@hack, :name, :difficult, :time_limit, :description, :score, :identifier, :status)
   json.language @hack.language
   json.username @hack.user.real_name
   json.code @my_hack.code

app/views/hacks/index.json.jbuilder

@@ -8,6 +8,6 @@ end
 json.hacks_count @hacks_count
 json.hacks_list do
   json.array! @hacks do |hack|
-    json.(hack,:identifier, :name , :hack_user_lastest_codes_count, :difficult, :passed_rate, :category)
+    json.(hack,:identifier, :name , :hack_user_lastest_codes_count, :difficult, :passed_rate, :category, :open_or_not, :status)
   end
 end

app/views/shixuns/_top.json.jbuilder

@@ -17,3 +17,5 @@ json.score_info     shixun.shixun_preference_info # todo: 这块可以改成只
 json.is_jupyter     shixun.is_jupyter
 # 用于是否显示导航栏中的'背景知识'
 json.propaedeutics  shixun.propaedeutics.present?
+
+json.public shixun.public

app/views/student_works/shixun_work_report.json.jbuilder

@@ -42,7 +42,7 @@ if @shixun
       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
-      json.view_answer game ? game.answer_open != 0 : 0
+      json.view_answer game ? game.view_answer : false
     end
   end
 

config/routes.rb

@@ -55,6 +55,7 @@ Rails.application.routes.draw do
       end
       member do
         post :publish
+        post :cancel_publish
         get :start
         post :update_set
         delete :delete_set
@@ -273,7 +274,9 @@ Rails.application.routes.draw do
         post :send_to_course
         delete :collaborators_delete
         get :cancel_publish
+        get :cancel_apply_public
         get :publish
+        get :apply_public
         get :shixun_exec
         post :review_shixun
         get :review_newest_record
@@ -440,6 +443,7 @@ Rails.application.routes.draw do
         get 'statistics'
         post :inform_up
         post :inform_down
+        get :calculate_all_shixun_scores
       end
 
       collection do

db/migrate/20191212025227_add_public_status_to_shixun.rb

@@ -0,0 +1,5 @@
+class AddPublicStatusToShixun < ActiveRecord::Migration[5.2]
+  def change
+    add_column :shixuns, :public, :integer, default: 0
+  end
+end

db/migrate/20191212034354_migrate_shixun_status.rb

@@ -0,0 +1,9 @@
+class MigrateShixunStatus < ActiveRecord::Migration[5.2]
+  def change
+    # 平台上所有已发布且未隐藏的实训都设为公开
+    Shixun.unhidden.update_all(public: 2)
+
+    # 所有已申请发布的实训状态都改为已发布，申请发布改为申请公开
+    Shixun.where(status: 1, id: ApplyAction.where(container_type: 'ApplyShixun', status: 0).pluck(:container_id)).update_all(status: 2, public: 1)
+  end
+end

public/react/config/webpack.config.prod.js

@@ -326,7 +326,7 @@ module.exports = {
 					comments: false
 				},
 				compress: {
-					drop_debugger: true,
+					drop_debugger: false,
 					drop_console: false
 				}
 			}

public/react/src/App.js

@@ -617,7 +617,11 @@ class App extends Component {
 
 								{/* jupyter */}
 								<Route path="/tasks/:identifier/jupyter/"
-									component={JupyterTPI}
+									render={
+										(props) => {
+											return (<JupyterTPI {...this.props} {...props} {...this.state}/>)
+										}
+									}
 								/>
 
 								<Route path="/tasks/:stageId" component={IndexWrapperComponent}/>

public/react/src/AppConfig.js

@@ -35,7 +35,7 @@ if (isDev) {
 // 老师
 // debugType="teacher";
 // 学生
-//debugType="student";
+// debugType="student";
 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
@@ -52,7 +52,7 @@ export function initAxiosInterceptors(props) {
 			//proxy="http://47.96.87.25:48080"
 			proxy="https://pre-newweb.educoder.net"
       proxy="https://test-newweb.educoder.net"
-            proxy="https://test-jupyterweb.educoder.net/"
+      proxy="https://test-jupyterweb.educoder.net"
 	     //proxy="http://192.168.2.63:3001"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
@@ -109,15 +109,15 @@ export function initAxiosInterceptors(props) {
             }
             //
 					// console.log(config);
-					if (config.method === "post") {
+					// if (config.method === "post") {
-						if (requestMap[config.url] === true) { // 避免重复的请求  导致页面f5刷新 也会被阻止  显示这个方法会影响到定制信息
+					// 	if (requestMap[config.url] === true) { // 避免重复的请求  导致页面f5刷新 也会被阻止  显示这个方法会影响到定制信息
-							// console.log(config);
+					// 		// console.log(config);
-							// console.log(JSON.parse(config));
+					// 		// console.log(JSON.parse(config));
-							// console.log(config.url);
+					// 		// console.log(config.url);
-							// console.log("被阻止了是重复请求=================================");
+					// 		// console.log("被阻止了是重复请求=================================");
-							return false;
+					// 		return false;
-						}
+					// 	}
-					}
+					// }
             // 非file_update请求
             if (config.url.indexOf('update_file') === -1) {
                 requestMap[config.url] = true;

public/react/src/common/components/MyIcon.js

@@ -4,12 +4,12 @@
  * @Github: 
  * @Date: 2019-12-10 09:03:48
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-10 09:05:41
+ * @LastEditTime: 2019-12-12 10:53:47
  */
 import { Icon } from 'antd';
 
 const MyIcon = Icon.createFromIconfontCN({
-  scriptUrl: '//at.alicdn.com/t/font_1535266_ss6796i6f6j.js'
+  scriptUrl: '//at.alicdn.com/t/font_1535266_i4ilpm93kp.js'
 });
 
 export default MyIcon;

public/react/src/modules/courses/coursesPublic/NewShixunModel.js

@@ -19,7 +19,8 @@ class NewShixunModel extends Component{
 			order:'desc',
 			diff:0,
 			limit:15,
-			sort:"myshixuns_count"
+			sort:"myshixuns_count",
+			belongtoindex:0,
 		}
 	}
 	componentDidMount() {
@@ -161,7 +162,17 @@ class NewShixunModel extends Component{
 		})
 		let{status,order,diff,limit,sort}=this.state;
 		if(this.props.type==='shixuns'){
-			this.getdatalist(1,value,status,undefined,order,diff,limit)
+			this.getdatalist(1,value,status,undefined,order,diff,limit);
+			if(value==="all"){
+				this.setState({
+					belongtoindex:0
+				})
+			}else{
+				this.setState({
+					belongtoindex:1
+				})
+			}
+
 		}else{
 			this.getdatalist(1,value,undefined,undefined,order,undefined,limit,undefined,sort)
 		}
@@ -322,6 +333,7 @@ class NewShixunModel extends Component{
 		this.getdatalist(page,type,status,keyword,order,diff,limit)
 	}
 
+
 	updatepathlist=(sorts,orders)=>{
 		let{page,type,keyword,order,diff,limit,status,sort}=this.state;
 		let seartorders;
@@ -352,7 +364,7 @@ class NewShixunModel extends Component{
 	}
 	render() {
 
-	  let {diff,Grouplist,status,shixun_list,shixuns_count,page,type,order,sort}=this.state;
+	  let {diff,Grouplist,status,shixun_list,shixuns_count,page,type,order,sort,belongtoindex}=this.state;
 		// let {visible,patheditarry}=this.props;
     //   console.log(Grouplist)
 		// 	console.log(allGrouplist)
@@ -446,7 +458,7 @@ class NewShixunModel extends Component{
 					<Spin spinning={this.state.isspinning}>
 					<div className={"clearfix educontent pr mb60shixun"}>
 
-						<div className={"square-list clearfix"}>
+						<div className={"square-list clearfix verticallayout"}>
 
 							<div className="newshixunheadersear">
 								<div style={{height:"53px"}}></div>
@@ -472,7 +484,36 @@ class NewShixunModel extends Component{
 									onSearch={ (value)=>this.setdatafuns(value)} />
 							</div>
 
-							 <div className="clearfix font-12 mt30">
+
+
+
+
+
+
+							{this.props.type==='shixuns'?
+								<div className="clearfix sortinxdirection mt30 intermediatecenterysls">
+									<p className="nandu">筛选：</p>
+									<p className={belongtoindex===0?"clickbutstwo ml13":"clickbutstwos ml13"} onClick={()=>this.belongto("all")}>全部实训</p>
+									<p className={belongtoindex===1?"clickbutstwo ml20":"clickbutstwos ml20"} onClick={()=>this.belongto("mine")}>我的实训</p>
+								</div>:""
+							}
+							{/*{this.props.type==='shixuns'? <Dropdown overlay={menus}>*/}
+							{/* <a className="ant-dropdown-link  color-grey-6">*/}
+							{/*	 {diff===0?"难度":diff===1?"初级":diff===2?"中级":diff===3?"高级":diff===4?"顶级":""}<Icon type="down" className={"color-grey-6"}/>*/}
+							{/* </a>*/}
+							{/*</Dropdown>:""}*/}
+							{this.props.type==='shixuns'?
+								<div className="clearfix sortinxdirection mt20 intermediatecenterysls">
+									<p className="nandu">难度：</p>
+									<p className={diff===0?"clickbuts ml13":"clickbutst ml13"} onClick={()=>this.DropdownClick(0)}>全部</p>
+									<p className={diff===1?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(1)}>初级</p>
+									<p className={diff===2?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(2)}>中级</p>
+									<p className={diff===3?"clickbuts ml30":"clickbutst ml30"}  onClick={()=>this.DropdownClick(3)}>高级</p>
+									<p className={diff===4?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(4)}>顶级</p>
+								</div>:""
+							}
+
+							 <div className={this.props.type==='shixuns'?"clearfix font-12 mt20":"clearfix font-12 mt30"}>
 
 								<div className="font-12 ml5 fl">
 
@@ -509,17 +550,18 @@ class NewShixunModel extends Component{
 										</a>
 									</Dropdown>:"":""}
 
-									{this.props.type==='shixuns'? <Dropdown overlay={menus}>
+
-										<a className="ant-dropdown-link  color-grey-6">
-											{diff===0?"难度":diff===1?"初级":diff===2?"中级":diff===3?"高级":diff===4?"顶级":""}<Icon type="down" className={"color-grey-6"}/>
-										</a>
-									</Dropdown>:""}
 								</div>
 
-								<div className="font-12 alltopiscright ml25 fr">
+								<div className="font-12 alltopiscright ml25 fl">
-									{/*<span className={"fr pointer color-grey-3"}  onClick={()=>this.props.hideNewShixunModelType()}>返回</span>*/}
+
-									<span className={type==="mine"?"fr topcsactive pointer color-grey-3 color-blue":"fr pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的{this.props.type==='shixuns'?'实训':"课程"}</span>
+									{this.props.type==='shixuns'?"":
-									<span className={type==="all"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"}  onClick={()=>this.belongto("all")}>全部{this.props.type==='shixuns'?'实训':"课程"}</span>
+										<span className={type==="mine"?"fr topcsactive pointer color-grey-3 color-blue":"fr pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的课程</span>
+									}
+
+									{this.props.type==='shixuns'?"":
+										<span className={type==="all"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"}  onClick={()=>this.belongto("all")}>全部课程</span>
+									}
 								</div>
 
 							</div>
@@ -539,11 +581,17 @@ class NewShixunModel extends Component{
 													className="fl task-hide edu-txt-left mt3"
 													name="shixun_homework[]"
 												></Checkbox>
+
+												<a target="_blank" href={this.props.type==='shixuns'?`/shixuns/${item.identifier}/challenges`:`/paths/${item.id}`} className="ml15 fl font-16  color-dark maxwidth1100"
+													 dangerouslySetInnerHTML={{__html: item.title}}
+												>
+												</a>
+
 												{
 													this.props.type==='shixuns'?
 														(
 															item.is_jupyter===true?
-																<div className="myysljupyter fl ml15 mt3 intermediatecenter">
+																<div className="myysljupyter fl ml20 mt3 intermediatecenter">
 																	<p className="myysljupytertest">
 																		Jupyter
 																	</p>
@@ -553,12 +601,6 @@ class NewShixunModel extends Component{
 														:""
 												}
 
-
-												<a target="_blank" href={this.props.type==='shixuns'?`/shixuns/${item.identifier}/challenges`:`/paths/${item.id}`} className="ml15 fl font-16  color-dark maxwidth1100"
-													 dangerouslySetInnerHTML={{__html: item.title}}
-												>
-												</a>
-
 												<div className="cl"></div>
 												<style>
 													{

public/react/src/modules/courses/coursesPublic/Newshixunmodel.css

@@ -386,16 +386,19 @@
     margin: 0 auto;
 }
 .myysljupyter{
-    width:48px;
+    width:54px;
-    height:22px;
+    height:24px;
-    background:#FF6802;
+    text-align: center;
-    border-radius:2px 10px 10px 2px;
+    border-radius:5px;
+    border:1px solid #FF6802;
+    margin-top: 4px;
 }
 .myysljupytertest{
-    width:39px;
+    width:54px;
     height:16px;
+    line-height:16px;
     font-size:12px;
-    color:#FFFFFF;
+    color:#FF6802;
     line-height:16px;
 }
 .intermediatecenter{
@@ -404,3 +407,110 @@
      align-items: center;
      justify-content: center;
  }
+
+
+/* 中间居中 */
+.intermediatecenter{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+/* 简单居中 */
+.intermediatecenterysls{
+    display: flex;
+    align-items: center;
+}
+.spacearound{
+    display: flex;
+    justify-content: space-around;
+
+}
+.spacebetween{
+    display: flex;
+    justify-content: space-between;
+}
+/* 头顶部居中 */
+.topcenter{
+    display: -webkit-flex;
+    flex-direction: column;
+    align-items: center;
+
+}
+
+
+/* x轴正方向排序 */
+/* 一 二 三 四 五 六 七 八 */
+.sortinxdirection{
+    display: flex;
+    flex-direction:row;
+}
+/* x轴反方向排序 */
+/* 八    七   六  五   四  三  二 一 */
+.xaxisreverseorder{
+    display: flex;
+    flex-direction:row-reverse;
+}
+/* 垂直布局 正方向*/
+/* 一
+ 二
+ 三
+ 四
+ 五
+ 六
+ 七
+ 八 */
+.verticallayout{
+    display: flex;
+    flex-direction:column;
+}
+/* 垂直布局 反方向*/
+.reversedirection{
+    display: flex;
+    flex-direction:column-reverse;
+}
+
+.nandu{
+    width: 42px;
+    height: 19px;
+    font-size: 14px;
+    color: #000000;
+    line-height: 19px;
+    margin-left: 6px;
+}
+
+.clickbuts{
+    text-align: center;
+    width: 60px;
+    height: 32px;
+    background: #4CACFF;
+    border-radius: 16px;
+    line-height: 30px;
+    color: #FFFFFF;
+    cursor:pointer;
+}
+.clickbutst{
+    height:19px;
+    font-size:14px;
+    color:#505050;
+    line-height:19px;
+    cursor:pointer;
+}
+
+.clickbutstwo{
+    text-align: center;
+    width: 85px;
+    height: 32px;
+    background: #4CACFF;
+    border-radius: 16px;
+    line-height: 30px;
+    color: #FFFFFF;
+    cursor:pointer;
+}
+.clickbutstwos{
+    height:19px;
+    font-size:14px;
+    color:#505050;
+    line-height:19px;
+    cursor:pointer;
+}

public/react/src/modules/modals/Bottomsubmit.js

@@ -1,16 +1,18 @@
 import React, {Component} from 'react';
+import {
+  Button,
+} from 'antd';
 
 class Bottomsubmit extends Component {
   constructor(props) {
     super(props)
 
-    this.state = {
+    this.state = {}
-
-    }
   }
 
-  cannelfun=()=>{
+  cannelfun = () => {
-    window.location.href=this.props.url
+    // window.location.href=
+    this.props.history.replace(this.props.url);
   }
 
 
@@ -29,8 +31,11 @@ class Bottomsubmit extends Component {
         </style>
         <div className="clearfix bor-bottom-greyE edu-back-white orderingbox newshixunbottombtn">
           <div className=" edu-txt-center padding13-30">
-            <button type="button" className="ant-btn mr20 newshixunmode backgroundFFF" onClick={()=>this.cannelfun()}><span>取 消</span></button>
+            <button type="button" className="ant-btn mr20 newshixunmode backgroundFFF" onClick={() => this.cannelfun()}>
-            <button type="button" className="ant-btn newshixunmode mr40 ant-btn-primary" type="primary" htmlType="submit" onClick={()=>this.props.onSubmits()}><span>确 定</span></button>
+              <span>取 消</span></button>
+            <Button type="button" className="ant-btn newshixunmode mr40 ant-btn-primary" type="primary"
+                    htmlType="submit" onClick={() => this.props.onSubmits()}
+                    loading={this.props.loadings}><span>{this.props.bottomvalue===undefined?"确 定":this.props.bottomvalue}</span></Button>
           </div>
         </div>
       </div>
@@ -40,7 +45,6 @@ class Bottomsubmit extends Component {
 }
 
 
-
 export default Bottomsubmit;
 
 

public/react/src/modules/modals/Modals.js

@@ -28,6 +28,9 @@ render() {
 						 	`
 						 	body{
 						 	     overflow: hidden !important;
+						 	 }
+						 	 .ant-modal-body {
+                    padding: 20px 40px;
                 }
 						 	`
 						 }

public/react/src/modules/tpm/TPMBanner.js

@@ -1,14 +1,10 @@
 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 {Rating, Progress} from "@icedesign/base";
 
-import {Modal, Input, Radio, Pagination, message, Spin, Icon, Tooltip, Rate} from 'antd';
+import {Modal, Input, Radio, Pagination, message, Spin, Icon, Tooltip, Button,Popover} from 'antd';
 
 import AccountProfile from "../user/AccountProfile";
 
@@ -298,7 +294,10 @@ class TPMBanner extends Component {
 
   ModalCancel = () => {
     this.setState({
-      Modalstype: false
+      Modalstype: false,
+      Modalstopval: "",
+      modalsMidval:undefined,
+      ModalsBottomval:"",
     })
   }
   ModalSave = () => {
@@ -311,16 +310,53 @@ class TPMBanner extends Component {
       console.log(error)
     });
   }
+
   cancel_publish = () => {
     this.setState({
       Modalstype: true,
       Modalstopval: "是否确认撤销发布？",
+      modalsMidval:"撤销发布后，学员将无法进行练习，若您新增关",
+      ModalsBottomval:"卡，学员需要重新体验课程",
       ModalCancel: this.ModalCancel,
       ModalSave: this.ModalSave,
     })
   }
 
+  openpublic=()=>{
+    let id = this.props.match.params.shixunId;
+    let url = `/shixuns/${id}/apply_public.json`;
+    axios.get(url).then((response) => {
+     if(response.data.status===0){
+       window.location.reload()
+     }
+    }).catch((error) => {
+      console.log(error)
+    });
+  }
 
+  ModalhidenpublicSave=()=>{
+    let id = this.props.match.params.shixunId;
+    let url = `/shixuns/${id}/cancel_apply_public.json`;
+    axios.get(url).then((response) => {
+      if(response.data.status===0){
+         window.location.reload()
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+  }
+
+  hidenpublic=()=>{
+    this.setState({
+      Modalstype: true,
+      Modalstopval: "是否确认撤销公开？",
+      modalsMidval:" ",
+      ModalsBottomval:" ",
+      ModalCancel: this.ModalCancel,
+      ModalSave: this.ModalhidenpublicSave,
+    })
+
+  }
   /*
   * 申请发布按钮
   * */
@@ -334,12 +370,17 @@ class TPMBanner extends Component {
       } else {
         evaluation_set_position = response.data.evaluation_set_position
       }
+      if(response.data.status===0){
+        window.location.reload()
+      }else{
         this.setState({
           Issuevisible: true,
           tag_position: response.data.tag_position,
           evaluation_set_position: evaluation_set_position,
           publishboxstatus: response.data.status,
         })
+      }
+
     }).catch((error) => {
       console.log(error)
     });
@@ -448,7 +489,7 @@ class TPMBanner extends Component {
             })
             // this.shixunexec(response.data.message+".json")
           } else if (response.data.status === -1) {
-            console.log(response)
+
           } else if (response.data.status === -3) {
             this.setState({
               shixunsmessage: response.data.message,
@@ -520,7 +561,7 @@ class TPMBanner extends Component {
             })
             // this.shixunexec(response.data.message+".json")
           } else if (response.data.status === -1) {
-            console.log(response)
+
           } else if (response.data.status === -3) {
             this.setState({
               shixunsmessage: response.data.message,
@@ -699,6 +740,7 @@ class TPMBanner extends Component {
               modalCancel={this.state.ModalCancel}
               modalSave={this.state.ModalSave}
               modalsBottomval={this.state.ModalsBottomval}
+              modalsMidval={this.state.modalsMidval}
               loadtype={this.state.Loadtype}
             /> : ""}
 
@@ -748,7 +790,8 @@ class TPMBanner extends Component {
 
                   </li>
                 </ul>
-
+								{
+									this.props.is_jupyter===false?
 										<div className="pr fl" id="commentsStar" onMouseOver={() => this.showonMouseOver()}
 												 onMouseOut={() => this.hideonMouseOut()}>
 											<div className={"color-grey-c  ml15"} style={{color: "#Fff", textAlign: "center"}}>学员评分</div>
@@ -824,6 +867,9 @@ class TPMBanner extends Component {
 											</div>
 
 										</div>
+										:""
+								}
+
 
                 {
                   startbtn === false && shixunsDetails.shixun_status != -1 ?
@@ -903,8 +949,22 @@ class TPMBanner extends Component {
                 {/*}*/}
 
                 {shixunsDetails.shixun_status === 0 && this.props.identity < 5 ?
+                  <Popover
+                    content={
+                       <pre className={"pd20"}>
+                          <div>您编辑完成后，可以马上使用到自</div>
+                          <div className={"wechatcenter mt10"}>己的课堂和实训课程哦</div>
+                          <div className={"wechatcenter mt15"}>   <Button  type="primary" >我知道了</Button></div>
+                       </pre>
+                    }
+                    trigger="click"
+                    placement="bottom"
+                    visible={false}
+                    onVisibleChange={this.handleVisibleChange}
+                  >
                     <a onClick={this.applyrelease} className="fr user_default_btn user_blue_btn mr20 font-18 height39"
-                     id="challenge_begin">申请发布</a> : ""
+                       id="challenge_begin">发布</a>
+                  </Popover>: ""
                 }
 
                 <Modal
@@ -967,7 +1027,19 @@ class TPMBanner extends Component {
 
                 </Modal>
 
-                {shixunsDetails.shixun_status === 1 && this.props.identity < 5 ?
+                {shixunsDetails.shixun_status === 2 && shixunsDetails.public===0 && this.props.identity < 5 ?
+                  <Button type="primary" ghost id="challenge_begin" onClick={this.openpublic} className="fr user_default_btn user_blue_btn mr20 font-18 height39">
+                  申请公开
+                  </Button>: ""
+                }
+
+                {shixunsDetails.shixun_status === 2 && shixunsDetails.public===1 && this.props.identity < 5 ?
+                  <Button type="primary" ghost id="challenge_begin" onClick={this.hidenpublic} className="fr user_default_btn user_blue_btn mr20 font-18 height39">
+                    撤销公开
+                  </Button>: ""
+                }
+
+                {shixunsDetails.shixun_status === 2 && shixunsDetails.public===0 && this.props.identity < 5 ?
                   <a onClick={this.cancel_publish} className="fr user_default_btn user_blue_btn mr20 font-18 height39"
                      id="challenge_begin">撤销发布</a> : ""
                 }

public/react/src/modules/tpm/TPMDataset.js

@@ -7,7 +7,7 @@ import TPMRightSection from './component/TPMRightSection';
 import TPMNav from './component/TPMNav';
 import axios from 'axios';
 import './tpmmodel/tpmmodel.css'
-import {getUploadActionUrl} from 'educoder';
+import {getUploadActionUrl,appendFileSizeToUploadFileAll} from 'educoder';
 import moment from 'moment';
 
 const confirm = Modal.confirm;
@@ -16,13 +16,12 @@ class TPMDataset extends Component {
 	constructor(props) {
 		super(props)
 		this.state = {
-			datas: [0, 1, 2, 3, 4, 5],
 			value: undefined,
 			columns: [
 				{
 					title: '文件',
-					dataIndex: 'number',
+					dataIndex: 'title',
-					key: 'number',
+					key: 'title',
 					align: 'left',
 					className: " font-14 wenjiantit",
 					width: '220px',
@@ -34,8 +33,8 @@ class TPMDataset extends Component {
 				},
 				{
 					title: '最后修改时间',
-					dataIndex: 'number',
+					dataIndex: 'timedata',
-					key: 'number',
+					key: 'timedata',
 					align: 'center',
 					className: "edu-txt-center font-14 zuihoushijian",
 					width: '150px',
@@ -47,8 +46,8 @@ class TPMDataset extends Component {
 				},
 				{
 					title: '最后修改人',
-					dataIndex: 'number',
+					dataIndex: 'author',
-					key: 'number',
+					key: 'author',
 					align: 'center',
 					className: "edu-txt-center font-14 ",
 					render: (text, record) => (
@@ -59,8 +58,8 @@ class TPMDataset extends Component {
 				},
 				{
 					title: '文件大小',
-					dataIndex: 'number',
+					dataIndex: 'filesize',
-					key: 'number',
+					key: 'filesize',
 					align: 'center',
 					className: "edu-txt-center font-14 ",
 					render: (text, record) => (
@@ -76,14 +75,20 @@ class TPMDataset extends Component {
 			mylistansum:30,
 			collaboratorList:[],
 			fileList:[],
+			fileListimg:[],
 			file:null,
 			datalist:[],
 			data_sets_count:0,
 			selectedRowKeysdata:[],
+			loadingstate:false,
+			checked: false,
 		}
 	}
 
 	componentDidMount() {
+		this.setState({
+			loadingstate:true,
+		})
 		this.getdatas()
 
 	}
@@ -98,18 +103,20 @@ class TPMDataset extends Component {
 				datas.push(i);
 
 			}
-
 			this.setState({
 				selectedRowKeysdata:mydata,
 				selectedRowKeys: datas,
+				checked:true,
 			})
 		  // console.log(mydata);
 			// console.log(datas);
-
-
 		} else {
 			this.setState({
+				selectedRowKeysdata:[],
 				selectedRowKeys: [],
+				checked:false,
+
+
 			})
 		}
 	}
@@ -143,11 +150,26 @@ class TPMDataset extends Component {
 						collaboratorList: response.data,
 						data_sets_count:response.data.data_sets_count,
 						datalist:datalists,
+						selectedRowKeysdata:[],
+						selectedRowKeys: [],
+						checked:false,
 					});
+
 				}
 
 			}
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
+
 		}).catch((error)=>{
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
 			console.log(error)
 		});
 
@@ -181,34 +203,39 @@ class TPMDataset extends Component {
 						collaboratorList: response.data,
 						data_sets_count:response.data.data_sets_count,
 						datalist:datalists,
+						selectedRowKeysdata:[],
+						selectedRowKeys: [],
+						checked:false,
 					});
 				}
 
 			}
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
 		}).catch((error)=>{
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
 			console.log(error)
 		});
 
 	}
 
-	showModal = (id, status) => {
-
-	};
-
-	handleOk = (id, editid) => {
-
-	};
-
-	handleCancel = (e) => {
-
-	};
 	paginationonChanges = (pageNumber) => {
 		// //console.log('Page: ');
 		this.setState({
 			page: pageNumber,
+			loadingstate:true,
 		})
+
 		this.getdatastwo(pageNumber,10);
 	}
+
 	onSelectChange = (selectedRowKeys, selectedRows) => {
 		console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
 		this.setState(
@@ -234,40 +261,34 @@ class TPMDataset extends Component {
 		if (index % 2 === 1) className = 'dark-row';
 		return className;
 	}
-
-	// 附件相关 START
 	handleChange = (info) => {
-		if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+		if(info.file.status == "done" || info.file.status == "uploading" || info.file.status === 'removed'){
-			let {fileList} = this.state;
+			let fileList = info.fileList;
-
+			// try {
-			if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+			// 	for(var list of fileList ){
-				console.log("handleChange1fileLists");
+			// 		console.log(list)
-				// if(fileList.length===0){
+			// 		this.state.fileListimg.push(list);
-				let fileLists = info.fileList;
+			// 	}
-				console.log(fileLists);
+			// }catch (e) {
+			//
+			// }
 			this.setState({
-					// fileList:appendFileSizeToUploadFileAll(fileList),
+				fileList: appendFileSizeToUploadFileAll(fileList),
-					fileList: fileLists,
+
-					deleteisnot: false
 			});
-			}
+
 						 if(info.file.status === 'done'){
-				//done 成功就会调用这个方法
+							 this.setState({
+								 fileListimg:this.state.fileListimg,
+							 })
 							 this.getdatas();
-				// this.props.showNotification(`上传文件成功`);
-
-			}else if(info.file.status === 'removed'){
-				// this.props.showNotification(`上传文件失败`);
-
-			}else if(info.file.status === 'uploading'){
-				// this.props.showNotification(`正在上传文件中`);
-
 						 }
 		}
 	}
 
+
 	onAttachmentRemove = (file) => {
-		debugger
+		// debugger
 		if(!file.percent || file.percent == 100){
 			confirm({
 				title: '确定要删除这个附件吗?',
@@ -288,18 +309,32 @@ class TPMDataset extends Component {
 	}
 
   deleteRemovedata(){
-		debugger
+
-		console.log("删除");
+    if(this.state.selectedRowKeysdata===undefined || this.state.selectedRowKeysdata===null ||this.state.selectedRowKeysdata.length===0){
-		console.log(this.state.selectedRowKeysdata);
+
+			this.props.showNotification(`请选择要删除的文件`);
+
+			return
+		}
+
+		confirm({
+			title: '确定要删除文件吗?',
+			okText: '确定',
+			cancelText: '取消',
+			// content: 'Some descriptions',
+			onOk: () => {
 				const url = `/attachments/destroy_files.json`;
-		axios.delete(url, {
+				axios.delete(url,
+					{ params: {
 							id:this.state.selectedRowKeysdata,
-			})
+						}}
+					)
 					.then((response) => {
 						if (response.data) {
 							const { status } = response.data;
 							if (status == 0) {
 								this.props.showNotification(`删除成功`);
+
 								this.getdatas()
 							}
 						}
@@ -307,9 +342,15 @@ class TPMDataset extends Component {
 					.catch(function (error) {
 						console.log(error);
 					});
+			},
+			onCancel() {
+				console.log('Cancel');
+			},
+		});
+
 	}
 	deleteAttachment = (file) => {
-		console.log(file);
+		// console.log(file);
 		let id=file.response ==undefined ? file.id : file.response.id
 		const url = `/attachements/destroy_files.json`
 		axios.delete(url, {
@@ -343,7 +384,7 @@ class TPMDataset extends Component {
 
 	render() {
 		const {tpmLoading, shixun, user, match} = this.props;
-		const {columns, datas, page, limit, selectedRowKeys,mylistansum,fileList,datalist,data_sets_count} = this.state;
+		const {columns, page, limit, selectedRowKeys,mylistansum,fileList,datalist,data_sets_count,loadingstate,fileListimg} = this.state;
 		const rowSelection = {
 			selectedRowKeys,
 			onChange: this.onSelectChange,
@@ -366,41 +407,22 @@ class TPMDataset extends Component {
 			// showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
 			// showUploadList: false,
 			action: `${getUploadActionUrl()}`,
+			showUploadList:false,
 			onChange: this.handleChange,
 			onRemove: this.onAttachmentRemove,
-			beforeUpload: (file, fileList) => {
+			beforeUpload: (file) => {
-
+				//上传前的操作
-				if (this.state.fileList.length >= 1) {
+				console.log('beforeUpload', file.name);
-					return false
+				console.log("TPMDatasetTPMDatasetTPMDataset");
-				}
+				console.log(fileListimg);
-				// console.log('beforeUpload', file.name);
+				const isLt150M = file.size / 1024 / 1024 < 150;
-				const isLt150M = file.size / 1024 / 1024 < 50;
 				if (!isLt150M) {
-					// this.props.showNotification(`文件大小必须小于50MB`);
+					this.props.showNotification('文件大小必须小于150MB!');
-					notification.open(
-						{
-							message: '提示',
-							description:
-								'文件大小必须小于50MB',
-
-						}
-					)
-				}
-				if(this.state.file !== undefined){
-					console.log("763")
-					this.setState({
-						file:file
-					})
-				}else {
-					this.setState({
-						file:file
-					})
 				}
-
-				console.log("handleChange2");
 				return isLt150M;
 			},
-		}
+		};
+
 		return (
 			<React.Fragment>
 				<div className="tpmComment educontent clearfix mt30 mb80">
@@ -417,9 +439,11 @@ class TPMDataset extends Component {
 
 						<div className="padding20 edu-back-white mt20 " style={{minHeight: '463px'}}>
 							<div className="sortinxdirection">
+
 										<div className="tpmwidth">
-									<Checkbox onChange={this.mysonChange}>全选</Checkbox>
+											<Checkbox checked={this.state.checked} onChange={this.mysonChange}>全选</Checkbox>
 										</div>
+
 								<div className="tpmwidth xaxisreverseorder">
 									<style>
 										{
@@ -430,7 +454,7 @@ class TPMDataset extends Component {
 											`
 										}
 									</style>
-									<div className="deletebuttom intermediatecenter ">	<Upload {...uploadProps}><p className="deletebuttomtest">
+									<div className="deletebuttom intermediatecenter ">	<Upload {...uploadProps}><p className="deletebuttomtest" type="upload">
 
 										上传文件</p>		</Upload></div>
 									{
@@ -517,6 +541,8 @@ class TPMDataset extends Component {
 											className="mysjysltable4"
 											rowSelection={rowSelection}
 											rowClassName={this.rowClassName}
+											loading={loadingstate}
+
 										/>
 									</div>
 								}

public/react/src/modules/tpm/TPMIndex.js

@@ -20,9 +20,9 @@ import TPMRepositoryComponent from './TPMRepositoryComponent';
 
 import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits';
 
-//import TPMsettings from './TPMsettings/TPMsettings';
+import TPMsettings from './TPMsettings/TPMsettings';
 
-import TPMsettings from './TPMsettings/oldTPMsettings';
+//import TPMsettings from './TPMsettings/oldTPMsettings';
 
 import TPMChallengeComponent from './TPMChallengeContainer';
 import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent';
@@ -153,7 +153,7 @@ class TPMIndex extends Component {
     componentDidMount = () => {
 
         let id = this.props.match.params.shixunId;
-        console.log('props', this.props);
+        // console.log('props', this.props);
         // let collaborators = `/shixuns/` + id + `/propaedeutics.json`;
         //
         // axios.get(collaborators).then((response) => {
@@ -288,6 +288,7 @@ class TPMIndex extends Component {
                     <TPMBanner
                         {...this.props}
                         {...this.state}
+												is_jupyter={this.state. is_jupyter}
                     ></TPMBanner>
                 }
                    {/*筛选*/}

public/react/src/modules/tpm/TPMsettings/Configuration.js

@@ -1,11 +1,15 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
-
-import MonacoEditor from 'react-monaco-editor';
 
 //MonacoDiffEditor  对比模式
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Icon,DatePicker,Breadcrumb,Upload,Button,notification, Tooltip} from 'antd';
+import {
-
+  Badge,
-// import "antd/dist/antd.css";
+  Select,
+  Radio,
+  Checkbox,
+  Modal,
+  DatePicker,
+  Button,
+} from 'antd';
 
 import locale from 'antd/lib/date-picker/locale/zh_CN';
 
@@ -15,12 +19,9 @@ import axios from 'axios';
 
 import './css/TPMsettings.css';
 
-import { getImageUrl, toPath, getUrl ,appendFileSizeToUploadFileAll, getUploadActionUrl} from 'educoder';
 import {handleDateStrings} from "./oldTPMsettings";
 
-let origin = getUrl();
+import Bottomsubmit from "../../modals/Bottomsubmit";
-
-let path = getUrl("/editormd/lib/")
 
 const $ = window.$;
 
@@ -31,7 +32,6 @@ let currentValue;
 const Option = Select.Option;
 
 const RadioGroup = Radio.Group;
-const confirm = Modal.confirm;
 
 function range(start, end) {
   const result = [];
@@ -40,6 +40,7 @@ function range(start, end) {
   }
   return result;
 }
+
 function disabledDateTime() {
   return {
     // disabledHours: () => range(0, 24).splice(4, 20),
@@ -57,81 +58,270 @@ export default class Shixuninformation extends Component {
   constructor(props) {
     super(props)
     this.state = {
+      can_copy: false,
+      use_scope: 0,
+      opening_time: null,
+      opentime: false,
+      oldscope_partment: [],
+      scope_partment: [],
+      loading: false
+    }
+  }
+
+  componentDidMount() {
+    if (this.props.data) {
+      if (this.props.data.shixun) {
+        this.setState({
+          can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
+          use_scope: this.props.data && this.props.data.shixun.use_scope,
+          opening_time: this.props.data && this.props.data.shixun.opening_time,
+          opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+          oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
+        })
+      }
+    }
+    let departmentsUrl = `/shixuns/departments.json`;
+    axios.get(departmentsUrl).then((response) => {
+      if (response.status === 200) {
+        if (response.data.message === undefined) {
+          this.setState({
+            departmentslist: response.data.shools_name
+          });
+        }
+      }
+    }).catch((error) => {
+      console.log(error)
+    });
+  }
+
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.data != this.props.data) {
+      if (this.props.data) {
+        if (this.props.data.shixun) {
+          this.setState({
+            can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
+            use_scope: this.props.data && this.props.data.shixun.use_scope,
+            opening_time: this.props.data && this.props.data.shixun.opening_time,
+            opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+            oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
+          })
+        }
+      }
+    }
+  }
+
+  onChangeTimePicker = (value, dateString) => {
+    this.setState({
+      opening_time: dateString === "" ? "" : handleDateStrings(dateString)
+    })
+  }
+
+  onSubmits = () => {
+    this.setState({
+      loading: true
+    })
+    let {can_copy, use_scope, scope_partment, opening_time} = this.state;
+
+    let id = this.props.match.params.shixunId;
+    let url = `/shixuns/${id}/update_permission_setting.json`;
+    axios.post(url,
+      {
+        scope_partment: scope_partment,
+        shixun: {
+          can_copy: can_copy,
+          use_scope: use_scope,
+          opening_time: opening_time
+        }
+      }
+    ).then((response) => {
+      if (response.data.status === -1) {
 
+      } else {
+        this.props.getdatas("3")
+        this.props.showNotification("权限配置保存成功!")
+        this.setState({
+          loading: false
+        })
       }
+    }).catch((error) => {
+      this.setState({
+        loading: false
+      })
+
+    })
+
+  }
+  CheckboxonChange = (e) => {
+    this.setState({
+      can_copy: e.target.checked
+    })
   }
 
-  onChangeTimePicker =(value, dateString)=> {
+  SelectOpenpublic = (e) => {
     this.setState({
-      opening_time: dateString=== ""?"":moment(handleDateStrings(dateString))
+      use_scope: e.target.value
+    });
+  }
+
+  shixunScopeInput = (e) => {
+    let {scope_partment, oldscope_partment} = this.state;
+    let datalist = scope_partment;
+    if (datalist === undefined) {
+      datalist = []
+    }
+
+    datalist.push(e)
+
+    let scopetype = false;
+
+    scope_partment.map((item, key) => {
+      if (item === e) {
+        scopetype = true
+      }
     })
+
+    oldscope_partment.map((item, key) => {
+      if (item === e) {
+        scopetype = true
+      }
+    })
+
+    if (scopetype === false) {
+      this.setState({
+        scope_partment: datalist
+      });
+    } else {
+      this.props.showNotification("请勿指定相同的单位")
+    }
+
+  }
+
+  shixunsfetch = (value, callback) => {
+    if (timeout) {
+      clearTimeout(timeout);
+      timeout = null;
+    }
+    currentValue = value;
+
+    function fake() {
+      let departmentsUrl = `/shixuns/departments.json?q=` + currentValue;
+      axios.get(departmentsUrl).then((response) => {
+        callback(response.data.shools_name);
+      }).catch((error) => {
+        console.log(error)
+      });
+    }
+
+    timeout = setTimeout(fake, 300);
+  }
+
+  shixunHandleSearch = (value) => {
+    this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
+  }
+
+  deleteScopeInput = (key) => {
+    let {scope_partment} = this.state;
+    let datalist = scope_partment;
+    datalist.splice(key, 1);
+    this.setState({
+      scope_partment: datalist
+    });
   }
 
+  setopentime = (e) => {
+    this.setState({
+      opentime: e.target.checked
+    })
+  }
 
   render() {
-  let {can_copy}=this.state;
-    let options;
 
-    if (this.props.departmentslist != undefined) {
+    let options;
-      options = this.props.departmentslist.map((d, k) => {
+    if (this.state.departmentslist != undefined) {
+      options = this.state.departmentslist.map((d, k) => {
         return (
           <Option key={d} id={k}>{d}</Option>
         )
       })
     }
+
+    const dateFormat = 'YYYY-MM-DD HH:mm';
+
     return (
-      <div className="educontent mb50 edu-back-white padding10-20">
+      <div>
-        <div className="clearfix ml30">
+        <div className="educontent mb200 edu-back-white padding10-20 pdb30 mb50">
-          <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>复制:</span>
+          <div className="clearfix ml40">
-          <span className="fl mt5">
+            <span className="color-grey-6 mt5 fl font-16 ml20" style={{minWidth: '45px'}}>复制:</span>
-            <Checkbox checked={this.props.data&&this.props.data.shixun.can_copy === undefined ? false : this.props.data&&this.props.data.shixun.can_copy} onChange={this.props.data&&this.props.data.shixun.can_copy}></Checkbox>
+            <span className="fl mt8 ml13">
-            <label style={{top:'6px'}} className="color-grey-9 ml10">(勾选则允许已认证的教师复制该实训)</label>
+              <Checkbox
+                checked={this.state.can_copy}
+                onChange={this.CheckboxonChange}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许已职业认证的教师复制该实训）</label>
             </span>
           </div>
 
-        <div className="edu-back-white mb10 padding40-20" style={{display:this.props.identity===1?"block":this.props.data&&this.props.data.shixun.status===2&&this.props.data&&this.props.data.shixun.use_scope===0||this.props.data&&this.props.data.shixun.status===1&&this.props.data&&this.props.data.shixun.use_scope===0?"none":"block"}}>
+          <div className="edu-back-white mb10 ml30 mt20">
-          <p className="color-grey-6 font-16 mb30">公开程度</p>
+            {this.props.data && this.props.data.shixun.use_scope === 0 && this.props.data && this.props.data.shixun.status === 2 ? "" :
-          <RadioGroup onChange={this.SelectOpenpublic} value={this.props.data&&this.props.data.use_scope}>
+              <div>
-            <Radio className="radioStyle" value={0}><span>对所有公开</span> <span  className="color-grey-9">(选中则所有已被试用授权的用户可以学习)</span></Radio>
+                <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>公开程度:</span>
-            <Radio className="radioStyle" value={1}><span>对指定单位公开</span> <span  className="color-grey-9">(选中则下方指定单位的已被试用授权的用户可以学习)</span></Radio>
+                <span className="fl mt8 ml20">
+            <RadioGroup onChange={this.SelectOpenpublic} value={this.state.use_scope}>
+              <Radio className="radioStyle" value={0}><span>对所有单位公开</span> <span
+                className="color-grey-9">（实训发布后，所有用户可见）</span></Radio>
+              <Radio className="radioStyle" value={1}><span>对指定单位公开</span> <span
+                className="color-grey-9">（实训发布后，仅对下方指定单位的用户可见）</span></Radio>
             </RadioGroup>
 
-          <div className="clearfix none" id="unit-all" style={{display: this.props.scopetype === false ? 'none' : 'block'}}>
+            <div className="clearfix" id="unit-all"
+                 style={{display: this.state.use_scope === 0 ? 'none' : 'block'}}>
               <div className="fl ml25">
-              <div className="fl" id="unit-input-part"  style={{width:'100%'}}>
+                <div className="fl" id="unit-input-part" style={{width: '100%'}}>
                   <div id="person-unit" className="fl pr mr10">
-                  <div className="shixunScopeInput fl" >
+                    <div className="shixunScopeInput fl">
                       <Select
-                      style={{width:'200px'}}
+                        style={{width: '200px'}}
                         placeholder="请输入并选择单位名称"
-                      onChange={(value)=>this.shixunScopeInput(value)}
+                        onChange={(value) => this.shixunScopeInput(value)}
                         onSearch={this.shixunHandleSearch}
                         showSearch
+                        value={this.state.scope_partment}
                         defaultActiveFirstOption={false}
                         showArrow={false}
                         filterOption={false}
                         notFoundContent={null}
-                      className={this.props.scope_partmenttype===true?"bor-red":""}
+                        className={this.props.scope_partmenttype === true ? "bor-red" : ""}
                       >
                         {options}
                       </Select>
                     </div>
-                  <span className="color-grey-9">(搜索并选中添加单位名称)</span>
+                    <span className="color-grey-9 openrenyuan">（请通过搜索并选中单位名称进行添加）</span>
                   </div>
                 </div>
 
-              <div style={{width:'100%'}}>
+                <div style={{width: '100%'}}>
                   <div className="mt20 clearfix" id="task_tag_content">
                     {
-                    this.props.scope_partment===undefined?"":this.props.scope_partment.map((item,key)=>{
+                      this.state.oldscope_partment.map((item, key) => {
+                        return (
+                          <li key={key} className={"fl mr20"}>
+                            <Button type="primary" ghost className={"Permanentban "}>
+                              {item}
+                            </Button>
+                          </li>
+                        )
+                      })
+                    }
+                    {
+                      this.state.scope_partment === undefined ? "" : this.state.scope_partment.map((item, key) => {
 
-                      return(
+                        return (
-                        <li className="task_tag_span" key={key}><span>{item}</span>
+                          <li key={key} className={"fl mr20"}>
-                          <a  style={{ color: 'rgba(0,0,0,.25)' }}
+                            <Badge count={"x"} onClick={(key) => this.deleteScopeInput(key)}>
-                              onClick={(key)=>this.deleteScopeInput(key)}
+                              <Button type="primary" ghost className={"Permanentban "}>
-                          >
+                                {item}
-                            {this.props.identity===1?"x":this.state.status===2&&this.props.scope_partment===this.props.scope_partments||this.state.status===1&&this.props.scope_partment===this.props.scope_partments?"":"×"}
+                              </Button>
-                          </a>
+                            </Badge>
                           </li>
                         )
                       })
@@ -140,36 +330,53 @@ export default class Shixuninformation extends Component {
 
                 </div>
 
-              <span className={this.props.scope_partmenttype===true?"color-orange ml20 fl":"color-orange ml20 fl none"} id="public_unit_notice">
+                  <span
+                    className={this.props.scope_partmenttype === true ? "color-orange ml20 fl" : "color-orange ml20 fl none"}
+                    id="public_unit_notice">
                             <i className="fa fa-exclamation-circle mr3"></i>
                         请选择需要公开的单位
                  </span>
+                </div>
+              </div>
 
 
-              <div className="clearfix mt20 ml30">
+            </span>
-                <span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>开启时间:</span>
+              </div>}
-                <span className="fl mt5">
+
+            <div className="clearfix mt20">
+              <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>开启时间:</span>
+              <span className="fl mt8 ml20">
+                <Checkbox
+                  checked={this.state.opentime === undefined ? false : this.state.opentime}
+                  onChange={this.setopentime}></Checkbox>
+                <label style={{top: '6px'}}
+                       className="color-grey-9 ml10">（选中则学员在指定的开启时间后，才能开启学习；不选中则学员在实训发布后，能立即开启学习）</label>
+               <div className={"both"}></div>
+                {this.state.opentime === false ? "" : <div className="mt20 ml25">
                   <DatePicker
                     showToday={false}
-                              showTime={{ format: 'HH:mm' }}
+                    showTime={{format: 'HH:mm'}}
                     format="YYYY-MM-DD HH:mm"
                     width={178}
                     locale={locale}
                     disabledTime={disabledDateTime}
                     disabledDate={disabledDate}
-                              placeholder="请选择开启时间"
+                    placeholder="请输入开启时间"
-                              value={this.props.shixun.opening_time===null||this.props.shixun.opening_time===""?"":moment(this.props.shixun.opening_time, dateFormat)}
+                    value={this.state.opening_time === null || this.state.opening_time === "" ? "" : moment(this.state.opening_time, dateFormat)}
                     onChange={this.onChangeTimePicker}
                     dropdownClassName="hideDisable"
                   />
-															<label style={{top:'6px'}} className="color-grey-9 ml10" >（为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）</label>
+                </div>}
               </span>
+
             </div>
 
 
           </div>
         </div>
-        </div>
+        {this.props.identity < 5 ?
+          <Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${this.props.match.params.shixunId}/challenges`}
+                        onSubmits={this.onSubmits} loadings={this.state.loading} bottomvalue={ this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true?"确 定":"下一步"} /> : ""}
       </div>
     );
   }

public/react/src/modules/tpm/TPMsettings/LearningSettings.js

@@ -1,30 +1,345 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Icon,DatePicker,Breadcrumb,Upload,Button,notification, Tooltip,Tabs} from 'antd';
+import {
+  Radio,
+  Checkbox,
+} from 'antd';
 
 import axios from 'axios';
 
 import './css/TPMsettings.css';
 
-import { getImageUrl, toPath, getUrl ,appendFileSizeToUploadFileAll, getUploadActionUrl} from 'educoder';
+import Bottomsubmit from "../../modals/Bottomsubmit";
 
+const RadioGroup = Radio.Group;
 
 
 export default class Shixuninformation extends Component {
   constructor(props) {
     super(props)
     this.state = {
+      vnc: false,
+      hide_code: false,
+      is_secret_repository: false,
+      code_hidden: false,
+      forbid_copy: false,
+      test_set_permission: true,
+      task_pass: true,
+      websshshow: false,
+      multi_webssh: false,
+      opensshRadio: null,
+      loading: false
+    }
+  }
+
+
+  componentDidMount() {
+    if (this.props.data ) {
+      if (this.props.data.shixun) {
+        this.setState({
+          vnc: this.props.data && this.props.data.shixun.vnc,
+          code_hidden: this.props.data && this.props.data.shixun.code_hidden,
+          forbid_copy: this.props.data && this.props.data.shixun.forbid_copy,
+          hide_code: this.props.data && this.props.data.shixun.hide_code,
+          task_pass: this.props.data && this.props.data.shixun.task_pass,
+          test_set_permission: this.props.data && this.props.data.shixun.test_set_permission,
+          is_secret_repository: this.props.data && this.props.data.shixun.is_secret_repository,
+          websshshow: this.props.data && this.props.data.shixun.webssh === 0 ? false : true,
+          multi_webssh: this.props.data && this.props.data.shixun.multi_webssh,
+          opensshRadio: this.props.data && this.props.data.shixun.webssh === 0 ? null : this.props.data && this.props.data.shixun.webssh,
+        })
 
+        // if(this.props.data && this.props.data.shixun.status===0){
+        //   this.setState({
+        //     task_pass:true
+        //   })
+        // }
+
+      }
     }
+
   }
 
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.data != this.props.data) {
+      if (this.props.data) {
+        if (this.props.data.shixun) {
+          this.setState({
+            vnc: this.props.data && this.props.data.shixun.vnc,
+            code_hidden: this.props.data && this.props.data.shixun.code_hidden,
+            forbid_copy: this.props.data && this.props.data.shixun.forbid_copy,
+            hide_code: this.props.data && this.props.data.shixun.hide_code,
+            task_pass: this.props.data && this.props.data.shixun.task_pass,
+            test_set_permission: this.props.data && this.props.data.shixun.test_set_permission,
+            is_secret_repository: this.props.data && this.props.data.shixun.is_secret_repository,
+            websshshow: this.props.data && this.props.data.shixun.webssh === 0 ? false : true,
+            multi_webssh: this.props.data && this.props.data.shixun.multi_webssh,
+            opensshRadio: this.props.data && this.props.data.shixun.webssh === 0 ? null : this.props.data && this.props.data.shixun.webssh,
+          })
 
+          // if(this.props.data && this.props.data.shixun.status===0){
+          //   this.setState({
+          //     task_pass:true
+          //   })
+          // }
 
-  render() {
+        }
+      }
+    }
+  }
+
+
+  onSubmits = () => {
+    this.setState({
+      loading: true
+    })
+    let id = this.props.match.params.shixunId;
+    let url = `/shixuns/${id}/update_permission_setting.json`;
+    axios.post(url,
+      {
+        shixun: {
+          code_hidden: this.state.code_hidden,
+          forbid_copy: this.state.forbid_copy,
+          hide_code: this.state.hide_code,
+          multi_webssh: this.state.multi_webssh,
+          task_pass: this.state.task_pass,
+          test_set_permission: this.state.test_set_permission,
+          vnc: this.state.vnc,
+          webssh: this.state.websshshow === false ? 0 : this.state.opensshRadio,
+        },
+        is_secret_repository: this.state.is_secret_repository
+      }
+    ).then((response) => {
+      if (response.data.status === -1) {
+
+      } else {
+        this.props.getdatas()
+        this.props.showNotification("学习页面设置保存成功!")
+        this.setState({
+          loading: false
+        })
+      }
+    }).catch((error) => {
+      this.setState({
+        loading: false
+      })
+    })
+  }
+
+  Checkvnc = () => {
+    console.log(this.state.vnc)
+    if (this.state.vnc === false) {
+      this.setState({
+        hide_code: false,
+        is_secret_repository: false,
+        code_hidden: false,
+        forbid_copy: false,
+        multi_webssh: false,
+        websshshow: false,
+      })
+    }
+    this.setState({
+      vnc: !this.state.vnc
+    })
+  }
+
+  Checkhide_code = () => {
+    if (this.state.hide_code === false) {
+      this.setState({
+        is_secret_repository: false
+      })
+    }
+    this.setState({
+      hide_code: !this.state.hide_code
+    })
+  }
+
+  Checkis_secret_repository = () => {
+    this.setState({
+      is_secret_repository: !this.state.is_secret_repository
+    })
+  }
+
+  Checkcode_hidden = () => {
+    this.setState({
+      code_hidden: !this.state.code_hidden
+    })
+  }
+
+  Checkforbid_copy = () => {
+    this.setState({
+      forbid_copy: !this.state.forbid_copy
+    })
+  }
+
+  Checktask_pass = () => {
+    this.setState({
+      task_pass: !this.state.task_pass
+    })
+  }
+
+  Checktest_set_permission = () => {
+    this.setState({
+      test_set_permission: !this.state.test_set_permission
+    })
+  }
+
+  Checkwebsshshow = () => {
+    if (this.state.websshshow === false) {
+      this.setState({
+        vnc: false,
+        opensshRadio: 1
+      })
+    } else {
+      this.setState({
+        multi_webssh: false,
+        opensshRadio: null
+      })
+    }
+    this.setState({
+      websshshow: !this.state.websshshow
+    })
+
+  }
+
+  Checkmulti_webssh = () => {
+    this.setState({
+      multi_webssh: !this.state.multi_webssh
+    })
+  }
+
+  opensshRadio = (e) => {
+    if (e.target.value === 1) {
+      this.setState({
+        multi_webssh: false
+      })
+    } else {
+      this.setState({
+        multi_webssh: true
+      })
+    }
+    this.setState({
+      opensshRadio: e.target.value
+    });
+  }
 
+  render() {
+    // console.log(this.props)
     return (
-      <div className="educontent mb50 edu-back-white padding10-20">
+      <div>
-        1111
+        <div className="educontent mb200 edu-back-white padding10-20 pdb30 mb50">
+
+          {this.state.websshshow === true ? "" : <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>开启图形化界面：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.vnc}
+                onChange={this.Checkvnc}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则给学员的实践任务启动Ubuntu系统的图形化界面）</label>
+            </span>
+          </div>}
+
+          {this.state.vnc === true ? "" : <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16 ml64" style={{minWidth: '45px'}}>命令行：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.websshshow}
+                onChange={this.Checkwebsshshow}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则给学员的实践任务提供命令行窗口）</label>
+            </span>
+          </div>}
+
+
+          {this.state.vnc === true ? "" : this.state.websshshow === true ? <div>
+               <span className="fl ml160">
+                  <RadioGroup onChange={this.opensshRadio} value={this.state.opensshRadio}>
+                    <Radio className="radioStyle font-14" value={1}><span>命令行练习窗口</span> <span
+                      className="color-grey-9">（选中则给学员提供用于练习操作的命令行，命令行的操作不会对学生的实验环境造成影响）</span></Radio>
+                    <Radio className="radioStyle font-14" value={2}><span>命令行评测窗口</span> <span
+                      className="color-grey-9">（选中则给学员提供用于评测操作的命令行，命令行的操作可以对学生的实验环境产生影响）</span></Radio>
+                  </RadioGroup>
+               </span>
+
+            {this.state.opensshRadio === 2 ? <span className="fl ml180">
+                   <div className="clearfix mb20">
+                        <span className="fl mt8 ml5">
+                          <Checkbox
+                            checked={this.state.multi_webssh}
+                            onChange={this.Checkmulti_webssh}></Checkbox>
+                          <label style={{top: '6px'}} className="color-grey-9 ml10">
+                            <span className="color-grey-6 font-14" style={{minWidth: '45px'}}>多个命令行窗口：</span>
+                            （选中则允许学员同时开启多个命令行窗口）</label>
+                        </span>
+                      </div>
+               </span> : ""}
+          </div> : ""}
+
+          {this.state.vnc === true ? "" : <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16 ml17" style={{minWidth: '45px'}}>隐藏代码窗口：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.hide_code}
+                onChange={this.Checkhide_code}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则学员页面不显示代码窗口）</label>
+            </span>
+          </div>}
+
+          {this.state.vnc === true || this.state.hide_code === true ? "" : <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16 ml33" style={{minWidth: '45px'}}>公开版本库：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.is_secret_repository}
+                onChange={this.Checkis_secret_repository}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许学员修改版本库中的全部文件）</label>
+            </span>
+          </div>}
+
+          {this.state.vnc === true ? "" : <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16 ml17" style={{minWidth: '45px'}}>隐藏代码目录：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.code_hidden}
+                onChange={this.Checkcode_hidden}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则学员页面不显示版本库目录）</label>
+            </span>
+          </div>}
+
+          {this.state.vnc === true ? "" : <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16 ml17" style={{minWidth: '45px'}}>禁用复制粘贴：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.forbid_copy}
+                onChange={this.Checkforbid_copy}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则学员页面不允许使用复制和粘贴功能）</label>
+            </span>
+          </div>}
+
+          <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16 ml80" style={{minWidth: '45px'}}>跳关：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.task_pass}
+                onChange={this.Checktask_pass}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许学员跳关学习实训关卡任务）</label>
+            </span>
+          </div>
+
+          <div className="clearfix mb20">
+            <span className="color-grey-6 mt5 fl font-16 ml32s" style={{minWidth: '45px'}}>测试集解锁：</span>
+            <span className="fl mt8">
+              <Checkbox
+                checked={this.state.test_set_permission}
+                onChange={this.Checktest_set_permission}></Checkbox>
+              <label style={{top: '6px'}} className="color-grey-9 ml10">（选中则允许学员允许学员通过金币解锁查看隐藏测试集的内容）</label>
+            </span>
+          </div>
+
+
+        </div>
+
+        {this.props.identity < 5 ?
+          <Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${this.props.match.params.shixunId}/challenges`}
+                        onSubmits={this.onSubmits} loadings={this.state.loading}/> : ""}
       </div>
     );
   }

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -2,9 +2,12 @@ import React, {Component} from 'react';
 
 import {
   Button,
-  Tabs
+  Tabs,
+  Modal
 } from 'antd';
 
+import './css/TPMsettings.css';
+
 import TopShixuninformation from './Shixuninformation';
 
 import Configuration from './Configuration';
@@ -13,8 +16,6 @@ import LearningSettings from './LearningSettings';
 
 import axios from 'axios';
 
-import './css/TPMsettings.css';
-
 const {TabPane} = Tabs;
 
 // 处理整点 半点
@@ -24,64 +25,119 @@ export default class TPMsettings extends Component {
   constructor(props) {
     super(props)
     this.state = {
-
+      activeKeys:"1"
     }
   }
 
 
-
-
-
   componentDidMount() {
+    this.getdatas("1")
+  }
 
-    let id = this.props.match.params.shixunId;
+  getdatas = (key) => {
 
+    let id = this.props.match.params.shixunId;
     let Url = `/shixuns/` + id + `/settings.json`;
-
     axios.get(Url).then((response) => {
       // alert(response.data.shixun.choice_standard_scripts)
       if (response.status === 200) {
+        if(response.data){
+            if (response.data.shixun&&response.data.shixun.scope_partment.length > 0) {
               this.setState({
-           data:response.data
+                scopetype: true
               })
-        if (response.data.shixun.multi_webssh === true) {
+            }
+        }
+
         this.setState({
-            SelectTheCommandtype: true
+          data: response.data
         })
-        } else {
+      }
+
+    });
+
+    if(key==="3"&&this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true){
+      this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/challenges`);
+    }else{
+      if(key){
         this.setState({
-            SelectTheCommandtype: false
+          activeKeys:key
         })
+      }else{
+        this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/challenges`);
+      }
+
+    }
+
   }
-        if (response.data.shixun.scope_partment.length > 0) {
+
+  operateshixuns = (value) => {
     this.setState({
-            scopetype: true
+      operateshixunstype: true,
+      delType: value
     })
   }
+
+  hideoperateshixuns = () => {
+    this.setState({
+      operateshixunstype: false
+    })
   }
 
-    });
 
+  shixunsdel = () => {
+    let id = this.props.match.params.shixunId;
+    let cul = `/shixuns/` + id + `.json`;
 
-    let departmentsUrl = `/shixuns/departments.json`;
+    axios.delete(cul).then((response) => {
-    axios.get(departmentsUrl).then((response) => {
+      if (response.data.status === 1) {
-      if (response.status === 200) {
+        this.props.showSnackbar("操作成功");
-        if (response.data.message === undefined) {
         this.setState({
-            departmentslist: response.data.shools_name
+          operateshixunstype: false,
         });
-        }
+
+        // window.location.href = "/shixuns";
+        this.props.history.replace( "/shixuns/");
       }
     }).catch((error) => {
       console.log(error)
+    })
+  }
+
+  shixunsclose = () => {
+    let id = this.props.match.params.shixunId;
+    let cul = `/shixuns/` + id + `/close.json`;
+    axios.post(cul).then((response) => {
+      if (response.data.status === 1) {
+        this.props.showSnackbar("操作成功");
+        this.setState({
+          operateshixunstype: false,
         });
 
+        // window.location.href = "/shixuns/" + id + "/challenges";
+        this.props.history.replace( "/shixuns/" + id + "/challenges");
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
+  }
 
+  callback = (key) =>  {
+    this.setState({
+      activeKeys:key
+    })
   }
 
+  render() {
 
+    let showtabs = this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true ? "" : "学习页面设置"
 
-  render() {
+    // let a="isvnc";
+    // let b="isVNC";
+    // console.log(a.indexOf("vnc"))
+    // console.log(b.indexOf("vnc"))
+
+    // console.log( this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails.is_jupyter === false ? "学习页面设置" : "")
     return (
 
       <div>
@@ -95,38 +151,80 @@ export default class TPMsettings extends Component {
                   border-bottom: 0px;
                   margin-top: 30px!important;
               }
+              .ant-tabs-nav{
+                margin-left:20px;
+              }
+              .ant-tabs-nav .ant-tabs-tab {
+                font-size: 16px;
+               }
               `
           }
         </style>
-          <Tabs tabBarExtraContent={
+
+        <Tabs  activeKey={this.state.activeKeys}  onChange={this.callback} animated={false} tabBarExtraContent={
           <div className={"mb20 mr20"}>
-              <Button type="primary" ghost className={"Permanentban"}>
+
-                永久关闭
+            {
-              </Button>
+              this.props.identity < 5 && this.state.data && this.state.data.shixun.status == 0 ?
-              <Button type="primary" ghost className={"Permanentban ml20"}>
+                <Button type="primary" ghost className={"Permanentban mr20"} onClick={() => this.operateshixuns(1)}>
                   删除实训
                 </Button>
+                : ""
+            }
+            {
+              this.props.identity == 1 && this.state.data && this.state.data.shixun.status == 2 ?
+                <Button type="primary" ghost className={"Permanentban mr20"} onClick={() => this.operateshixuns(1)}>
+                  删除实训
+                </Button> : ""
+            }
+            {
+              this.props.identity === 1 && this.state.data && this.state.data.shixun.status == 2 ?
+                <Button type="primary" ghost className={"Permanentban"} onClick={() => this.operateshixuns(2)}>
+                  永久关闭
+                </Button> : ""
+            }
           </div>
         }>
           <TabPane tab="基本信息" key="1">
             <TopShixuninformation
               {...this.state}
               {...this.props}
+              getdatas={(key) => this.getdatas(key)}
             />
           </TabPane>
           <TabPane tab="权限配置" key="2">
             <Configuration
               {...this.state}
               {...this.props}
+              getdatas={(key) => this.getdatas(key)}
             />
           </TabPane>
-            <TabPane tab="学习页面设置" key="3">
+          {this.props.shixunsDetails === undefined ? "" : this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === false ?
+            <TabPane tab={showtabs} key="3">
               <LearningSettings
                 {...this.state}
                 {...this.props}
+                getdatas={(key) => this.getdatas(key)}
               />
-            </TabPane>
+            </TabPane>:"" }
         </Tabs>
+        <Modal
+          keyboard={false}
+          title="提示"
+          visible={this.state.operateshixunstype}
+          closable={false}
+          footer={null}
+        >
+          <div className="task-popup-content">
+            {this.state.delType === 1 ? <p className="task-popup-text-center font-16 pb20">是否确认删除 ？</p> :
+              <p className="task-popup-text-center font-16 pb20">关闭后,<br/>用户不能再开始挑战了是否确认关闭 ？</p>}
+          </div>
+          <div className="task-popup-submit clearfix">
+            <a onClick={this.hideoperateshixuns} className="task-btn fl">取消</a>
+            {this.state.delType === 1 ? <a className="task-btn task-btn-orange fr" onClick={this.shixunsdel}>确定</a> :
+              <a className="task-btn task-btn-orange fr" onClick={this.shixunsclose}>确定</a>}
+          </div>
+        </Modal>
       </div>
 
     );

public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css

@@ -126,3 +126,28 @@ a.newuse_scope-btn {
 .ant-tabs-extra-content{
     margin-top: 18px;
 }
+
+.pdb30{
+    padding-bottom: 30px;
+}
+
+.openrenyuan{
+    margin-top: 5px !important;
+    display: inline-block;
+}
+
+.ml81{
+    margin-left:81px;
+}
+
+.ml32s{
+    margin-left: 32px;
+}
+
+.ml64{
+    margin-left: 64px;
+}
+
+.ml160{
+    margin-left: 160px;
+}

public/react/src/modules/tpm/component/TPMNav.js

@@ -5,9 +5,9 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 class TPMNav extends Component {
 
   	render() {
-			console.log("componentDidMount");
+			// console.log("componentDidMount");
-			console.log("TPMNavTPMNavTPMNavTPMNav");
+			// console.log("TPMNavTPMNavTPMNavTPMNav");
-			console.log(this.props);
+			// console.log(this.props);
 
       const { user, match, shixun, secret_repository,is_jupyter} = this.props;
   		let isAdminOrCreator = false;

public/react/src/modules/tpm/jupyter/index.js

@@ -4,46 +4,165 @@
  * @Github: 
  * @Date: 2019-12-11 08:35:23
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-12 09:26:17
+ * @LastEditTime: 2019-12-12 20:19:48
  */
 import './index.scss';
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import SplitPane from 'react-split-pane';
-import { Button } from 'antd';
+import { Button, Modal } from 'antd';
 import {
   connect
 } from 'react-redux';
 import UserInfo from '../../developer/components/userInfo';
 import actions from '../../../redux/actions';
-
+import LeftPane from './leftPane';
+import RightPane from './rightPane';
 function JupyterTPI (props) {
 
+  // 获取 identifier 值
+  const {
+    match: {
+      params = {}
+    },
+    url,
+    loading, // 保存按钮状态
+    dataSets, // 数据集
+    jupyter_info,
+    getJupyterInfo,
+    syncJupyterCode,
+    jupyter_tpi_url_state,
+    // getJupyterTpiDataSet,
+    getJupyterTpiUrl,
+    saveJupyterTpi,
+    changeLoadingState,
+    changeGetJupyterUrlState
+  } = props;
+
+  const {identifier} = params;  
+  const [userInfo, setUserInfo] = useState({});
+  const [jupyterInfo, setJupyterInfo] = useState({});
+  const [updateTip, setUpdateTip] = useState(true);
+  const [myIdentifier, setMyIdentifier] = useState('');
+  useEffect(() => {
+    /* 先调用 jupyter的 TPI 接口， 
+     * 获取 用户信息,  
+     * 实训的 identifier, 状态， 名称， 是否被修改等信息
+    */
+   getJupyterInfo(identifier);
+  }, [identifier]);
+
   useEffect(() => {
-    // 获取数据集
+    // 设置jupyter信息
+    setJupyterInfo(jupyter_info || {});
+    const {user, tpm_modified, myshixun_identifier} = jupyter_info;
+    if (user) {
+      setUserInfo(user);
+    }
+    
+    if (myshixun_identifier) {
+      setMyIdentifier(myshixun_identifier);
+    }
+
+    // 同步代码
+    if (tpm_modified && updateTip && myshixun_identifier) {
+      setUpdateTip(false);
+      Modal.confirm({
+        title: '更新通知',
+        content: (<div className="update_notice">
+          <p className="update_txt">关卡任务的代码文件有更新啦</p>
+          <p className="update_txt">更新操作将保留已完成的评测记录和成绩</p>
+          <p className="update_txt">还未完成评测的任务代码，请自行保存</p>
+        </div>),
+        okText: '确定',
+        cancelText: '取消',
+        onOk () {
+          syncJupyterCode(myshixun_identifier, '同步成功');
+        }
+      })
+    }
+  }, [props]);
+
+  // 重置实训
+  const handleClickResetTpi = () => {
+    Modal.confirm({
+      title: '重置实训',
+      content: (
+        <p style={{ lineHeight: '24px' }}>
+          你在本文件中修改的内容将丢失,<br />
+          是否确定重新加载初始代码？
+        </p>
+      ),
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        console.log('调用重置代码....', myIdentifier);
+        if (myIdentifier) {
+          syncJupyterCode(myIdentifier, '重置成功');
+        }
+      }
+    })
+  }
+
+  // 退出实训
+  const handleClickQuitTpi = () => {
+    // console.log(jupyterInfo);
+    const { identifier } = jupyterInfo;
+    props.history.push(`/shixuns/${identifier}/challenges`);
+  }
+
+  // 重新获取 jupyter url
+  const handleOnReloadUrl = (id) => {
+    // console.log('jupyter 信息: ', jupyterInfo);
+    // 改变加载状态值
+    changeGetJupyterUrlState(-1);
+    getJupyterTpiUrl({identifier: myIdentifier});
+  }
+
+  // 保存代码
+  const handleOnSave = () => {
+    // 改变按钮状态
+    changeLoadingState(true);
+    saveJupyterTpi();
+  }
 
-    // 获取jupyter地址
-  }, []);
   return (
     <div className="jupyter_area">
       <div className="jupyter_header">
-        <UserInfo userInfo={{}} />
+        <UserInfo userInfo={userInfo} />
         <p className="jupyter_title">
-          <span className="title_desc">MySQL数据库编程开发实训(基础篇)</span>
+          <span className="title_desc" style={{ marginTop: '20px' }}>{jupyterInfo.name}</span>
-          <span className="title_time">时间</span>
+          <span className="title_time"></span>
         </p>
         <p className="jupyter_btn">
           {/* sync | poweroff */}
-          <Button className="btn_common" type="link" icon="sync">重置实训</Button> 
+          <Button 
-          <Button className="btn_common" type="link" icon="poweroff">退出实训</Button> 
+            className="btn_common" 
+            type="link" 
+            icon="sync"
+            onClick={handleClickResetTpi}
+          >重置实训</Button> 
+          <Button 
+            className="btn_common" 
+            type="link" 
+            icon="poweroff"
+            onClick={handleClickQuitTpi}
+          >退出实训</Button> 
         </p>
       </div>
       <div className="jupyter_ctx">
         <SplitPane split="vertical" minSize={350} maxSize={-350} defaultSize="30%">
           <div className={'split-pane-left'}>
-            左侧内容
+            <LeftPane dataSets={dataSets} />
           </div>
           <SplitPane split="vertical" defaultSize="100%" allowResize={false}>
-            <div>右侧内容</div>
+            <RightPane
+              identifier={myIdentifier}
+              status={jupyter_tpi_url_state}
+              url={url}
+              loading={loading}
+              onReloadUrl={handleOnReloadUrl}
+              onSave={handleOnSave}
+            />
             <div />
           </SplitPane>
         </SplitPane>
@@ -53,17 +172,31 @@ function JupyterTPI (props) {
 }
 
 const mapStateToProps = (state) => {
-  const {jupyter_tpi_url, jupyter_data_set, jupyter_identifier} = state.jupyterReducer;
+  const {
+    jupyter_info,
+    jupyter_tpi_url, 
+    jupyter_data_set,
+    jupyter_tpi_url_state
+  } = state.jupyterReducer;
+  const { loading } = state.commonReducer;
   return {
+    loading,
+    jupyter_info,
     url: jupyter_tpi_url,
     dataSets: jupyter_data_set,
-    identifier: jupyter_identifier
+    jupyter_tpi_url_state
   };
 }
 
 const mapDispatchToProps = (dispatch) => ({
-  getJupyterTpiDataSet: (identifier) => dispatch(actions.getJupyterTpiDataSet(identifier)),
+  changeGetJupyterUrlState: (status) => dispatch(actions.changeGetJupyterUrlState(status)),
-  getJupyterTpiUrl: (identifier) => dispatch(actions.getJupyterTpiUrl(identifier))
+  getJupyterInfo: (identifier) => dispatch(actions.getJupyterInfo(identifier)),
+  // 重置代码
+  syncJupyterCode: (identifier, msg) => dispatch(actions.syncJupyterCode(identifier, msg)),
+  // getJupyterTpiDataSet: (identifier) => dispatch(actions.getJupyterTpiDataSet(identifier)),
+  getJupyterTpiUrl: (identifier) => dispatch(actions.getJupyterTpiUrl(identifier)),
+  saveJupyterTpi: () => dispatch(actions.saveJupyterTpi()),
+  changeLoadingState: (flag) => dispatch(actions.changeLoadingState(flag))
 });
 
 export default connect(

public/react/src/modules/tpm/jupyter/index.scss

@@ -55,7 +55,7 @@
     height: 60px;
     line-height: 60px;
     background-color: #070F1A;
-    
+    padding-left: 30px;
     .jupyter_title{
       display: flex;
       flex-direction: column;
@@ -78,9 +78,13 @@
       right: 10px;
       top: 14px;
 
+      .btn_common{
+        color: #888;
+      }
       .btn_common:hover{
         // background-color: #29BD8B;
-        color: #29BD8B;
+        // color: #29BD8B;
+        color: #1890ff;
       }
     }
   }
@@ -90,4 +94,12 @@
     position: relative;
     height: calc(100vh - 60px);
   }
+
+  .update_notice{
+    text-align: center;
+    .update_txt{
+      line-height: 18px;
+      font-size: 14px;
+    }
+  }
 }

public/react/src/modules/tpm/jupyter/leftPane/index.js

@@ -0,0 +1,84 @@
+/*
+ * @Description: 
+ * @Author: tangjiang
+ * @Github: 
+ * @Date: 2019-12-12 10:34:03
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-12 20:18:46
+ */
+import './index.scss';
+import React, { useState, useEffect } from 'react';
+import {Icon, Empty} from 'antd';
+import MyIcon from '../../../../common/components/MyIcon';
+
+function LeftPane (props) {
+  
+  // 获取数据集
+  const { dataSets = [] } = props;
+
+  const emptyCtx = (
+    <div className="jupyter_empty">
+      <Empty />
+    </div>
+  );
+
+  // const listCtx = ;
+  const [renderCtx, setRenderCtx] = useState(() => (emptyCtx));
+
+  useEffect(() => {
+    if (dataSets.length > 0) {
+      console.log('数据集的个数: ', dataSets.length);
+      const oList = dataSets.map((item, i) => {
+        return (
+          <li className="jupyter_item" key={`key_${i}`}>
+            <Icon type="file-text" className="jupyter_icon"/>
+            <span className="jupyter_name">{item.title}</span>
+          </li>
+        );
+      });
+
+      const oUl = (
+        <ul className="jupyter_data_list">
+          { oList }
+        </ul>
+      );
+
+      setRenderCtx(oUl);
+    }
+  }, [props]);
+  // 渲染数据集
+  // const renderList = () => {
+  //   // 空数据
+  //   if (dataSets.length === 0) {
+  //     return <div className="jupyter_empty">
+  //       <Empty />
+  //     </div>
+  //   } else {
+  //     // 渲染列表
+  //     const oList = dataSets.map((item, i) => {
+  //       return (
+  //         <li className="jupyter_item" key={`key_${i}`}>
+  //           <Icon type="file-text" className="jupyter_icon"/>
+  //           <span className="jupyter_name">{item.title}</span>
+  //         </li>
+  //       );
+  //     });
+  //     return (
+  //       <ul className="jupyter_data_list">
+  //         { oList }
+  //       </ul>
+  //     );
+  //   }
+  // }
+
+  return (
+    <div className="jupyter_data_sets_area">
+      <h2 className="jupyter_h2_title">
+        <MyIcon type="iconwenti" className="jupyter_data_icon"/> 数据集
+      </h2>
+      { renderCtx }
+    </div>
+  )
+}
+
+export default LeftPane;

public/react/src/modules/tpm/jupyter/leftPane/index.scss

@@ -0,0 +1,57 @@
+.jupyter_data_sets_area{
+  height: 100%;
+  .jupyter_h2_title{
+    height: 44px;
+    line-height: 44px;
+    background-color: #EEEEEE;
+    padding: 0 30px;
+    .jupyter_data_icon{
+      // color: #7286ff;
+      color: #1890ff;
+      font-size: 24px;
+      position: relative;
+      top: 2px;
+      transform: scale(1.5);
+      margin-right: 5px;
+    }
+  }
+
+  .jupyter_data_list,
+  .jupyter_empty{
+    height: calc(100vh - 104px);
+    overflow-y: auto;
+  }
+
+  .jupyter_data_list{
+    .jupyter_item{
+      line-height:45px;
+      border-bottom: 1px solid rgba(238,238,238, 1);
+      padding: 0 30px 0 60px;
+      overflow: hidden;
+      text-overflow:ellipsis;
+      white-space: nowrap;
+      cursor: pointer;
+      transition: .3s;
+      &:hover{
+        background-color: rgba(235, 235, 235, .3);
+      }
+      .jupyter_icon{
+        color: rgb(74, 188, 125);
+        font-size: 16px;
+        transform: scale(1.2);
+        margin-right: 5px;
+      }
+      .jupyter_name{
+        color: #000;
+        font-size: 16px;
+      }
+    }
+  }
+
+  .jupyter_empty{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+  }
+}

public/react/src/modules/tpm/jupyter/rightPane/index.js

@@ -0,0 +1,91 @@
+/*
+ * @Description: 
+ * @Author: tangjiang
+ * @Github: 
+ * @Date: 2019-12-12 15:04:20
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-13 11:25:22
+ */
+import './index.scss';
+import React, { useEffect, useState } from 'react';
+import { Spin, Button } from 'antd';
+function RightPane (props) {
+  const { 
+    status,
+    url,
+    onReloadUrl,
+    onSave,
+    loading
+  } = props;
+
+  const [renderCtx, setRenderCtx] = useState(() => loadInit);
+  // 重新获取 url
+  const handleClickReload = () => {
+    onReloadUrl && onReloadUrl();
+  }
+
+  const loadInit = (
+    <div className="jupyter_loading_init">
+        <Spin tip="加载中..."></Spin>
+      </div>
+  );
+
+  const loadError = (
+    <div className="jupyter_load_url_error">
+      <span className="iconfont icon-jiazaishibai1 icon-error"></span>
+      <p className="jupyter_error_txt">
+        实训加载失败，
+        <span 
+          className="jupyter_reload"
+          onClick={handleClickReload}
+        >重新加载</span>
+      </p>
+    </div>
+  );
+
+  // 保存
+  const handleClickSubmit = () => {
+    console.log('调用了保存接口....');
+    onSave && onSave();
+  }
+
+  useEffect(() => {
+    if (status === -1) {
+      setRenderCtx(() => loadInit);
+    } else if (status === 0 && url) {
+      setRenderCtx(() => (
+
+        <div className="jupyter_result">
+          <div className="jupyter_iframe">
+            <iframe 
+              title=" "
+              width="100%"
+              height="100%"
+              src={url}
+              className='jupyter_iframe_style'
+            ></iframe>
+          </div>
+          <div className="jupyter_submit">
+            <Button
+              loading={loading}
+              type="primary"
+              onClick={handleClickSubmit}
+            >保存</Button>
+          </div>
+        </div>
+        
+      ));
+    } else {
+      setRenderCtx(() => loadError);
+    }
+  }, [status, url, loading]);
+  
+  return (
+    <div className="jupyter_right_pane_area">
+      { renderCtx }
+    </div>
+  )
+}
+
+export default RightPane;
+

public/react/src/modules/tpm/jupyter/rightPane/index.scss

@@ -0,0 +1,74 @@
+.jupyter_right_pane_area{
+  position: relative;
+  height: calc(100vh - 60px);
+  // background: pink;
+
+  .jupyter_load_url_error,
+  .jupyter_loading_init{
+    display: flex;
+    position: relative;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    &::before{
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+      content: '';
+      
+    }
+  }
+
+  .jupyter_loading_init{
+    &::before{
+      background-color: rgba(0,0,0,.2);
+    }
+  }
+
+  .jupyter_load_url_error{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    // &::before{
+    //   background-color: rgba(0,0,0,.2);
+    // }
+    .jupyter_error_txt{
+      position: relative;
+      z-index: 1;
+      font-size: 12px;
+      .jupyter_reload{
+        cursor: pointer;
+        color: #1890ff;
+      }
+    }
+
+    .icon-error{
+      position: relative;
+      color: #DCE0E6;
+      transform: scale(5);
+      top: -35px;
+    }
+  }
+
+  .jupyter_result{
+    height: 100%;
+    .jupyter_iframe{
+      height: calc(100% - 56px);
+      // background: pink;
+      .jupyter_iframe_style{
+        border: none;
+        outline: none;
+      }
+    }
+    .jupyter_submit{
+      display: flex;
+      align-items: center;
+      height: 56px;
+      justify-content: flex-end;
+      padding-right: 30px;
+    }
+  }
+}

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -4,7 +4,7 @@ import {TPMIndexHOC} from '../TPMIndexHOC';
 
 import {SnackbarHOC} from 'educoder';
 
-import {Select, Radio, Input, Modal, Button, Form, Tooltip, Upload, Icon,notification} from 'antd';
+import {Select, Radio, Input, Modal, Button, Form, Tooltip, Upload, Icon, notification} from 'antd';
 
 import axios from 'axios';
 
@@ -32,6 +32,7 @@ class Newshixuns extends Component {
       run_method: undefined,
       postapplyvisible: undefined,
       fileList: [],
+      Radiovalue:"1"
     }
   }
 
@@ -85,9 +86,15 @@ class Newshixuns extends Component {
     this.setState({
       Radiovalue: e.target.value,
     });
+    this.props.form.setFieldsValue({
+      is_jupyter: e.target.value,
+    });
   };
 
   handleSubmit = (e) => {
+    this.setState({
+      loading: true
+    })
     const mdContnet = this.contentMdRef.current.getValue().trim();
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
@@ -110,19 +117,21 @@ class Newshixuns extends Component {
             // window.open("/shixuns/"+response.data.shixun_identifier+"/challenges");
           } else {
             this.setState({
-              bottonloading: false
+              loading: true
             })
           }
         }).catch((error) => {
-          console.log(error)
           this.setState({
-            bottonloading: false
+            loading: true
           })
         })
 
 
       }
     });
+    this.setState({
+      loading: false
+    })
   };
   Selectthestudent = (value) => {
     this.props.form.setFieldsValue({
@@ -145,7 +154,7 @@ class Newshixuns extends Component {
     });
     let newlist = ""
     e.map((item, key) => {
-      if(item.props.name!=""){
+      if (item.props.name != "") {
         newlist = newlist + `${item.props.name}`
       }
     })
@@ -316,7 +325,7 @@ class Newshixuns extends Component {
 
   // 附件相关 START
   handleChange = (info) => {
-    if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       let {fileList} = this.state;
 
       if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
@@ -334,7 +343,7 @@ class Newshixuns extends Component {
   }
 
   onAttachmentRemove = (file) => {
-    if(!file.percent || file.percent == 100){
+    if (!file.percent || file.percent == 100) {
       Modal.confirm({
         title: '确定要删除这个附件吗?',
         okText: '确定',
@@ -355,13 +364,12 @@ class Newshixuns extends Component {
 
   deleteAttachment = (file) => {
     console.log(file);
-    let id=file.response ==undefined ? file.id : file.response.id
+    let id = file.response == undefined ? file.id : file.response.id
     const url = `/attachments/${id}.json`
-    axios.delete(url, {
+    axios.delete(url, {})
-    })
       .then((response) => {
         if (response.data) {
-          const { status } = response.data;
+          const {status} = response.data;
           if (status == 0) {
             // console.log('--- success')
 
@@ -372,7 +380,7 @@ class Newshixuns extends Component {
               newFileList.splice(index, 1);
               return {
                 fileList: newFileList,
-                deleteisnot:true
+                deleteisnot: true
               };
             });
           }
@@ -461,7 +469,7 @@ class Newshixuns extends Component {
                   >
                     {getFieldDecorator('name', {
                       rules: [{
-                        required: true, message: '请输入选题名称',
+                        required: true, message: '请输入名称',
                       }, {
                         max: 60, message: '请输入名称，最大限制60个字符',
                       }, {
@@ -503,8 +511,8 @@ class Newshixuns extends Component {
                         >
                           <Option value={1}>初级</Option>
                           <Option value={2}>中级</Option>
-                          <Option value={3}>高级</Option>
+                          <Option value={3}>中高级</Option>
-                          <Option value={4}>顶级</Option>
+                          <Option value={4}>高级</Option>
                         </Select>
 
                       </div>
@@ -531,7 +539,9 @@ class Newshixuns extends Component {
                                   defaultOpen={false}
                           >
                             {
-                              newshixunlist === undefined ? "" : newshixunlist.main_type.map((item, key) => {
+                              newshixunlist === undefined ? "" :  this.state.Radiovalue==="2"?newshixunlist.main_type.map((item, key) => {
+                                let itemtype=item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
+                                if(itemtype>-1){
                                   return (
                                     <Option value={item.id} key={key} name={item.description}>
                                       <Tooltip placement="right"
@@ -540,7 +550,25 @@ class Newshixuns extends Component {
                                       </Tooltip>
                                     </Option>
                                   )
-                              })
+                                }
+
+                              }):""
+                            }
+                            {
+                              newshixunlist === undefined ? "" : this.state.Radiovalue==="1"?newshixunlist.main_type.map((item, key) => {
+                                let itemtype=item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
+                                if(itemtype===-1){
+                                  return (
+                                    <Option value={item.id} key={key} name={item.description}>
+                                      <Tooltip placement="right"
+                                               title={item.description === "" ? "无描述" : item.description}>
+                                        {item.type_name}
+                                      </Tooltip>
+                                    </Option>
+                                  )
+                                }
+
+                              }):""
                             }
                           </Select>
 
@@ -567,7 +595,7 @@ class Newshixuns extends Component {
                         <div className=" fl pr mr20">
                           <Select placeholder="请选择小类别"
                                   mode="multiple"
-                                  style={{width: 180}}
+                                  style={{width: 280}}
                                   onChange={this.sub_type}
                                   defaultOpen={false}
                                   className={"Selectlittle"}
@@ -589,12 +617,12 @@ class Newshixuns extends Component {
                       )}
                       <span className="fl ml20 color-grey lineh-20">
                               <div>
-                                {this.state.mainvalues === undefined && this.state.subvalues === undefined||this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
+                                {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
-                                  <div className={"font-12"} style={{'max-width':'700px'}}>
+                                  <div className={"font-12"} style={{'max-width': '600px'}}>
-                                    {`${this.state.mainvalues===undefined||this.state.mainvalues=== ""?"":`已安装软件：`+this.state.mainvalues}`}
+                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : `已安装软件：` + this.state.mainvalues}`}
-                                    {`${this.state.subvalues===undefined||this.state.subvalues=== ""?"":this.state.mainvalues===undefined||this.state.mainvalues=== ""?`已安装软件：`+this.state.subvalues:this.state.subvalues}`}
+                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ? `已安装软件：` + this.state.subvalues : this.state.subvalues}`}
-                                    {`${this.state.mainvalues===undefined||this.state.mainvalues=== ""?"":`说明：添加了`+this.state.mainvalues}${this.state.subvalues===undefined||this.state.subvalues=== ""?"":
+                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : `说明：添加了` + this.state.mainvalues}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
-                                      this.state.mainvalues===undefined||this.state.mainvalues=== ""?`说明：添加了`+this.state.subvalues:this.state.subvalues}`}
+                                      this.state.mainvalues === undefined || this.state.mainvalues === "" ? `说明：添加了` + this.state.subvalues : this.state.subvalues}`}
                                   </div>}
 
                               </div>
@@ -704,7 +732,7 @@ class Newshixuns extends Component {
             </div>
           </div>
         </div>
-        <Bottomsubmit url={"/shixuns"} onSubmits={() => this.handleSubmit()}/>
+        <Bottomsubmit {...this.props} {...this.state} url={"/shixuns"} onSubmits={() => this.handleSubmit()} loadings={this.state.loading}/>
       </div>
 
     );

public/react/src/modules/tpm/newshixuns/css/Newshixuns.css

@@ -392,9 +392,9 @@ a.white-btn.use_scope-btn:hover{
     border-color: #096dd9;
 }
 
-.ant-btn:hover, .ant-btn:focus, .ant-btn:active, .ant-btn.active{
+/*.ant-btn:hover, .ant-btn:focus, .ant-btn:active, .ant-btn.active{*/
-    background-color: #4CACFF;
+/*    background-color: #4CACFF;*/
-}
+/*}*/
 
 .newViewAfter .ant-input{
     line-height: 40px !important;

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -13,7 +13,7 @@ import { getImageUrl ,markdownToHTML, configShareForCustom} from 'educoder'
 import { CircularProgress } from 'material-ui/Progress';
 
 import { Modal, Spin, Tooltip ,message,Icon} from 'antd';
-
+import LoadingSpin from '../../../../common/LoadingSpin';
 import 'antd/lib/pagination/style/index.css';
 
 import '../shixunchildCss/Challenges.css'
@@ -34,6 +34,8 @@ class Challengesjupyter extends Component {
 			jupyter_port:0,
 			jupyter_url:null,
 			username:"",
+			booljupyterurls:false,
+			loading:false,
 		}
 	}
 
@@ -54,102 +56,106 @@ class Challengesjupyter extends Component {
 				}
 			}
 		}).catch((error) => {
-			console.log(error)
+			//console.log(error)
 		});
 	}
 
 	componentDidMount() {
 		setTimeout(this.ChallengesList(), 1000);
-
-
-
 		let id = this.props.match.params.shixunId;
 		let ChallengesURL = `/jupyters/get_info_with_tpm.json`;
      let datas={
 			 identifier:id,
 		 }
 		axios.get(ChallengesURL, {params: datas}).then((response) => {
-			debugger
-
 			if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
-
+				setTimeout(() => {
+					this.setState({
+						booljupyterurls:true,
+					})
+				}, 600)
 				}else{
-					// console.log("componentDidMountChallengesjupyter");
-				  // console.log(response.data);
 				  if(response.data.status===0){
+
+						setTimeout(() => {
 							this.setState({
 								jupyter_url:response.data.url,
 								jupyter_port:response.data.port,
+								booljupyterurls:true,
 							})
-
+						}, 800)
 
 					}else{
+						setTimeout(() => {
+							this.setState({
+								booljupyterurls:true,
+							})
+						}, 600)
 
 					}
 				}
-		}).catch((error) => {
-			console.log(error)
-		});
-
-
-
-
-	}
-
-	updatamakedown = (id) => {
-
-	}
-
-	// 关卡的上移下移操作
-	operations = (sumid, type) => {
-
-	}
-	delOperations = (sumid) => {
-
-	}
 
-	clonedelOperationss = () => {
 
-	}
+		}).catch((error) => {
-	delOperationss = () => {
+			setTimeout(() => {
+				this.setState({
+					booljupyterurls:true,
+				})
+			}, 600)
 
+		});
 	}
 
-	startgameid=(id)=>{
+	updatamakedowns = () => {
-
+		this.setState({
-
+			loading:true,
-
+			booljupyterurls:false
-
+		})
+		let id = this.props.match.params.shixunId;
+		let ChallengesURL = `/jupyters/get_info_with_tpm.json`;
+		let datas={
+			identifier:id,
 		}
+		axios.get(ChallengesURL, {params: datas}).then((response) => {
+			if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+				setTimeout(() => {
+					this.setState({
+						booljupyterurls:true,
+					})
+				}, 600)
+			}else{
+				if(response.data.status===0){
+					setTimeout(() => {
+						this.setState({
+							jupyter_url:response.data.url,
+							jupyter_port:response.data.port,
+							booljupyterurls:true,
+						})
+					}, 800)
+					this.setState({
 
-	hidestartshixunsreplace=(url)=>{
+					})
-
+				}else{
-
+					setTimeout(() => {
+						this.setState({
+							booljupyterurls:true,
+						})
+					}, 600)
 				}
-
-	//编辑实训题目选择题
-	EditTraining=(type, ids, path)=>{
-
 			}
+		}).catch((error) => {
+			setTimeout(() => {
+				this.setState({
+					booljupyterurls:true,
+				})
+			}, 600)
 
-	//开始实战按钮
+		});
-	startshixunCombat = (type, ids, id) => {
-
-
-
-
-	}
-	hidestartshixunCombattype=()=>{
 
 	}
 
-	hideAccountProfile=()=>{
-
-	};
 
 	modifyjupyter=()=>{
-		// console.log("propsysl");
-		// console.log(propsysl);
 		let id=this.props.match.params.shixunId;
      var jupyter_port="";
 			 try{
@@ -170,42 +176,13 @@ class Challengesjupyter extends Component {
 				}
 			}).catch((error) => {
 		})
-	}
 
-	sendToken=()=>{
-		// console.log("sendToken");
-		// const iframe = document.getElementById('iframe');
-		// console.log("modifyjupyter");
-	  // const frameWindow = iframe.contentWindow;
-		// console.log("frameWindow");
-		// console.log(frameWindow);
 	}
 
+
 	render() {
-		let{ChallengesDataList}=this.state;
+		let{ChallengesDataList,booljupyterurls}=this.state;
 		let id = this.props.match.params.shixunId;
-// 		var deptObjs=document.getElementById("IFRAMEID").contentWindow.document.getElementById("TAGID");
-// //判断此元素是否存在
-// 		if(deptObjs!=null){
-// 			//设置该元素的样式或其他属性
-// 			deptObjs.setAttribute('style',' height: 20px !important;'); //!important用来提升指定样式条目的应用优先权
-// 		}
-// 		var submitObj = document.getElementById('submit');
-// 		if(submitObj){
-// 			submitObj.style.color = 'green';
-// 		}
-// 		const dom = document.getElementById('shutdown');
-// 		ReactDOM.unmountComponentAtNode(dom)
-// 		// window.$('#picture_display').hide();
-// 		window.$('.data-tip-right').hide()
-// 		window.onload=()=>{
-// 			debugger
-// 			var _iframe = document.getElementById('header');
-// 			console.log(_iframe);
-// 			// 	.contentWindow.document.getElementById('shutdown_widget')   //get iframe下的id
-// 			// _iframe.style.display= "none";  //修改样式
-// 		}
-
 		const  is_teacher = this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
 
 
@@ -231,6 +208,23 @@ class Challengesjupyter extends Component {
 								<div className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(ChallengesDataList.description).replace(/▁/g,"▁▁▁")}}></div>
 							}
 						</p>
+						{
+							booljupyterurls===true?
+								(
+									this.state.jupyter_url === null?
+										<div className="mt50 intermediatecenter juplbool">
+											<span className="icon iconfontysl icon-jiazaishibai1"></span>
+											<p className="intermediatecenter sortinxdirection mt5 juplboolp"><p className="colorbluetest">加载实训出错，是否</p><p className="colorbluetwo" onClick={()=>this.updatamakedowns()}>重新加载</p></p>
+
+										</div>
+
+										:""
+								)
+								:""
+						}
+
+
+
 						<style>
 							{
 								`
@@ -250,6 +244,8 @@ class Challengesjupyter extends Component {
 									display: flex;
 									flex-direction:row-reverse;
 									}
+								;						
+																}
 								`
 							}
 						</style>
@@ -262,7 +258,7 @@ class Challengesjupyter extends Component {
 										<div className="sortinxdirection mt60">
 											<div className="renwuxiangssi sortinxdirection">
 												<div><p className="renwuxiangqdiv">任务详情</p></div>
-												<div><p className="renwuxiangqdivtest ml24">（请将实训题目写在下方）</p></div>
+												<div><p className="renwuxiangqdivtest ml1 shixunbingbaocun">（请将实训题目写在下方并保存）</p></div>
 											</div>
 											<div className="renwuxiangssit xaxisreverseorder">
 												<div className="challenbaocun" onClick={() => this.modifyjupyter(this.state)}><p
@@ -293,18 +289,24 @@ class Challengesjupyter extends Component {
 							#header{
 							visibility:hidden;
 							}
+							
+						
+							
+							
 								`
 							}
 						</style>
 						{
 								is_teacher===true?
 									<div className="mt35">
-										{/*https://48888.jupyter.educoder.net/tree?*/}
-
 										<div className="pb47">
 											{
 												this.state.jupyter_url===null || this.state.jupyter_url===undefined?
-													""
+													(
+														booljupyterurls===false?
+															<LoadingSpin></LoadingSpin>
+															:""
+													)
 													:
 													<iframe src={this.state.jupyter_url}
 																	sandbox="allow-same-origin allow-scripts allow-top-navigation " scrolling="no" id="frame"

public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css

@@ -31,6 +31,7 @@
     height:30px;
     background:#29BD8B;
     border-radius:3px;
+    cursor:pointer
 }
 .challenbaocuntest{
     width:103px;
@@ -39,7 +40,7 @@
     color:#FFFFFF;
     text-align: center;
     line-height:30px;
-    cursor:default
+    cursor:pointer
 }
 .renwuxiangqdiv{
     width:72px;
@@ -64,3 +65,41 @@
 .pb47{
     padding-bottom: 47px;
 }
+.colorbluetwo{
+    color: #1E8FFD;
+    font-size: 12px;
+    cursor:pointer;
+    margin-right: 18px;
+}
+.colorbluetest{
+    color: #06101A;
+    font-size: 12px;
+    cursor:default
+}
+.shixunbingbaocun{
+    font-size:14px;
+    color:#888888;
+}
+.intermediatecenter{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+.iconfontysl{
+    vertical-align:middle;
+    font-family:"iconfont" !important;
+    font-style:normal;
+    -webkit-font-smoothing: antialiased;
+    -webkit-text-stroke-width: 0.2px;
+    font-size: 100px;
+    color: #F5F5F5;
+}
+.juplbool{
+    position: relative;
+}
+
+.juplboolp{
+    position: absolute;
+    bottom: 21px;
+}

public/react/src/modules/tpm/shixuns/ShixunSearchBar.js

@@ -275,10 +275,10 @@ render() {
 													}
 													<div className="fl pr shaiAllItem mt1">
 														<li className={this.state.diff===0?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(0)}>全部难度</li>
-														<li className={this.state.diff===1?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(1)}>初级学员</li>
+														<li className={this.state.diff===1?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(1)}>初级</li>
-														<li className={this.state.diff===2?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(2)}>中级学员</li>
+														<li className={this.state.diff===2?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(2)}>中级</li>
-														<li className={this.state.diff===3?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(3)}>高级学员</li>
+														<li className={this.state.diff===3?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(3)}>中高级</li>
-														<li className={this.state.diff===4?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(4)}>顶级学员</li>
+														<li className={this.state.diff===4?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(4)}>高级</li>
 													</div>
 
                     </div>

public/react/src/modules/tpm/tpmmodel/tpmmodel.css

@@ -66,6 +66,8 @@
     height:30px;
     background:#C4C4C4;
     border-radius:3px;
+    cursor:pointer
+
 }
 .deletebutomtext{
     width:28px;
@@ -73,12 +75,14 @@
     font-size:14px;
     color:#FFFFFF;
     line-height:19px;
+    cursor:pointer
 }
 .deletebuttom{
     width:85px;
     height:30px;
     background:#29BD8B;
     border-radius:3px;
+    cursor:pointer
 }
 .deletebuttomtest{
     width:56px;
@@ -86,6 +90,8 @@
     font-size:14px;
     color:#FFFFFF;
     line-height:19px;
+    cursor:pointer
+
 }
 .tpmwidth{
     width: 50%;
@@ -111,6 +117,8 @@
     height:30px;
     background:#FF5555;
     border-radius:3px;
+    cursor:pointer
+
 }
 .light-row{
     background: #F7F7F8;

public/react/src/redux/actions/actionTypes.js

@@ -54,6 +54,9 @@ const types = {
   GET_JUPYTER_DATA_SETS: 'GET_JUPYTER_DATA_SETS', // jupyter 数据集
   GET_JUPYTER_TPI_URL: 'GET_JUPYTER_TPI_URL', // 获取 jupyter url
   SAVE_JUPYTER_IDENTIFIER: 'SAVE_JUPYTER_IDENTIFIER', // 保存jupyter identifier
+  SAVE_JUPYTER_INFO: 'SAVE_JUPYTER_INFO', // 保存 jupyter 信息
+  CHANGE_JUPYTER_URL_STATE: 'CHANGE_JUPYTER_URL_STATE', // 获取url返回的状态值
+  SAVE_JUPYTER_TPI: 'SAVE_JUPYTER_TPI', // 保存 jupyter tpi
 }
 
 export default types;

public/react/src/redux/actions/index.js

@@ -64,7 +64,11 @@ import {
 
 import {
   getJupyterTpiDataSet,
-  getJupyterTpiUrl
+  getJupyterTpiUrl,
+  getJupyterInfo,
+  syncJupyterCode,
+  changeGetJupyterUrlState,
+  saveJupyterTpi
 } from './jupyter';
 
 export default {
@@ -111,6 +115,10 @@ export default {
   saveEditorCodeForDetail,
   // jupyter
   getJupyterTpiDataSet,
-  getJupyterTpiUrl
+  getJupyterTpiUrl,
+  getJupyterInfo,
+  syncJupyterCode,
+  changeGetJupyterUrlState,
+  saveJupyterTpi
   // isUpdateCodeCtx
 }

public/react/src/redux/actions/jupyter.js

@@ -4,31 +4,81 @@
  * @Github: 
  * @Date: 2019-12-12 09:01:30
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-12 09:30:53
+ * @LastEditTime: 2019-12-12 17:58:38
  */
 import types from "./actionTypes";
-import { fetchJupyterTpiDataSet, fetchJupyterTpiUrl } from "../../services/jupyterServer";
+import { message } from 'antd';
+import { 
+  fetchJupyterTpiDataSet,
+  fetchJupyterTpiUrl,
+  fetchJupyterInfo,
+  fetchSyncJupyterCode,
+  fetchSaveJupyterTpi
+} from "../../services/jupyterServer";
 
+// 获取 jupyter 相关信息
+export const getJupyterInfo = (id) => {
+  return (dispatch) => {
+    fetchJupyterInfo(id).then(res => {
+      if (res.data.status === 401) return;
+      if (res.status === 200) {
+        const { data } = res;
+        console.log(data); 
+        if (data.status === 0) {
+          dispatch({
+            type: types.SAVE_JUPYTER_INFO,
+            payload: data
+          });
+          const { identifier, myshixun_identifier } = data;
+          // 调用获取数据集接口
+          dispatch(getJupyterTpiDataSet(identifier));
+          // 调用获取url接口
+          dispatch(getJupyterTpiUrl({identifier: myshixun_identifier}));
+        }
+      }
+    })
+  }
+}
 // 获取 jupyter tpi 数据集
 export const getJupyterTpiDataSet = (identifier) => {
   return (dispatch) => {
     fetchJupyterTpiDataSet(identifier).then(res => {
       if (res.data.status === 401) return; // 用户未登录
       console.log('数据集:', res);
+      if (res.status === 200) {
+        const {data_sets} = res.data;
+        dispatch({
+          type: types.GET_JUPYTER_DATA_SETS,
+          payload: data_sets
+        });
+      }
     });
   }
 }
-
 // 获取 jupyter tpi 地址
-export const getJupyterTpiUrl = (identifier) => {
+export const getJupyterTpiUrl = (obj) => {
-  return (dispatch) => {
+  return (dispatch, getState) => {
-    fetchJupyterTpiUrl(identifier).then(res => {
+    const {jupyter_info} = getState().jupyterReducer;
+    console.log(obj.identifier, jupyter_info.myshixun_identifier);
+    if (!obj.identifier && !jupyter_info.myshixun_identifier) return;
+    const id = obj.identifier || jupyter_info.myshixun_identifier;
+    fetchJupyterTpiUrl({identifier: id}).then(res => {
       if (res.data.status === 401) return; // 用户未登录
       console.log('获取url', res);
+      if (res.status === 200) {
+        const { status, url = '', port } = res.data;
+        dispatch({
+          type: types.GET_JUPYTER_TPI_URL,
+          payload: {
+            status,
+            url,
+            port
+          }
+        })
+      }
     })
   }
 }
-
 // 保存 jupyter identifer
 export const saveJupyterIdentifier = (identifier) => {
   return {
@@ -36,3 +86,54 @@ export const saveJupyterIdentifier = (identifier) => {
     payload: identifier
   }
 }
+// 重置代码
+export const syncJupyterCode = (identifier, msg) => {
+  return (dispatch) => {
+    fetchSyncJupyterCode(identifier).then(res => {
+      // console.log('同步代码成功: ', res);
+      if (res.data.status === 401) return;
+      if (res.status === 200) {
+        const {status} = res.data
+        if (status === 0) message.success(msg);
+      }
+    })
+  }
+}
+// 改变状态值
+export const changeGetJupyterUrlState = (status) => {
+  return {
+    type: types.CHANGE_JUPYTER_URL_STATE,
+    payload: status
+  }
+}
+// 保存 jupyter tpi
+export const saveJupyterTpi = () => {
+  return (dispatch, getState) => {
+    
+    const { jupyter_tpi_code, jupyter_info }= getState().jupyterReducer;
+    // console.log(jupyter_info.myshixun_identifier, jupyter_tpi_code);
+    if (!jupyter_info.myshixun_identifier) return;
+    const params = {
+      identifier: jupyter_info.myshixun_identifier,
+      jupyter_port: jupyter_tpi_code
+    };
+    console.log(params);
+    fetchSaveJupyterTpi(params).then(res => {
+      dispatch({
+        type: types.LOADING_STATUS,
+        payload: false
+      });
+      if (res.status === 200) {
+        const { data } = res;
+        if (data.status === 0) {
+          message.success('保存成功!')
+        }
+      }
+    }).catch(() => {
+      dispatch({
+        type: types.LOADING_STATUS,
+        payload: false
+      });
+    });
+  }
+}

public/react/src/redux/reducers/commonReducer.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 16:27:09
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-03 11:00:19
+ * @LastEditTime: 2019-12-12 17:36:51
  */
 import types from "../actions/actionTypes";
 

public/react/src/redux/reducers/jupyterReducer.js

@@ -4,14 +4,17 @@
  * @Github: 
  * @Date: 2019-12-12 09:01:39
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-12 09:29:49
+ * @LastEditTime: 2019-12-12 17:23:54
  */
 import types from "../actions/actionTypes";
 
 const initState = {
   jupyter_tpi_url: '',
+  jupyter_info: {}, // 保存用户信息及实训相关的内容
   jupyter_data_set: [],
-  jupyter_identifier: ''
+  jupyter_identifier: '',
+  jupyter_tpi_url_state: -1, // 获取 url 状态值: 0 成功, 其它 失败
+  jupyter_tpi_code: '' // 端口号
 };
 
 const JupyterReducer = (state = initState, action) => {
@@ -22,15 +25,28 @@ const JupyterReducer = (state = initState, action) => {
         jupyter_data_set: action.payload
       }
     case types.GET_JUPYTER_TPI_URL:
+      const {url, status, port} = action.payload;
       return {
         ...state,
-        jupyter_tpi_url: action.payload
+        jupyter_tpi_url: url,
+        jupyter_tpi_url_state: status,
+        jupyter_tpi_code: port
       }
     case types.SAVE_JUPYTER_IDENTIFIER:
       return {
         ...state,
         jupyter_identifier: action.payload
       }
+    case types.SAVE_JUPYTER_INFO:
+      return {
+        ...state,
+        jupyter_info: action.payload
+      }
+    case types.CHANGE_JUPYTER_URL_STATE:
+      return {
+        ...state,
+        jupyter_tpi_url_state: action.payload
+      }
     default:
       return {
         ...state

public/react/src/search/SearchPage.js

@@ -215,7 +215,7 @@ class SearchPage extends Component{
 															type==="shixun"?
 																(
 																	item.is_jupyter===true?
-																		<div className="jupytertext intermediatecenter ml15"><p className="jupytertextp">Jupyter</p></div>
+																		<div className="jupytertext intermediatecenter ml20"><p className="jupytertextp">Jupyter</p></div>
 																		:""
 																)
 																:""

public/react/src/search/searchc.css

@@ -135,17 +135,18 @@
 .jupytertext{
     width:54px;
     height:24px;
-    background:#FF6802;
-    border-radius:2px 10px 10px 2px;
-    margin-top: 2px;
     text-align: center;
+    border-radius:5px;
+    border:1px solid #FF6802;
+    margin-top: 4px;
 
 }
 .jupytertextp{
-    width:39px;
+    width:54px;
     height:16px;
+    line-height:16px;
     font-size:12px;
-    color:#FFFFFF;
+    color:#FF6802;
     line-height:16px;
 }
 /* x轴正方向排序 */

public/react/src/services/jupyterServer.js

@@ -4,10 +4,15 @@
  * @Github: 
  * @Date: 2019-12-12 09:07:07
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-12 09:10:58
+ * @LastEditTime: 2019-12-12 17:46:17
  */
 import axios from 'axios';
 
+// 获取 jupyter实训相关的内容
+export async function fetchJupyterInfo (identifier) {
+  const url = `/tasks/${identifier}/jupyter.json`;
+  return axios.get(url);
+}
 // 获取数据集
 export async function fetchJupyterTpiDataSet (identifier) {
   const url = `/shixuns/${identifier}/jupyter_data_sets.json`;
@@ -18,3 +23,13 @@ export async function fetchJupyterTpiUrl (params) {
   const url = `/jupyters/get_info_with_tpi.json`;
   return axios.get(url, { params });
 }
+// 同步代码功能
+export async function fetchSyncJupyterCode (identifier) {
+  const url = `/myshixuns/${identifier}/sync_code.json`;
+  return axios.post(url);
+}
+// jupyter 保存
+export async function fetchSaveJupyterTpi (params) {
+  const url = `/jupyters/save_with_tpi.json`;
+  return axios.get(url, { params });
+}