diff --git a/app/controllers/admins/daily_school_statistics_controller.rb b/app/controllers/admins/daily_school_statistics_controller.rb
index eb9c75fbc..f0911f239 100644
--- a/app/controllers/admins/daily_school_statistics_controller.rb
+++ b/app/controllers/admins/daily_school_statistics_controller.rb
@@ -6,6 +6,7 @@ class Admins::DailySchoolStatisticsController < Admins::BaseController
     total_count, statistics = Admins::SchoolDailyStatisticService.call(params)
 
     @statistics = paginate statistics, total_count: total_count
+    @params_page = params[:page] || 1
 
     respond_to do |format|
       format.html { load_statistic_total }
diff --git a/app/controllers/admins/myshixuns_controller.rb b/app/controllers/admins/myshixuns_controller.rb
index f70a64554..adc34e95e 100644
--- a/app/controllers/admins/myshixuns_controller.rb
+++ b/app/controllers/admins/myshixuns_controller.rb
@@ -6,6 +6,7 @@ class Admins::MyshixunsController < Admins::BaseController
     myshixuns = Admins::MyshixunQuery.call(params)
 
     @myshixuns = paginate myshixuns.includes(:last_executable_task, :last_task, shixun: :user, user: { user_extension: :school })
+    @params_page = params[:page] || 1
 
     myshixun_ids = @myshixuns.map(&:id)
     @finish_game_count = Game.where(myshixun_id: myshixun_ids, status: 2).group(:myshixun_id).count
diff --git a/app/controllers/admins/school_statistics_controller.rb b/app/controllers/admins/school_statistics_controller.rb
index fdd10c70f..5133cc997 100644
--- a/app/controllers/admins/school_statistics_controller.rb
+++ b/app/controllers/admins/school_statistics_controller.rb
@@ -10,6 +10,7 @@ class Admins::SchoolStatisticsController < Admins::BaseController
     @grow_summary = service.grow_summary
 
     total_count, statistics = service.call
+    @params_page = params[:page] || 1
 
     @statistics = paginate statistics, total_count: total_count
   end
diff --git a/app/controllers/admins/shixun_settings_controller.rb b/app/controllers/admins/shixun_settings_controller.rb
index bd54018cd..6dbbc077a 100644
--- a/app/controllers/admins/shixun_settings_controller.rb
+++ b/app/controllers/admins/shixun_settings_controller.rb
@@ -15,7 +15,8 @@ class Admins::ShixunSettingsController < Admins::BaseController
       hidden: params[:hidden].present? ? params[:hidden] : false,
       homepage_show: params[:homepage_show].present? ? params[:homepage_show] : false,
       task_pass: params[:task_pass].present? ? params[:task_pass] : false,
-      code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false
+      code_hidden: params[:code_hidden].present? ? params[:code_hidden] : false,
+      vip: params[:vip].present? ? params[:vip] : false
     }
 
     @shixuns_type_check = MirrorRepository.pluck(:type_name,:id)
@@ -126,6 +127,6 @@ class Admins::ShixunSettingsController < Admins::BaseController
   end
 
   def setting_params
-    params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:page_no, :id,tag_repertoires:[])
+    params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:vip,:page_no,:id,tag_repertoires:[])
   end
 end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index de24f7a8e..b08ba2dbd 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1299,8 +1299,10 @@ class CoursesController < ApplicationController
       begin
         @all_members = @course.students
         search = params[:search] ? "#{params[:search].strip}" : ""   #用户名或学生学号id搜索
-        group_id = params[:group_id]  #分班的班级id
-        @all_members = @all_members.where(course_group_id: group_id.map(&:to_i)) unless group_id.blank?
+        if params[:group_id].present?
+          group_ids = params[:group_id].is_a?(String) ? [params[:group_id].to_i] : params[:group_id].map(&:to_i)
+          @all_members = @all_members.where(course_group_id: group_ids)
+        end
         unless search.blank?
           @all_members = @all_members.joins(user: [:user_extension]).where('concat(users.lastname, users.firstname) like ? or user_extensions.student_id like ?',"%#{search}%","%#{search}%")
         end
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 0299fdf7d..25e0de44a 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -47,26 +47,26 @@ class FilesController < ApplicationController
 
   def bulk_publish
     return normal_status(403, "您没有权限进行操作") if current_user.course_identity(@course) >= 5
-    tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
+    # tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
 
     attachments = @course.attachments.by_ids(@attachment_ids)
 
     ActiveRecord::Base.transaction do
       # 有分班设置时
-      if @course.course_group_module? && @course.course_groups_count != 0 && params[:group_ids]
-        group_ids = params[:group_ids]&.reject(&:blank?)
-        charge_group_ids = @course.charge_group_ids(current_user)
-        publish_groups = charge_group_ids & group_ids if group_ids
-
-        attachments.each do |atta|
-          if atta.published? && !atta.unified_setting || !atta.published?
-            create_atta_group_settings atta
-            atta.update_all(unified_setting: 0) if atta.unified_setting
-            none_publish_settings = atta.attachment_group_settings.where(course_group_id: publish_groups).none_published
-            none_publish_settings.update_all(publish_time: Time.now)
-          end
-        end
-      end
+      # if @course.course_group_module? && @course.course_groups_count != 0 && params[:group_ids]
+      #   group_ids = params[:group_ids]&.reject(&:blank?)
+      #   charge_group_ids = @course.charge_group_ids(current_user)
+      #   publish_groups = charge_group_ids & group_ids if group_ids
+      #
+      #   attachments.each do |atta|
+      #     if atta.published? && !atta.unified_setting || !atta.published?
+      #       create_atta_group_settings atta
+      #       atta.update_attributes!(unified_setting: 0) if atta.unified_setting
+      #       none_publish_settings = atta.attachment_group_settings.where(course_group_id: publish_groups).none_published
+      #       none_publish_settings.update_all(publish_time: Time.now)
+      #     end
+      #   end
+      # end
 
       # 未发布的资源更新状态
       attachments.where(is_publish: 0).update_all(is_publish: 1, publish_time: Time.now)
@@ -140,7 +140,7 @@ class FilesController < ApplicationController
   def public_with_course_and_project
     @attachments = Attachment.publiced.simple_columns
                        .contains_course_and_project
-                       .includes(:author => :user_extension)
+                       .includes(:container, author: :user_extension)
                        .by_filename_or_user_name(params[:search])
                        .ordered(sort: 0, sort_type: 'created_on')
 
@@ -361,15 +361,16 @@ class FilesController < ApplicationController
   def publish_params
     tip_exception("缺少发布参数") if params[:delay_publish].blank?
     @unified_setting = 1
-    if params[:delay_publish].to_i == 1 && @course.course_group_module? && @course.course_groups_count != 0
-      tip_exception("分班发布设置不能为空") if params[:group_settings].blank?
-      min_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).min
-      max_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).max
-      tip_exception("分班发布设置不能为空") if min_publish_time.blank?
-
-      # 分班设置中的时间一样且包含所有分班 则按统一设置处理，否则是非统一设置
-      @unified_setting = 0 unless min_publish_time == max_publish_time && params[:group_settings].pluck(:group_id).flatten.sort == @course.course_groups.pluck(:id).sort
-    elsif params[:delay_publish].to_i == 1
+    # if params[:delay_publish].to_i == 1 && @course.course_group_module? && @course.course_groups_count != 0
+    #   tip_exception("分班发布设置不能为空") if params[:group_settings].blank?
+    #   min_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).min
+    #   max_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).max
+    #   tip_exception("分班发布设置不能为空") if min_publish_time.blank?
+    #
+    #   # 分班设置中的时间一样且包含所有分班 则按统一设置处理，否则是非统一设置
+    #   @unified_setting = 0 unless min_publish_time == max_publish_time && params[:group_settings].pluck(:group_id).flatten.sort == @course.course_groups.pluck(:id).sort
+    # els
+    if params[:delay_publish].to_i == 1
       tip_exception("缺少延期发布的时间参数") if params[:publish_time].blank?
       min_publish_time = params[:publish_time]
     end
diff --git a/app/controllers/hack_user_lastest_codes_controller.rb b/app/controllers/hack_user_lastest_codes_controller.rb
index 442e9ca3b..b7ec6fb8e 100644
--- a/app/controllers/hack_user_lastest_codes_controller.rb
+++ b/app/controllers/hack_user_lastest_codes_controller.rb
@@ -68,6 +68,7 @@ class HackUserLastestCodesController < ApplicationController
   # 提交记录详情
   def record_detail
     @hack_user = HackUserCode.find params[:id]
+    @my_hack = @hack_user.hack_user_lastest_code
   end
 
   # 接收中间件返回结果接口
diff --git a/app/controllers/hacks_controller.rb b/app/controllers/hacks_controller.rb
index c9e9097f8..657ad0f2a 100644
--- a/app/controllers/hacks_controller.rb
+++ b/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]
-  before_action :require_teacher_identity, only: [:create, :update_set, :edit, :update]
-  before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set]
+  before_action :find_hack, only: [:edit, :update, :publish, :start, :update_set, :delete_set, :destroy]
+  before_action :require_teacher_identity, only: [:create]
+  before_action :require_auth_identity, only: [:update, :edit, :publish, :update_set, :delete_set, :destroy]
 
 
   # 开启编程，如果第一次开启，创建一条记录，如果已经开启过的话，直接返回标识即可
@@ -112,6 +112,11 @@ class HacksController < ApplicationController
 
   def new;end
 
+  def destroy
+    @hack.destroy
+    render_ok
+  end
+
   private
   # 实名认证老师，管理员与运营人员权限
   def require_teacher_identity
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 4b2e3f54f..b5c8af1f3 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -216,7 +216,8 @@ class MyshixunsController < ApplicationController
     begin
       shixun_tomcat = edu_setting('tomcat_webssh')
       uri = "#{shixun_tomcat}/bridge/webssh/getConnectInfo"
-      params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh),
+      # 由于中间层采用混合云的方式，因为local参数表示在有文件生成的实训是在本地生成，还是在其他云端生成评测文件
+      params = {tpiID:@myshixun.id, podType:@myshixun.shixun.try(:webssh), local: @myshixun.shixun.show_type != -1,
                 containers:(Base64.urlsafe_encode64(shixun_container_limit @myshixun.shixun))}
       res = uri_post uri, params
       if res && res['code'].to_i != 0
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index a918f4e0a..f18d9cd2a 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -21,7 +21,7 @@ class Attachment < ApplicationRecord
   scope :contains_only_project,         -> { where(container_type: 'Project') }
   scope :contains_course_and_project,   -> { contains_only_course.or(contains_only_project) }
   scope :mine,                          -> (author_id) { where(author_id: author_id) }
-  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type) }
+  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
   scope :unified_setting, -> {where("unified_setting = ? ", 1)}
 
@@ -35,7 +35,7 @@ class Attachment < ApplicationRecord
 
   def title
     title = filename
-    if container.is_a?(StudentWork) && author_id != User.current.id
+    if container && container.is_a?(StudentWork) && author_id != User.current.id
       course = container&.homework_common&.course
       unless User.current.teacher_of_course?(course)
         title = "#{Time.now.strftime('%Y%m%d%H%M%S')}_#{DCODES.sample(8).join}" + File.extname(filename)
diff --git a/app/models/hack_user_code.rb b/app/models/hack_user_code.rb
index 072fd4e31..eee394e39 100644
--- a/app/models/hack_user_code.rb
+++ b/app/models/hack_user_code.rb
@@ -1,6 +1,7 @@
 class HackUserCode < ApplicationRecord
   # 用户编程题的信息
   belongs_to :hack
+  belongs_to :hack_user_lastest_code
 
   scope :created_order, ->{ order("created_at desc")}
 end
diff --git a/app/queries/admins/shixun_settings_query.rb b/app/queries/admins/shixun_settings_query.rb
index ab871b58e..377e7bf60 100644
--- a/app/queries/admins/shixun_settings_query.rb
+++ b/app/queries/admins/shixun_settings_query.rb
@@ -51,6 +51,7 @@ class Admins::ShixunSettingsQuery < ApplicationQuery
     all_shixuns = all_shixuns.where(homepage_show: params[:homepage_show]) if params[:homepage_show]
     all_shixuns = all_shixuns.where(task_pass: params[:task_pass]) if params[:task_pass]
     all_shixuns = all_shixuns.where(code_hidden: params[:code_hidden]) if params[:code_hidden]
+    all_shixuns = all_shixuns.where(vip: params[:vip]) if params[:vip]
 
     custom_sort(all_shixuns, params[:sort_by], params[:sort_direction])
   end
diff --git a/app/views/admins/courses/shared/_list.html.erb b/app/views/admins/courses/shared/_list.html.erb
index 633616462..4105c8153 100644
--- a/app/views/admins/courses/shared/_list.html.erb
+++ b/app/views/admins/courses/shared/_list.html.erb
@@ -1,30 +1,31 @@
 <table class="table table-hover text-center subject-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="4%">ID</th>
     <th width="10%" class="text-left">课堂名称</th>
-    <th width="6%">成员</th>
+    <th width="5%">成员</th>
     <th width="4%">资源</th>
     <th width="4%">普通作业</th>
     <th width="4%">分组作业</th>
     <th width="4%">实训作业</th>
     <th width="4%">试卷</th>
-    <th width="7%">评测次数</th>
+    <th width="6%">评测次数</th>
     <th width="4%">私有</th>
     <th width="6%">状态</th>
     <th width="10%">单位</th>
     <th width="7%">创建者</th>
     <th width="10%"><%= sort_tag('创建时间', name: 'created_at', path: admins_courses_path) %></th>
     <th width="4%">首页</th>
-    <th width="6%">邮件通知</th>
-    <th width="6%">操作</th>
+    <th width="5%">邮件通知</th>
+    <th width="5%">操作</th>
   </tr>
   </thead>
   <tbody>
   <% if courses.present? %>
-    <% courses.each do |course| %>
+    <% courses.each_with_index do |course, index| %>
       <tr class="course-item-<%= course.id %>">
-        <%= render 'admins/courses/shared/td', course: course %>
+        <%= render partial: 'admins/courses/shared/td', locals: {course: course, no: index} %>
       </tr>
     <% end %>
   <% else %>
diff --git a/app/views/admins/courses/shared/_td.html.erb b/app/views/admins/courses/shared/_td.html.erb
index 1d2da2a33..51cc4b199 100644
--- a/app/views/admins/courses/shared/_td.html.erb
+++ b/app/views/admins/courses/shared/_td.html.erb
@@ -1,3 +1,4 @@
+<td><%= list_index_no((params[:page] || 1).to_i, no) %></td>
 <td><%= course.id %></td>
 <td class="text-left">
   <%= link_to(course.name, "/courses/#{course.id}", target: '_blank') %>
diff --git a/app/views/admins/courses/update.js.erb b/app/views/admins/courses/update.js.erb
index 1278a2e1f..983ac22f0 100644
--- a/app/views/admins/courses/update.js.erb
+++ b/app/views/admins/courses/update.js.erb
@@ -1 +1,3 @@
-$("#course-item-<%= @course.id %>").html("<%= j render partial: "admins/courses/shared/td",locals: {course: @course} %>")
\ No newline at end of file
+var index = $("#course-item-<%= @course.id %>").children(":first").html();
+$("#course-item-<%= @course.id %>").html("<%= j render partial: "admins/courses/shared/td",locals: {course: @course, no: 1} %>");
+$("#course-item-<%= @course.id %>").children(":first").html(index);
\ No newline at end of file
diff --git a/app/views/admins/customers/shared/_list.html.erb b/app/views/admins/customers/shared/_list.html.erb
index 0ba5638cb..6f84db4e5 100644
--- a/app/views/admins/customers/shared/_list.html.erb
+++ b/app/views/admins/customers/shared/_list.html.erb
@@ -1,15 +1,17 @@
 <table class="table table-hover text-center customer-list-table">
   <thead class="thead-light">
   <tr>
-    <th width="50%" class="text-left">客户名称</th>
+    <th width="10%">序号</th>
+    <th width="40%" class="text-left">客户名称</th>
     <th width="30%"><%= sort_tag('添加时间', name: 'created_at', path: admins_partner_customers_path(current_partner)) %></th>
     <th width="20%">操作</th>
   </tr>
   </thead>
   <tbody>
   <% if customers.present? %>
-    <% customers.each do |customer| %>
+    <% customers.each_with_index do |customer, index| %>
       <tr class="customer-item-<%= customer.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td class="text-left"><%= customer.school&.name %></td>
         <td><%= customer.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
         <td>
diff --git a/app/views/admins/daily_school_statistics/shared/_list.html.erb b/app/views/admins/daily_school_statistics/shared/_list.html.erb
index 611acdd2a..6982891ee 100644
--- a/app/views/admins/daily_school_statistics/shared/_list.html.erb
+++ b/app/views/admins/daily_school_statistics/shared/_list.html.erb
@@ -1,8 +1,8 @@
 <table class="table table-hover daily-school-statistic-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="12%" class="text-left">单位名称</th>
-
     <th width="10%"><%= sort_tag('教师总数', name: 'teacher_count', path: admins_daily_school_statistics_path) %></th>
     <th width="10%"><%= sort_tag('学生总数', name: 'student_count', path: admins_daily_school_statistics_path) %></th>
     <th width="10%"><%= sort_tag('课堂总数', name: 'course_count', path: admins_daily_school_statistics_path) %></th>
@@ -16,13 +16,14 @@
     </th>
     <th width="11%"><%= sort_tag('实训作业总数', name: 'homework_count', path: admins_daily_school_statistics_path) %></th>
     <th width="11%"><%= sort_tag('其它作业总数', name: 'other_homework_count', path: admins_daily_school_statistics_path) %></th>
-    <th width="13%"><%= sort_tag('动态时间', name: 'nearly_course_time', path: admins_daily_school_statistics_path) %></th>
+    <th width="9%"><%= sort_tag('动态时间', name: 'nearly_course_time', path: admins_daily_school_statistics_path) %></th>
   </tr>
   </thead>
   <tbody>
   <% if statistics.present? %>
-    <% statistics.each do |statistic| %>
+    <% statistics.each_with_index do |statistic, index| %>
       <tr>
+        <td><%= list_index_no(@params_page.to_i, index) %></td>
         <td class="text-left">
           <%= link_to statistic[:name], "/colleges/#{statistic[:id]}/statistics",
                       target: '_blank', data: { toggle: 'tooltip', title: '点击查看学校统计概况' } %>
diff --git a/app/views/admins/department_applies/shared/_list.html.erb b/app/views/admins/department_applies/shared/_list.html.erb
index 0a1d803be..87d5ab66f 100644
--- a/app/views/admins/department_applies/shared/_list.html.erb
+++ b/app/views/admins/department_applies/shared/_list.html.erb
@@ -1,18 +1,20 @@
 <table class="table table-hover text-center department_applies-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="8%">ID</th>
     <th width="22%" class="text-left">部门名称</th>
     <th width="20%" class="text-left">单位名称</th>
-    <th width="15%">创建者</th>
+    <th width="11%">创建者</th>
     <th width="15%"><%= sort_tag('创建于', name: 'created_at', path: admins_department_applies_path) %></th>
     <th width="20%">操作</th>
   </tr>
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <tr class="department-apply-<%= apply.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td><%= apply.id %></td>
         <td class="text-left"> <%= apply.name %></td>
         <td class="text-left"> <%= apply.school.try(:name) %></td>
diff --git a/app/views/admins/department_members/create.js.erb b/app/views/admins/department_members/create.js.erb
index 4355c7432..6bf0a6ac3 100644
--- a/app/views/admins/department_members/create.js.erb
+++ b/app/views/admins/department_members/create.js.erb
@@ -1,4 +1,6 @@
 $('.modal.admin-add-department-member-modal').modal('hide');
 $.notify({ message: '操作成功' });
 
-$('.department-list-table .department-item-<%= current_department.id %>').html("<%= j(render partial: 'admins/departments/shared/department_item', locals: { department: current_department }) %>")
\ No newline at end of file
+var index = $(".department-item-<%= current_department.id %>").children(":first").html();
+$('.department-list-table .department-item-<%= current_department.id %>').html("<%= j(render partial: 'admins/departments/shared/department_item', locals: { department: current_department, index: 1 }) %>");
+$(".department-item-<%= current_department.id %>").children(":first").html(index);
\ No newline at end of file
diff --git a/app/views/admins/departments/shared/_department_item.html.erb b/app/views/admins/departments/shared/_department_item.html.erb
index 64b4ee70b..62f3a81ac 100644
--- a/app/views/admins/departments/shared/_department_item.html.erb
+++ b/app/views/admins/departments/shared/_department_item.html.erb
@@ -1,3 +1,4 @@
+<td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
 <% not_list = defined?(:users_count) %>
 
 <td class="text-left"><%= overflow_hidden_span department.name, width: 150 %></td>
diff --git a/app/views/admins/departments/shared/_list.html.erb b/app/views/admins/departments/shared/_list.html.erb
index 6af63d6f4..09ba2a65f 100644
--- a/app/views/admins/departments/shared/_list.html.erb
+++ b/app/views/admins/departments/shared/_list.html.erb
@@ -1,10 +1,11 @@
 <table class="table table-hover text-center department-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="14%" class="text-left">部门名称</th>
     <th width="14%" class="text-left">单位名称</th>
     <th width="6%">用户数</th>
-    <th width="10%">已职业认证</th>
+    <th width="6%">已职业认证</th>
     <th width="20%">部门管理员</th>
     <th width="8%">统计链接</th>
     <th width="8%">云主机数</th>
@@ -14,9 +15,9 @@
   </thead>
   <tbody>
   <% if departments.present? %>
-    <% departments.each do |department| %>
+    <% departments.each_with_index do |department, index| %>
       <tr class="department-item-<%= department.id %>">
-        <%= render 'admins/departments/shared/department_item', department: department %>
+        <%= render partial: 'admins/departments/shared/department_item', locals: {department: department, index: index} %>
       </tr>
     <% end %>
   <% else %>
diff --git a/app/views/admins/departments/update.js.erb b/app/views/admins/departments/update.js.erb
index 359bac59c..d20ca9524 100644
--- a/app/views/admins/departments/update.js.erb
+++ b/app/views/admins/departments/update.js.erb
@@ -1,4 +1,6 @@
 $('.modal.admin-edit-department-modal').modal('hide');
 $.notify({ message: '操作成功' });
 
-$('.department-list-table .department-item-<%= current_department.id %>').html("<%= j(render partial: 'admins/departments/shared/department_item', locals: { department: current_department }) %>")
\ No newline at end of file
+var index = $(".department-item-<%= current_department.id %>").children(":first").html();
+$('.department-list-table .department-item-<%= current_department.id %>').html("<%= j(render partial: 'admins/departments/shared/department_item', locals: {department: current_department, index: 1}) %>");
+$(".department-item-<%= current_department.id %>").children(":first").html(index);
\ No newline at end of file
diff --git a/app/views/admins/identity_authentications/shared/_list.html.erb b/app/views/admins/identity_authentications/shared/_list.html.erb
index 607feb93a..6e12d1c54 100644
--- a/app/views/admins/identity_authentications/shared/_list.html.erb
+++ b/app/views/admins/identity_authentications/shared/_list.html.erb
@@ -3,6 +3,7 @@
 <table class="table table-hover text-center identity-authentication-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <% unless is_processed %>
       <th width="4%">
         <%= check_box_tag('all-check', 1, false, id: nil, class: 'batch-all-check-box',
@@ -13,7 +14,7 @@
     <th width="10%">姓名</th>
     <th width="14%">身份证号</th>
     <th width="20%">学校/单位</th>
-    <th width="12%">职称</th>
+    <th width="8%">职称</th>
     <% unless is_processed %>
       <th width="8%">
         照片
@@ -33,9 +34,10 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <% user = apply.user %>
       <tr class="identity-authentication-item identity-authentication-<%= apply.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <% unless is_processed %>
           <td><%= check_box_tag('ids[]', apply.id, false, id: nil, class: 'batch-check-box') %></td>
         <% end %>
diff --git a/app/views/admins/laboratories/shared/_laboratory_item.html.erb b/app/views/admins/laboratories/shared/_laboratory_item.html.erb
index 81a45ca71..765616926 100644
--- a/app/views/admins/laboratories/shared/_laboratory_item.html.erb
+++ b/app/views/admins/laboratories/shared/_laboratory_item.html.erb
@@ -1,4 +1,5 @@
 <% school = laboratory.school %>
+<td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
 <td class="text-left"><%= school&.name || 'EduCoder主站' %></td>
 <td class="text-left">
   <% if laboratory.identifier %>
diff --git a/app/views/admins/laboratories/shared/_list.html.erb b/app/views/admins/laboratories/shared/_list.html.erb
index 2520b3276..a731be44a 100644
--- a/app/views/admins/laboratories/shared/_list.html.erb
+++ b/app/views/admins/laboratories/shared/_list.html.erb
@@ -1,6 +1,7 @@
 <table class="table table-hover text-center laboratory-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="14%" class="text-left">单位名称</th>
     <th width="16%" class="text-left">域名</th>
     <th width="6%">统计链接</th>
@@ -9,14 +10,14 @@
     <th width="4%" title="同步显示主站下该单位的课堂">同步课堂</th>
     <th width="4%" title="同步显示主站下该单位用户创建的实践课程">同步实践课程</th>
     <th width="4%" title="同步显示主站下该单位用户创建的实训">同步实训</th>
-    <th width="20%">操作</th>
+    <th width="16%">操作</th>
   </tr>
   </thead>
   <tbody>
   <% if laboratories.present? %>
-    <% laboratories.each do |laboratory| %>
+    <% laboratories.each_with_index do |laboratory, index| %>
       <tr class="laboratory-item laboratory-item-<%= laboratory.id %>">
-        <%= render 'admins/laboratories/shared/laboratory_item', laboratory: laboratory %>
+        <%= render partial: 'admins/laboratories/shared/laboratory_item', locals: {laboratory: laboratory, index: index} %>
       </tr>
     <% end %>
   <% else %>
diff --git a/app/views/admins/laboratories/update.js.erb b/app/views/admins/laboratories/update.js.erb
index 1b9f307a6..149539ad6 100644
--- a/app/views/admins/laboratories/update.js.erb
+++ b/app/views/admins/laboratories/update.js.erb
@@ -1 +1,3 @@
-$(".laboratory-item-<%= @laboratory.id %>").html("<%= j render partial: "admins/laboratories/shared/laboratory_item",locals: {laboratory: @laboratory} %>")
\ No newline at end of file
+var index = $(".laboratory-item-<%= @laboratory.id %>").children(":first").html();
+$(".laboratory-item-<%= @laboratory.id %>").html("<%= j render partial: "admins/laboratories/shared/laboratory_item",locals: {laboratory: @laboratory, index: 1} %>");
+$(".laboratory-item-<%= @laboratory.id %>").children(":first").html(index);
\ No newline at end of file
diff --git a/app/views/admins/laboratories/update_sync_course.js.erb b/app/views/admins/laboratories/update_sync_course.js.erb
index 5ae68f673..663f56ee1 100644
--- a/app/views/admins/laboratories/update_sync_course.js.erb
+++ b/app/views/admins/laboratories/update_sync_course.js.erb
@@ -1 +1,3 @@
-$("#laboratory-item-<%= @laboratory.id %>").html("<%= j render partial: 'admins/laboratories/shared/laboratory_item', locals: {laboratory: @laboratory} %>")
\ No newline at end of file
+var index = $(".laboratory-item-<%= @laboratory.id %>").children(":first").html();
+$("#laboratory-item-<%= @laboratory.id %>").html("<%= j render partial: 'admins/laboratories/shared/laboratory_item', locals: {laboratory: @laboratory, index: 1} %>");
+$(".laboratory-item-<%= @laboratory.id %>").children(":first").html(index);
\ No newline at end of file
diff --git a/app/views/admins/laboratory_shixuns/shared/_list.html.erb b/app/views/admins/laboratory_shixuns/shared/_list.html.erb
index e1244c472..462486f4b 100644
--- a/app/views/admins/laboratory_shixuns/shared/_list.html.erb
+++ b/app/views/admins/laboratory_shixuns/shared/_list.html.erb
@@ -1,21 +1,22 @@
 <table class="table text-center laboratory-shixun-list-table">
   <thead class="thead-light">
     <tr>
-      <th width="28%" class="text-left">实训名称</th>
+      <th width="4%">序号</th>
+      <th width="26%" class="text-left">实训名称</th>
       <th width="12%">技术平台</th>
       <th width="14%" class="text-left">技术体系</th>
       <th width="10%">封面</th>
       <th width="8%">创建者</th>
-      <th width="8%">状态</th>
+      <th width="6%">状态</th>
       <th width="8%">执行时间</th>
       <th width="16%">操作</th>
     </tr>
   </thead>
   <tbody>
     <% if laboratory_shixuns.present? %>
-      <% laboratory_shixuns.each do |laboratory_shixun| %>
+      <% laboratory_shixuns.each_with_index do |laboratory_shixun, index| %>
         <tr class="laboratory-shixun-item-<%= laboratory_shixun.id %>">
-          <%= render partial: 'admins/laboratory_shixuns/shared/td', locals: { laboratory_shixun: laboratory_shixun } %>
+          <%= render partial: 'admins/laboratory_shixuns/shared/td', locals: { laboratory_shixun: laboratory_shixun, index: index } %>
         </tr>
       <% end %>
     <% else %>
diff --git a/app/views/admins/laboratory_shixuns/shared/_td.html.erb b/app/views/admins/laboratory_shixuns/shared/_td.html.erb
index dbdf0df75..d987b53b4 100644
--- a/app/views/admins/laboratory_shixuns/shared/_td.html.erb
+++ b/app/views/admins/laboratory_shixuns/shared/_td.html.erb
@@ -1,5 +1,6 @@
 <%- shixun = laboratory_shixun.shixun -%>
 
+<td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
 <td class="text-left">
   <%= link_to "/shixuns/#{shixun.identifier}", target: '_blank' do %>
     <%= shixun.name %>
diff --git a/app/views/admins/laboratory_subjects/shared/_list.html.erb b/app/views/admins/laboratory_subjects/shared/_list.html.erb
index 55f67dea8..c40d02260 100644
--- a/app/views/admins/laboratory_subjects/shared/_list.html.erb
+++ b/app/views/admins/laboratory_subjects/shared/_list.html.erb
@@ -1,7 +1,8 @@
 <table class="table text-center laboratory-subject-list-table">
   <thead class="thead-light">
     <tr>
-      <th width="28%" class="text-left">课程名称</th>
+      <th width="4%">序号</th>
+      <th width="24%" class="text-left">课程名称</th>
       <th width="12%">技术体系</th>
       <th width="10%">等级体系</th>
       <th width="10%">封面</th>
@@ -13,10 +14,11 @@
   </thead>
   <tbody>
     <% if laboratory_subjects.present? %>
-      <% laboratory_subjects.each do |laboratory_subject| %>
+      <% laboratory_subjects.each_with_index do |laboratory_subject, index| %>
         <tr class="laboratory-subject-item-<%= laboratory_subject.id %>">
           <%- subject = laboratory_subject.subject -%>
 
+          <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
           <td class="text-left">
             <%= link_to(subject.name, "/paths/#{subject.id}", target: '_blank') %>
             <span class="badge badge-pill badge-success homepage-badge" style="<%= laboratory_subject.homepage? ? '' : 'display:none' %>">首页</span>
diff --git a/app/views/admins/laboratory_users/create.js.erb b/app/views/admins/laboratory_users/create.js.erb
index f43fd7887..604e62943 100644
--- a/app/views/admins/laboratory_users/create.js.erb
+++ b/app/views/admins/laboratory_users/create.js.erb
@@ -1,4 +1,6 @@
 $('.modal.admin-add-laboratory-user-modal').modal('hide');
 $.notify({ message: '操作成功' });
 
-$('.laboratory-list-table .laboratory-item-<%= current_laboratory.id %>').html("<%= j(render partial: 'admins/laboratories/shared/laboratory_item', locals: { laboratory: current_laboratory }) %>")
\ No newline at end of file
+var index = $(".laboratory-item-<%= current_laboratory.id %>").children(":first").html();
+$('.laboratory-list-table .laboratory-item-<%= current_laboratory.id %>').html("<%= j(render partial: 'admins/laboratories/shared/laboratory_item', locals: {laboratory: current_laboratory, index: 1}) %>");
+$(".laboratory-item-<%= current_laboratory.id %>").children(":first").html(index);
\ No newline at end of file
diff --git a/app/views/admins/library_applies/shared/_list.html.erb b/app/views/admins/library_applies/shared/_list.html.erb
index 783d0db30..fde3d1d1a 100644
--- a/app/views/admins/library_applies/shared/_list.html.erb
+++ b/app/views/admins/library_applies/shared/_list.html.erb
@@ -3,11 +3,12 @@
 <table class="table table-hover text-center library_applies-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="8%">头像</th>
     <th width="14%">姓名</th>
     <th width="26%" class="text-left">教学案例</th>
     <th width="26%" class="text-left">案例描述</th>
-    <th width="16%">时间</th>
+    <th width="12%">时间</th>
     <% if is_processed %>
       <th width="16%">拒绝原因</th>
       <th width="8%">状态</th>
@@ -18,10 +19,11 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <% user = apply.library.user %>
       <% library = apply.library %>
       <tr class="library_applies-item library_applies-<%= apply.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td>
           <%= link_to "/users/#{user.login}", class: 'professional-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
             <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
diff --git a/app/views/admins/myshixuns/shared/_list.html.erb b/app/views/admins/myshixuns/shared/_list.html.erb
index 440437320..a80a4ef23 100644
--- a/app/views/admins/myshixuns/shared/_list.html.erb
+++ b/app/views/admins/myshixuns/shared/_list.html.erb
@@ -1,9 +1,10 @@
 <table class="table table-hover text-center myshixun-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="6%">ID</th>
     <th width="10%">标识</th>
-    <th width="22%" class="text-left">实训名称</th>
+    <th width="18%" class="text-left">实训名称</th>
     <th width="10%">实训老师</th>
     <th width="6%">完成</th>
     <th width="6%">经验值</th>
@@ -14,8 +15,9 @@
   </thead>
   <tbody>
   <% if myshixuns.present? %>
-    <% myshixuns.each do |myshixun| %>
+    <% myshixuns.each_with_index do |myshixun, index| %>
       <tr class="myshixun-item-<%= myshixun.id %>">
+        <td><%= list_index_no(@params_page.to_i, index) %></td>
         <td><%= myshixun.id %></td>
         <td><%= myshixun.identifier %></td>
         <td class="text-left">
diff --git a/app/views/admins/partners/shared/_list.html.erb b/app/views/admins/partners/shared/_list.html.erb
index 0bebc2a4b..71153c175 100644
--- a/app/views/admins/partners/shared/_list.html.erb
+++ b/app/views/admins/partners/shared/_list.html.erb
@@ -1,15 +1,17 @@
 <table class="table table-hover text-center partner-list-table">
   <thead class="thead-light">
   <tr>
-    <th width="50%" class="text-left">名称</th>
+    <th width="10%">序号</th>
+    <th width="40%" class="text-left">名称</th>
     <th width="30%"><%= sort_tag('添加时间', name: 'created_at', path: admins_partners_path) %></th>
     <th width="20%">操作</th>
   </tr>
   </thead>
   <tbody>
   <% if partners.present? %>
-    <% partners.each do |partner| %>
+    <% partners.each_with_index do |partner, index| %>
       <tr class="partner-item-<%= partner.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td class="text-left">
           <%= link_to partner.school&.name || partner.name, customers_partner_path(partner), target: '_blank' %>
         </td>
diff --git a/app/views/admins/professional_authentications/shared/_list.html.erb b/app/views/admins/professional_authentications/shared/_list.html.erb
index 6ec6355ba..7ffa5837e 100644
--- a/app/views/admins/professional_authentications/shared/_list.html.erb
+++ b/app/views/admins/professional_authentications/shared/_list.html.erb
@@ -3,6 +3,7 @@
 <table class="table table-hover text-center professional-authentication-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <% unless is_processed %>
       <th width="4%">
         <%= check_box_tag('all-check', 1, false, id: nil, class: 'batch-all-check-box',
@@ -12,7 +13,7 @@
     <th width="8%">头像</th>
     <th width="14%">姓名</th>
     <th width="20%">学校/单位</th>
-    <th width="12%">职称</th>
+    <th width="8%">职称</th>
     <% unless is_processed %>
       <th width="14%">
         照片
@@ -31,9 +32,10 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <% user = apply.user %>
       <tr class="professional-authentication-item professional-authentication-<%= apply.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <% unless is_processed %>
           <td><%= check_box_tag('ids[]', apply.id, false, id: nil, class: 'batch-check-box') %></td>
         <% end %>
diff --git a/app/views/admins/project_package_applies/shared/_list.html.erb b/app/views/admins/project_package_applies/shared/_list.html.erb
index d94c96184..bec0912ca 100644
--- a/app/views/admins/project_package_applies/shared/_list.html.erb
+++ b/app/views/admins/project_package_applies/shared/_list.html.erb
@@ -3,11 +3,12 @@
 <table class="table table-hover text-center library_applies-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="8%">头像</th>
     <th width="14%">姓名</th>
     <th width="26%" class="text-left">众包需求</th>
     <th width="26%" class="text-left">需求描述</th>
-    <th width="16%">时间</th>
+    <th width="12%">时间</th>
     <% if is_processed %>
       <th width="16%">拒绝原因</th>
       <th width="8%">状态</th>
@@ -18,10 +19,11 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <% package = apply.project_package %>
       <% user = package.creator %>
       <tr class="project-package-item project-package-applies-<%= apply.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td>
           <%= link_to "/users/#{user.login}", class: 'professional-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
             <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb
index 8a84a72d0..e2a6307ad 100644
--- a/app/views/admins/projects/shared/_list.html.erb
+++ b/app/views/admins/projects/shared/_list.html.erb
@@ -1,6 +1,7 @@
 <table class="table table-hover text-center subject-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="4%">ID</th>
     <th width="15%" class="text-left">项目名称</th>
     <th width="6%">公开</th>
@@ -11,14 +12,15 @@
     <th width="6%">里程碑</th>
     <th width="10%">成员</th>
     <th width="10%">管理员</th>
-    <th width="15%"><%= sort_tag('创建时间', name: 'created_at', path: admins_projects_path) %></th>
+    <th width="11%"><%= sort_tag('创建时间', name: 'created_at', path: admins_projects_path) %></th>
     <th width="10%">操作</th>
   </tr>
   </thead>
   <tbody>
   <% if projects.present? %>
-    <% projects.each do |project| %>
+    <% projects.each_with_index do |project, index| %>
       <tr class="project-item-<%= project.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td><%= project.id %></td>
         <td class="text-left">
           <%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %>
diff --git a/app/views/admins/school_statistics/shared/_list.html.erb b/app/views/admins/school_statistics/shared/_list.html.erb
index aa043f097..9d2a1c209 100644
--- a/app/views/admins/school_statistics/shared/_list.html.erb
+++ b/app/views/admins/school_statistics/shared/_list.html.erb
@@ -20,7 +20,8 @@
 <table class="table table-hover text-center daily-school-statistic-list-table">
   <thead class="thead-light">
   <tr>
-    <th width="24%" class="text-left">单位名称</th>
+    <th width="4%">序号</th>
+    <th width="20%" class="text-left">单位名称</th>
     <th width="12%"><%= sort_tag('新增教师', name: 'teacher_increase_count', path: admins_school_statistics_path) %></th>
     <th width="12%"><%= sort_tag('新增学生', name: 'student_increase_count', path: admins_school_statistics_path) %></th>
     <th width="12%"><%= sort_tag('新增课堂', name: 'course_increase_count', path: admins_school_statistics_path) %></th>
@@ -32,8 +33,9 @@
   </thead>
   <tbody>
   <% if statistics.present? %>
-    <% statistics.each do |statistic| %>
+    <% statistics.each_with_index do |statistic, index| %>
       <tr>
+        <td><%= list_index_no(@params_page.to_i, index) %></td>
         <td class="text-left">
           <%= link_to statistic.school_name, "/colleges/#{statistic.school_id}/statistics",
                       target: '_blank', data: { toggle: 'tooltip', title: '点击查看学校统计概况' } %>
diff --git a/app/views/admins/schools/index.html.erb b/app/views/admins/schools/index.html.erb
index 9c41067ee..56cbadd9d 100644
--- a/app/views/admins/schools/index.html.erb
+++ b/app/views/admins/schools/index.html.erb
@@ -4,7 +4,7 @@
 
 <div class="box search-form-container school-list-form">
   <%= form_tag(admins_schools_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
-    <%= 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 ml-3', placeholder: '单位名称检索') %>
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
   <% end %>
 
diff --git a/app/views/admins/schools/shared/_list.html.erb b/app/views/admins/schools/shared/_list.html.erb
index ec7475028..ff0b17992 100644
--- a/app/views/admins/schools/shared/_list.html.erb
+++ b/app/views/admins/schools/shared/_list.html.erb
@@ -1,6 +1,7 @@
 <table class="table table-hover text-center school-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="6%">ID</th>
     <th width="6%">LOGO</th>
     <th width="8%">标识码</th>
@@ -11,13 +12,14 @@
     <th width="6%"><%= sort_tag('用户数', name: 'users_count', path: admins_schools_path) %></th>
     <th width="6%">部门数</th>
     <th width="12%"><%= sort_tag('创建时间', name: 'created_at', path: admins_schools_path) %></th>
-    <th width="14%">操作</th>
+    <th width="10%">操作</th>
   </tr>
   </thead>
   <tbody>
   <% if schools.present? %>
-    <% schools.each do |school| %>
+    <% schools.each_with_index do |school, index| %>
       <tr class="school-item-<%= school.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td><%= school.id %></td>
         <td>
           <% if Util::FileManage.exists?(school) %>
diff --git a/app/views/admins/shixun_authorizations/shared/_list.html.erb b/app/views/admins/shixun_authorizations/shared/_list.html.erb
index c1dec5f45..c3828ec86 100644
--- a/app/views/admins/shixun_authorizations/shared/_list.html.erb
+++ b/app/views/admins/shixun_authorizations/shared/_list.html.erb
@@ -3,11 +3,12 @@
 <table class="table table-hover text-center shixun-authorization-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="8%">头像</th>
     <th width="8%">创建者</th>
     <th width="28%" class="text-left">实训名称</th>
     <th width="8%">审核情况</th>
-    <th width="12%">任务数</th>
+    <th width="8%">任务数</th>
     <th width="16%">时间</th>
     <% if is_processed %>
       <th width="12%">拒绝原因</th>
@@ -19,12 +20,13 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <% user = apply.user %>
       <% shixun = shixun_map[apply.container_id] %>
       <% content_review = shixun.shixun_reviews.select{|sr| sr.review_type == 'Content'}.first %>
       <% perference_review = shixun.shixun_reviews.select{|sr| sr.review_type == 'Performance'}.first %>
       <tr class="shixun-authorization-item shixun-authorization-<%= apply.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td>
           <%= link_to "/users/#{user.login}", class: 'shixun-authorization-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
             <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
diff --git a/app/views/admins/shixun_recycles/shared/_list.html.erb b/app/views/admins/shixun_recycles/shared/_list.html.erb
index 60d2742e9..5518fc753 100644
--- a/app/views/admins/shixun_recycles/shared/_list.html.erb
+++ b/app/views/admins/shixun_recycles/shared/_list.html.erb
@@ -1,16 +1,18 @@
 <table class="table table-hover text-center shixuns-list-table">
   <thead class="thead-light">
+  <th width="4%">序号</th>
   <th width="8%">ID</th>
   <th width="32%" class="text-left">实训名称</th>
-  <th width="20%">子站源</th>
+  <th width="16%">子站源</th>
   <th width="10%">创建者</th>
   <th width="20%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixun_recycles_path) %></th>
   <th width="10%">操作</th>
   </thead>
   <tbody>
   <% if shixuns.present? %>
-    <% shixuns.each do |shixun| %>
+    <% shixuns.each_with_index do |shixun, index| %>
       <tr id="shixun_recycle_item_<%= shixun.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td><%= shixun.identifier %></td>
         <td class="text-left"><span><%= link_to overflow_hidden_span(shixun.name), "/shixuns/#{shixun.identifier}", :target => "_blank", :title => shixun.name %></span></td>
         <td><%= shixun.laboratory&.school&.name %></td>
diff --git a/app/views/admins/shixun_settings/index.html.erb b/app/views/admins/shixun_settings/index.html.erb
index 7aab73f64..66286926a 100644
--- a/app/views/admins/shixun_settings/index.html.erb
+++ b/app/views/admins/shixun_settings/index.html.erb
@@ -65,6 +65,12 @@
             <span class="only_view">只看已隐藏文件目录</span>
           </label>
         </div>
+        <div class="mr-5">
+          <label for="vip">
+            <%= check_box_tag :vip, !@sort_json[:vip],@sort_json[:vip], class:"shixun-settings-select" %>
+            <span class="only_view">只看vip</span>
+          </label>
+        </div>
       </div>
     </div>
   <% end %>
diff --git a/app/views/admins/shixun_settings/shared/_list.html.erb b/app/views/admins/shixun_settings/shared/_list.html.erb
index 7591fe323..549c7edf4 100644
--- a/app/views/admins/shixun_settings/shared/_list.html.erb
+++ b/app/views/admins/shixun_settings/shared/_list.html.erb
@@ -1,12 +1,13 @@
 <table class="table text-center shixun-settings-list-table">
   <thead class="thead-light">
-  <th width="8%">ID</th>
+  <th width="4%">序号</th>
+  <th width="7%">ID</th>
   <th width="12%" class="text-left">实训名称</th>
   <th width="8%">技术平台</th>
   <th width="8%">权限</th>
-  <th width="15%">技术体系</th>
-  <th width="8%">上传图片</th>
-  <th width="8%">小程序封面</th>
+  <th width="13%">技术体系</th>
+  <th width="7%">上传图片</th>
+  <th width="7%">小程序封面</th>
   <th width="5%">创建者</th>
   <th width="5%">关闭</th>
   <th width="4%">复制</th>
@@ -14,7 +15,7 @@
   <th>
     操作
     <div class="setting-chosen">
-      ssh/隐藏/首页/跳关/隐藏目录
+      ssh/隐藏/首页/跳关/隐藏目录/vip
     </div>
   </th>
   </thead>
diff --git a/app/views/admins/shixun_settings/shared/_td.html.erb b/app/views/admins/shixun_settings/shared/_td.html.erb
index f4a05f178..fc5af645a 100644
--- a/app/views/admins/shixun_settings/shared/_td.html.erb
+++ b/app/views/admins/shixun_settings/shared/_td.html.erb
@@ -1,3 +1,4 @@
+<td class="shixun-line-no"><%= page_no %></td>
 <td><%= shixun.identifier %></td>
 <td class="text-left">
   <span>
@@ -47,6 +48,7 @@
   <%= check_box_tag :homepage_show,!shixun.homepage_show,shixun.homepage_show,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form",title:"首页" %>
   <%= check_box_tag :task_pass,!shixun.task_pass,shixun.task_pass,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"跳关"%>
   <%= check_box_tag :code_hidden,!shixun.code_hidden,shixun.code_hidden,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"隐藏目录"%>
+  <%= check_box_tag :vip,!shixun.vip,shixun.vip,remote:true,data:{id:shixun.id,toggle:"tooltip",placement:"top"},class:"shixun-setting-form" ,title:"vip"%>
 </td>
 
 <script>
diff --git a/app/views/admins/subject_authorizations/shared/_list.html.erb b/app/views/admins/subject_authorizations/shared/_list.html.erb
index 28a699e22..94503dad7 100644
--- a/app/views/admins/subject_authorizations/shared/_list.html.erb
+++ b/app/views/admins/subject_authorizations/shared/_list.html.erb
@@ -3,9 +3,10 @@
 <table class="table table-hover text-center subject-authorization-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="8%">头像</th>
     <th width="10%">创建者</th>
-    <th width="28%" class="text-left">实践课程名称</th>
+    <th width="24%" class="text-left">实践课程名称</th>
     <th width="6%">阶段数</th>
     <th width="6%">实训数</th>
     <th width="6%">关卡数</th>
@@ -20,10 +21,11 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <% user = apply.user %>
       <% subject = subject_map[apply.container_id] %>
       <tr class="subject-authorization-item subject-authorization-<%= apply.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td>
           <%= link_to "/users/#{user.login}", class: 'subject-authorization-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
             <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
diff --git a/app/views/admins/subjects/shared/_list.html.erb b/app/views/admins/subjects/shared/_list.html.erb
index 5a37b64e7..33d37f21d 100644
--- a/app/views/admins/subjects/shared/_list.html.erb
+++ b/app/views/admins/subjects/shared/_list.html.erb
@@ -1,11 +1,12 @@
 <table class="table table-hover text-center subject-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="14%" class="text-left">名称</th>
-    <th width="6%">阶段数</th>
-    <th width="6%">实训数</th>
-    <th width="8%">技术体系</th>
-    <th width="8%">等级体系</th>
+    <th width="5%">阶段数</th>
+    <th width="5%">实训数</th>
+    <th width="7%">技术体系</th>
+    <th width="7%">等级体系</th>
     <th width="8%">封面</th>
     <th width="7%">创建者</th>
     <th width="10%">单位</th>
@@ -17,8 +18,9 @@
   </thead>
   <tbody>
   <% if subjects.present? %>
-    <% subjects.each do |subject| %>
+    <% subjects.each_with_index do |subject, index| %>
       <tr class="subject-item-<%= subject.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td class="text-left">
           <%= link_to(subject.name, "/paths/#{subject.id}", target: '_blank') %>
           <span class="badge badge-pill badge-success homepage-show-badge" style="<%= subject.homepage_show? ? '' : 'display:none' %>">首页</span>
diff --git a/app/views/admins/unit_applies/shared/_apply_item.html.erb b/app/views/admins/unit_applies/shared/_apply_item.html.erb
index 084826d72..b7d38b776 100644
--- a/app/views/admins/unit_applies/shared/_apply_item.html.erb
+++ b/app/views/admins/unit_applies/shared/_apply_item.html.erb
@@ -1,3 +1,4 @@
+<td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
 <td><%= apply.id %></td>
 <td class="text-left"><%= overflow_hidden_span apply.name %></td>
 <td class="text-left">
diff --git a/app/views/admins/unit_applies/shared/_list.html.erb b/app/views/admins/unit_applies/shared/_list.html.erb
index c28ce7967..75b9c720b 100644
--- a/app/views/admins/unit_applies/shared/_list.html.erb
+++ b/app/views/admins/unit_applies/shared/_list.html.erb
@@ -1,9 +1,10 @@
 <table class="table table-hover text-center unit-applies-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="8%">ID</th>
     <th width="20%" class="text-left">单位名称</th>
-    <th width="12%" class="text-left">地区</th>
+    <th width="8%" class="text-left">地区</th>
     <th width="20%" class="text-left">详细地址</th>
     <th width="10%">申请者</th>
     <th width="15%"><%= sort_tag('创建于', name: 'created_at', path: admins_unit_applies_path) %></th>
@@ -12,9 +13,9 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |apply| %>
+    <% applies.each_with_index do |apply, index| %>
       <tr class="unit-apply-<%= apply.id %>">
-        <%= render partial: "admins/unit_applies/shared/apply_item", locals: {apply: apply} %>
+        <%= render partial: "admins/unit_applies/shared/apply_item", locals: {apply: apply, index: index} %>
       </tr>
     <% end %>
   <% else %>
diff --git a/app/views/admins/user_statistics/shared/_list.html.erb b/app/views/admins/user_statistics/shared/_list.html.erb
index 5759d2f38..1e63fd0ac 100644
--- a/app/views/admins/user_statistics/shared/_list.html.erb
+++ b/app/views/admins/user_statistics/shared/_list.html.erb
@@ -1,20 +1,22 @@
 <table class="table table-hover text-center user-statistic-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="14%" class="text-left">姓名</th>
     <th width="22%" class="text-left">单位部门</th>
     <th width="10%">学习关卡数<%#= sort_tag('学习关卡数', name: 'study_challenge_count', path: admins_user_statistics_path) %></th>
-    <th width="10%">完成关卡数<%#= sort_tag('完成关卡数', name: 'finish_challenge_count', path: admins_user_statistics_path) %></th>
-    <th width="10%"><%= sort_tag('学习实训数', name: 'study_shixun_count', path: admins_user_statistics_path) %></th>
-    <th width="10%"><%= sort_tag('完成实训数', name: 'finish_shixun_count', path: admins_user_statistics_path) %></th>
-    <th width="10%">评测次数</th>
+    <th width="9%">完成关卡数<%#= sort_tag('完成关卡数', name: 'finish_challenge_count', path: admins_user_statistics_path) %></th>
+    <th width="9%"><%= sort_tag('学习实训数', name: 'study_shixun_count', path: admins_user_statistics_path) %></th>
+    <th width="9%"><%= sort_tag('完成实训数', name: 'finish_shixun_count', path: admins_user_statistics_path) %></th>
+    <th width="9%">评测次数</th>
     <th width="14%">实战时间</th>
   </tr>
   </thead>
   <tbody>
   <% if users.present? %>
-    <% users.each do |user| %>
+    <% users.each_with_index do |user, index| %>
       <tr class="user-statistic-item-<%= user.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td class="text-left">
           <%= link_to "/users/#{user.login}", target: '_blank' do %>
             <%= overflow_hidden_span user.real_name, width: 100 %>
diff --git a/app/views/admins/users/shared/_user_list.html.erb b/app/views/admins/users/shared/_user_list.html.erb
index 0a21baafe..36243e547 100644
--- a/app/views/admins/users/shared/_user_list.html.erb
+++ b/app/views/admins/users/shared/_user_list.html.erb
@@ -1,8 +1,9 @@
 <table class="table table-hover users-list-table">
   <thead class="thead-light">
     <tr>
-      <th width="10%" class="text-left">真实姓名</th>
-      <th width="15%">邮件地址</th>
+      <th width="4%">序号</th>
+      <th width="8%" class="text-left">真实姓名</th>
+      <th width="13%">邮件地址</th>
       <th width="10%">手机号码</th>
       <th width="14%">单位</th>
       <th width="7%">角色</th>
@@ -15,8 +16,9 @@
   </thead>
   <tbody>
     <% if users.present? %>
-      <% users.each do |user| %>
+      <% users.each_with_index do |user, index| %>
         <tr class="user-item-<%= user.id %>">
+          <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
           <td class="text-left">
             <%= link_to "/users/#{user.login}", target: '_blank' do %>
               <%= overflow_hidden_span user.real_name, width: 100 %>
diff --git a/app/views/admins/video_applies/shared/_list.html.erb b/app/views/admins/video_applies/shared/_list.html.erb
index 5e472bd4b..3466d21ba 100644
--- a/app/views/admins/video_applies/shared/_list.html.erb
+++ b/app/views/admins/video_applies/shared/_list.html.erb
@@ -3,12 +3,13 @@
 <table class="table table-hover text-center library_applies-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="8%">头像</th>
     <th width="14%">姓名</th>
     <th width="26%" class="text-left">视频名称</th>
     <th width="13%">视频大小</th>
     <th width="13%" class="text-left">播放链接</th>
-    <th width="16%">时间</th>
+    <th width="12%">时间</th>
     <% if is_processed %>
       <th width="16%">拒绝原因</th>
       <th width="8%">状态</th>
@@ -19,10 +20,11 @@
   </thead>
   <tbody>
   <% if applies.present? %>
-    <% applies.each do |v| %>
+    <% applies.each_with_index do |v, index| %>
       <% video = v.video %>
       <% user = video.user %>
       <tr class="video-applies-item video-applies-<%= v.id %>">
+        <td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
         <td>
           <%= link_to "/users/#{user.login}", class: 'professional-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
             <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
diff --git a/app/views/hack_user_lastest_codes/record_detail.json.jbuilder b/app/views/hack_user_lastest_codes/record_detail.json.jbuilder
index 4b77c2e00..8f72014fe 100644
--- a/app/views/hack_user_lastest_codes/record_detail.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/record_detail.json.jbuilder
@@ -1,4 +1,8 @@
 json.(@hack_user, :id, :status, :error_line, :error_msg, :expected_output,
     :input, :output, :execute_time, :execute_memory, :created_at, :code)
 json.language @hack_user.hack.language
-json.name @hack_user.hack.name
\ No newline at end of file
+json.name @hack_user.hack.name
+json.myproblem_identifier @my_hack.identifier
+json.user do
+  json.partial! 'users/user', user: current_user
+end
\ No newline at end of file
diff --git a/db/migrate/20191210084737_add_vip_to_shixun.rb b/db/migrate/20191210084737_add_vip_to_shixun.rb
new file mode 100644
index 000000000..e72879b78
--- /dev/null
+++ b/db/migrate/20191210084737_add_vip_to_shixun.rb
@@ -0,0 +1,5 @@
+class AddVipToShixun < ActiveRecord::Migration[5.2]
+  def change
+    add_column :shixuns, :vip, :boolean, default: 0
+  end
+end
diff --git a/public/images/educoder/index/shixun/shixun24.jpg b/public/images/educoder/index/shixun/shixun24.jpg
deleted file mode 100644
index 51d97e719..000000000
Binary files a/public/images/educoder/index/shixun/shixun24.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun25.jpg b/public/images/educoder/index/shixun/shixun25.jpg
deleted file mode 100644
index ceb1ff60a..000000000
Binary files a/public/images/educoder/index/shixun/shixun25.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun26.jpg b/public/images/educoder/index/shixun/shixun26.jpg
deleted file mode 100644
index 6180626a4..000000000
Binary files a/public/images/educoder/index/shixun/shixun26.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun27.jpg b/public/images/educoder/index/shixun/shixun27.jpg
deleted file mode 100644
index a998669c6..000000000
Binary files a/public/images/educoder/index/shixun/shixun27.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun28.jpg b/public/images/educoder/index/shixun/shixun28.jpg
deleted file mode 100644
index 8b9422b87..000000000
Binary files a/public/images/educoder/index/shixun/shixun28.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun29.jpg b/public/images/educoder/index/shixun/shixun29.jpg
deleted file mode 100644
index e9cda9129..000000000
Binary files a/public/images/educoder/index/shixun/shixun29.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun30.jpg b/public/images/educoder/index/shixun/shixun30.jpg
deleted file mode 100644
index df4df88a0..000000000
Binary files a/public/images/educoder/index/shixun/shixun30.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun31.jpg b/public/images/educoder/index/shixun/shixun31.jpg
deleted file mode 100644
index 131afcac2..000000000
Binary files a/public/images/educoder/index/shixun/shixun31.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun31.jpg~HEAD b/public/images/educoder/index/shixun/shixun31.jpg~HEAD
deleted file mode 100644
index 5d4218a45..000000000
Binary files a/public/images/educoder/index/shixun/shixun31.jpg~HEAD and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun32.jpg b/public/images/educoder/index/shixun/shixun32.jpg
deleted file mode 100644
index bb4fb7d31..000000000
Binary files a/public/images/educoder/index/shixun/shixun32.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun33.jpg b/public/images/educoder/index/shixun/shixun33.jpg
deleted file mode 100644
index b851ac0fc..000000000
Binary files a/public/images/educoder/index/shixun/shixun33.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun34.jpg b/public/images/educoder/index/shixun/shixun34.jpg
deleted file mode 100644
index 6eadbbe35..000000000
Binary files a/public/images/educoder/index/shixun/shixun34.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun35.jpg b/public/images/educoder/index/shixun/shixun35.jpg
deleted file mode 100644
index 87f8276ca..000000000
Binary files a/public/images/educoder/index/shixun/shixun35.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun36.jpg b/public/images/educoder/index/shixun/shixun36.jpg
deleted file mode 100644
index 149841c9a..000000000
Binary files a/public/images/educoder/index/shixun/shixun36.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun37.jpg b/public/images/educoder/index/shixun/shixun37.jpg
deleted file mode 100644
index 0ad960534..000000000
Binary files a/public/images/educoder/index/shixun/shixun37.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun38.jpg b/public/images/educoder/index/shixun/shixun38.jpg
deleted file mode 100644
index e1e64007e..000000000
Binary files a/public/images/educoder/index/shixun/shixun38.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun39.jpg b/public/images/educoder/index/shixun/shixun39.jpg
deleted file mode 100644
index 07a00b3a6..000000000
Binary files a/public/images/educoder/index/shixun/shixun39.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun40.jpg b/public/images/educoder/index/shixun/shixun40.jpg
deleted file mode 100644
index d4bf2fadf..000000000
Binary files a/public/images/educoder/index/shixun/shixun40.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun41.jpg b/public/images/educoder/index/shixun/shixun41.jpg
deleted file mode 100644
index c7a03198a..000000000
Binary files a/public/images/educoder/index/shixun/shixun41.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun42.jpg b/public/images/educoder/index/shixun/shixun42.jpg
deleted file mode 100644
index cbccb88c6..000000000
Binary files a/public/images/educoder/index/shixun/shixun42.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun43.jpg b/public/images/educoder/index/shixun/shixun43.jpg
deleted file mode 100644
index e3e3a41e2..000000000
Binary files a/public/images/educoder/index/shixun/shixun43.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun44.jpg b/public/images/educoder/index/shixun/shixun44.jpg
deleted file mode 100644
index 80e8b193a..000000000
Binary files a/public/images/educoder/index/shixun/shixun44.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun45.jpg b/public/images/educoder/index/shixun/shixun45.jpg
deleted file mode 100644
index d032aed71..000000000
Binary files a/public/images/educoder/index/shixun/shixun45.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun46.jpg b/public/images/educoder/index/shixun/shixun46.jpg
deleted file mode 100644
index 84b7cf6e0..000000000
Binary files a/public/images/educoder/index/shixun/shixun46.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun47.jpg b/public/images/educoder/index/shixun/shixun47.jpg
deleted file mode 100644
index cb99dc95d..000000000
Binary files a/public/images/educoder/index/shixun/shixun47.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun48.jpg b/public/images/educoder/index/shixun/shixun48.jpg
deleted file mode 100644
index c619abfa6..000000000
Binary files a/public/images/educoder/index/shixun/shixun48.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun49.jpg b/public/images/educoder/index/shixun/shixun49.jpg
deleted file mode 100644
index 398dfa1e1..000000000
Binary files a/public/images/educoder/index/shixun/shixun49.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun50.jpg b/public/images/educoder/index/shixun/shixun50.jpg
deleted file mode 100644
index 6a3a61dfd..000000000
Binary files a/public/images/educoder/index/shixun/shixun50.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun51.jpg b/public/images/educoder/index/shixun/shixun51.jpg
deleted file mode 100644
index 29262fba7..000000000
Binary files a/public/images/educoder/index/shixun/shixun51.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun52.jpg b/public/images/educoder/index/shixun/shixun52.jpg
deleted file mode 100644
index 766d7afd8..000000000
Binary files a/public/images/educoder/index/shixun/shixun52.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun53.jpg b/public/images/educoder/index/shixun/shixun53.jpg
deleted file mode 100644
index db81f7cff..000000000
Binary files a/public/images/educoder/index/shixun/shixun53.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun54.jpg b/public/images/educoder/index/shixun/shixun54.jpg
deleted file mode 100644
index e47fb239c..000000000
Binary files a/public/images/educoder/index/shixun/shixun54.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun55.jpg b/public/images/educoder/index/shixun/shixun55.jpg
deleted file mode 100644
index 556e59b33..000000000
Binary files a/public/images/educoder/index/shixun/shixun55.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun56.jpg b/public/images/educoder/index/shixun/shixun56.jpg
deleted file mode 100644
index 0048c81a5..000000000
Binary files a/public/images/educoder/index/shixun/shixun56.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun57.jpg b/public/images/educoder/index/shixun/shixun57.jpg
deleted file mode 100644
index caf3ad104..000000000
Binary files a/public/images/educoder/index/shixun/shixun57.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun58.jpg b/public/images/educoder/index/shixun/shixun58.jpg
deleted file mode 100644
index 610199dc5..000000000
Binary files a/public/images/educoder/index/shixun/shixun58.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun59.jpg b/public/images/educoder/index/shixun/shixun59.jpg
deleted file mode 100644
index 973cba886..000000000
Binary files a/public/images/educoder/index/shixun/shixun59.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun60.jpg b/public/images/educoder/index/shixun/shixun60.jpg
deleted file mode 100644
index 9d13e9c61..000000000
Binary files a/public/images/educoder/index/shixun/shixun60.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun61.jpg b/public/images/educoder/index/shixun/shixun61.jpg
deleted file mode 100644
index 54e283cd9..000000000
Binary files a/public/images/educoder/index/shixun/shixun61.jpg and /dev/null differ
diff --git a/public/images/educoder/index/shixun/shixun62.jpg b/public/images/educoder/index/shixun/shixun62.jpg
deleted file mode 100644
index 079c83926..000000000
Binary files a/public/images/educoder/index/shixun/shixun62.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject18.jpg b/public/images/educoder/index/subject/subject18.jpg
deleted file mode 100644
index 5bcdd8e21..000000000
Binary files a/public/images/educoder/index/subject/subject18.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject19.jpg b/public/images/educoder/index/subject/subject19.jpg
deleted file mode 100644
index 0c82077d2..000000000
Binary files a/public/images/educoder/index/subject/subject19.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject20.jpg b/public/images/educoder/index/subject/subject20.jpg
deleted file mode 100644
index 25c3896e0..000000000
Binary files a/public/images/educoder/index/subject/subject20.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject21.jpg b/public/images/educoder/index/subject/subject21.jpg
deleted file mode 100644
index ebe3df86d..000000000
Binary files a/public/images/educoder/index/subject/subject21.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject22.jpg b/public/images/educoder/index/subject/subject22.jpg
deleted file mode 100644
index b06cca4ab..000000000
Binary files a/public/images/educoder/index/subject/subject22.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject23.jpg b/public/images/educoder/index/subject/subject23.jpg
deleted file mode 100644
index bd6ea450c..000000000
Binary files a/public/images/educoder/index/subject/subject23.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject24.jpg b/public/images/educoder/index/subject/subject24.jpg
deleted file mode 100644
index e6fbb0ab0..000000000
Binary files a/public/images/educoder/index/subject/subject24.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject25.jpg b/public/images/educoder/index/subject/subject25.jpg
deleted file mode 100644
index bedeea999..000000000
Binary files a/public/images/educoder/index/subject/subject25.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject26.jpg b/public/images/educoder/index/subject/subject26.jpg
deleted file mode 100644
index 3c8040901..000000000
Binary files a/public/images/educoder/index/subject/subject26.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject27.jpg b/public/images/educoder/index/subject/subject27.jpg
deleted file mode 100644
index 59410bd62..000000000
Binary files a/public/images/educoder/index/subject/subject27.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject28.jpg b/public/images/educoder/index/subject/subject28.jpg
deleted file mode 100644
index 4799d28d8..000000000
Binary files a/public/images/educoder/index/subject/subject28.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject29.jpg b/public/images/educoder/index/subject/subject29.jpg
deleted file mode 100644
index 451053cf7..000000000
Binary files a/public/images/educoder/index/subject/subject29.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject30.jpg b/public/images/educoder/index/subject/subject30.jpg
deleted file mode 100644
index 2abd5a860..000000000
Binary files a/public/images/educoder/index/subject/subject30.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject31.jpg b/public/images/educoder/index/subject/subject31.jpg
deleted file mode 100644
index f84e0587a..000000000
Binary files a/public/images/educoder/index/subject/subject31.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject32.jpg b/public/images/educoder/index/subject/subject32.jpg
deleted file mode 100644
index 7ab3f038e..000000000
Binary files a/public/images/educoder/index/subject/subject32.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject33.jpg b/public/images/educoder/index/subject/subject33.jpg
deleted file mode 100644
index c3f1e57db..000000000
Binary files a/public/images/educoder/index/subject/subject33.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject34.jpg b/public/images/educoder/index/subject/subject34.jpg
deleted file mode 100644
index b5f4cb5f7..000000000
Binary files a/public/images/educoder/index/subject/subject34.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject35.jpg b/public/images/educoder/index/subject/subject35.jpg
deleted file mode 100644
index 6a9156340..000000000
Binary files a/public/images/educoder/index/subject/subject35.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject36.jpg b/public/images/educoder/index/subject/subject36.jpg
deleted file mode 100644
index f7c8757cc..000000000
Binary files a/public/images/educoder/index/subject/subject36.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject37.jpg b/public/images/educoder/index/subject/subject37.jpg
deleted file mode 100644
index b8b815f8b..000000000
Binary files a/public/images/educoder/index/subject/subject37.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject38.jpg b/public/images/educoder/index/subject/subject38.jpg
deleted file mode 100644
index 286a1e356..000000000
Binary files a/public/images/educoder/index/subject/subject38.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject39.jpg b/public/images/educoder/index/subject/subject39.jpg
deleted file mode 100644
index e901842c4..000000000
Binary files a/public/images/educoder/index/subject/subject39.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject4-o.jpg b/public/images/educoder/index/subject/subject4-o.jpg
deleted file mode 100644
index 7c6784cf1..000000000
Binary files a/public/images/educoder/index/subject/subject4-o.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject40.jpg b/public/images/educoder/index/subject/subject40.jpg
deleted file mode 100644
index ac5f581fd..000000000
Binary files a/public/images/educoder/index/subject/subject40.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject41.jpg b/public/images/educoder/index/subject/subject41.jpg
deleted file mode 100644
index f968870f0..000000000
Binary files a/public/images/educoder/index/subject/subject41.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject42.jpg b/public/images/educoder/index/subject/subject42.jpg
deleted file mode 100644
index b3251b7e4..000000000
Binary files a/public/images/educoder/index/subject/subject42.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject43.jpg b/public/images/educoder/index/subject/subject43.jpg
deleted file mode 100644
index 0dd42efaa..000000000
Binary files a/public/images/educoder/index/subject/subject43.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject44.jpg b/public/images/educoder/index/subject/subject44.jpg
deleted file mode 100644
index 21214a7d1..000000000
Binary files a/public/images/educoder/index/subject/subject44.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject45.jpg b/public/images/educoder/index/subject/subject45.jpg
deleted file mode 100644
index bd27e6ba0..000000000
Binary files a/public/images/educoder/index/subject/subject45.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject46.jpg b/public/images/educoder/index/subject/subject46.jpg
deleted file mode 100644
index 3d621652b..000000000
Binary files a/public/images/educoder/index/subject/subject46.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject47.jpg b/public/images/educoder/index/subject/subject47.jpg
deleted file mode 100644
index fcd318623..000000000
Binary files a/public/images/educoder/index/subject/subject47.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject48.jpg b/public/images/educoder/index/subject/subject48.jpg
deleted file mode 100644
index e7ee65970..000000000
Binary files a/public/images/educoder/index/subject/subject48.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject49.jpg b/public/images/educoder/index/subject/subject49.jpg
deleted file mode 100644
index 5adf9e274..000000000
Binary files a/public/images/educoder/index/subject/subject49.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject50.jpg b/public/images/educoder/index/subject/subject50.jpg
deleted file mode 100644
index 46ee0208c..000000000
Binary files a/public/images/educoder/index/subject/subject50.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject51.jpg b/public/images/educoder/index/subject/subject51.jpg
deleted file mode 100644
index 4c52ae48e..000000000
Binary files a/public/images/educoder/index/subject/subject51.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject52.jpg b/public/images/educoder/index/subject/subject52.jpg
deleted file mode 100644
index f959d9ed7..000000000
Binary files a/public/images/educoder/index/subject/subject52.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject53.jpg b/public/images/educoder/index/subject/subject53.jpg
deleted file mode 100644
index 3516fad82..000000000
Binary files a/public/images/educoder/index/subject/subject53.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject54.jpg b/public/images/educoder/index/subject/subject54.jpg
deleted file mode 100644
index d717562e7..000000000
Binary files a/public/images/educoder/index/subject/subject54.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject55.jpg b/public/images/educoder/index/subject/subject55.jpg
deleted file mode 100644
index 2cc6c0173..000000000
Binary files a/public/images/educoder/index/subject/subject55.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject56.jpg b/public/images/educoder/index/subject/subject56.jpg
deleted file mode 100644
index 2125dc132..000000000
Binary files a/public/images/educoder/index/subject/subject56.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject57.jpg b/public/images/educoder/index/subject/subject57.jpg
deleted file mode 100644
index eecf5b1c2..000000000
Binary files a/public/images/educoder/index/subject/subject57.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject58.jpg b/public/images/educoder/index/subject/subject58.jpg
deleted file mode 100644
index 89d26b0b0..000000000
Binary files a/public/images/educoder/index/subject/subject58.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject6-o.jpg b/public/images/educoder/index/subject/subject6-o.jpg
deleted file mode 100644
index f7cda83f2..000000000
Binary files a/public/images/educoder/index/subject/subject6-o.jpg and /dev/null differ
diff --git a/public/images/educoder/index/subject/subject8-o.jpg b/public/images/educoder/index/subject/subject8-o.jpg
deleted file mode 100644
index fbeebe4ee..000000000
Binary files a/public/images/educoder/index/subject/subject8-o.jpg and /dev/null differ
diff --git a/public/images/educoder/shixun-detail.jpg b/public/images/educoder/shixun-detail.jpg
index a9af2ecdf..37c86aefa 100644
Binary files a/public/images/educoder/shixun-detail.jpg and b/public/images/educoder/shixun-detail.jpg differ
diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js
index 31c6d2f52..e2454652b 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectResource.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js
@@ -42,12 +42,7 @@ class Selectresource extends Component{
 			getallfiles:false,
 			searchtype:'getallfiles',
 			Radiovalue:0,
-			datatime:undefined,
-			course_group_publish_times:[
-				{
-					group_id : [],
-					publish_time :undefined,
-				}],
+			datatime:undefined
 		}
 	}
 	componentDidMount() {
@@ -79,7 +74,7 @@ class Selectresource extends Component{
 	}
 
 	SenttotheSearch=(value)=>{
-    let {searchtype}=this.state;
+		let {searchtype}=this.state;
 		if(searchtype==="getallfiles"){
 			this.getallfiles(value,1)
 		}else if(searchtype==="getmyfiles"){
@@ -91,32 +86,32 @@ class Selectresource extends Component{
 	setupdatalist=(url,newpage)=>{
 		let {Resourcelist,Searchvalue}=this.state;
 		if(Resourcelist!=undefined){
-		let newResourcelist=Resourcelist.files;
-		axios.get(url,{
-			params:{
-				page:newpage,
-				page_size:15,
-				search:Searchvalue,
-			}
-		}).then((result)=>{
+			let newResourcelist=Resourcelist.files;
+			axios.get(url,{
+				params:{
+					page:newpage,
+					page_size:15,
+					search:Searchvalue,
+				}
+			}).then((result)=>{
 
-	      var list=result.data.data.files;
+				var list=result.data.data.files;
 				for(var i=0;i<list.length; i++ ){
-				  newResourcelist.push(list[i])
+					newResourcelist.push(list[i])
+				}
+				let lists={
+					total_count:Resourcelist.total_count,
+					files:newResourcelist
 				}
-        let lists={
-	        total_count:Resourcelist.total_count,
-	        files:newResourcelist
-        }
 				this.setState({
 					Resourcelist:lists,
 					hometypepvisible:false,
 					getallfiles:true,
 					page:newpage
 				})
-		}).catch((error)=>{
-			console.log(error)
-		})
+			}).catch((error)=>{
+				console.log(error)
+			})
 		}
 	}
 	contentViewScroll=(e)=>{
@@ -152,7 +147,7 @@ class Selectresource extends Component{
 		// this.props.funshixunmodallist(Searchvalue,types,true,1)
 		// this.props.funpatheditarry([])
 		if(types==="all"){
-      this.getallfiles(undefined,1)
+			this.getallfiles(undefined,1)
 		}else if(types==="my"){
 			this.getmyfiles(undefined,1)
 		}
@@ -168,12 +163,12 @@ class Selectresource extends Component{
 				search:value,
 			}
 		}).then((result)=>{
-	      this.setState({
-		      Resourcelist:result.data.data,
-		      hometypepvisible:false,
-		      getallfiles:true,
-		      searchtype:'getallfiles'
-	      })
+			this.setState({
+				Resourcelist:result.data.data,
+				hometypepvisible:false,
+				getallfiles:true,
+				searchtype:'getallfiles'
+			})
 		}).catch((error)=>{
 			console.log(error)
 		})
@@ -189,11 +184,11 @@ class Selectresource extends Component{
 				search:value,
 			}
 		}).then((result)=>{
-				this.setState({
-					Resourcelist: result.data.data,
-					hometypepvisible:false,
-					searchtype:'getmyfiles'
-				})
+			this.setState({
+				Resourcelist: result.data.data,
+				hometypepvisible:false,
+				searchtype:'getmyfiles'
+			})
 		}).catch((error)=>{
 			console.log(error)
 		})
@@ -201,7 +196,7 @@ class Selectresource extends Component{
 
 
 	hidecouseShixunModal=()=>{
-		 this.props.hidecouseShixunModal()
+		this.props.hidecouseShixunModal()
 	}
 
 	ModalCancelModalCancel=()=>{
@@ -217,22 +212,22 @@ class Selectresource extends Component{
 
 	savecouseShixunModal=()=>{
 
-		let {patheditarry,datatime,Radiovalue,course_group_publish_times}=this.state;
+		let {patheditarry,datatime,Radiovalue}=this.state;
 		let {coursesId,attachmentId}=this.props;
-	   let url="/files/import.json";
-
-	  if(patheditarry===undefined||patheditarry.length===0){
-	  	this.setState({
-			  patheditarrytype:true
-		  })
-		  return
-	  }else{
-		  this.setState({
-			  patheditarrytype:false
-		  })
-	  }
-
-		if(this.state.Radiovalue===1&&this.props.course_groups.length===0){
+		let url="/files/import.json";
+
+		if(patheditarry===undefined||patheditarry.length===0){
+			this.setState({
+				patheditarrytype:true
+			})
+			return
+		}else{
+			this.setState({
+				patheditarrytype:false
+			})
+		}
+
+		if(this.state.Radiovalue===1){
 			if(datatime===undefined||datatime===null||datatime=== ""){
 				this.setState({
 					Radiovaluetype:true
@@ -249,17 +244,16 @@ class Selectresource extends Component{
 				course_id:coursesId,
 				attachment_ids:patheditarry,
 				course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
-			  delay_publish:Radiovalue,
-			  publish_time:this.props.course_groups.length===0?Radiovalue===1?datatime===undefined? undefined:datatime:undefined:undefined,
-			  group_settings:this.props.course_groups.length===0?undefined:course_group_publish_times
+				delay_publish:Radiovalue,
+				publish_time:Radiovalue===1?datatime:undefined
 			}
 		).then((response) => {
-				if(response.data.status===0){
-					this.ModalCancelModalCancel();
-					this.props.updataleftNavfun();
-					this.props.showNotification("选用资源成功");
-					this.props.setupdate(attachmentId)
-				}
+			if(response.data.status===0){
+				this.ModalCancelModalCancel();
+				this.props.updataleftNavfun();
+				this.props.showNotification("选用资源成功");
+				this.props.setupdate(attachmentId)
+			}
 		}).catch((error) => {
 			console.log(error)
 		})
@@ -277,58 +271,15 @@ class Selectresource extends Component{
 		});
 	}
 
-	onChangeTimepublish= (date, dateString,key,type) => {
-		if(type===1){
-			this.setState({
-				datatime:handleDateString(dateString),
-			})
-		}else if(type===2){
-			let {course_group_publish_times}=this.state;
-			let newgroup_publish=course_group_publish_times;
-			for(var i=0; i<newgroup_publish.length; i++){
-				if(i===parseInt(key)){
-					newgroup_publish[i].publish_time=handleDateString(dateString);
-				}
-			}
-			this.setState({
-				course_group_publish_times:newgroup_publish,
-			})
-		}
-	}
+	onChangeTimepublish= (date, dateString) => {
 
-	addgrouppublish=()=>{
-		let newlist=this.state.course_group_publish_times;
-		newlist.push(  {
-			group_id : undefined,
-			publish_time :undefined,
-		})
-		this.setState({
-			course_group_publish_times:newlist
-		})
-	}
-	deletegrouppublish=(key)=>{
-		let newlist=this.state.course_group_publish_times;
-		newlist.splice(key,1);
 		this.setState({
-			course_group_publish_times:newlist
+			datatime:handleDateString(dateString),
 		})
-	}
-	selectassigngroups=(e,index,key)=>{
-		debugger
-		let {course_group_publish_times}=this.state;
-		let newgroup_publish=course_group_publish_times;
-		for(var i=0; i<newgroup_publish.length; i++){
-			if(i===parseInt(key)){
-				newgroup_publish[i].group_id=e;
-			}
-		}
-		this.setState({
-			course_group_publish_times:newgroup_publish,
-		})
-	}
 
+	}
 	render(){
-		let {Searchvalue,type,Resourcelist,hometypepvisible,patheditarry,datatime,course_group_publish_times}=this.state;
+		let {Searchvalue,type,Resourcelist,hometypepvisible,patheditarry,datatime}=this.state;
 		let {visible}=this.props;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		const radioStyle = {
@@ -336,8 +287,6 @@ class Selectresource extends Component{
 			height: '30px',
 			lineHeight: '30px',
 		};
-
-		console.log(course_group_publish_times)
 		return(
 			<div>
 				{/*提示*/}
@@ -350,73 +299,73 @@ class Selectresource extends Component{
 
 				/>
 				{visible===true?
-				<Modal
-					keyboard={false}
-					title="选用资源"
-					visible={visible}
-					closable={false}
-					footer={null}
-					width="600px"
-					destroyOnClose={true}
-				>
-					<style>
-						{
-							`
+					<Modal
+						keyboard={false}
+						title="选用资源"
+						visible={visible}
+						closable={false}
+						footer={null}
+						width="600px"
+						destroyOnClose={true}
+					>
+						<style>
+							{
+								`
 							.ant-modal-body{
                   padding: 30px 0px;
 							}
 							`
-						}
-					</style>
+							}
+						</style>
 
 						<Spin indicator={antIcon} spinning={hometypepvisible}  size="large" style={{marginTop:'15%'}}>
-						<style>{`
+							<style>{`
                 .newupload_conboxtop{
                    margin-top: -30px;
                 }
                 #shixun_tab_div{
                    padding: 0 30px;
-                   padding-top:15px;
+                   padding-top:30px;
                 }
                 .search-news{
 									width: 237px!important;
 									height: 30px;
-									margin-bottom: 15px;
+									margin-bottom: 30px;
                 }
               `}</style>
 
-						<div className="newupload_conbox newupload_conboxtop">
-							<div className="clearfix shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">
-
-								<li className="fl mr5 mt5"> <a onClick={()=>this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
-								<li className="fl mr5 mt5 ml15"> <a onClick={()=>this.changeTag("my")} className={ type==="my" ? " active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>我的资源</a></li>
-								<div className="fr search-news" >
-									<Search
-										placeholder="请输入发布人或名称进行搜索"
-										value={Searchvalue}
-										onInput={this.SenttotheValue}
-										onSearch={(value) => this.SenttotheSearch(value)}
-										style={{width: '100%'}}
-									/>
+							<div className="newupload_conbox newupload_conboxtop">
+								<div className="clearfix shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">
+
+									<li className="fl mr5 mt5"> <a onClick={()=>this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
+									<li className="fl mr5 mt5 ml15"> <a onClick={()=>this.changeTag("my")} className={ type==="my" ? " active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>我的资源</a></li>
+									<div className="fr search-news" >
+										<Search
+											placeholder="请输入发布人或名称进行搜索"
+											value={Searchvalue}
+											onInput={this.SenttotheValue}
+											onSearch={(value) => this.SenttotheSearch(value)}
+											style={{width: '100%'}}
+										/>
+									</div>
 								</div>
-							</div>
 
 
-							<style>{`
+								<style>{`
                 .greybackHead{
                   padding:0px 30px;
                 }
                 .fontlefts{text-align: left;}
               `}</style>
-							<ul className="clearfix greybackHead edu-txt-center">
-								<li className="fl paddingleft22 fontlefts" style={{width:'220px'}}>资源名称</li>
-								<li className="fl edu-txt-left" style={{width:'80px'}}>大小</li>
-								<li className="fl" style={{width:'100px'}}>发布人</li>
-								<li className="fl" style={{width:'100px'}}>时间</li>
-							</ul>
+								<ul className="clearfix greybackHead edu-txt-center">
+									<li className="fl paddingleft22 fontlefts" style={{width:'220px'}}>资源名称</li>
+									<li className="fl edu-txt-left" style={{width:'80px'}}>大小</li>
+									<li className="fl" style={{width:'100px'}}>发布人</li>
+									<li className="fl" style={{width:'100px'}}>时间</li>
+								</ul>
 
 
-							<style>{`
+								<style>{`
                    .color-grey-9a{color: #9A9A9A !important;}
                    .datastyle{
                       width: 120px;
@@ -424,169 +373,87 @@ class Selectresource extends Component{
 									    height: 37px;
                    }
                    .scrollbox{
-                     height:145px !important;
+                     height:250px !important;
                    }
                    .selectfilsbox{
 								     height: 50px;
 								     line-height: 50px;
                    }
                 `}</style>
-						  	<div className="over210 pl20 pr20 scrollbox"
-							     onScroll={this.contentViewScroll}
-							     >
-
-								{
-									Resourcelist === undefined ?"":Resourcelist.files.length===0?<NoneData/>:
-
-										<Checkbox.Group style={{ width: '100%' }} value={patheditarry}  onChange={this.shixunhomeworkedit}>
-											{
-											  Resourcelist.files.map((item,key)=>{
-													return(
-														<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE selectfilsbox" key={key}>
-															<li className="fl" style={{width:'220px'}}>
-																<Checkbox
-																	value={item.id}
-																	key={item.id}
-																	className="fl task-hide edu-txt-left"
-																	style={{"width":"220px"}}
-																	name="shixun_homework[]"
-																>
-																	<label style={{"textAlign":"left","color":"#4C4C4C"}} className="task-hide" title={item.title}>{item.title}</label>
-																</Checkbox>
-															</li>
-															<li className="fl edu-txt-left task-hide paddingl5 color-grey-9a" style={{width:'90px'}}>{item.filesize}</li>
-															<li className="fl paddingl10 color-grey-9a" style={{width:'100px'}}>{item.author.name}</li>
-															<li className="fl color-grey-9a paddingl10 datastyle">{formatDate(item.created_on)}</li>
-														</div>
-													)
-												})
-											}
-										</Checkbox.Group>
-
-								}
-								</div>
+								<div className="over210 pl20 pr20 scrollbox"
+										 onScroll={this.contentViewScroll}
+								>
 
-							<div className={"mt10"}>
-								<span className={"color-ooo fl mt6 ml20"}>发布设置：</span>
-								<Radio.Group onChange={this.RadioonChange} value={this.state.Radiovalue} style={{'width': '460px'}}>
-									<Radio style={radioStyle} value={0}>
-										立即发布
-									</Radio>
-									<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""} >
-									<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
-										<span className={"mr5"}>延期发布</span>
-										{this.props.course_groups.length>0?"":<DatePicker
-											dropdownClassName="hideDisable"
-											showTime={{ format: 'HH:mm' }}
-											locale={locale}
-											format={dateFormat}
-											placeholder="请选择发布时间"
-											id={"startime"}
-											showToday={false}
-											width={"210px"}
-											value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
-											onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
-											disabledTime={disabledDateTime}
-											disabledDate={disabledDate}
-											disabled={this.state.Radiovalue===1?false:true}
-										/>}
-									</Radio>
-									</Tooltip>
-									<span className={"fl mt5 color-grey-c"}>(按照设置的时间定时发布)</span>
-								</Radio.Group>
-
-								<style>{`
-                .Selectleft20{
-                   margin-left: 20px !important;
-                   width: 176px;
-                   height: 40px;
-                }
-               #startimes .ant-calendar-picker-icon{
-                  margin-top:-11px;
-                }
-                .resourcebox{
-                   max-height:106px;
-                    overflow: auto;
-                }
-                .ml70{
-                 margin-left:70px;
-                }
-              `}</style>
-								{this.props.course_groups.length>0?this.props.isStudent()===true?"":<div className={"resourcebox"}>
-									{this.state.Radiovalue===1?<style>
-										{
-											`
-										.ant-input, .ant-input .ant-input-suffix {
-													background-color: #fff!important;
-											}
-										`
-										}
-									</style>:""}
 									{
-										course_group_publish_times.map((item,key)=>{
-											return(
-												<div className={"mt10"} key={key}>
-													<Select
-														mode="multiple"
-														className={"ml70"}
-														disabled={this.state.Radiovalue===1?false:true}
-														placeholder="请选择分班名称"
-														value={item.group_id}
-														style={{ width: 200 }}
-														onChange={(e,index)=>this.selectassigngroups(e,index,key)}
-													>
-														{this.props.course_groups.map((items,keys)=>{
-															let type=0
-															{course_group_publish_times.map((itsem,kesy)=>{
-																if(itsem.group_id===items.id){
-																	type=1
-																	return
-																}
-															})}
-															if(type===0){
-																return(
-																	<Option value={items.name} key={keys} id={items.id}>{items.name}</Option>
-																)
-															}
-														})}
-													</Select>
-
-													<DatePicker
-														disabled={this.state.Radiovalue===1?false:true}
-														dropdownClassName="hideDisable"
-														showTime={{ format: 'HH:mm' }}
-														locale={locale}
-														showToday={false}
-														format={dateFormat}
-														placeholder="请选择发布时间"
-														id={"startimes"}
-														className={"Selectleft20  "}
-														width={"200px"}
-														value={item.publish_time===undefined||item.publish_time===""?undefined:moment(item.publish_time, dateFormat)}
-														onChange={(e,index)=>this.onChangeTimepublish(e,index,key,2)}
-														// onChange={ this.onChangeTimepublish }
-														disabledTime={disabledDateTime}
-														disabledDate={disabledDate}
-													/>
-													{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
-													{key+1===this.props.course_groups.length?"":<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>}
-												</div>
-											)
-										})
+										Resourcelist === undefined ?"":Resourcelist.files.length===0?<NoneData/>:
+
+											<Checkbox.Group style={{ width: '100%' }} value={patheditarry}  onChange={this.shixunhomeworkedit}>
+												{
+													Resourcelist.files.map((item,key)=>{
+														return(
+															<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE selectfilsbox" key={key}>
+																<li className="fl" style={{width:'220px'}}>
+																	<Checkbox
+																		value={item.id}
+																		key={item.id}
+																		className="fl task-hide edu-txt-left"
+																		style={{"width":"220px"}}
+																		name="shixun_homework[]"
+																	>
+																		<label style={{"textAlign":"left","color":"#4C4C4C"}} className="task-hide" title={item.title}>{item.title}</label>
+																	</Checkbox>
+																</li>
+																<li className="fl edu-txt-left task-hide paddingl5 color-grey-9a" style={{width:'90px'}}>{item.filesize}</li>
+																<li className="fl paddingl10 color-grey-9a" style={{width:'100px'}}>{item.author.name}</li>
+																<li className="fl color-grey-9a paddingl10 datastyle">{formatDate(item.created_on)}</li>
+															</div>
+														)
+													})
+												}
+											</Checkbox.Group>
 
 									}
-								</div>:""}
-							</div>
+								</div>
+
+								<div className={"mt10"}>
+									<span className={"color-ooo fl mt6 ml20"}>发布设置：</span>
+									<Radio.Group onChange={this.RadioonChange} value={this.state.Radiovalue} style={{'width': '460px'}}>
+										<Radio style={radioStyle} value={0}>
+											立即发布
+										</Radio>
+										<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""} >
+											<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
+												<span className={"mr5"}>延期发布</span>
+												<DatePicker
+													dropdownClassName="hideDisable"
+													showTime={{ format: 'HH:mm' }}
+													locale={locale}
+													format={dateFormat}
+													placeholder="请选择发布时间"
+													id={"startime"}
+													showToday={false}
+													width={"210px"}
+													value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
+													onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
+													disabledTime={disabledDateTime}
+													disabledDate={disabledDate}
+													disabled={this.state.Radiovalue===1?false:true}
+												/>
+											</Radio>
+										</Tooltip>
+										<span className={"fl mt5 color-grey-c"}>(按照设置的时间定时发布)</span>
+									</Radio.Group>
+								</div>
 
-							{this.state.patheditarrytype===true?<p className={"color-red ml20"}>请选择资源</p>:""}
-							{this.state.Radiovaluetype===true?<p className={"color-red ml20"}>发布时间不能为空</p>:""}
-							<div className="mt20 marginauto clearfix edu-txt-center">
+								{this.state.patheditarrytype===true?<p className={"color-red ml20"}>请选择资源</p>:""}
+								{this.state.Radiovaluetype===true?<p className={"color-red ml20"}>发布时间不能为空</p>:""}
+								<div className="mt20 marginauto clearfix edu-txt-center">
 									<a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a>
 									<a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun" onClick={this.savecouseShixunModal}>确定</a>
+								</div>
 							</div>
-						</div>
-					</Spin>
-				</Modal>:""}
+						</Spin>
+					</Modal>:""}
 			</div>
 		)
 	}
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index b0f4b1b69..73a0f6630 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -14,12 +14,12 @@ function range(start, end) {
 	}
 	return result;
 }
-
 function disabledDateTime() {
 	return {
+		// disabledHours: () => range(0, 24).splice(4, 20),
 		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
-		// disabledSeconds: () => range(0,60)
-	}
+		// disabledSeconds: () => [0, 60],
+	};
 }
 
 function disabledDate(current) {
@@ -45,8 +45,8 @@ class Sendresource extends Component{
 			// moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
 			course_group_publish_times:[
 				{
-					group_id : undefined,
-					publish_time :undefined,
+					course_group_id : undefined,
+					publish_time :""
 				}],
 			course_groups:undefined,
 			course_groups_count:undefined,
@@ -86,34 +86,34 @@ class Sendresource extends Component{
 	}
 
 	onAttachmentRemove = (file) => {
-	 if(!file.percent || file.percent == 100){
-		 const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
-		 axios.delete(url, {
-			 })
-			 .then((response) => {
-				 if (response.data) {
-					 const { status } = response.data;
-					 if (status == 0) {
-						 this.setState({
-							 fileListtype:false,
-							 fileList:[]
-						 })
-					 }
-
-				 }
-			 })
-			 .catch(function (error) {
-				 console.log(error);
-			 });
-		 this.setState({
-			 fileListtype:false,
-		 })
-	 }else{
-		 this.setState({
-			 fileListtype:false,
-			 fileList:[]
-		 })
-	 }
+		if(!file.percent || file.percent == 100){
+			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+			axios.delete(url, {
+			})
+				.then((response) => {
+					if (response.data) {
+						const { status } = response.data;
+						if (status == 0) {
+							this.setState({
+								fileListtype:false,
+								fileList:[]
+							})
+						}
+
+					}
+				})
+				.catch(function (error) {
+					console.log(error);
+				});
+			this.setState({
+				fileListtype:false,
+			})
+		}else{
+			this.setState({
+				fileListtype:false,
+				fileList:[]
+			})
+		}
 	}
 
 	ModalCancelModalCancel=()=>{
@@ -127,7 +127,7 @@ class Sendresource extends Component{
 	}
 	Saves=()=>{
 
-		let {fileList,description,is_public,datatime,Radiovalue,course_group_publish_times} =this.state;
+		let {fileList,description,is_public,datatime,Radiovalue} =this.state;
 
 		let newfileList=[];
 		for(var list of fileList){
@@ -141,7 +141,7 @@ class Sendresource extends Component{
 			return
 		}
 
-		if(this.state.Radiovalue===1&&this.props.course_groups.length===0){
+		if(this.state.Radiovalue===1){
 			if(datatime===undefined||datatime===null||datatime=== ""){
 				this.setState({
 					Radiovaluetype:true
@@ -156,7 +156,6 @@ class Sendresource extends Component{
 
 
 
-
 		if(description===undefined){
 
 		}else if(description.length>100){
@@ -177,10 +176,9 @@ class Sendresource extends Component{
 			course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
 			attachment_ids:newfileList,
 			is_public:is_public,
-			publish_time:this.props.course_groups.length===0?Radiovalue===1?datatime===undefined? undefined:datatime:undefined:"",
+			publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
 			description:description,
 			delay_publish:Radiovalue,
-			group_settings:this.props.course_groups.length===0?"":course_group_publish_times
 		}).then((result)=>{
 
 			if(result.data.status===0){
@@ -239,42 +237,10 @@ class Sendresource extends Component{
 			Radiovalue: e.target.value,
 		});
 	}
-
-	addgrouppublish=()=>{
-		let newlist=this.state.course_group_publish_times;
-		newlist.push(  {
-			group_id : undefined,
-			publish_time :undefined,
-		})
-		this.setState({
-			course_group_publish_times:newlist
-		})
-	}
-	deletegrouppublish=(key)=>{
-		let newlist=this.state.course_group_publish_times;
-		newlist.splice(key,1);
-		this.setState({
-			course_group_publish_times:newlist
-		})
-	}
-	selectassigngroups=(e,index,key)=>{
-		let {course_group_publish_times}=this.state;
-		let newgroup_publish=course_group_publish_times;
-		for(var i=0; i<newgroup_publish.length; i++){
-			if(i===parseInt(key)){
-				newgroup_publish[i].group_id=e;
-			}
-		}
-		this.setState({
-			course_group_publish_times:newgroup_publish,
-		})
-	}
-
 	render(){
 		let { newfileListtype,descriptiontype,
 			is_public,
 			datatime,
-			course_group_publish_times
 		}=this.state;
 
 		const uploadProps = {
@@ -299,7 +265,7 @@ class Sendresource extends Component{
 		};
 
 
-	  //console.log(this.state.course_group_publish_times)
+		console.log(this.props.course_groups)
 		return(
 			<div>
 				{/*提示*/}
@@ -406,8 +372,8 @@ class Sendresource extends Component{
 
 							{this.props.course_is_public===true?<div>
 								<span className={"color-ooo"}>公开：</span><Checkbox  checked={is_public} onChange={this.onChangepublic}>
-											<span className={"font-14 color-ooo"}>选中，所有用户可见，否则课堂成员可见</span>
-								</Checkbox>
+								<span className={"font-14 color-ooo"}>选中，所有用户可见，否则课堂成员可见</span>
+							</Checkbox>
 							</div>:""}
 
 							<style>{`
@@ -434,110 +400,28 @@ class Sendresource extends Component{
 									立即发布
 								</Radio>
 								<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
-								<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
-									<span className={"mr5"}>延期发布</span>
-									{this.props.course_groups.length===0?
-									<DatePicker
-									dropdownClassName="hideDisable"
-									showTime={{ format: 'HH:mm' }}
-									locale={locale}
-									format={dateFormat}
-									placeholder="请选择发布时间"
-									id={"startime"}
-									showToday={false}
-									width={"210px"}
-									value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
-									onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
-									disabledTime={disabledDateTime}
-									disabledDate={disabledDate}
-									disabled={this.state.Radiovalue===1?false:true}
-								/>:""}
-								</Radio>
+									<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
+										<span className={"mr5"}>延期发布</span>
+										<DatePicker
+
+											dropdownClassName="hideDisable"
+											showTime={{ format: 'HH:mm' }}
+											locale={locale}
+											format={dateFormat}
+											placeholder="请选择发布时间"
+											id={"startime"}
+											showToday={false}
+											width={"210px"}
+											value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
+											onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
+											disabledTime={disabledDateTime}
+											disabledDate={disabledDate}
+											disabled={this.state.Radiovalue===1?false:true}
+										/>
+									</Radio>
 								</Tooltip>
 								<span className={"fl mt5 color-grey-c"}>(按照设置的时间定时发布)</span>
 							</Radio.Group>
-
-
-							<style>{`
-                .Selectleft20{
-                   margin-left: 20px !important;
-                   width: 176px;
-                   height: 40px;
-                }
-               #startimes .ant-calendar-picker-icon{
-                  margin-top:-11px;
-                }
-                .resourcebox{
-                   max-height:150px;
-                    overflow: auto;
-                }
-                .ml70{
-                 margin-left:70px;
-                }
-              `}</style>
-							{this.props.course_groups.length>0?this.props.isStudent()===true?"":<div className={"resourcebox"}>
-									{this.state.Radiovalue===1?<style>
-									{
-										`
-										.ant-input, .ant-input .ant-input-suffix {
-													background-color: #fff!important;
-											}
-										`
-									}
-								</style>:""}
-								{
-									course_group_publish_times.map((item,key)=>{
-										return(
-											<div className={"mt10"} key={key}>
-												<Select
-																 mode="multiple"
-												         disabled={this.state.Radiovalue===1?false:true}
-													       placeholder="请选择分班名称"
-																 value={item.group_id}
-																 style={{ width: 200 }}
-																 onChange={(e,index)=>this.selectassigngroups(e,index,key)}
-												>
-													{this.props.course_groups.map((items,keys)=>{
- 														let type=0
-														{course_group_publish_times.map((itsem,kesy)=>{
-													      if(itsem.group_id===items.id){
-																	type=1
-																	return
-																}
-														})}
-														if(type===0){
-															return(
-																<Option value={items.name} key={keys} id={items.id}>{items.name}</Option>
-															)
-														}
-													})}
-												</Select>
-
-												<DatePicker
-													disabled={this.state.Radiovalue===1?false:true}
-													dropdownClassName="hideDisable"
-													showTime={{ format: 'HH:mm' }}
-													locale={locale}
-													showToday={false}
-													format={dateFormat}
-													placeholder="请选择发布时间"
-													id={"startimes"}
-													className={"Selectleft20  "}
-													width={"200px"}
-													value={item.publish_time===undefined||item.publish_time===""?undefined:moment(item.publish_time, dateFormat)}
-													onChange={(e,index)=>this.onChangeTimepublish(e,index,key,2)}
-													// onChange={ this.onChangeTimepublish }
-													disabledTime={disabledDateTime}
-													disabledDate={disabledDate}
-												/>
-												{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
-												{key+1===this.props.course_groups.length?"":<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>}
-											</div>
-										)
-									})
-
-								}
-							</div>:""}
 						</div>