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

issues25489
cxt 5 years ago
commit 12f2e65cd2

@ -7,6 +7,7 @@ $(document).on('turbolinks:load', function() {
$searchForm.find('.school-select').select2({
theme: 'bootstrap4',
placeholder: '请选择创建者单位',
allowClear: true,
minimumInputLength: 1,
ajax: {
delay: 500,

@ -0,0 +1,60 @@
$(document).on('turbolinks:load', function() {
if ($('body.cooperative-laboratory-shixuns-index-page').length > 0) {
var $searchForm = $('.laboratory-shixun-list-form .search-form');
$searchForm.find('select#tag_id').select2({
placeholder: "请选择",
allowClear: true
});
// 上传图片
$('.modal.cooperative-upload-file-modal').on('upload:success', function (e, data) {
var $imageElement = $('.shixun-image-' + data.source_id);
if($imageElement.length === 0) return;
$imageElement.attr('src', data.url);
$imageElement.show();
$imageElement.next().html('重新上传');
});
// 定义状态切换监听事件
var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
$('.laboratory-shixun-list-container').on('click', doElement, function () {
var $doAction = $(this);
var $undoAction = $doAction.siblings(undoElement);
var laboratoryShixunId = $doAction.data('id');
customConfirm({
content: '确认进行该操作吗?',
ok: function () {
$.ajax({
url: '/cooperative/laboratory_shixuns/' + laboratoryShixunId + url,
method: 'POST',
dataType: 'json',
success: function () {
show_success_flash();
$doAction.hide();
$undoAction.show();
if (callback && typeof callback === "function") {
callback(laboratoryShixunId, url);
}
}
});
}
});
});
}
// 首页展示与取消首页展示
var homepageShowCallback = function (laboratoryShixunId, url) {
var $laboratoryShixunItem = $('.laboratory-shixun-list-container').find('.laboratory-shixun-item-' + laboratoryShixunId);
if (url === '/homepage') {
$laboratoryShixunItem.find('.homepage-badge').show();
} else {
$laboratoryShixunItem.find('.homepage-badge').hide();
}
}
defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage', homepageShowCallback);
defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage', homepageShowCallback);
}
})

@ -0,0 +1,83 @@
$(document).on('turbolinks:load', function() {
if ($('body.cooperative-laboratory-subjects-index-page').length > 0) {
var $searchForm = $('.laboratory-subject-list-form .search-form');
// ************** 学校选择 *************
$searchForm.find('.school-select').select2({
theme: 'bootstrap4',
placeholder: '请选择创建者单位',
allowClear: true,
minimumInputLength: 1,
ajax: {
delay: 500,
url: '/api/schools/search.json',
dataType: 'json',
data: function (params) {
return {keyword: params.term};
},
processResults: function (data) {
return {results: data.schools}
}
},
templateResult: function (item) {
if (!item.id || item.id === '') return item.text;
return item.name;
},
templateSelection: function (item) {
if (item.id) {
}
return item.name || item.text;
}
});
// 上传图片
$('.modal.cooperative-upload-file-modal').on('upload:success', function (e, data) {
var $imageElement = $('.subject-image-' + data.source_id);
if($imageElement.length === 0) return;
$imageElement.attr('src', data.url);
$imageElement.show();
$imageElement.next().html('重新上传');
});
// 定义状态切换监听事件
var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
$('.laboratory-subject-list-container').on('click', doElement, function () {
var $doAction = $(this);
var $undoAction = $doAction.siblings(undoElement);
var laboratorySubjectId = $doAction.data('id');
customConfirm({
content: '确认进行该操作吗?',
ok: function () {
$.ajax({
url: '/cooperative/laboratory_subjects/' + laboratorySubjectId + url,
method: 'POST',
dataType: 'json',
success: function () {
show_success_flash();
$doAction.hide();
$undoAction.show();
if (callback && typeof callback === "function") {
callback(laboratorySubjectId, url);
}
}
});
}
});
});
}
// 首页展示与取消首页展示
var homepageShowCallback = function (laboratoryShixunId, url) {
var $laboratoryShixunItem = $('.laboratory-subject-list-container').find('.laboratory-subject-item-' + laboratoryShixunId);
if (url === '/homepage') {
$laboratoryShixunItem.find('.homepage-badge').show();
} else {
$laboratoryShixunItem.find('.homepage-badge').hide();
}
}
defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage', homepageShowCallback);
defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage', homepageShowCallback);
}
})

@ -0,0 +1,18 @@
$(document).on('turbolinks:load', function () {
$('.cooperative-modal-container').on('show.bs.modal', '.modal.cooperative-edit-subject-modal', function () {
var $modal = $('.modal.cooperative-edit-subject-modal');
var $form = $modal.find('form.cooperative-edit-subject-form');
$modal.on('click', '.submit-btn', function () {
$form.find('.error').html('');
var url = $form.attr('action');
$.ajax({
method: 'PATCH',
dataType: 'script',
url: url,
data: $form.serialize()
});
});
})
});

@ -42,7 +42,7 @@ $(document).on('turbolinks:load', function() {
$.ajax({
method: 'POST',
dataType: 'json',
url: '/cooperatives/files?' + formDataString,
url: '/cooperative/files?' + formDataString,
data: new FormData($form[0]),
processData: false,
contentType: false,

@ -47,6 +47,12 @@
}
}
.image-preview-container {
display: flex;
flex-direction: column;
align-items: center;
}
.action-container {
& > .action {
padding: 0 3px;

@ -47,6 +47,12 @@
}
}
.image-preview-container {
display: flex;
flex-direction: column;
align-items: center;
}
.action-container {
& > .action {
padding: 0 3px;

@ -8,6 +8,7 @@ module Base::RenderHelper
def render_forbidden
render_by_format(html: -> { current_user&.business? ? render('shared/403') : redirect_to('/403') },
js: -> { render_js_error(I18n.t('error.forbidden'), type: :notify) },
json: -> { render status: 403, json: { messages: I18n.t('error.forbidden') } } )
end

@ -1,5 +1,5 @@
class Cooperative::FilesController < Cooperative::BaseController
before_action :convert_file!, only: [:create]
before_action :convert_file!, :check_permission!, only: [:create]
def create
File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
@ -29,6 +29,22 @@ class Cooperative::FilesController < Cooperative::BaseController
render_error(ex.message)
end
def check_permission!
permission =
case params[:source_type].to_s
when '' then false
when 'Shixun' then
current_laboratory.laboratory_shixuns.exists?(ownership: true, shixun_id: params[:source_id])
when 'Subject' then
current_laboratory.laboratory_subjects.exists?(ownership: true, subject_id: params[:source_id])
else true
end
return if permission
render_forbidden
end
def file_path
@_file_path ||= begin
case params[:source_type].to_s

@ -0,0 +1,39 @@
class Cooperative::LaboratoryShixunsController < Cooperative::BaseController
before_action :check_shixun_ownership!, only: [:edit, :update]
helper_method :current_laboratory_shixun
def index
laboratory_shixuns = Admins::LaboratoryShixunQuery.call(current_laboratory, params)
@laboratory_shixuns = paginate laboratory_shixuns.includes(shixun: %i[tag_repertoires user])
end
def edit
end
def update
end
def homepage
current_laboratory_shixun.update!(homepage: true)
render_ok
end
def cancel_homepage
current_laboratory_shixun.update!(homepage: false)
render_ok
end
private
def current_laboratory_shixun
@_current_laboratory_shixun ||= current_laboratory.laboratory_shixuns.find(params[:id])
end
def check_shixun_ownership!
return if current_laboratory_shixun.ownership?
render_forbidden
end
end

@ -0,0 +1,46 @@
class Cooperative::LaboratorySubjectsController < Cooperative::BaseController
before_action :check_subject_ownership!, only: [:edit, :update]
helper_method :current_laboratory_subject
def index
laboratory_subjects = Admins::LaboratorySubjectQuery.call(current_laboratory, params)
includes_tables = { subject: [:repertoire, :subject_level_system, user: {user_extension: :school}] }
@laboratory_subjects = paginate(laboratory_subjects.includes(includes_tables))
end
def edit
@laboratory_subject = current_laboratory_subject
end
def update
current_laboratory_subject.subject.update!(update_params)
end
def homepage
current_laboratory_subject.update!(homepage: true)
render_ok
end
def cancel_homepage
current_laboratory_subject.update!(homepage: false)
render_ok
end
private
def current_laboratory_subject
@_current_laboratory_subject ||= current_laboratory.laboratory_subjects.find(params[:id])
end
def check_subject_ownership!
return if current_laboratory_subject.ownership?
render_forbidden
end
def update_params
params.require(:laboratory_subject).permit(:repertoire_id, :subject_level_system_id)
end
end

@ -526,11 +526,16 @@ class StudentWorksController < ApplicationController
@echart_data = student_efficiency(@homework, @work)
@myself_eff = @echart_data[:efficiency_list].find { |item| item.last == @user.id }
@myself_consume = @echart_data[:consume_list].find { |item| item.last == @user.id }
filename_ = "#{@use&.student_id}_#{@use&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
filename = Base64.urlsafe_encode64(filename_.strip)
stylesheets = %w(shixun_work/shixun_work.css shared/codemirror.css)
render pdf: 'shixun_work/shixun_work', filename: filename, stylesheets: stylesheets, disposition: 'inline', type:"pdf_attachment.content_type",stream:false
if params[:export].present? && params[:export]
normal_status(0,"正在下载中")
else
set_export_cookies
render pdf: 'shixun_work/shixun_work', filename: filename, stylesheets: stylesheets, disposition: 'inline', type:"pdf_attachment.content_type",stream:false
end
# render pdf: 'shixun_work/shixun_work', filename: filename, stylesheets: stylesheets, disposition: 'inline', type:"pdf_attachment.content_type",stream:false
end
# 作品调分

@ -1,5 +1,5 @@
class TrustieHacksController < ApplicationController
before_action :require_admin, :except => [:index]
before_action :require_admin, :except => [:index, :entry]
before_action :require_login, :except => [:index]
before_action :find_hackathon
before_action :find_hack, :except => [:create, :index, :edit_hackathon, :update_hackathon]

@ -1,4 +1,6 @@
class LaboratorySubject < ApplicationRecord
belongs_to :laboratory
belongs_to :subject
delegate :repertoire_id, :subject_level_system_id, :student_count, to: :subject
end

@ -1,4 +1,5 @@
class TrustieHack < ApplicationRecord
validates_length_of :description, maximum: 500
has_many :hack_users, :dependent => :destroy
belongs_to :trustie_hackathon, counter_cache: true

@ -1,5 +1,5 @@
class TrustieHackathon < ApplicationRecord
validates_length_of :description, maximum: 500
has_many :trustie_hacks, :dependent => :destroy
end

@ -7,8 +7,8 @@
<th width="10%">封面</th>
<th width="8%">创建者</th>
<th width="8%">状态</th>
<th width="10%">执行时间</th>
<th width="14%">操作</th>
<th width="8%">执行时间</th>
<th width="16%">操作</th>
</tr>
</thead>
<tbody>

@ -0,0 +1,42 @@
<% define_breadcrumbs do %>
<% add_breadcrumb('实训项目') %>
<% end %>
<div class="box search-form-container laboratory-shixun-list-form">
<%= form_tag(cooperative_laboratory_shixuns_path, method: :get, class: 'form-inline search-form', remote: true) do %>
<div class="form-group mr-1">
<label for="status">状态:</label>
<% status_options = [['全部', ''], ['编辑中', 0], ['审核中', 1], ['已发布', 2], ['已关闭', 3]] %>
<%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
</div>
<div class="form-group mr-4">
<label for="status">技术平台:</label>
<%= select_tag(:tag_id, options_for_select(MirrorRepository.pluck(:type_name,:id).unshift(['']), params[:tag_id]), class: 'form-control') %>
</div>
<%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-12 col-md-2 mr-3', placeholder: '创建者/实训名称检索') %>
<div class="form-check mr-2">
<%= hidden_field_tag(:homepage, false, id:'') %>
<%= check_box_tag(:homepage, true, params[:homepage].to_s == 'true', class: 'form-check-input') %>
<label class="form-check-label" for="homepage">只看首页展示</label>
</div>
<div class="form-check mr-2">
<%= hidden_field_tag(:ownership, false, id:'') %>
<%= check_box_tag(:ownership, true, params[:ownership].to_s == 'true', class: 'form-check-input') %>
<label class="form-check-label" for="ownership">只看自建</label>
</div>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
<%= link_to '清空', cooperative_laboratory_shixuns_path, class: 'btn btn-default','data-disable-with': '清空中...' %>
<% end %>
</div>
<div class="box laboratory-shixun-list-container">
<%= render partial: 'cooperative/laboratory_shixuns/shared/list', locals: { laboratory_shixuns: @laboratory_shixuns } %>
</div>
<%= render(partial: 'cooperative/shared/modal/upload_file_modal', locals: { title: '上传封面', accept: 'image/*' }) %>

@ -0,0 +1 @@
$('.laboratory-shixun-list-container').html("<%= j(render partial: 'cooperative/laboratory_shixuns/shared/list', locals: { laboratory_shixuns: @laboratory_shixuns }) %>");

@ -0,0 +1,27 @@
<table class="table text-center laboratory-shixun-list-table">
<thead class="thead-light">
<tr>
<th width="28%" 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="8%">执行时间</th>
<th width="16%">操作</th>
</tr>
</thead>
<tbody>
<% if laboratory_shixuns.present? %>
<% laboratory_shixuns.each do |laboratory_shixun| %>
<tr class="laboratory-shixun-item-<%= laboratory_shixun.id %>">
<%= render partial: 'cooperative/laboratory_shixuns/shared/td', locals: { laboratory_shixun: laboratory_shixun } %>
</tr>
<% end %>
<% else %>
<%= render 'cooperative/shared/no_data_for_table' %>
<% end %>
</tbody>
</table>
<%= render partial: 'cooperative/shared/paginate', locals: { objects: laboratory_shixuns } %>

@ -0,0 +1,32 @@
<%- shixun = laboratory_shixun.shixun -%>
<td class="text-left">
<%= link_to "/shixuns/#{shixun.identifier}", target: '_blank' do %>
<%= shixun.name %>
<span class="badge badge-pill badge-success homepage-badge" style="<%= laboratory_shixun.homepage? ? '' : 'display:none' %>">首页</span>
<span class="badge badge-pill badge-info ownership-badge" style="<%= laboratory_shixun.ownership ? '' : 'display:none' %>">自建</span>
<% end %>
</td>
<td><%= shixun.shixun_main_name %></td>
<td class="text-left">
<% shixun.tag_repertoires.each do |tag| %>
<span class="badge badge-secondary"><%= tag.name %></span>
<% end %>
</td>
<td class="image-preview-container">
<% imageExists = Util::FileManage.exists?(shixun) %>
<%= image_tag(imageExists ? Util::FileManage.source_disk_file_url(shixun) : '', height: 40, class: "preview-image shixun-image-#{shixun.id}", data: { toggle: 'tooltip', title: '点击预览' }, style: imageExists ? '' : 'display:none') %>
<% if laboratory_shixun.ownership? %>
<%= javascript_void_link imageExists ? '重新上传' : '上传图片', class: 'action upload-shixun-image-action', data: { source_id: shixun.id, source_type: 'Shixun', toggle: 'modal', target: '.cooperative-upload-file-modal' } %>
<% end %>
</td>
<td><%= link_to shixun.user&.real_name, "/users/#{shixun.user&.login}", target:'_blank' %></td>
<td><span class="<%= shixun_status_class(shixun) %>"><%= t("shixun.status.#{shixun.status}") %></span></td>
<td><%= shixun.excute_time %></td>
<td class="action-container">
<% if laboratory_shixun.ownership? %>
<%#= link_to('修改', cooperative_laboratory_subjects_path(laboratory_shixun)) %>
<% end %>
<%= javascript_void_link('首页展示', class: 'action homepage-show-action', data: { id: laboratory_shixun.id }, style: laboratory_shixun.homepage? ? 'display:none' : '') %>
<%= javascript_void_link('取消首页展示', class: 'action homepage-hide-action', data: { id: laboratory_shixun.id }, style: laboratory_shixun.homepage? ? '' : 'display:none') %>
</td>

@ -0,0 +1,2 @@
$('.cooperative-modal-container').html("<%= j( render partial: 'cooperative/laboratory_subjects/shared/edit_subject_modal', locals: { laboratory_subject: @laboratory_subject } ) %>");
$('.modal.cooperative-edit-subject-modal').modal('show');

@ -0,0 +1,42 @@
<% define_breadcrumbs do %>
<% add_breadcrumb('实践课程') %>
<% end %>
<div class="box search-form-container laboratory-subject-list-form">
<%= form_tag(cooperative_laboratory_subjects_path, method: :get, class: 'form-inline search-form', remote: true) do %>
<div class="form-group mr-1">
<label for="status">状态:</label>
<% status_options = [['全部', ''], ['编辑中', 0], ['审核中', 1], ['已发布', 2]] %>
<%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
</div>
<div class="form-group col-12 col-md-3">
<label for="school_name">单位:</label>
<%= select_tag :school_id, options_for_select([''], params[:school_id]), class: 'form-control school-select flex-1' %>
</div>
<%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-12 col-md-2 mr-3', placeholder: '创建者/课程名称检索') %>
<div class="form-check mr-2">
<%= hidden_field_tag(:homepage, false, id:'') %>
<%= check_box_tag(:homepage, true, params[:homepage].to_s == 'true', class: 'form-check-input') %>
<label class="form-check-label" for="homepage">只看首页展示</label>
</div>
<div class="form-check mr-2">
<%= hidden_field_tag(:ownership, false, id:'') %>
<%= check_box_tag(:ownership, true, params[:ownership].to_s == 'true', class: 'form-check-input') %>
<label class="form-check-label" for="ownership">只看自建</label>
</div>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
<%= link_to '清空', cooperative_laboratory_subjects_path(current_laboratory), class: 'btn btn-default','data-disable-with': '清空中...' %>
<% end %>
</div>
<div class="box laboratory-subject-list-container">
<%= render partial: 'cooperative/laboratory_subjects/shared/list', locals: { laboratory_subjects: @laboratory_subjects } %>
</div>
<%= render(partial: 'cooperative/shared/modal/upload_file_modal', locals: { title: '上传封面', accept: 'image/*' }) %>

@ -0,0 +1 @@
$('.laboratory-subject-list-container').html("<%= j(render partial: 'cooperative/laboratory_subjects/shared/list', locals: { laboratory_subjects: @laboratory_subjects }) %>");

@ -0,0 +1,31 @@
<div class="modal fade cooperative-edit-subject-modal" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">编辑课程信息</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<%= simple_form_for([:cooperative, laboratory_subject], html: { class: 'cooperative-edit-subject-form' }, defaults: { wrapper_html: { class: 'offset-md-1 col-md-10' } }) do |f| %>
<%= f.input :repertoire_id, label: '技术体系:' do %>
<% repertoire_options = Repertoire.order('CONVERT(name USING gbk) COLLATE gbk_chinese_ci ASC').map{|r| [r.name, r.id]} %>
<%= f.select :repertoire_id, [['请选择', '']] + repertoire_options, {}, class: 'form-control' %>
<% end %>
<%= f.input :subject_level_system_id, label: '等级体系:' do %>
<% level_options = SubjectLevelSystem.all.map{|r| [r.name, r.id]} %>
<%= f.select :subject_level_system_id, [['请选择', '']] + level_options, {}, class: 'form-control' %>
<% end %>
<div class="error text-danger"></div>
<% end %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary submit-btn">确认</button>
</div>
</div>
</div>
</div>

@ -0,0 +1,27 @@
<table class="table text-center laboratory-subject-list-table">
<thead class="thead-light">
<tr>
<th width="28%" class="text-left">课程名称</th>
<th width="12%">技术体系</th>
<th width="10%">等级体系</th>
<th width="10%">封面</th>
<th width="8%">创建者</th>
<th width="10%">单位</th>
<th width="8%">状态</th>
<th width="14%">操作</th>
</tr>
</thead>
<tbody>
<% if laboratory_subjects.present? %>
<% laboratory_subjects.each do |laboratory_subject| %>
<tr class="laboratory-subject-item-<%= laboratory_subject.id %>">
<%= render partial: 'cooperative/laboratory_subjects/shared/td', locals: { laboratory_subject: laboratory_subject } %>
</tr>
<% end %>
<% else %>
<%= render 'cooperative/shared/no_data_for_table' %>
<% end %>
</tbody>
</table>
<%= render partial: 'cooperative/shared/paginate', locals: { objects: laboratory_subjects } %>

@ -0,0 +1,28 @@
<%- subject = laboratory_subject.subject -%>
<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>
<span class="badge badge-pill badge-success ownership-badge" style="<%= laboratory_subject.ownership? ? '' : 'display:none' %>">自建</span>
</td>
<td><%= display_text subject.repertoire&.name %></td>
<td><%= display_text subject.subject_level_system&.name %></td>
<td class="image-preview-container">
<% image_exists = Util::FileManage.exists?(subject) %>
<%= image_tag(image_exists ? Util::FileManage.source_disk_file_url(subject) : '', height: 40, class: "w-100 preview-image subject-image-#{subject.id}", style: image_exists ? '' : 'display:none') %>
<% if laboratory_subject.ownership? %>
<%= javascript_void_link image_exists ? '重新上传' : '上传图片', class: 'action upload-subject-image-action', data: { source_id: subject.id, source_type: 'Subject', toggle: 'modal', target: '.cooperative-upload-file-modal' } %>
<% end %>
</td>
<td><%= link_to subject.user&.real_name, "/users/#{subject.user&.login}", target:'_blank' %></td>
<td><%= subject.user.school_name %></td>
<td><%= display_subject_status(subject) %></td>
<td class="action-container">
<% if laboratory_subject.ownership? %>
<%= link_to('修改', edit_cooperative_laboratory_subject_path(laboratory_subject), remote: true) %>
<% end %>
<%= javascript_void_link('首页展示', class: 'action homepage-show-action', data: { id: laboratory_subject.id }, style: laboratory_subject.homepage? ? 'display:none' : '') %>
<%= javascript_void_link('取消首页展示', class: 'action homepage-hide-action', data: { id: laboratory_subject.id }, style: laboratory_subject.homepage? ? '' : 'display:none') %>
</td>

@ -0,0 +1,3 @@
$('.laboratory-subject-list-container .laboratory-subject-item-<%= current_laboratory_subject.id %>').html("<%= j(render partial: 'cooperative/laboratory_subjects/shared/td', locals: { laboratory_subject: current_laboratory_subject }) %>");
$('.cooperative-modal-container .modal.cooperative-edit-subject-modal').modal('hide');
show_success_flash();

@ -17,6 +17,8 @@
<li><%= sidebar_item(edit_cooperative_laboratory_setting_path, '网站设置', icon: 'cogs', controller: 'cooperative-laboratory_settings') %></li>
<li><%= sidebar_item(cooperative_carousels_path, '轮播图设置', icon: 'image', controller: 'cooperative-carousels') %></li>
<li><%= sidebar_item(cooperative_laboratory_users_path, '管理员列表', icon: 'user', controller: 'cooperative-laboratory_users') %></li>
<li><%= sidebar_item(cooperative_laboratory_shixuns_path, '实训项目', icon: 'window-restore', controller: 'cooperative-laboratory_shixuns') %></li>
<li><%= sidebar_item(cooperative_laboratory_subjects_path, '实践课程', icon: 'th-list', controller: 'cooperative-laboratory_subjects') %></li>
<li><%= sidebar_item('/', '返回主页', icon: 'sign-out', controller: 'root') %></li>
</ul>
</nav>

@ -11,12 +11,13 @@
<form class="cooperative-upload-file-form" enctype="multipart/form-data">
<%= hidden_field_tag(:source_type, nil) %>
<%= hidden_field_tag(:source_id, nil) %>
<%= hidden_field_tag(:suffix, nil) %>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">文件</span>
</div>
<div class="custom-file">
<input type="file" name="file" class="upload-file-input" id="upload-file-input">
<input type="file" name="file" class="upload-file-input" accept="<%= accept ||= '*' %>" id="upload-file-input">
<label class="custom-file-label file-names" for="upload-file-input">选择文件</label>
</div>
</div>

@ -1121,12 +1121,25 @@ Rails.application.routes.draw do
namespace :cooperative do
# get '/', to: 'dashboards#show'
get '/', to: 'laboratory_settings#edit'
resources :files, only: [:create]
resources :users, only: [:index]
resources :laboratory_users, only: [:index, :create, :destroy]
resource :laboratory_setting, only: [:edit, :update]
resources :carousels, only: [:index, :create, :update, :destroy] do
post :drag, on: :collection
end
resources :laboratory_shixuns, only: [:index, :edit, :update] do
member do
post :homepage
post :cancel_homepage
end
end
resources :laboratory_subjects, only: [:index, :edit, :update] do
member do
post :homepage
post :cancel_homepage
end
end
end
resources :colleges, only: [] do

@ -0,0 +1,6 @@
class ModifyDescriotionLimitForHacks < ActiveRecord::Migration[5.2]
def change
change_column :trustie_hackathons, :description, :text
change_column :trustie_hacks, :description, :text
end
end

File diff suppressed because one or more lines are too long

@ -137829,6 +137829,7 @@ $(document).on('turbolinks:load', function() {
$searchForm.find('.school-select').select2({
theme: 'bootstrap4',
placeholder: '请选择创建者单位',
allowClear: true,
minimumInputLength: 1,
ajax: {
delay: 500,

@ -25487,17 +25487,28 @@ input.form-control {
height: 300px;
}
/* line 51, app/assets/stylesheets/admins/common.scss */
/* line 50, app/assets/stylesheets/admins/common.scss */
.admin-body-container .image-preview-container {
display: -webkit-box;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
flex-direction: column;
-webkit-box-align: center;
align-items: center;
}
/* line 57, app/assets/stylesheets/admins/common.scss */
.admin-body-container .action-container > .action {
padding: 0 3px;
}
/* line 56, app/assets/stylesheets/admins/common.scss */
/* line 62, app/assets/stylesheets/admins/common.scss */
.admin-body-container .action-container .more-action-dropdown .dropdown-item {
font-size: 14px;
}
/* line 63, app/assets/stylesheets/admins/common.scss */
/* line 69, app/assets/stylesheets/admins/common.scss */
.admin-body-container .paginate-container {
margin-top: 20px;
display: -webkit-box;
@ -25511,68 +25522,68 @@ input.form-control {
align-items: center;
}
/* line 70, app/assets/stylesheets/admins/common.scss */
/* line 76, app/assets/stylesheets/admins/common.scss */
.admin-body-container .paginate-container .paginate-total {
margin-bottom: 10px;
color: darkgrey;
}
/* line 75, app/assets/stylesheets/admins/common.scss */
/* line 81, app/assets/stylesheets/admins/common.scss */
.admin-body-container .paginate-container .pagination {
margin-bottom: 0px;
}
/* line 81, app/assets/stylesheets/admins/common.scss */
/* line 87, app/assets/stylesheets/admins/common.scss */
.admin-body-container .search-form-container {
display: -webkit-box;
display: flex;
margin-bottom: 20px;
}
/* line 85, app/assets/stylesheets/admins/common.scss */
/* line 91, app/assets/stylesheets/admins/common.scss */
.admin-body-container .search-form-container .search-form {
-webkit-box-flex: 1;
flex: 1;
}
/* line 88, app/assets/stylesheets/admins/common.scss */
/* line 94, app/assets/stylesheets/admins/common.scss */
.admin-body-container .search-form-container .search-form * {
font-size: 14px;
}
/* line 90, app/assets/stylesheets/admins/common.scss */
/* line 96, app/assets/stylesheets/admins/common.scss */
.admin-body-container .search-form-container .search-form select, .admin-body-container .search-form-container .search-form input {
margin-right: 10px;
font-size: 14px;
}
/* line 97, app/assets/stylesheets/admins/common.scss */
/* line 103, app/assets/stylesheets/admins/common.scss */
.admin-body-container .global-error {
color: grey;
min-height: 300px;
}
/* line 101, app/assets/stylesheets/admins/common.scss */
/* line 107, app/assets/stylesheets/admins/common.scss */
.admin-body-container .global-error-code {
font-size: 80px;
}
/* line 105, app/assets/stylesheets/admins/common.scss */
/* line 111, app/assets/stylesheets/admins/common.scss */
.admin-body-container .global-error-text {
font-size: 24px;
}
/* line 111, app/assets/stylesheets/admins/common.scss */
/* line 117, app/assets/stylesheets/admins/common.scss */
.admin-body-container .nav-tabs .nav-link {
padding: 0.5rem 2rem;
}
/* line 116, app/assets/stylesheets/admins/common.scss */
/* line 122, app/assets/stylesheets/admins/common.scss */
.admin-body-container .CodeMirror {
border: 1px solid #ced4da;
}
/* line 120, app/assets/stylesheets/admins/common.scss */
/* line 126, app/assets/stylesheets/admins/common.scss */
.admin-body-container .batch-action-container {
margin-bottom: -15px;
padding: 10px 20px 0;

@ -25047,17 +25047,28 @@ input.form-control {
height: 300px;
}
/* line 51, app/assets/stylesheets/cooperative/common.scss */
/* line 50, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .image-preview-container {
display: -webkit-box;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
flex-direction: column;
-webkit-box-align: center;
align-items: center;
}
/* line 57, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .action-container > .action {
padding: 0 3px;
}
/* line 56, app/assets/stylesheets/cooperative/common.scss */
/* line 62, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .action-container .more-action-dropdown .dropdown-item {
font-size: 14px;
}
/* line 63, app/assets/stylesheets/cooperative/common.scss */
/* line 69, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .paginate-container {
margin-top: 20px;
display: -webkit-box;
@ -25071,68 +25082,68 @@ input.form-control {
align-items: center;
}
/* line 70, app/assets/stylesheets/cooperative/common.scss */
/* line 76, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .paginate-container .paginate-total {
margin-bottom: 10px;
color: darkgrey;
}
/* line 75, app/assets/stylesheets/cooperative/common.scss */
/* line 81, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .paginate-container .pagination {
margin-bottom: 0px;
}
/* line 81, app/assets/stylesheets/cooperative/common.scss */
/* line 87, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .search-form-container {
display: -webkit-box;
display: flex;
margin-bottom: 20px;
}
/* line 85, app/assets/stylesheets/cooperative/common.scss */
/* line 91, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .search-form-container .search-form {
-webkit-box-flex: 1;
flex: 1;
}
/* line 88, app/assets/stylesheets/cooperative/common.scss */
/* line 94, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .search-form-container .search-form * {
font-size: 14px;
}
/* line 90, app/assets/stylesheets/cooperative/common.scss */
/* line 96, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .search-form-container .search-form select, .cooperative-body-container .search-form-container .search-form input {
margin-right: 10px;
font-size: 14px;
}
/* line 97, app/assets/stylesheets/cooperative/common.scss */
/* line 103, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .global-error {
color: grey;
min-height: 300px;
}
/* line 101, app/assets/stylesheets/cooperative/common.scss */
/* line 107, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .global-error-code {
font-size: 80px;
}
/* line 105, app/assets/stylesheets/cooperative/common.scss */
/* line 111, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .global-error-text {
font-size: 24px;
}
/* line 111, app/assets/stylesheets/cooperative/common.scss */
/* line 117, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .nav-tabs .nav-link {
padding: 0.5rem 2rem;
}
/* line 116, app/assets/stylesheets/cooperative/common.scss */
/* line 122, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .CodeMirror {
border: 1px solid #ced4da;
}
/* line 120, app/assets/stylesheets/cooperative/common.scss */
/* line 126, app/assets/stylesheets/cooperative/common.scss */
.cooperative-body-container .batch-action-container {
margin-bottom: -15px;
padding: 10px 20px 0;

@ -136047,6 +136047,151 @@ $(document).on('turbolinks:load', function() {
})
}
});
$(document).on('turbolinks:load', function() {
if ($('body.cooperative-laboratory-shixuns-index-page').length > 0) {
var $searchForm = $('.laboratory-shixun-list-form .search-form');
$searchForm.find('select#tag_id').select2({
placeholder: "请选择",
allowClear: true
});
// 上传图片
$('.modal.cooperative-upload-file-modal').on('upload:success', function (e, data) {
var $imageElement = $('.shixun-image-' + data.source_id);
if($imageElement.length === 0) return;
$imageElement.attr('src', data.url);
$imageElement.show();
$imageElement.next().html('重新上传');
});
// 定义状态切换监听事件
var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
$('.laboratory-shixun-list-container').on('click', doElement, function () {
var $doAction = $(this);
var $undoAction = $doAction.siblings(undoElement);
var laboratoryShixunId = $doAction.data('id');
customConfirm({
content: '确认进行该操作吗?',
ok: function () {
$.ajax({
url: '/cooperative/laboratory_shixuns/' + laboratoryShixunId + url,
method: 'POST',
dataType: 'json',
success: function () {
show_success_flash();
$doAction.hide();
$undoAction.show();
if (callback && typeof callback === "function") {
callback(laboratoryShixunId, url);
}
}
});
}
});
});
}
// 首页展示与取消首页展示
var homepageShowCallback = function (laboratoryShixunId, url) {
var $laboratoryShixunItem = $('.laboratory-shixun-list-container').find('.laboratory-shixun-item-' + laboratoryShixunId);
if (url === '/homepage') {
$laboratoryShixunItem.find('.homepage-badge').show();
} else {
$laboratoryShixunItem.find('.homepage-badge').hide();
}
}
defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage', homepageShowCallback);
defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage', homepageShowCallback);
}
})
;
$(document).on('turbolinks:load', function() {
if ($('body.cooperative-laboratory-subjects-index-page').length > 0) {
var $searchForm = $('.laboratory-subject-list-form .search-form');
// ************** 学校选择 *************
$searchForm.find('.school-select').select2({
theme: 'bootstrap4',
placeholder: '请选择创建者单位',
allowClear: true,
minimumInputLength: 1,
ajax: {
delay: 500,
url: '/api/schools/search.json',
dataType: 'json',
data: function (params) {
return {keyword: params.term};
},
processResults: function (data) {
return {results: data.schools}
}
},
templateResult: function (item) {
if (!item.id || item.id === '') return item.text;
return item.name;
},
templateSelection: function (item) {
if (item.id) {
}
return item.name || item.text;
}
});
// 上传图片
$('.modal.cooperative-upload-file-modal').on('upload:success', function (e, data) {
var $imageElement = $('.subject-image-' + data.source_id);
if($imageElement.length === 0) return;
$imageElement.attr('src', data.url);
$imageElement.show();
$imageElement.next().html('重新上传');
});
// 定义状态切换监听事件
var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
$('.laboratory-subject-list-container').on('click', doElement, function () {
var $doAction = $(this);
var $undoAction = $doAction.siblings(undoElement);
var laboratorySubjectId = $doAction.data('id');
customConfirm({
content: '确认进行该操作吗?',
ok: function () {
$.ajax({
url: '/cooperative/laboratory_subjects/' + laboratorySubjectId + url,
method: 'POST',
dataType: 'json',
success: function () {
show_success_flash();
$doAction.hide();
$undoAction.show();
if (callback && typeof callback === "function") {
callback(laboratorySubjectId, url);
}
}
});
}
});
});
}
// 首页展示与取消首页展示
var homepageShowCallback = function (laboratoryShixunId, url) {
var $laboratoryShixunItem = $('.laboratory-subject-list-container').find('.laboratory-subject-item-' + laboratoryShixunId);
if (url === '/homepage') {
$laboratoryShixunItem.find('.homepage-badge').show();
} else {
$laboratoryShixunItem.find('.homepage-badge').hide();
}
}
defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage', homepageShowCallback);
defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage', homepageShowCallback);
}
})
;
$(document).on('turbolinks:load', function() {
if ($('body.cooperative-laboratory-users-index-page').length > 0) {
// ============= 添加管理员 ==============
@ -136109,6 +136254,24 @@ $(document).on('turbolinks:load', function() {
});
}
});
$(document).on('turbolinks:load', function () {
$('.cooperative-modal-container').on('show.bs.modal', '.modal.cooperative-edit-subject-modal', function () {
var $modal = $('.modal.cooperative-edit-subject-modal');
var $form = $modal.find('form.cooperative-edit-subject-form');
$modal.on('click', '.submit-btn', function () {
$form.find('.error').html('');
var url = $form.attr('action');
$.ajax({
method: 'PATCH',
dataType: 'script',
url: url,
data: $form.serialize()
});
});
})
});
$(document).on('turbolinks:load', function() {
var $modal = $('.modal.cooperative-upload-file-modal');
if ($modal.length > 0) {
@ -136153,7 +136316,7 @@ $(document).on('turbolinks:load', function() {
$.ajax({
method: 'POST',
dataType: 'json',
url: '/cooperatives/files?' + formDataString,
url: '/cooperative/files?' + formDataString,
data: new FormData($form[0]),
processData: false,
contentType: false,

@ -32,7 +32,7 @@ module.exports = {
// See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
// devtool: "cheap-module-eval-source-map",
// 开启调试
// devtool: "source-map", // 开启调试
devtool: "source-map", // 开启调试
// These are the "entry points" to our application.
// This means they will be the "root" imports that are included in JS bundle.
// The first two entry points enable "hot" CSS and auto-refreshes for JS.

@ -30,7 +30,8 @@ class BoardsNew extends Component{
boards: [],
title_num: 0,
email_notify:false,
isemail_notify:false
isemail_notify:false,
isemail_notifys:false
}
}
addSuccess = () => {
@ -99,7 +100,7 @@ class BoardsNew extends Component{
}
})
this.setState({ fileList: _fileList, board_name: data.board_name, title_num: parseInt(data.subject.length) ,isemail_notify:response.data.data.email_notify})
this.setState({ fileList: _fileList, board_name: data.board_name, title_num: parseInt(data.subject.length) ,isemail_notifys:response.data.data.email_notify})
}
}
})
@ -341,8 +342,8 @@ class BoardsNew extends Component{
{/* notRequired */}
<Form {...formItemLayout} onSubmit={this.handleSubmit}>
<div className="formBlock" style={{paddingBottom: '0px', position: 'relative'}}>
{this.state.boardsdata&&this.state.boardsdata.email_notify===true?this.props.isAdminOrTeacher()===true?<Tooltip placement="bottom" title={this.state.isemail_notify?"邮件只能发送一次":""}><span className={"setemail fr mr70 setemailposition"}>
<Checkbox onChange={this.setemailchange} checked={this.state.isemail_notify} disabled={this.state.isemail_notify}>发送邮件提醒</Checkbox>
{this.state.boardsdata&&this.state.boardsdata.email_notify===true?this.props.isAdminOrTeacher()===true?<Tooltip placement="bottom" title={this.state.isemail_notifys===true?"邮件只能发送一次":""}><span className={"setemail fr mr70 setemailposition"}>
<Checkbox onChange={this.setemailchange} checked={this.state.isemail_notifys===true?this.state.isemail_notifys:this.state.isemail_notify} disabled={this.state.isemail_notifys}>发送邮件提醒</Checkbox>
</span></Tooltip>:"":""}
{ isAdmin &&

@ -724,22 +724,28 @@ class CommonWorkSetting extends Component{
let course_id=this.props.match.params.coursesId;
const url = `/homework_commons/${workId}/update_settings.json`
// comments
const temp_publish_time_date = new Date(temp_publish_time)
const temp_end_time_date = new Date(temp_end_time)
const late_time_date = new Date(late_time)
const evaluation_start_date = new Date(evaluation_start)
const evaluation_end_date = new Date(evaluation_end)
const appeal_time_date = new Date(appeal_time)
axios.post(url,{
course_id ,
unified_setting: unified_setting, // 统一设置
group_settings: group_settings_param,
publish_time: temp_publish_time ? new Date(temp_publish_time.replace(/-/g, '/')) : temp_publish_time, // 发布
end_time: temp_end_time ? new Date(temp_end_time.replace(/-/g, '/')) : temp_end_time, // 截止
publish_time: temp_publish_time ? !isNaN(temp_publish_time_date.getTime()) ? temp_publish_time_date : new Date(temp_publish_time.replace(/-/g, '/')) : temp_publish_time, // 发布
end_time: temp_end_time ? !isNaN(temp_end_time_date.getTime()) ? temp_end_time_date : new Date(temp_end_time.replace(/-/g, '/')) : temp_end_time, // 截止
late_penalty: late_penalty, // 迟交扣分
allow_late: allow_late, // 是否允许补交
late_time: late_time ? new Date(late_time.replace(/-/g, '/')) : late_time, // 补交截止时间
late_time: late_time ? !isNaN(late_time_date.getTime()) ? late_time_date : new Date(late_time.replace(/-/g, '/')) : late_time, // 补交截止时间
anonymous_comment: anonymous_comment, // true: 启用匿评 false:未启用匿评
evaluation_start: evaluation_start ? new Date(evaluation_start.replace(/-/g, '/')) : evaluation_start, //匿评开始时间
evaluation_end: evaluation_end ? new Date(evaluation_end.replace(/-/g, '/')) : evaluation_end,
evaluation_start: evaluation_start ? !isNaN(evaluation_start_date.getTime()) ? evaluation_start_date : new Date(evaluation_start.replace(/-/g, '/')) : evaluation_start, //匿评开始时间
evaluation_end: evaluation_end ? !isNaN(evaluation_end_date.getTime()) ? evaluation_end_date : new Date(evaluation_end.replace(/-/g, '/')) : evaluation_end,
evaluation_num: evaluation_num, // 匿评数
absence_penalty: absence_penalty, // 匿评扣分
anonymous_appeal: anonymous_appeal, // true: 启用匿评申诉, false:未启用
appeal_time: appeal_time ? new Date(appeal_time.replace(/-/g, '/')) : appeal_time, // 申诉结束时间
appeal_time: appeal_time ? !isNaN(appeal_time_date.getTime()) ? appeal_time_date : new Date(appeal_time.replace(/-/g, '/')) : appeal_time, // 申诉结束时间
appeal_penalty: appeal_penalty, // 违规匿评扣分
ta_mode: ta_mode, // 1:普通模式 0:复审模式
final_mode: final_mode, // true: 单项评分优先, false: 多项评分配比

@ -1,5 +1,5 @@
import React,{ Component } from "react";
import {Modal, Checkbox, Upload, Button, Icon, message, Input, Form} from "antd";
import {Modal, Checkbox, Upload, Button, Icon, message, Input, Form, InputNumber} from "antd";
import { WordNumberTextarea } from 'educoder';
import './Newshixunmodel.css'
@ -17,6 +17,7 @@ class ModulationModal extends Component{
Saves=()=>{
console.log("Saves=()");
let {textareaval,Inputsval}=this.state;
// if(textareaval===""||textareaval===undefined){
// this.setState({
@ -32,7 +33,7 @@ class ModulationModal extends Component{
this.setState({
Inputsval: "",
Inputsvaltype: true,
Inputsvaltest: "请输入分数",
Inputsvaltest: "请填写分数",
})
return
}
@ -40,10 +41,51 @@ class ModulationModal extends Component{
if (this.state.Inputsvaltype === true) {
return;
}
if (Inputsval === undefined || Inputsval === null || Inputsval === "") {
this.setState({
borredszf: "ml10 color-grey-9 bor-reds ",
Inputsval: "",
Inputsvaltype: true,
Inputsvaltest: "成绩不能为空",
})
return
}
var re = /^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 //判断正整数 /^[1-9]+[0-9]*]*$/
var nubmer = Inputsval;
if (!re.test(nubmer)) {
this.setState({
borredszf: "ml10 color-grey-9 bor-reds ",
Inputsval: Inputsval,
Inputsvaltype: true,
Inputsvaltest: "请输入0-100的分数",
})
return;
}
if (0 > parseFloat(Inputsval)) {
this.setState({
borredszf: "ml10 color-grey-9 bor-reds ",
Inputsval: Inputsval,
Inputsvaltype: true,
Inputsvaltest: "成绩不能小于零",
})
return;
} else if (parseFloat(Inputsval) > 100) {
this.setState({
borredszf: "ml10 color-grey-9 bor-reds ",
Inputsval: Inputsval,
Inputsvaltype: true,
Inputsvaltest: "成绩不能大于100",
})
return;
}
this.setState({
Inputsvaltype: false,
Inputsvaltest: "",
})
console.log(Inputsval);
this.props.Saves(textareaval,Inputsval)
}
@ -55,31 +97,13 @@ class ModulationModal extends Component{
}
setInputs=(e)=>{
debugger
var value=parseInt(e.target.value)
console.log("setInputs");
console.log(e);
if(isNaN(value)){
value = 0;
this.setState({
Inputsval: value,
Inputsvaltype: true,
Inputsvaltest: "请输入分数",
})
}else{
if(value<0||value>100){
value = 0;
this.setState({
Inputsval: value,
Inputsvaltype: true,
Inputsvaltest: "请输入0-100的分数",
})
}
}
this.setState({
Inputsval: value,
this.setState({
Inputsval: e,
Inputsvaltype: false,
})
})
}
render(){
let {textareaval, Inputsval, textareavaltype, Inputsvaltype, Inputsvaltest} = this.state;
@ -100,65 +124,90 @@ class ModulationModal extends Component{
alignItems: "center",
}}>
<div style={{
marginTop: " 27px",
display: "flex",
flexDirection: "initial",
}}>
}}>
<p className=" mt3 font-14 " style={{color: "#666666"}}>该学生的最终成绩将不会按照评分规则进行计算</p>
</div>
<div style={{
marginTop: " 27px",
display: "flex",
flexDirection: "initial",
width: "100%",
}}>
<span style={{
width: "70px",
textAlign: "center",
lineHeight: " 40px",
lineHeight: "40px",
marginLeft: "16px",
}}><span style={{
textAlign: "center",
lineHeight: " 40px",
color: " #f5222d",
}}>*</span></span>
<Input
className={Inputsvaltype === true ? "borerinput" : ""}
}}>*</span></span>
<style>
{
`
.myinputnumbers .ant-input-number-input{
line-height: 40px;
height: 35px;
}
`
}
</style>
{Inputsvaltype === true ?
<style>
{
`
.ant-input:hover {
border: 1px solid #DD1717!important;
}
.ant-input:focus {
border: 1px solid #DD1717!important;
}
}
`
}
</style>
:
""
} <InputNumber
className={Inputsvaltype === true ? "borerinput myinputnumbers bor-reds" : "myinputnumbers"}
style={{
width: "120px",
height: "40px",
}}
placeholder="请填写分数"
onChange={(e) => this.setInputs(e)}
value={Inputsval === undefined || Inputsval === null ? "" : Inputsval}/>
<span
style={{
width: "335px",
height: "40px",
}}
placeholder="请填写分数"
value={Inputsval}
onInput={this.setInputs}
suffix={
<span
style={{
textAlign: "center",
lineHeight: " 40px",
}}
></span>
}
/>
textAlign: "center",
lineHeight: " 40px",
marginLeft: "10px",
}}
></span>
</div>
{
Inputsvaltype === true ?
<p style={{color: "#DD1717", width: "268px"}}>{Inputsvaltest}</p>
<p style={{color: "#DD1717", width: "77%", marginLeft: "1px", marginTop: "10px",}}>{Inputsvaltest}</p>
: ""
}
<div style={{
display: "flex",
flexDirection: "initial",
}}>
<span style={{width: "70px"}}></span>
<p className=" mt3 font-14 " style={{color: "#666666"}}>调分后该学生的最终成绩将不会按照评分规则进行计算</p>
</div>
<div style={{
display: "flex",
flexDirection: "initial",
marginTop: "10px;",
}}>
<span style={{width: "70px", marginTop: "24px"}}>调分原因</span>
<WordNumberTextarea
style={{width: "335px"}}
placeholder={"请输入调分原因(选填)"}
style={{width: "100%"}}
placeholder={"请填写您对作品调分的原因(选填)"}
onInput={(e) => this.settextarea(e)}
value={textareaval}
maxlength={100}
@ -166,16 +215,19 @@ class ModulationModal extends Component{
</div>
<div style={{
marginTop: "27px",
width: " 336px",
marginTop: "15px",
width: "82%",
marginLeft: "70px",
marginBottom: "29px",
display: "flex",
flexDirection: "row-reverse",
}}>
<a className="task-btn color-white mr30" style={{width: "72px",}}
<a className="task-btn task-btn-orange " style={{width: "72px", borderRadius: "5px"}}
onClick={this.Saves}>{this.props.Savesname || '确认'}</a>
<a className="task-btn color-white mr30" style={{width: "72px", borderRadius: "5px"}}
onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
<a className="task-btn task-btn-orange" style={{width: "72px",}}
onClick={this.Saves}>{this.props.Savesname || '保存'}</a>
</div>
</div>
</div>

@ -0,0 +1,176 @@
import React, {Component} from "react";
import {Modal, Checkbox, Upload, Button, Icon, message, Input, Form} from "antd";
import {WordNumberTextarea} from 'educoder';
import './Newshixunmodel.css'
//调分
class ModulationModal_exercise extends Component {
constructor(props) {
super(props);
this.state = {
score: 0,
subjective_questions: 0,
objective_questions: 0,
}
//因为主观题加客观题的和是总分
}
componentDidMount = () => {
}
Saves = () => {
let {textareaval, subjective_questions, objective_questions, score} = this.state;
// this.props.Saves(textareaval, Inputsval)
}
settextarea = (e) => {
this.setState({
textareaval: e.target.value
})
}
setInputs = (e) => {
}
render() {
let {Inputsvaltype, subjective_questions, objective_questions, score} = this.state;
return (
<div>
<Modal
keyboard={false}
className={"HomeworkModal"}
title={this.props.modalname || '评阅'}
visible={this.props.visible}
closable={false}
footer={null}
destroyOnClose={true}
>
<div className="clearfix" style={{
display: "-webkit-flex",
flexDirection: "column",
alignItems: "center",
}}>
<div className="mexertwo">
<p className="mexeheigth2">主观题成绩:</p>
<Input
className={Inputsvaltype === true ? "borerinput myinputnumbers bor-reds" : "myinputnumbers"}
style={{
width: "120px",
height: "40px",
}}
placeholder="请填写主观题成绩"
onChange={(e) => this.setInputs(e)}
value={subjective_questions === undefined || subjective_questions === null ? "" : subjective_questions}/>
<p className="mexeheigth"> ,</p>
<p className="mexeheigth"><span>总分</span><span>45.0 </span><span></span></p>
</div>
<div className="mexertwo">
<p className="mexeheigth2">客观题成绩:</p>
<Input
className={Inputsvaltype === true ? "borerinput myinputnumbers bor-reds" : "myinputnumbers"}
style={{
width: "120px",
height: "40px",
}}
placeholder="请填写客观题成绩"
onChange={(e) => this.setInputs(e)}
value={objective_questions === undefined || objective_questions === null ? "" : objective_questions}/>
<p className="mexeheigth"> ,</p>
<p className="mexeheigth"><span>总分</span><span>45.0 </span><span></span></p>
</div>
<div className="mexertwo">
<p className="mexeheigth2">最终成绩:</p>
<Input
className={Inputsvaltype === true ? "borerinput myinputnumbers bor-reds" : "myinputnumbers"}
style={{
width: "120px",
height: "40px",
}}
placeholder="请填写最终成绩"
onChange={(e) => this.setInputs(e)}
value={score === undefined || score === null ? "" : score}/>
<p className="mexeheigth"> ,</p>
<p className="mexeheigth"><span>总分</span><span>45.0 </span><span></span></p>
</div>
<div className="minbuttionte">
<a className="task-btn color-white mr30" style={{width: "72px",}}
onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
<a className="task-btn task-btn-orange" style={{width: "72px",}}
onClick={this.Saves}>{this.props.Savesname || '保存'}</a>
</div>
</div>
</Modal>
</div>
)
}
}
export default ModulationModal_exercise;
// <div className="task-popup-content">
// <p className="task-popup-text-center font-16 mb20">
//
// <span className={"color-dark-21"}>该学生的最终成绩将不会按照评分规则进行计算</span>
//
// </p>
//
//
// <div className="clearfix">
// {/*<textarea*/}
// {/*className="winput-100-150"*/}
// {/*placeholder="请填写您对作品调分的原因"*/}
// {/*value={textareaval}*/}
// {/*onInput={this.settextarea}*/}
// {/*></textarea>*/}
//
// <WordNumberTextarea
// placeholder={"请填写您对作品调分的原因"}
// onInput={(e)=>this.settextarea(e)}
// value={textareaval}
// maxlength={100}
// />
//
// {/*<li style={{height:"20px",lineHeight:"20px"}}><span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span></li>*/}
// <div style={{height:"20px",lineHeight:"20px"}}></div>
// </div>
//
// <style>
// {
//
// `
// .pdl10{
// padding-left:10px;
// }
// `
// }
// </style>
//
// <li className={"pdl10"}>
//
// </li>
// <li style={{height:"20px",lineHeight:"20px"}}><span className={Inputsvaltype===true?"color-red":"none"}>分数不能为空</span></li>
// <div className="clearfix edu-txt-center">
// <a className="task-btn color-white mr30" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
// <a className="task-btn task-btn-orange" onClick={this.Saves}>{this.props.Savesname || '保存'}</a>
{/* </div>*/
}
{/*</div>*/
}

@ -305,8 +305,27 @@
margin: 10px 10px 0px 10px;
padding: 10px 10px 5px 10px;
backgroud: rgba(234, 234, 234, 1);
width: 335px;
width: 530px;
margin-left: 10px;
margin-top: 25px;
height: 214px !important;
}
.WordNumbernote .WordNumberTextarea {
outline: none;
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
background-color: white;
text-shadow: none;
-webkit-writing-mode: horizontal-tb !important;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
resize: none;
border: none;
width: 100%;
height: 169px !important;
border: none;
display: block;
}
.WordNumberTextarea-count {
@ -325,3 +344,30 @@
border: 1px solid #eee !important;
}
.mexertwo {
display: flex;
flex-direction: initial;
}
.mexeheigth {
line-height: 40px;
}
.mexeheigth2 {
line-height: 40px;
width: 74px;
}
.minbuttionte {
/* display: flex; */
margin-top: 27px;
width: 100%;
/* align-items: center; */
margin-bottom: 17px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
flex-direction: initial;
}

@ -24,6 +24,7 @@ import {getImageUrl, toPath, sortDirections} from 'educoder';
import CheckBoxGroup from "../../page/component/CheckBoxGroup";
import NoneData from '../../../modules/courses/coursesPublic/NoneData'
import ModulationModal from "../coursesPublic/ModulationModal";
import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise";
const Search = Input.Search;
const RadioGroup = Radio.Group;
const CheckboxGroup = Checkbox.Group;
@ -1030,9 +1031,10 @@ class Studentshavecompletedthelist extends Component {
render: (text, record) => (
<span>
{record.finalscore==="--"?
<span style={{color: "#9A9A9A"}}>
--
</span>
<span style={{textAlign: "center", color: '#999999'}}
>--</span>
:
<a style={{textAlign: "center"}} className="color-blue"
target="_blank"
@ -1227,9 +1229,8 @@ class Studentshavecompletedthelist extends Component {
render: (text, record) => (
<span>
{record.finalscore==="--"?
<span style={{color: "#9A9A9A"}}>
--
</span>
<span style={{textAlign: "center", color: '#999999'}}
>--</span>
:
<a style={{textAlign: "center"}} className="color-blue"
target="_blank"
@ -1243,14 +1244,15 @@ class Studentshavecompletedthelist extends Component {
exercise_status:0,
order_type: "desc",
exeuserid: 0,
subjective: 0,
objective_score: 0,
subjective_score: 0,
}
{/*<span className="color-blue" style={{textAlign: "center", cursor: "pointer"}}*/
{/*<a style={{textAlign: "center"}} className="color-blue"*/
}
{/* onClick={() => this.Adjustment(record)}*/
{/* target="_blank"*/
}
{/*>调分</span>*/
{/* onClick={() => this.Adjustment(record.user_id)}>评阅</a>*/
}
// //console.log("Studentshavecompletedthelist");
// //console.log(props.current_status);
@ -1807,6 +1809,9 @@ class Studentshavecompletedthelist extends Component {
course_groups: response.data.course_groups,
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
loadingstate: false,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
columnsys: arr,
})
} else {
@ -1839,6 +1844,9 @@ class Studentshavecompletedthelist extends Component {
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
columnsys: arr,
})
}
@ -1876,6 +1884,9 @@ class Studentshavecompletedthelist extends Component {
course_groups: response.data.course_groups,
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
loadingstate: false,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
columnsys: arr,
})
} else {
@ -1908,6 +1919,9 @@ class Studentshavecompletedthelist extends Component {
course_groups: response.data.course_groups,
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
loadingstate: false,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
columnsys: arr,
})
}
@ -1940,6 +1954,9 @@ class Studentshavecompletedthelist extends Component {
course_groups: response.data.course_groups,
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
columnsys: arr,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
})
} else {
var arr =[];
@ -1965,6 +1982,9 @@ class Studentshavecompletedthelist extends Component {
course_groups: response.data.course_groups,
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
columnsys:arr,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
})
}
} else {
@ -1981,6 +2001,9 @@ class Studentshavecompletedthelist extends Component {
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
loadingstate: false,
columnsys: this.state.columnsystwo,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
})
} else {
var arr =[];
@ -2007,6 +2030,9 @@ class Studentshavecompletedthelist extends Component {
mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
loadingstate: false,
columnsys: arr,
subjective: response.data.exercise_types.subjective,
objective_score: response.data.exercise_types.objective_score,
subjective_score: response.data.exercise_types.subjective_score,
})
}
@ -2594,9 +2620,9 @@ class Studentshavecompletedthelist extends Component {
var exercise_id = this.props.match.params.Id;
let url = `/exercises/${exercise_id}/adjust_score.json`;
axios.post(url, {
score: n,
user_id: this.state.exeuserid,
comment: v,
subjective_score: n,
objective_score: v,
})
.then((response) => {
if (response.data.status == '0') {
@ -2647,6 +2673,13 @@ class Studentshavecompletedthelist extends Component {
Cancel={() => this.Adjustments()}
Saves={(value, num) => this.Testpapergrading(value, num)}
/> : ""}
{/*{*/}
{/* testpapergradingboll === true ? <ModulationModal_exercise*/}
{/* visible={testpapergradingboll}*/}
{/* Cancel={() => this.Adjustments()}*/}
{/* Saves={(value, num) => this.Testpapergrading(value, num)}*/}
{/* /> : ""*/}
{/*}*/}
<div className="edu-back-white" >
<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>

@ -443,7 +443,7 @@ class Testpapersettinghomepage extends Component{
<a className="fr color-blue font-16 mt20" onClick={()=>this.setgameexercise(`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`)}>开始答题</a>:
<Link className="fr color-blue font-16 mt20"
to={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`}>
{exercise_status===2?"":exercise_status===3?"":exercise_status===4?"":start_Value[exercise_status]}
{exercise_status===2?start_Value[Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.current_status]:exercise_status===3?"":exercise_status===4?"":start_Value[Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.current_status]}
</Link>
:""}

@ -211,6 +211,59 @@ class Bullsubdirectory extends Component{
});
}
//上移
Moveupward = (id) => {
let url = `/courses/${this.props.match.params.coursesId}/inform_up.json`;
axios.post(url, {
inform_id: id
}).then((response) => {
if (response) {
if (response.data) {
if (response.data.status === 0) {
this.props.showNotification(`上移成功`);
this.props.getinputdata();
} else {
this.props.showNotification(`上移失败`);
}
} else {
this.props.showNotification(`上移失败`);
}
} else {
this.props.showNotification(`上移失败`);
}
}).catch((error) => {
console.log(error)
});
}
//下移
Movedown = (id) => {
let url = `/courses/${this.props.match.params.coursesId}/inform_down.json`;
axios.post(url, {
inform_id: id
}).then((response) => {
if (response) {
if (response.data) {
if (response.data.status === 0) {
this.props.showNotification(`下移成功`);
this.props.getinputdata();
} else {
this.props.showNotification(`下移失败`);
}
} else {
this.props.showNotification(`下移失败`);
}
} else {
this.props.showNotification(`下移失败`);
}
}).catch((error) => {
console.log(error)
});
}
render(){
let{description,whethertoeditysl,addonAfter,eduintits,informs,isSpinysl} =this.state;
@ -269,6 +322,42 @@ class Bullsubdirectory extends Component{
:""
}
</span>
{
this.props.length - 1 === this.props.index ? "" :
this.props.isAdmin() === true ?
(this.props.yslbool === false ?
<a className="fr yslbianji mr30"
style={{
lineHeight: "31px",
}}
onClick={() => this.Movedown(this.props.id)}
><Tooltip
title="下移"><i
style={{color: "#4CACFF"}}
className=" font-18 iconfont icon-xiangxiayi"></i></Tooltip></a>
:
""
)
: ""
}
{
this.props.index === 0 ? "" :
this.props.isAdmin() === true ?
(this.props.yslbool === false ?
<a className="fr yslbianji mr30"
style={{
lineHeight: "31px",
}}
onClick={() => this.Moveupward(this.props.id)}
><Tooltip
title="上移"><i
style={{color: "#4CACFF"}}
className=" font-18 iconfont icon-xiangshangyi"></i></Tooltip></a>
:
""
)
: ""
}
</div>
<div className="yslclear"></div>
</div>

@ -491,9 +491,12 @@ class Eduinforms extends Component{
:
<div className="edu-back-white ">
{/*公告栏底部*/}
{ informs&&informs.map((item, index) => {
return (
<Bullsubdirectory {...this.state} {...this.props} key={index} index={index} yslbool={yslbool} id={item.id} myname={item.name} mydescription={item.description}
<Bullsubdirectory {...this.state} {...this.props} key={index} index={index}
length={informs.length} yslbool={yslbool} id={item.id}
myname={item.name} mydescription={item.description}
getyslbooltrue={()=>this.getyslbooltrue()}
getyslboolfalse={()=>this.getyslboolfalse()}
getinputdata={()=>this.getinputdata()} ></Bullsubdirectory>
@ -524,4 +527,4 @@ export default Eduinformss;
{/*<div key={index} className="bor-bottom-greyE" >*/}
{/* {item.name===""?"":item.name===undefined?"":item.name===null?"":<div className="ysltitbt"><span >{item.name}</span></div>}*/}
{/* <div id="MakedownHTML" key={index} className={"markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"} dangerouslySetInnerHTML={{__html: markdownToHTML(item.description).replace(/▁/g, "▁▁▁")}}/>*/}
{/*</div>*/}
{/*</div>*/}

@ -1,5 +1,5 @@
import React,{ Component } from "react";
import { Pagination} from "antd";
import { Pagination , Spin } from "antd";
import NoneData from "../coursesPublic/NoneData"
import '../css/members.css'
@ -16,10 +16,14 @@ class PollDetailTabSecond extends Component{
page:1,
limit:10,
questions:undefined,
questionsInfo:undefined
questionsInfo:undefined,
isSpin:false
}
}
getInfo=(page)=>{
this.setState({
isSpin:true
})
let pollId=this.props.match.params.pollId;
let url=`/polls/${pollId}/commit_result.json?page=${page}`;
axios.get(url).then((result)=>{
@ -27,7 +31,8 @@ class PollDetailTabSecond extends Component{
this.setState({
page: page,
questions:result.data.questions,
questionsInfo:result.data.question_types
questionsInfo:result.data.question_types,
isSpin:false
})
}
}).catch((error)=>{
@ -56,11 +61,12 @@ class PollDetailTabSecond extends Component{
}
render(){
let {page, limit, questions, questionsInfo} = this.state;
let {page, limit, questions, questionsInfo , isSpin} = this.state;
return(
<Spin size="large" spinning={ isSpin }>
<div>
{
questions && questions.length>0?questions.map((item,key)=>{
questions && questions.length>0 && questions.map((item,key)=>{
return(
<div className="edu-back-white mb10">
<div className="pt20 pl30 pr30 pb10">
@ -90,8 +96,9 @@ class PollDetailTabSecond extends Component{
<p className="countHeader">
{
item.question.question_type==3?
<ul className="clearfix">
<span>文本答案</span>
<ul className="clearfix df">
<span style={{width:"6%"}}>编号</span>
<span style={{width:"50%",textAlign:"left"}}>文本答案</span>
</ul>
:
<ul className="clearfix">
@ -105,19 +112,22 @@ class PollDetailTabSecond extends Component{
{/* 主观题 */}
{
item.question.question_type == 3 && item.question.vote_text &&
<div className="countBody">
<ul className="clearfix">
<span className="color-grey-3 break-word" style={{width:"100%"}}>
{
item.question.vote_text.map((txt,t)=>{
return(
<li>{t+1}.{txt}</li>
)
})
}
</span>
</ul>
</div>
<React.Fragment>
{
item.question.vote_text.map((txt,t)=>{
return(
<div className="countBody">
<ul className="clearfix df">
<span style={{width:"6%"}} className="pl8">{t+1}</span>
<span className="color-grey-3 break-word edu-txt-left flex1">
<li>{txt}</li>
</span>
</ul>
</div>
)
})
}
</React.Fragment>
}
{/* 单选和多选 */}
{
@ -166,7 +176,10 @@ class PollDetailTabSecond extends Component{
</div>
</div>
)
}):<NoneData></NoneData>
})
}
{
questions && questions.length == 0 && <NoneData></NoneData>
}
{
questionsInfo && questionsInfo.q_counts > limit &&
@ -177,6 +190,7 @@ class PollDetailTabSecond extends Component{
}
</div>
</Spin>
)
}
}

@ -1,5 +1,5 @@
import React,{ Component } from "react";
import { Spin } from 'antd';
import '../css/members.css'
import '../css/busyWork.css'
import './pollStyle.css'
@ -12,10 +12,14 @@ class PollDetailTabThird extends Component{
constructor(props){
super(props);
this.state={
pollDetail:undefined
pollDetail:undefined,
isSpin:false
}
}
getPollInfo=()=>{
this.setState({
isSpin:true
})
let pollId=this.props.match.params.pollId;
let url=`/polls/${pollId}.json`;
axios.get(url).then((result)=>{
@ -23,12 +27,14 @@ class PollDetailTabThird extends Component{
if (result.data.status === 401) {
//未登入
this.setState({
pollDetail: undefined
pollDetail: undefined,
isSpin:false
})
return
}
this.setState({
pollDetail:result.data
pollDetail:result.data,
isSpin:false
})
}
}).catch((error)=>{
@ -39,10 +45,12 @@ class PollDetailTabThird extends Component{
this.getPollInfo();
}
render(){
let {pollDetail}=this.state;
let {pollDetail , isSpin}=this.state;
return(
<div>
<PollDetailTabThirdInfo {...this.props} {...this.state} pollDetail = {pollDetail}></PollDetailTabThirdInfo>
<Spin size="large" spinning={isSpin}>
<PollDetailTabThirdInfo {...this.props} {...this.state} pollDetail = {pollDetail}></PollDetailTabThirdInfo>
</Spin>
</div>
)
}

@ -43,6 +43,7 @@ const {Option} = Select;
//GraduationTaskssetting.js
//作品列表(学生)
let allow_lates=false;
class Listofworksstudentone extends Component {
//unifiedsetting 统一设置
//allowreplenishment 允许补交
@ -288,7 +289,11 @@ class Listofworksstudentone extends Component {
),
},
{
title: '实战耗时',
title:<span>实训总耗时<Tooltip placement="top" title={<pre>
计算规则:<br/>
学员离开实训学习界面停止计时<br/>
评测首次通过之后停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -383,7 +388,19 @@ class Listofworksstudentone extends Component {
)
},
{
title: '效率分',
title: <span>效率分<Tooltip placement="top" title={allow_lates===true?<pre>
补交结束时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>:<pre>
作业截止时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -645,7 +662,11 @@ class Listofworksstudentone extends Component {
),
},
{
title: '实战耗时',
title:<span>实训总耗时<Tooltip placement="top" title={<pre>
计算规则:<br/>
学员离开实训学习界面停止计时<br/>
评测首次通过之后停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -736,7 +757,19 @@ class Listofworksstudentone extends Component {
)
},
{
title: '效率分',
title: <span>效率分<Tooltip placement="top" title={allow_lates===true?<pre>
补交结束时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>:<pre>
作业截止时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -953,7 +986,11 @@ class Listofworksstudentone extends Component {
},
{
title: '实战耗时',
title:<span>实训总耗时<Tooltip placement="top" title={<pre>
计算规则:<br/>
学员离开实训学习界面停止计时<br/>
评测首次通过之后停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -1007,18 +1044,11 @@ class Listofworksstudentone extends Component {
className: 'font-14',
render: (text, record) => (
<span>
<Tooltip placement="bottom" title={<div>
<div>已通过{record.completion}{this.state.challenges_count}</div>
<div>完成任务评测之前查看了参考答案{record.view_answer_count}</div>
</div>}>
<span style={{
color: '#07111B',
"text-align": "center"
}}>{record.completion + "/" + this.state.challenges_count} </span>
</Tooltip>
</span>
</span>
)
},
{
@ -1043,7 +1073,19 @@ class Listofworksstudentone extends Component {
)
},
{
title: '效率分',
title: <span>效率分<Tooltip placement="top" title={allow_lates===true?<pre>
补交结束时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>:<pre>
作业截止时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -1053,22 +1095,14 @@ class Listofworksstudentone extends Component {
{
record.efficiencyscore && record.efficiencyscore === "--" ? (
this.state.allow_late && this.state.allow_late === false ?
<Tooltip placement="bottom" title={<div>
<div>作业截止时系统根据学生在课堂成员中的效率表现自动评分</div>
</div>}>
<span style={{color: "#9A9A9A"}}>
--
</span>
</Tooltip>
:
this.state.allow_late && this.state.allow_late === true ?
<Tooltip placement="bottom" title={<div>
<div>补交结束时系统根据学生在课堂成员中的效率表现自动评分</div>
</div>}>
<span style={{color: "#9A9A9A"}}>
--
</span>
</Tooltip>
:
<span style={{color: "#9A9A9A"}}>
--
@ -1104,7 +1138,7 @@ class Listofworksstudentone extends Component {
{
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.finalscore === "--" ? <span>最终调整成绩0</span> :
<span>最终调整成绩{record.finalscore}</span>}</div>
</div>}>
@ -1130,16 +1164,21 @@ class Listofworksstudentone extends Component {
</Tooltip>
:
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
<div>完成任务评测之前查看了参考答案{record.view_answer_count}</div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.levelscore === "--" ? <span>关卡得分0</span> :
<span>关卡得分{record.levelscore}</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分0</span> :
<span>效率评分{record.efficiencyscore}</span>}</div>
<div>{record.late_penalty === "--" ? <span>迟交扣分0</span> :
<span>迟交扣分{record.late_penalty}</span>}</div>
<div>{record.finalscore === "--" ? <span>当前成绩0</span> :
<span>当前成绩{record.finalscore}</span>}</div>
{record.view_answer_count===null?"":<div>查看参考答案{record.view_answer_count}</div>}
<div>{record.finalscore === "--" ? <span>最终成绩0</span> :
<span>最终成绩{record.finalscore}</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
@ -1175,13 +1214,13 @@ class Listofworksstudentone extends Component {
className: 'font-14',
render: (text, record) => (
record.submitstate === "未提交" ?
<span style={{color: "#9A9A9A"}}>
--
</span> :
<a style={{textAlign: "center"}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> :
<span>
<a style={{textAlign: "center"}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>查看</a>
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a>
</span>
)
},
@ -1304,7 +1343,11 @@ class Listofworksstudentone extends Component {
// ),
// },
{
title: '实战耗时',
title:<span>实训总耗时<Tooltip placement="top" title={<pre>
计算规则:<br/>
学员离开实训学习界面停止计时<br/>
评测首次通过之后停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -1341,18 +1384,11 @@ class Listofworksstudentone extends Component {
className: 'font-14',
render: (text, record) => (
<span>
<Tooltip placement="bottom" title={<div>
<div>已通过{record.completion}{this.state.challenges_count}</div>
<div>完成任务评测之前查看了参考答案{record.view_answer_count}</div>
</div>}>
<span style={{
color: '#07111B',
textAlign: "center"
}}>{record.completion + "/" + this.state.challenges_count} </span>
</Tooltip>
</span>
<span style={{
color: '#07111B',
textAlign: "center"
}}>{record.completion + "/" + this.state.challenges_count} </span>
</span>
)
},
{
@ -1377,7 +1413,19 @@ class Listofworksstudentone extends Component {
)
},
{
title: '效率分',
title: <span>效率分<Tooltip placement="top" title={allow_lates===true?<pre>
补交结束时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>:<pre>
作业截止时系统根据学生在课堂成员中的<br/>
效率表现自动评分计算规则:<br/>
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -1387,22 +1435,14 @@ class Listofworksstudentone extends Component {
{
record.efficiencyscore && record.efficiencyscore === "--" ? (
this.state.allow_late && this.state.allow_late === false ?
<Tooltip placement="bottom" title={<div>
<div>作业截止时系统根据学生在课堂成员中的效率表现自动评分</div>
</div>}>
<span style={{color: "#9A9A9A"}}>
--
</span>
</Tooltip>
:
this.state.allow_late && this.state.allow_late === true ?
<Tooltip placement="bottom" title={<div>
<div>补交结束时系统根据学生在课堂成员中的效率表现自动评分</div>
</div>}>
<span style={{color: "#9A9A9A"}}>
--
</span>
</Tooltip>
:
<span style={{color: "#9A9A9A"}}>
--
@ -1438,7 +1478,7 @@ class Listofworksstudentone extends Component {
{
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.finalscore === "--" ? <span>最终调整成绩0</span> :
<span>最终调整成绩{record.finalscore}</span>}</div>
</div>}>
@ -1464,16 +1504,21 @@ class Listofworksstudentone extends Component {
</Tooltip>
:
<Tooltip placement="bottom" title={<div>
<div>{record.user_name}{record.user_login}</div>
<div>完成任务评测之前查看了参考答案{record.view_answer_count}</div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.levelscore === "--" ? <span>关卡得分0</span> :
<span>关卡得分{record.levelscore}</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分0</span> :
<span>效率评分{record.efficiencyscore}</span>}</div>
<div>{record.late_penalty === "--" ? <span>迟交扣分0</span> :
<span>迟交扣分{record.late_penalty}</span>}</div>
<div>{record.finalscore === "--" ? <span>当前成绩0</span> :
<span>当前成绩{record.finalscore}</span>}</div>
{record.view_answer_count===null?"":<div>查看参考答案{record.view_answer_count}</div>}
<div>{record.finalscore === "--" ? <span>最终成绩0</span> :
<span>最终成绩{record.finalscore}</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
@ -1509,13 +1554,13 @@ class Listofworksstudentone extends Component {
className: 'font-14',
render: (text, record) => (
record.submitstate === "未提交" ?
<span style={{color: "#9A9A9A"}}>
--
</span> :
<a style={{textAlign: "center"}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> :
<span>
<a style={{textAlign: "center"}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a>
</span>
)
},
@ -1711,6 +1756,7 @@ class Listofworksstudentone extends Component {
homework_status: result.data.homework_status,
update_score: result.data.update_score
});
allow_lates=result.data.allow_late;
this.seacthdatat(result.data, result.data.student_works, result.data.work_efficiency, result.data.course_group_info, 1);
if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
@ -2419,6 +2465,7 @@ class Listofworksstudentone extends Component {
challenges_count: result.data.challenges_count,
homework_status: result.data.homework_status,
});
allow_lates=result.data.allow_late
this.seacthdatat(result.data, result.data.student_works, result.data.work_efficiency, result.data.course_group_info, page);
this.props.Getdataback(result, result.data);
// }

@ -72,10 +72,10 @@ class ShixunWorkReport extends Component {
})
}
}else {
this.props.slowDownload(url)
// this.props.slowDownload(url)
// this.props.showNotification(`正在下载中`);
// window.open("/api"+url+'?export=true', '_blank');
this.props.showNotification(`正在下载中`);
window.open("/api"+url+'?export=true', '_blank');
this.setState({ isspinning: false })
}
}).catch((error) => {

@ -151,3 +151,11 @@
.textcenter{
text-align: center;
}
.zindextest {
z-index: 1000 !important;
}
.MuiModal-root-15 {
z-index: 1000 !important;
}

@ -476,10 +476,28 @@ class LoginDialog extends Component {
if (response.data.status === 402) {
// window.location.href = response.data.url;
}else if (response.data.status === -2) {
notification.open({
message: '提示',
description:response.data.message,
});
if (response.data.message === "登录密码出错已达上限,账号已被锁定, 请10分钟后重新登录或找回密码") {
const messge = (
<div>
<p>
登录密码出错已达上限账号已被锁定
</p>
<p className="mt10">
请10分钟后重新登录或<a href={'/changepassword'} style={{
textDecoration: "underline",
color: "#4CACFF",
}}>找回密码</a>
</p>
</div>
)
this.openNotifications(messge);
} else {
notification.open({
message: '提示',
description: response.data.message,
duration: 5,
});
}
}else{
@ -529,6 +547,17 @@ class LoginDialog extends Component {
weixinlogin:true
})
}
openNotifications = (btn) => {
// type 1 成功提示绿色 2提醒颜色黄色 3错误提示红色
notification.open({
message: "提示",
description: btn,
duration: 5,
onClick: () => {
},
});
}
openqqlogin=()=>{
this.setState({
qqlogin:true
@ -543,13 +572,17 @@ class LoginDialog extends Component {
`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2ftest-newweb.educoder.net%2fotherloginqq&response_type=code`
)
}
getTContainer = () => {
return document.body;
}
hideweixinlogin=()=>{
this.setState({
weixinlogin:false,
qqlogin:false
})
}
render() {
let{qqlogin,login,isGoing,isGoingValue,disabled,bottonclass,Phonenumberisnotco,
dialogBox, isRender,weixinlogin}=this.state;
@ -560,9 +593,10 @@ class LoginDialog extends Component {
// console.log(this.props)
return (
<Dialog open={true} id="DialogID"
className="zindextest"
style={{ display: isRender==false? 'none' : ''}}
disableEscapeKeyDown={true}
disableBackdropClick={true}
disableEscapeKeyDown={true}
disableBackdropClick={true}
onClose={() => this.handleDialogClose()}
>
<Notcompletedysl
@ -605,27 +639,37 @@ class LoginDialog extends Component {
<input name="back_url" type="hidden" value={this.back_url}></input>
<input
type="text"
className="input-100-45 mt20"
id="name_loggin_input"
ref="loginPassText"
onInput={this.loginChange}
onBlur={(e) => this.inputOnBlur(e, 1)}
value={this.state.loginValue}
name="username"
placeholder="请输入有效的手机号/邮箱号" ></input>
type="text"
className="input-100-45 mt20"
id="name_loggin_input"
ref="loginPassText"
onInput={this.loginChange}
onBlur={(e) => this.inputOnBlur(e, 1)}
onPressEnter={disabled === false ?
this.loginEDU : () => {
}
// console.log(1)
}
value={this.state.loginValue}
name="username"
placeholder="请输入有效的手机号/邮箱号" ></input>
<div style={{height: '25px'}}><p className="color-orange edu-txt-left none" id="username_error_notice"
style={{display: Phonenumberisnotco===undefined?'none':'block'}}>{Phonenumberisnotco}</p></div>
<div>
<input type="password" id="password_loggin_input"
name="password"
ref="passwordText"
onInput={this.passwordChange}
onKeyDown={this.onKeydowns}
className="input-100-45 mt5"
placeholder="密码" >
name="password"
ref="passwordText"
onInput={this.passwordChange}
onKeyDown={this.onKeydowns}
className="input-100-45 mt5"
onPressEnter={disabled === false ?
this.loginEDU : () => {
}
// console.log(1)
}
placeholder="密码" >
</input>
<div style={{height: '25px'}}>
<p className="color-orange edu-txt-left none" id="password_error_notice">
@ -662,7 +706,8 @@ class LoginDialog extends Component {
</span>
<span className="fr">
<a onClick={(url)=>this.getloginurl("/changepassword")} className="mr3 color-grey-9">忘记密码</a><em className="vertical-line"></em>
<a onClick={(url) => this.getloginurl("/changepassword")}
className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
<a onClick={(url)=>this.getloginurl("/register")} className="color-grey-9">注册</a>
</span>

@ -42,6 +42,9 @@
font-weight:400;
color:rgba(5,16,26,1);
line-height:24px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.ant-input::-webkit-input-placeholder{

@ -39,14 +39,16 @@ class Osshackathon extends Component {
search:search,
}}).then((result)=>{
if(result.status==200){
console.log(result)
this.setState({
data:result.data,
spinning:false
})
}else{
this.setState({
spinning:false
})
}
}).catch((error)=>{
console.log(error);
this.setState({
spinning:true
})
@ -92,6 +94,15 @@ class Osshackathon extends Component {
Signupentry=(id)=>{
// 用户报名
if(this.props.checkIfLogin()===false){
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
this.props.showProfileCompleteDialog()
return
}
this.props.confirm({
content: `是否确认报名?`,
onOk: () => {
@ -157,7 +168,7 @@ class Osshackathon extends Component {
.then((response) => {
if (response.data.status == 0) {
// {"status":1,"message":"删除成功"}
this.getosshackathonlist()
this.getosshackathonlist();
this.props.showNotification(`删除成功`);
}
})
@ -172,6 +183,9 @@ class Osshackathon extends Component {
this.setState({
search:value
})
if(value.length>300){
this.props.showNotification(`搜索字数大于300个字`);
}
let {page,limit,search}=this.state;
this.getosshackathon(page,limit,value)
}
@ -280,7 +294,7 @@ class Osshackathon extends Component {
return(
<Card className={"OsshackathonCard mb20"} key={key}>
<Row>
<Col span={6} className={"OsshackathonCardtitle"}>
<Col span={20} className={"OsshackathonCardtitle"}>
{item.name}
</Col>
@ -319,7 +333,7 @@ class Osshackathon extends Component {
return(
<Card className={"OsshackathonCard mb20"}>
<Row>
<Col span={6} className={"OsshackathonCardtitle"}>
<Col span={20} className={"OsshackathonCardtitle"}>
{item.name}
</Col>
<Col span={4} className={"fr textcenter width14bai"}>
@ -346,7 +360,7 @@ class Osshackathon extends Component {
</Row>
</div>
</Col>
<Col span={18} pull={6} className={"minheight50px "}>
<Col span={18} pull={6} className={"minheight50px ml5"}>
{item.description}
</Col>
</Row>

@ -100,7 +100,7 @@ class Osshackathonmodel extends Component{
render() {
let {textareavaltype}=this.state;
// console.log(this.props.tabkey)
console.log(this.props.Osshackathonmodeltype)
// console.log(this.props.Osshackathonmodeltype)
return (
<div>
@ -139,7 +139,7 @@ class Osshackathonmodel extends Component{
<Modal
keyboard={false}
className={"HomeworkModal"}
title={"新建项目"}
title={this.props.modelid===undefined?"新建项目":"编辑项目"}
visible={this.props.Osshackathonmodeltype}
closable={false}
footer={null}

@ -1227,8 +1227,10 @@ submittojoinclass=(value)=>{
<li><a href="/admins">后台管理</a></li>
}
<li><a href={`/account/profile`}>账号管理</a></li>
<li><a href={`/account/profile`}>账号管理</a></li>
{/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
{/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
{/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
<li className="bor-top-greyE">

@ -184,7 +184,17 @@ class LoginRegisterComponent extends Component {
message: "提示",
description: messge,
onClick: () => {
console.log('Notification Clicked!');
console.log('Notification Clicked12312313123!');
},
});
}
openNotifications = (btn) => {
// type 1 成功提示绿色 2提醒颜色黄色 3错误提示红色
notification.open({
message: "提示",
description: btn,
onClick: () => {
},
});
}
@ -369,8 +379,23 @@ class LoginRegisterComponent extends Component {
})
return;
}
else {
} else if (response.data.message === "登录密码出错已达上限,账号已被锁定, 请10分钟后重新登录或找回密码") {
const messge = (
<div>
<p>
登录密码出错已达上限账号已被锁定
</p>
<p className="mt10">
请10分钟后重新登录或<a href={'/changepassword'} style={{
textDecoration: "underline",
color: "#4CACFF",
}}>找回密码</a>
</p>
</div>
)
this.openNotifications(messge);
return;
} else {
this.openNotification(response.data.message);
return;
}
@ -1012,7 +1037,9 @@ class LoginRegisterComponent extends Component {
name="username"
className={Phonenumberisnotco && Phonenumberisnotco !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
onBlur={(e) => this.inputOnBlur(e, 1)}
style={{marginTop: '30px', height: '38px'}}></Input>
style={{marginTop: '30px', height: '38px'}}
onPressEnter={() => this.postLogin()}
></Input>
{
Phonenumberisnotco && Phonenumberisnotco != "" ?
@ -1022,8 +1049,9 @@ class LoginRegisterComponent extends Component {
: <div style={{height:"25px"}}></div>
}
<Input type="password" name="password" id="password" value={this.state.password}
<Input type="password" name="password" id="password" value={this.state.password}
onChange={this.passwordonChange}
onPressEnter={() => this.postLogin()}
className={Phonenumberisnotcodmm && Phonenumberisnotcodmm !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
placeholder="密码"></Input>
{

@ -200,7 +200,7 @@ class InfosCourse extends Component{
.white-panel li.active {
border-radius: 24px;
border: 0px solid #4CACFF;
border: none !important;
color: #4CACFF;
}

@ -190,7 +190,7 @@ class InfosPackage extends Component{
}
.white-panel li.active {
border-radius: 24px;
border: 0px solid #4CACFF;
border: none !important;
color: #4CACFF;
}

@ -202,7 +202,7 @@ class InfosPath extends Component{
.white-panel li.active {
border-radius: 24px;
border: 0px solid #4CACFF;
border: none !important;
color: #4CACFF;
}

@ -203,7 +203,7 @@ class InfosProject extends Component{
.white-panel li.active {
border-radius: 24px;
border: 0px solid #4CACFF;
border: none !important;
color: #4CACFF;
}

@ -203,7 +203,7 @@ class InfosShixun extends Component{
.white-panel li.active {
border-radius: 24px;
border: 0px solid #4CACFF;
border: none !important;
color: #4CACFF;
}

@ -282,7 +282,7 @@ function InfoVideo (props) {
}
.white-panel li.active {
border-radius: 24px;
border: 0px solid #4CACFF;
border: none !important;
color: #4CACFF;
}
.whitepanelysllisyt {

Loading…
Cancel
Save