Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_local
commit
1ea42891e9
@ -0,0 +1,20 @@
|
|||||||
|
$(document).on('turbolinks:load', function() {
|
||||||
|
if ($('body.admins-shixun-authorizations-index-page').length > 0) {
|
||||||
|
var $searchFrom = $('.shixun-authorization-list-form');
|
||||||
|
$searchFrom.find('select[name="status"]').val('pending');
|
||||||
|
|
||||||
|
$searchFrom.on('click', '.search-form-tab', function(){
|
||||||
|
var $link = $(this);
|
||||||
|
|
||||||
|
$searchFrom.find('input[name="keyword"]').val('');
|
||||||
|
$searchFrom.find('select[name="status"]').val('processed');
|
||||||
|
|
||||||
|
if($link.data('value') === 'processed'){
|
||||||
|
$searchFrom.find('.status-filter').show();
|
||||||
|
} else {
|
||||||
|
$searchFrom.find('.status-filter').hide();
|
||||||
|
$searchFrom.find('select[name="status"]').val('pending');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
$(document).on('turbolinks:load', function() {
|
||||||
|
if ($('body.admins-subject-authorizations-index-page').length > 0) {
|
||||||
|
var $searchFrom = $('.subject-authorization-list-form');
|
||||||
|
$searchFrom.find('select[name="status"]').val('pending');
|
||||||
|
|
||||||
|
$searchFrom.on('click', '.search-form-tab', function(){
|
||||||
|
var $link = $(this);
|
||||||
|
|
||||||
|
$searchFrom.find('input[name="keyword"]').val('');
|
||||||
|
$searchFrom.find('select[name="status"]').val('processed');
|
||||||
|
|
||||||
|
if($link.data('value') === 'processed'){
|
||||||
|
$searchFrom.find('.status-filter').show();
|
||||||
|
} else {
|
||||||
|
$searchFrom.find('.status-filter').hide();
|
||||||
|
$searchFrom.find('select[name="status"]').val('pending');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,9 @@
|
|||||||
|
.admins-shixun-authorizations-index-page {
|
||||||
|
.shixun-authorization-list-container {
|
||||||
|
span {
|
||||||
|
&.apply-status-1 { color: #28a745; }
|
||||||
|
&.apply-status-2 { color: #dc3545; }
|
||||||
|
&.apply-status-3 { color: #6c757d; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
.admins-subject-authorizations-index-page {
|
||||||
|
.subject-authorization-list-container {
|
||||||
|
span {
|
||||||
|
&.apply-status-1 { color: #28a745; }
|
||||||
|
&.apply-status-2 { color: #dc3545; }
|
||||||
|
&.apply-status-3 { color: #6c757d; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
class Admins::ShixunAuthorizationsController < Admins::BaseController
|
||||||
|
def index
|
||||||
|
params[:status] ||= 'pending'
|
||||||
|
|
||||||
|
applies = ApplyAction.where(container_type: 'ApplyShixun')
|
||||||
|
|
||||||
|
status =
|
||||||
|
case params[:status]
|
||||||
|
when 'pending' then 0
|
||||||
|
when 'processed' then [1, 2]
|
||||||
|
when 'agreed' then 1
|
||||||
|
when 'refused' then 2
|
||||||
|
else 0
|
||||||
|
end
|
||||||
|
applies = applies.where(status: status) if status.present?
|
||||||
|
|
||||||
|
# 关键字模糊查询
|
||||||
|
keyword = params[:keyword].to_s.strip
|
||||||
|
if keyword.present?
|
||||||
|
applies = applies.joins('JOIN shixuns ON shixuns.id = apply_actions.container_id')
|
||||||
|
.where('shixuns.name LIKE :keyword', keyword: "%#{keyword}%")
|
||||||
|
end
|
||||||
|
|
||||||
|
applies = applies.order(updated_at: :desc)
|
||||||
|
|
||||||
|
@applies = paginate applies.includes(user: :user_extension)
|
||||||
|
|
||||||
|
shixun_ids = @applies.map(&:container_id)
|
||||||
|
@shixun_map = Shixun.where(id: shixun_ids).each_with_object({}) { |s, h| h[s.id] = s }
|
||||||
|
end
|
||||||
|
|
||||||
|
def agree
|
||||||
|
Admins::ShixunAuths::AgreeApplyService.call(current_apply, current_user)
|
||||||
|
render_success_js
|
||||||
|
end
|
||||||
|
|
||||||
|
def refuse
|
||||||
|
Admins::ShixunAuths::RefuseApplyService.call(current_apply, current_user, params)
|
||||||
|
|
||||||
|
render_success_js
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def current_apply
|
||||||
|
@_current_apply ||= ApplyAction.where(container_type: 'ApplyShixun').find(params[:id])
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
class Admins::SubjectAuthorizationsController < Admins::BaseController
|
||||||
|
def index
|
||||||
|
params[:status] ||= 'pending'
|
||||||
|
|
||||||
|
applies = ApplyAction.where(container_type: 'ApplySubject')
|
||||||
|
|
||||||
|
status =
|
||||||
|
case params[:status]
|
||||||
|
when 'pending' then 0
|
||||||
|
when 'processed' then [1, 2]
|
||||||
|
when 'agreed' then 1
|
||||||
|
when 'refused' then 2
|
||||||
|
else 0
|
||||||
|
end
|
||||||
|
applies = applies.where(status: status) if status.present?
|
||||||
|
|
||||||
|
# 关键字模糊查询
|
||||||
|
keyword = params[:keyword].to_s.strip
|
||||||
|
if keyword.present?
|
||||||
|
applies = applies.joins('JOIN subjects ON subjects.id = apply_actions.container_id')
|
||||||
|
.where('subjects.name LIKE :keyword', keyword: "%#{keyword}%")
|
||||||
|
end
|
||||||
|
|
||||||
|
applies = applies.order(updated_at: :desc)
|
||||||
|
|
||||||
|
@applies = paginate applies.includes(user: :user_extension)
|
||||||
|
|
||||||
|
subject_ids = @applies.map(&:container_id)
|
||||||
|
@subject_map = Subject.where(id: subject_ids).each_with_object({}) { |s, h| h[s.id] = s }
|
||||||
|
@challenge_count_map = Challenge.joins(shixun: :stage_shixuns).where(st: 0, stage_shixuns: { subject_id: subject_ids}).group('subject_id').count
|
||||||
|
end
|
||||||
|
|
||||||
|
def agree
|
||||||
|
Admins::SubjectAuths::AgreeApplyService.call(current_apply, current_user)
|
||||||
|
render_success_js
|
||||||
|
end
|
||||||
|
|
||||||
|
def refuse
|
||||||
|
Admins::SubjectAuths::RefuseApplyService.call(current_apply, current_user, params)
|
||||||
|
|
||||||
|
render_success_js
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def current_apply
|
||||||
|
@_current_apply ||= ApplyAction.where(container_type: 'ApplySubject').find(params[:id])
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
class Admins::ShixunAuths::AgreeApplyService < ApplicationService
|
||||||
|
attr_reader :apply, :user, :shixun
|
||||||
|
|
||||||
|
def initialize(apply, user)
|
||||||
|
@apply = apply
|
||||||
|
@user = user
|
||||||
|
@shixun = Shixun.find(apply.container_id)
|
||||||
|
end
|
||||||
|
|
||||||
|
def call
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
apply.update!(status: 1, dealer_id: user.id)
|
||||||
|
shixun.update!(status: 2, publish_time: Time.now)
|
||||||
|
|
||||||
|
# 奖励金币、经验
|
||||||
|
reward_grade_and_experience!
|
||||||
|
|
||||||
|
deal_tiding!
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def reward_grade_and_experience!
|
||||||
|
score = shixun.all_score
|
||||||
|
shixun_creator = shixun.user
|
||||||
|
|
||||||
|
RewardGradeService.call(shixun_creator, container_id: shixun.id, container_type: 'shixunPublish', score: score)
|
||||||
|
|
||||||
|
Experience.create!(user_id: shixun_creator.id, container_id: shixun.id, container_type: 'shixunPublish', score: score)
|
||||||
|
shixun_creator.update_column(:experience, shixun_creator.experience.to_i + score)
|
||||||
|
end
|
||||||
|
|
||||||
|
def deal_tiding!
|
||||||
|
apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
|
||||||
|
|
||||||
|
Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
|
||||||
|
container_id: apply.id, container_type: 'ApplyAction',
|
||||||
|
parent_container_id: apply.container_id, parent_container_type: apply.container_type,
|
||||||
|
belong_container_id: apply.container_id, belong_container_type: 'Shixun',
|
||||||
|
status: 1, tiding_type: 'System')
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
class Admins::ShixunAuths::RefuseApplyService < ApplicationService
|
||||||
|
attr_reader :apply, :user, :shixun, :params
|
||||||
|
|
||||||
|
def initialize(apply, user, params)
|
||||||
|
@apply = apply
|
||||||
|
@user = user
|
||||||
|
@shixun = Shixun.find(apply.container_id)
|
||||||
|
@params = params
|
||||||
|
end
|
||||||
|
|
||||||
|
def call
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
shixun.update!(status: 0)
|
||||||
|
apply.update!(status: 2, reason: reason, dealer_id: user.id)
|
||||||
|
|
||||||
|
deal_tiding!
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def reason
|
||||||
|
params[:reason].to_s.strip
|
||||||
|
end
|
||||||
|
|
||||||
|
def deal_tiding!
|
||||||
|
apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
|
||||||
|
|
||||||
|
Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
|
||||||
|
container_id: apply.id, container_type: 'ApplyAction',
|
||||||
|
parent_container_id: apply.container_id, parent_container_type: apply.container_type,
|
||||||
|
belong_container_id: apply.container_id, belong_container_type: 'Shixun',
|
||||||
|
status: 2, tiding_type: 'System')
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
class Admins::SubjectAuths::AgreeApplyService < ApplicationService
|
||||||
|
attr_reader :apply, :user, :subject
|
||||||
|
|
||||||
|
def initialize(apply, user)
|
||||||
|
@apply = apply
|
||||||
|
@user = user
|
||||||
|
@subject = Subject.find(apply.container_id)
|
||||||
|
end
|
||||||
|
|
||||||
|
def call
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
apply.update!(status: 1, dealer_id: user.id)
|
||||||
|
subject.update!(status: 2, publish_time: Time.now)
|
||||||
|
|
||||||
|
deal_tiding!
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def deal_tiding!
|
||||||
|
apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
|
||||||
|
|
||||||
|
Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
|
||||||
|
container_id: apply.id, container_type: 'ApplyAction',
|
||||||
|
parent_container_id: apply.container_id, parent_container_type: apply.container_type,
|
||||||
|
belong_container_id: apply.container_id, belong_container_type: 'Subject',
|
||||||
|
status: 1, tiding_type: 'System')
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
class Admins::SubjectAuths::RefuseApplyService < ApplicationService
|
||||||
|
attr_reader :apply, :user, :subject, :params
|
||||||
|
|
||||||
|
def initialize(apply, user, params)
|
||||||
|
@apply = apply
|
||||||
|
@user = user
|
||||||
|
@subject = Subject.find(apply.container_id)
|
||||||
|
@params = params
|
||||||
|
end
|
||||||
|
|
||||||
|
def call
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
subject.update!(status: 0)
|
||||||
|
apply.update!(status: 2, reason: reason, dealer_id: user.id)
|
||||||
|
|
||||||
|
deal_tiding!
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def reason
|
||||||
|
params[:reason].to_s.strip
|
||||||
|
end
|
||||||
|
|
||||||
|
def deal_tiding!
|
||||||
|
apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
|
||||||
|
|
||||||
|
Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
|
||||||
|
container_id: apply.id, container_type: 'ApplyAction',
|
||||||
|
parent_container_id: apply.container_id, parent_container_type: apply.container_type,
|
||||||
|
belong_container_id: apply.container_id, belong_container_type: 'Subject',
|
||||||
|
status: 2, tiding_type: 'System')
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
<% define_admin_breadcrumbs do %>
|
||||||
|
<% add_admin_breadcrumb('实训发布') %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<div class="box search-form-container flex-column mb-0 pb-0 shixun-authorization-list-form">
|
||||||
|
<ul class="nav nav-tabs w-100 search-form-tabs">
|
||||||
|
<li class="nav-item">
|
||||||
|
<%= link_to '待审批', admins_shixun_authorizations_path(status: :pending), remote: true, 'data-value': 'pending',
|
||||||
|
class: "nav-link search-form-tab #{params[:status] == 'pending' ? 'active' : ''}" %>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<%= link_to '已审批', admins_shixun_authorizations_path(status: :processed), remote: true, 'data-value': 'processed',
|
||||||
|
class: "nav-link search-form-tab #{params[:status] != 'pending' ? 'active' : ''}" %>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<%= form_tag(admins_shixun_authorizations_path(unsafe_params), method: :get, class: 'form-inline search-form justify-content-end mt-3', remote: true) do %>
|
||||||
|
<div class="form-group status-filter" style="<%= params[:status] != 'pending' ? '' : 'display: none;' %>">
|
||||||
|
<label for="status">审核状态：</label>
|
||||||
|
<% status_options = [['全部', 'processed'], ['已同意', 'agreed'], ['已拒绝', 'refused']] %>
|
||||||
|
<%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
|
||||||
|
</div>
|
||||||
|
<%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '实训名称检索') %>
|
||||||
|
<%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="box shixun-authorization-list-container">
|
||||||
|
<%= render(partial: 'admins/shixun_authorizations/shared/list', locals: { applies: @applies, shixun_map: @shixun_map }) %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$('.shixun-authorization-list-container').html("<%= j( render partial: 'admins/shixun_authorizations/shared/list', locals: { applies: @applies, shixun_map: @shixun_map } ) %>");
|
||||||
@ -0,0 +1,60 @@
|
|||||||
|
<% is_processed = params[:status].to_s != 'pending' %>
|
||||||
|
|
||||||
|
<table class="table table-hover text-center shixun-authorization-list-table">
|
||||||
|
<thead class="thead-light">
|
||||||
|
<tr>
|
||||||
|
<th width="8%">头像</th>
|
||||||
|
<th width="14%">创建者</th>
|
||||||
|
<th width="28%" class="text-left">实训名称</th>
|
||||||
|
<th width="12%">任务数</th>
|
||||||
|
<th width="16%">时间</th>
|
||||||
|
<% if is_processed %>
|
||||||
|
<th width="14%">拒绝原因</th>
|
||||||
|
<th width="8%">状态</th>
|
||||||
|
<% else %>
|
||||||
|
<th width="22%">操作</th>
|
||||||
|
<% end %>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<% if applies.present? %>
|
||||||
|
<% applies.each do |apply| %>
|
||||||
|
<% user = apply.user %>
|
||||||
|
<% shixun = shixun_map[apply.container_id] %>
|
||||||
|
<tr class="shixun-authorization-item shixun-authorization-<%= apply.id %>">
|
||||||
|
<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" />
|
||||||
|
<% end %>
|
||||||
|
</td>
|
||||||
|
<td><%= user.real_name %></td>
|
||||||
|
<td class="text-left">
|
||||||
|
<%= link_to "/shixuns/#{shixun.identifier}", target: '_blank' do %>
|
||||||
|
<%= overflow_hidden_span shixun.name, width: 300 %>
|
||||||
|
<% end %>
|
||||||
|
</td>
|
||||||
|
<td><%= shixun.challenges_count %></td>
|
||||||
|
<td><%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %></td>
|
||||||
|
|
||||||
|
<% if is_processed %>
|
||||||
|
<td class="text-secondary"><%= overflow_hidden_span apply.reason, width: 140 %></td>
|
||||||
|
<td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
|
||||||
|
<% else %>
|
||||||
|
<td class="action-container">
|
||||||
|
<%= agree_link '同意', agree_admins_shixun_authorization_path(apply, element: ".shixun-authorization-#{apply.id}"), 'data-confirm': '确认审核通过？' %>
|
||||||
|
<%= javascript_void_link('拒绝', class: 'action refuse-action',
|
||||||
|
data: {
|
||||||
|
toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id,
|
||||||
|
url: refuse_admins_shixun_authorization_path(apply, element: ".shixun-authorization-#{apply.id}")
|
||||||
|
}) %>
|
||||||
|
</td>
|
||||||
|
<% end %>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<%= render 'admins/shared/no_data_for_table' %>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
<% define_admin_breadcrumbs do %>
|
||||||
|
<% add_admin_breadcrumb('实践课程发布') %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<div class="box search-form-container flex-column mb-0 pb-0 subject-authorization-list-form">
|
||||||
|
<ul class="nav nav-tabs w-100 search-form-tabs">
|
||||||
|
<li class="nav-item">
|
||||||
|
<%= link_to '待审批', admins_subject_authorizations_path(status: :pending), remote: true, 'data-value': 'pending',
|
||||||
|
class: "nav-link search-form-tab #{params[:status] == 'pending' ? 'active' : ''}" %>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<%= link_to '已审批', admins_subject_authorizations_path(status: :processed), remote: true, 'data-value': 'processed',
|
||||||
|
class: "nav-link search-form-tab #{params[:status] != 'pending' ? 'active' : ''}" %>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<%= form_tag(admins_subject_authorizations_path(unsafe_params), method: :get, class: 'form-inline search-form justify-content-end mt-3', remote: true) do %>
|
||||||
|
<div class="form-group status-filter" style="<%= params[:status] != 'pending' ? '' : 'display: none;' %>">
|
||||||
|
<label for="status">审核状态：</label>
|
||||||
|
<% status_options = [['全部', 'processed'], ['已同意', 'agreed'], ['已拒绝', 'refused']] %>
|
||||||
|
<%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
|
||||||
|
</div>
|
||||||
|
<%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '实训课程名称检索') %>
|
||||||
|
<%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="box subject-authorization-list-container">
|
||||||
|
<%= render(partial: 'admins/subject_authorizations/shared/list',
|
||||||
|
locals: { applies: @applies, subject_map: @subject_map, challenge_count_map: @challenge_count_map }) %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$('.subject-authorization-list-container').html("<%= j( render partial: 'admins/subject_authorizations/shared/list', locals: { applies: @applies, subject_map: @subject_map, challenge_count_map: @challenge_count_map } ) %>");
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
<% is_processed = params[:status].to_s != 'pending' %>
|
||||||
|
|
||||||
|
<table class="table table-hover text-center subject-authorization-list-table">
|
||||||
|
<thead class="thead-light">
|
||||||
|
<tr>
|
||||||
|
<th width="8%">头像</th>
|
||||||
|
<th width="10%">创建者</th>
|
||||||
|
<th width="28%" class="text-left">实践课程名称</th>
|
||||||
|
<th width="6%">阶段数</th>
|
||||||
|
<th width="6%">实训数</th>
|
||||||
|
<th width="6%">关卡数</th>
|
||||||
|
<th width="14%">时间</th>
|
||||||
|
<% if is_processed %>
|
||||||
|
<th width="14%">拒绝原因</th>
|
||||||
|
<th width="8%">状态</th>
|
||||||
|
<% else %>
|
||||||
|
<th width="22%">操作</th>
|
||||||
|
<% end %>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<% if applies.present? %>
|
||||||
|
<% applies.each do |apply| %>
|
||||||
|
<% user = apply.user %>
|
||||||
|
<% subject = subject_map[apply.container_id] %>
|
||||||
|
<tr class="subject-authorization-item subject-authorization-<%= apply.id %>">
|
||||||
|
<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" />
|
||||||
|
<% end %>
|
||||||
|
</td>
|
||||||
|
<td><%= user.real_name %></td>
|
||||||
|
<td class="text-left">
|
||||||
|
<%= link_to "/paths/#{subject.id}", target: '_blank' do %>
|
||||||
|
<%= overflow_hidden_span subject.name, width: 300 %>
|
||||||
|
<% end %>
|
||||||
|
</td>
|
||||||
|
<td><%= subject.stages_count %></td>
|
||||||
|
<td><%= subject.shixuns_count %></td>
|
||||||
|
<td><%= challenge_count_map.fetch(subject.id, 0) %></td>
|
||||||
|
<td><%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %></td>
|
||||||
|
|
||||||
|
<% if is_processed %>
|
||||||
|
<td class="text-secondary"><%= overflow_hidden_span apply.reason, width: 140 %></td>
|
||||||
|
<td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
|
||||||
|
<% else %>
|
||||||
|
<td class="action-container">
|
||||||
|
<%= agree_link '同意', agree_admins_subject_authorization_path(apply, element: ".subject-authorization-#{apply.id}"), 'data-confirm': '确认审核通过？' %>
|
||||||
|
<%= javascript_void_link('拒绝', class: 'action refuse-action',
|
||||||
|
data: {
|
||||||
|
toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id,
|
||||||
|
url: refuse_admins_subject_authorization_path(apply, element: ".subject-authorization-#{apply.id}")
|
||||||
|
}) %>
|
||||||
|
</td>
|
||||||
|
<% end %>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<%= render 'admins/shared/no_data_for_table' %>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
zh-CN:
|
||||||
|
apply_action:
|
||||||
|
status:
|
||||||
|
'0': '待处理'
|
||||||
|
'1': '已同意'
|
||||||
|
'2': '已拒绝'
|
||||||
|
'3': '已撤销'
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
class ModifyChallnegeScoreForChoose < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
challenges = Challenge.where(st: 1)
|
||||||
|
challenges.find_each do |c|
|
||||||
|
puts(c.id)
|
||||||
|
score = c.challenge_chooses.sum(:score)
|
||||||
|
c.update_column(:score, score)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1 @@
|
|||||||
|
{"files":{"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js":{"logical_path":"admin.js","mtime":"2019-08-26T15:21:11+08:00","size":907839,"digest":"6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d","integrity":"sha256-ZXXxOZlT+xk1wDenuL0oxK/we3C+2bQfr2iZqJr0tX0="},"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css":{"logical_path":"admin.css","mtime":"2019-08-26T15:21:47+08:00","size":655571,"digest":"8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5","integrity":"sha256-iisDy4oFXcY/RUQ7MEyudzgjMb66VbFXCz08iqQkQtU="},"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot":{"logical_path":"font-awesome/fontawesome-webfont.eot","mtime":"2019-08-14T17:22:43+08:00","size":165742,"digest":"7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979","integrity":"sha256-e/yrbbmdXPvxcFygU23ceFhUMsxfpBu9etDwCQM7KXk="},"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2":{"logical_path":"font-awesome/fontawesome-webfont.woff2","mtime":"2019-08-14T17:22:43+08:00","size":77160,"digest":"2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe","integrity":"sha256-Kt78vAQefRj88tQXh53FoJmXqmTWdbejxLbOM9oT8/4="},"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff":{"logical_path":"font-awesome/fontawesome-webfont.woff","mtime":"2019-08-14T17:22:43+08:00","size":98024,"digest":"ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07","integrity":"sha256-ugxZ3rVFD1y0Gz+TYJ7i0NmVQVh33foiPoqKdTNHTwc="},"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf":{"logical_path":"font-awesome/fontawesome-webfont.ttf","mtime":"2019-08-14T17:22:43+08:00","size":165548,"digest":"aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8","integrity":"sha256-qljzPyOaD7AvXHpsRcBD16msmgkzNYBmlOzW1O3A1qg="},"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg":{"logical_path":"font-awesome/fontawesome-webfont.svg","mtime":"2019-08-14T17:22:43+08:00","size":444379,"digest":"ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4","integrity":"sha256-rWFXkmwWIrpOHQPUePFUE2hSS/xG9R5C/g2UX37zI+Q="},"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png":{"logical_path":"logo.png","mtime":"2019-08-21T15:10:12+08:00","size":2816,"digest":"7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423","integrity":"sha256-f/ESVocJv5f5iY/ockm3qPIA/x9I1TfYWvhyFfGHBCM="},"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js":{"logical_path":"application.js","mtime":"2019-08-26T15:21:11+08:00","size":1042232,"digest":"a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533","integrity":"sha256-o6TzVJ1oZwVyuwdwDIWprBHlNu3HP+9udIlyO/U15TM="},"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css":{"logical_path":"application.css","mtime":"2019-08-26T15:21:47+08:00","size":1182859,"digest":"a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46","integrity":"sha256-p1CLiOtqaaWzAWAr3cFHRc7AmFPqfZHG+uhWuW54j0Y="}},"assets":{"admin.js":"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js","admin.css":"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css","font-awesome/fontawesome-webfont.eot":"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot","font-awesome/fontawesome-webfont.woff2":"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2","font-awesome/fontawesome-webfont.woff":"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff","font-awesome/fontawesome-webfont.ttf":"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf","font-awesome/fontawesome-webfont.svg":"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg","logo.png":"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png","application.js":"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js","application.css":"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css"}}
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 434 KiB |
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 137 KiB |
|
After Width: | Height: | Size: 53 KiB |
@ -0,0 +1,19 @@
|
|||||||
|
import React,{Component} from "React";
|
||||||
|
|
||||||
|
export default function LeaderIcon(props = {}) {
|
||||||
|
let icon = null;
|
||||||
|
if (props.small) {
|
||||||
|
icon = <div className="font-8 blueFull Actionbtn" style={{
|
||||||
|
height: '14px',
|
||||||
|
'line-height': '14px',
|
||||||
|
width: '24px',
|
||||||
|
padding: 0,
|
||||||
|
'margin-top': '-2px',
|
||||||
|
'margin-left': '2px',
|
||||||
|
'vertical-align': 'middle', }}>组长</div>
|
||||||
|
} else {
|
||||||
|
icon = <div className="font-8 blueFull Actionbtn" style={{ height: '16px', 'line-height': '16px', width: '30px'}}>组长</div>
|
||||||
|
|
||||||
|
}
|
||||||
|
return icon
|
||||||
|
}
|
||||||
@ -1,209 +1,209 @@
|
|||||||
import React, { Component } from "react";
|
import React, { Component } from "react";
|
||||||
import { Modal, Checkbox, Input, Spin} from "antd";
|
import { Modal, Checkbox, Input, Spin} from "antd";
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import ModalWrapper from "../../common/ModalWrapper"
|
import ModalWrapper from "../../common/ModalWrapper"
|
||||||
import InfiniteScroll from 'react-infinite-scroller';
|
import InfiniteScroll from 'react-infinite-scroller';
|
||||||
|
|
||||||
const Search = Input.Search
|
const Search = Input.Search
|
||||||
const pageCount = 15;
|
const pageCount = 15;
|
||||||
class SendToCourseModal extends Component{
|
class SendToCourseModal extends Component{
|
||||||
constructor(props){
|
constructor(props){
|
||||||
super(props);
|
super(props);
|
||||||
this.state={
|
this.state={
|
||||||
checkBoxValues: [],
|
checkBoxValues: [],
|
||||||
course_lists: [],
|
course_lists: [],
|
||||||
course_lists_after_filter: [],
|
course_lists_after_filter: [],
|
||||||
searchValue: '',
|
searchValue: '',
|
||||||
hasMore: true,
|
hasMore: true,
|
||||||
loading: false,
|
loading: false,
|
||||||
page: 1
|
page: 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fetchCourseList = (arg_page) => {
|
fetchCourseList = (arg_page) => {
|
||||||
const page = arg_page || this.state.page;
|
const page = arg_page || this.state.page;
|
||||||
// search=''&
|
// search=''&
|
||||||
let url = `/courses/mine.json?page=${page}&page_size=${pageCount}`
|
let url = `/courses/mine.json?page=${page}&page_size=${pageCount}`
|
||||||
const searchValue = this.state.searchValue.trim()
|
const searchValue = this.state.searchValue.trim()
|
||||||
if (searchValue) {
|
if (searchValue) {
|
||||||
url += `&search=${searchValue}`
|
url += `&search=${searchValue}`
|
||||||
}
|
}
|
||||||
this.setState({ loading: true })
|
this.setState({ loading: true })
|
||||||
axios.get(url, {
|
axios.get(url, {
|
||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
if (!response.data.data || response.data.data.length == 0) {
|
if (!response.data.data || response.data.data.length == 0) {
|
||||||
this.setState({
|
this.setState({
|
||||||
course_lists: page == 1 ? [] : this.state.course_lists,
|
course_lists: page == 1 ? [] : this.state.course_lists,
|
||||||
page,
|
page,
|
||||||
loading: false,
|
loading: false,
|
||||||
hasMore: false,
|
hasMore: false,
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.setState({
|
this.setState({
|
||||||
course_lists: page == 1 ? response.data.data : this.state.course_lists.concat(response.data.data),
|
course_lists: page == 1 ? response.data.data : this.state.course_lists.concat(response.data.data),
|
||||||
course_lists_after_filter: response.data.data,
|
course_lists_after_filter: response.data.data,
|
||||||
page,
|
page,
|
||||||
loading: false,
|
loading: false,
|
||||||
hasMore: response.data.data.length == pageCount
|
hasMore: response.data.data.length == pageCount
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
.catch(function (error) {
|
.catch(function (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.fetchCourseList()
|
this.fetchCourseList()
|
||||||
}, 500)
|
}, 500)
|
||||||
|
|
||||||
}
|
}
|
||||||
setVisible = (visible) => {
|
setVisible = (visible) => {
|
||||||
this.refs.modalWrapper.setVisible(visible)
|
this.refs.modalWrapper.setVisible(visible)
|
||||||
if (visible == false) {
|
if (visible == false) {
|
||||||
this.setState({
|
this.setState({
|
||||||
checkBoxValues: []
|
checkBoxValues: []
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onSendOk = () => {
|
onSendOk = () => {
|
||||||
if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
|
if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
|
||||||
this.props.showNotification('请先选择要发送至的课堂')
|
this.props.showNotification('请先选择要发送至的课堂')
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(this.props.url==="/files/bulk_send.json"){
|
if(this.props.url==="/files/bulk_send.json"){
|
||||||
axios.post("/files/bulk_send.json", {
|
axios.post("/files/bulk_send.json", {
|
||||||
course_id:this.props.match.params.coursesId,
|
course_id:this.props.match.params.coursesId,
|
||||||
ids: this.props.selectedMessageIds,
|
ids: this.props.selectedMessageIds,
|
||||||
to_course_ids: this.state.checkBoxValues
|
to_course_ids: this.state.checkBoxValues
|
||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
if (response.data.status == 0) {
|
if (response.data.status == 0) {
|
||||||
this.setVisible(false)
|
this.setVisible(false)
|
||||||
this.props.gobackonSend(response.data.message)
|
this.props.gobackonSend(response.data.message)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(function (error) {
|
.catch(function (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
});
|
});
|
||||||
}else{
|
}else{
|
||||||
const bid = this.props.match.params.boardId
|
const bid = this.props.match.params.boardId
|
||||||
const url = `/boards/${bid}/messages/bulk_send.json`
|
const url = `/boards/${bid}/messages/bulk_send.json`
|
||||||
axios.post(url, {
|
axios.post(url, {
|
||||||
ids: this.props.selectedMessageIds,
|
ids: this.props.selectedMessageIds,
|
||||||
to_course_ids: this.state.checkBoxValues
|
to_course_ids: this.state.checkBoxValues
|
||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
if (response.data.status == 0) {
|
if (response.data.status == 0) {
|
||||||
this.setVisible(false)
|
this.setVisible(false)
|
||||||
this.props.showNotification('发送成功')
|
this.props.showNotification('发送成功')
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(function (error) {
|
.catch(function (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onOk = () => {
|
onOk = () => {
|
||||||
const { course_lists, checkBoxValues } = this.state
|
const { course_lists, checkBoxValues } = this.state
|
||||||
this.onSendOk()
|
this.onSendOk()
|
||||||
// this.props.onOk && this.props.onOk(checkBoxValues)
|
// this.props.onOk && this.props.onOk(checkBoxValues)
|
||||||
|
|
||||||
// this.refs.modalWrapper.setVisible(false)
|
// this.refs.modalWrapper.setVisible(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
onCheckBoxChange = (checkBoxValues) => {
|
onCheckBoxChange = (checkBoxValues) => {
|
||||||
this.setState({
|
this.setState({
|
||||||
checkBoxValues: checkBoxValues
|
checkBoxValues: checkBoxValues
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
onSearchChange = (e) => {
|
onSearchChange = (e) => {
|
||||||
this.setState({
|
this.setState({
|
||||||
searchValue: e.target.value
|
searchValue: e.target.value
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
handleInfiniteOnLoad = () => {
|
handleInfiniteOnLoad = () => {
|
||||||
console.log('loadmore...')
|
console.log('loadmore...')
|
||||||
this.fetchCourseList(this.state.page + 1)
|
this.fetchCourseList(this.state.page + 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
onSearch = () => {
|
onSearch = () => {
|
||||||
// const course_lists_after_filter = this.state.course_lists.filter( item => item.name.indexOf(this.state.searchValue) != -1 )
|
// const course_lists_after_filter = this.state.course_lists.filter( item => item.name.indexOf(this.state.searchValue) != -1 )
|
||||||
// this.setState({ course_lists_after_filter })
|
// this.setState({ course_lists_after_filter })
|
||||||
this.fetchCourseList(1)
|
this.fetchCourseList(1)
|
||||||
}
|
}
|
||||||
render(){
|
render(){
|
||||||
const { course_lists, checkBoxValues, searchValue, loading, hasMore } = this.state
|
const { course_lists, checkBoxValues, searchValue, loading, hasMore } = this.state
|
||||||
const { moduleName } = this.props
|
const { moduleName } = this.props
|
||||||
return(
|
return(
|
||||||
<ModalWrapper
|
<ModalWrapper
|
||||||
ref="modalWrapper"
|
ref="modalWrapper"
|
||||||
title={`发送${moduleName}`}
|
title={`发送${moduleName}`}
|
||||||
{...this.props }
|
{...this.props }
|
||||||
onOk={this.onOk}
|
onOk={this.onOk}
|
||||||
>
|
>
|
||||||
<style>
|
<style>
|
||||||
{`
|
{`
|
||||||
.demo-loading-container {
|
.demo-loading-container {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 93px;
|
bottom: 93px;
|
||||||
width: 82%;
|
width: 82%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}`}
|
}`}
|
||||||
</style>
|
</style>
|
||||||
<p className="color-grey-6 mb20 edu-txt-center" style={{ fontWeight: "bold" }} >选择的{moduleName}发送到<span className="color-orange-tip">指定课堂</span></p>
|
<p className="color-grey-6 mb20 edu-txt-center" style={{ fontWeight: "bold" }} >选择的{moduleName}发送到<span className="color-orange-tip">指定课堂</span></p>
|
||||||
|
|
||||||
<Search
|
<Search
|
||||||
className="mb14"
|
className="mb14"
|
||||||
value={searchValue}
|
value={searchValue}
|
||||||
placeholder="请输入课堂名称进行搜索"
|
placeholder="请输入课堂名称进行搜索"
|
||||||
onChange={this.onSearchChange}
|
onChange={this.onSearchChange}
|
||||||
onSearch={this.onSearch}
|
onSearch={this.onSearch}
|
||||||
></Search>
|
></Search>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
{/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
|
{/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
|
||||||
<div className="edu-back-skyblue padding15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
|
<div className="edu-back-skyblue padding15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
|
||||||
<InfiniteScroll
|
<InfiniteScroll
|
||||||
threshold={10}
|
threshold={10}
|
||||||
initialLoad={false}
|
initialLoad={false}
|
||||||
pageStart={0}
|
pageStart={0}
|
||||||
loadMore={this.handleInfiniteOnLoad}
|
loadMore={this.handleInfiniteOnLoad}
|
||||||
hasMore={!loading && hasMore}
|
hasMore={!loading && hasMore}
|
||||||
useWindow={false}
|
useWindow={false}
|
||||||
>
|
>
|
||||||
<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
|
<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
|
||||||
|
|
||||||
{ course_lists && course_lists.map( course => {
|
{ course_lists && course_lists.map( course => {
|
||||||
return (
|
return (
|
||||||
<p className="clearfix mb7" key={course.id}>
|
<p className="clearfix mb7" key={course.id}>
|
||||||
<Checkbox className="fl" value={course.id} key={course.id}></Checkbox>
|
<Checkbox className="fl" value={course.id} key={course.id}></Checkbox>
|
||||||
<span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
|
<span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
|
||||||
</p>
|
</p>
|
||||||
)
|
)
|
||||||
}) }
|
}) }
|
||||||
</Checkbox.Group>
|
</Checkbox.Group>
|
||||||
{loading && hasMore && (
|
{loading && hasMore && (
|
||||||
<div className="demo-loading-container">
|
<div className="demo-loading-container">
|
||||||
<Spin />
|
<Spin />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{/* TODO */}
|
{/* TODO */}
|
||||||
{/* {
|
{/* {
|
||||||
!hasMore && <div>没有更多了。。</div>
|
!hasMore && <div>没有更多了。。</div>
|
||||||
} */}
|
} */}
|
||||||
</InfiniteScroll>
|
</InfiniteScroll>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ModalWrapper>
|
</ModalWrapper>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export default SendToCourseModal;
|
export default SendToCourseModal;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,80 +1,80 @@
|
|||||||
.studentList_operation_ul{
|
.studentList_operation_ul{
|
||||||
color: #999;
|
color: #999;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
float: right;
|
float: right;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
}
|
}
|
||||||
.studentList_operation_ul li{
|
.studentList_operation_ul li{
|
||||||
float: left;
|
float: left;
|
||||||
padding:0px 20px;
|
padding:0px 20px;
|
||||||
position: relative;
|
position: relative;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
flex: 0 0 26px;
|
flex: 0 0 26px;
|
||||||
line-height: 26px;
|
line-height: 26px;
|
||||||
}
|
}
|
||||||
.studentList_operation_ul li.li_line:after{
|
.studentList_operation_ul li.li_line:after{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
content: '';
|
content: '';
|
||||||
width: 1px;
|
width: 1px;
|
||||||
height: 12px;
|
height: 12px;
|
||||||
background-color: #EDEDED;
|
background-color: #EDEDED;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
top:6px;
|
top:6px;
|
||||||
}
|
}
|
||||||
.studentList_operation_ul li:last-child{
|
.studentList_operation_ul li:last-child{
|
||||||
padding-right: 0px;
|
padding-right: 0px;
|
||||||
}
|
}
|
||||||
.studentList_operation_ul li:last-child:after{
|
.studentList_operation_ul li:last-child:after{
|
||||||
width: 0px;
|
width: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 基础的下拉列表、列如排序等 */
|
/* 基础的下拉列表、列如排序等 */
|
||||||
.drop_down_normal li{
|
.drop_down_normal li{
|
||||||
padding: 0px 20px;
|
padding: 0px 20px;
|
||||||
height: 34px;
|
height: 34px;
|
||||||
line-height: 34px;
|
line-height: 34px;
|
||||||
min-width: 96px;
|
min-width: 96px;
|
||||||
color: #333;
|
color: #333;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.stu_table table{
|
.stu_table table{
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
}
|
}
|
||||||
.stu_table .classesName{
|
.stu_table .classesName{
|
||||||
display: block;
|
display: block;
|
||||||
max-width: 428px;
|
max-width: 428px;
|
||||||
}
|
}
|
||||||
.stu_table .ant-table-thead > tr > th{
|
.stu_table .ant-table-thead > tr > th{
|
||||||
padding:21px 16px;
|
padding:21px 16px;
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
.stu_table .ant-table-tbody tr:last-child td{
|
.stu_table .ant-table-tbody tr:last-child td{
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
.stu_table table .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td{
|
.stu_table table .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td{
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.stu_head{
|
.stu_head{
|
||||||
padding-bottom: 15px;
|
padding-bottom: 15px;
|
||||||
}
|
}
|
||||||
.ant-modal-body{
|
.ant-modal-body{
|
||||||
padding:30px 40px;
|
padding:30px 40px;
|
||||||
}
|
}
|
||||||
.color-dark-21{
|
.color-dark-21{
|
||||||
color: #212121;
|
color: #212121;
|
||||||
}
|
}
|
||||||
.tabletd {
|
.tabletd {
|
||||||
background-color:#E6F7FF;
|
background-color:#E6F7FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
.yslminheigth{
|
.yslminheigth{
|
||||||
min-height: 20px;
|
min-height: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.yslminheigths{
|
.yslminheigths{
|
||||||
min-height: 21px;
|
min-height: 21px;
|
||||||
}
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue