m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_auth
杨树林 5 years ago
parent 469de62457 a618ad857a
commit cda7dce61b
16 changed files with 139334 additions and 94 deletions
Show Stats Download Patch File Download Diff File

27
app/assets/javascripts/admins/competition_settings/index.js
Unescape View File

@ -445,15 +445,10 @@ $(document).on('turbolinks:load', function(){
' <div class="col-2 no_padding input_middle">\n' + ' <div class="col-2 no_padding input_middle">\n' +
' <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' + ' <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' +
' </div>\n' + ' </div>\n' +
' <span class="col-2 text-right mt-2 no_padding">任务完成要求:</span>\n' + ' <span class="col-2 text-right mt-2 no_padding">总任务数:</span>\n' +
' <div class="col-1 no_padding input_small">\n' + ' <div class="col-1 no_padding input_small">\n' +
' <input type="number" class="form-control" name="stage[][mission_count]" value="1">\n' + ' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div>\n' + ' </div>\n' +
' <span class="mt-2 ml10 mr10">/</span>\n' +
' <div class="col-1 no_padding input_small">\n' +
' <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div>\n' +
' <span class=" mt-2">(总任务)</span>\n' +
' <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' + ' <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-2 no_padding input_middle">\n' + ' <div class="col-2 no_padding input_middle">\n' +
' <select class="form-control" name="stage[][score_source]">\n' + ' <select class="form-control" name="stage[][score_source]">\n' +
@ -526,15 +521,10 @@ $(document).on('turbolinks:load', function(){
' <div class="col-2 no_padding input_middle">\n' + ' <div class="col-2 no_padding input_middle">\n' +
' <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' + ' <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' +
' </div>\n' + ' </div>\n' +
' <span class="col-2 text-right mt-2 no_padding">任务完成要求:</span>\n' + ' <span class="col-2 text-right mt-2 no_padding">总任务数:</span>\n' +
' <div class="col-1 no_padding input_small">\n' +
' <input type="number" class="form-control" name="stage[][mission_count]" value="1">\n' +
' </div>\n' +
' <span class="mt-2 ml10 mr10">/</span>\n' +
' <div class="col-1 no_padding input_small">\n' + ' <div class="col-1 no_padding input_small">\n' +
' <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]">\n' + ' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div>\n' + ' </div>\n' +
' <span class=" mt-2">(总任务)</span>\n' +
' <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' + ' <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-2 no_padding input_middle">\n' + ' <div class="col-2 no_padding input_middle">\n' +
' <select class="form-control" name="stage[][score_source]">\n' + ' <select class="form-control" name="stage[][score_source]">\n' +
@ -672,15 +662,10 @@ function addNewTab(competition_id) {
' <div class="col-2 no_padding input_middle">\n' + ' <div class="col-2 no_padding input_middle">\n' +
' <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' + ' <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' +
' </div>\n' + ' </div>\n' +
' <span class="col-2 text-right mt-2 no_padding">任务完成要求:</span>\n' + ' <span class="col-2 text-right mt-2 no_padding">总任务数:</span>\n' +
' <div class="col-1 no_padding input_small">\n' +
' <input type="number" class="form-control" name="stage[][mission_count]" value="1">\n' +
' </div>\n' +
' <span class="mt-2 ml10 mr10">/</span>\n' +
' <div class="col-1 no_padding input_small">\n' + ' <div class="col-1 no_padding input_small">\n' +
' <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]">\n' + ' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div>\n' + ' </div>\n' +
' <span class=" mt-2">(总任务)</span>\n' +
' <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' + ' <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-2 no_padding input_middle">\n' + ' <div class="col-2 no_padding input_middle">\n' +
' <select class="form-control" name="stage[][score_source]">\n' + ' <select class="form-control" name="stage[][score_source]">\n' +

2
app/controllers/admins/competition_settings_controller.rb
Unescape View File

@ -28,6 +28,6 @@ class Admins::CompetitionSettingsController < Admins::BaseController
def nav_form_params def nav_form_params
params.permit(:enroll_end_time, params.permit(:enroll_end_time,
competition_staffs: %i[category minimum maximum mutiple_limited], competition_staffs: %i[category minimum maximum mutiple_limited],
navbar: %i[module_type name hidden position url]) navbar: %i[module_type module_id name hidden position url])
end end
end end

2
app/controllers/admins/competition_stages_controller.rb
Unescape View File

@ -107,7 +107,7 @@ class Admins::CompetitionStagesController < Admins::BaseController
end end
def update_form_params def update_form_params
params.permit(:stage_name, :score_rate, stage: [:start_time, :end_time, :mission_count, :entry, :score_source, identifiers: []]) params.permit(:stage_name, :score_rate, stage: [:start_time, :end_time, :entry, :score_source, identifiers: []])
end end

6
app/controllers/competitions/competitions_controller.rb
Unescape View File

@ -155,8 +155,8 @@ class Competitions::CompetitionsController < Competitions::BaseController
@competition_head_cells = [] @competition_head_cells = []
@competition_cells_column = [] @competition_cells_column = []
max_staff = competition.competition_staffs.sum(:maximum) personal = competition.personal?
if max_staff < 2 # 个人赛 if personal # 个人赛
@competition_head_cells = %w(序号 姓名 学校 学号) @competition_head_cells = %w(序号 姓名 学校 学号)
else # 战队赛 else # 战队赛
@competition_head_cells = %w(序号 战队名 指导老师 队员 学校) @competition_head_cells = %w(序号 战队名 指导老师 队员 学校)
@ -173,7 +173,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
row_cells_column = [] row_cells_column = []
row_cells_column << index + 1 row_cells_column << index + 1
record_user = record.user record_user = record.user
if max_staff < 2 if personal
row_cells_column << record_user.real_name row_cells_column << record_user.real_name
row_cells_column << record_user.school_name row_cells_column << record_user.school_name
row_cells_column << record_user.student_id row_cells_column << record_user.student_id

12
app/services/admins/competition_nav_setting_service.rb
Unescape View File

@ -8,21 +8,25 @@ class Admins::CompetitionNavSettingService < ApplicationService
def call def call
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
competition.competition_modules.where(module_type: 'md').destroy_all
# hidden_module_type = competition.all_module_types - params[:module_type] # hidden_module_type = competition.all_module_types - params[:module_type]
# competition.competition_modules.where(module_type: hidden_module_type).update_all(hidden: 1) # competition.competition_modules.where(module_type: hidden_module_type).update_all(hidden: 1)
old_module_ids = competition.competition_modules.pluck(:id)
module_ids = []
params[:navbar].each do |nav| params[:navbar].each do |nav|
module_type = nav["module_type"] if nav["module_id"]
if competition.all_module_types.include?(module_type) module_ids << nav["module_id"].to_i
com_module = competition.competition_modules.find_by(module_type: module_type) com_module = competition.competition_modules.find_by(id: nav["module_id"])
else else
com_module = CompetitionModule.create!(competition_id: competition.id, module_type: 'md') com_module = CompetitionModule.create!(competition_id: competition.id, module_type: 'md')
end end
com_module.update_attributes!(hidden: nav["hidden"] ? 0 : 1, position: nav["position"] ? nav["position"] : com_module.position, name: nav["name"], url: nav["url"]) com_module.update_attributes!(hidden: nav["hidden"] ? 0 : 1, position: nav["position"] ? nav["position"] : com_module.position, name: nav["name"], url: nav["url"])
end end
delete_module_ids = old_module_ids - module_ids
competition.competition_modules.where(id: delete_module_ids).destroy_all
competition.update_attributes!(enroll_end_time: params[:enroll_end_time]) competition.update_attributes!(enroll_end_time: params[:enroll_end_time])
if params[:competition_staffs].present? if params[:competition_staffs].present?
competition.competition_staffs.delete_all competition.competition_staffs.delete_all

3
app/services/admins/competition_stage_create_service.rb
Unescape View File

@ -13,8 +13,7 @@ class Admins::CompetitionStageCreateService < ApplicationService
params[:stage].each do |section| params[:stage].each do |section|
stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id, stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id,
start_time: section["start_time"], end_time: section["end_time"], start_time: section["start_time"], end_time: section["end_time"],
mission_count: section["mission_count"], entry: section["entry"], entry: section["entry"], score_source: section["score_source"])
score_source: section["score_source"])
section["identifiers"].each do |identifier| section["identifiers"].each do |identifier|
CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id, CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id,
shixun_identifier: identifier) shixun_identifier: identifier)

3
app/services/admins/competition_stage_update_service.rb
Unescape View File

@ -16,8 +16,7 @@ class Admins::CompetitionStageUpdateService < ApplicationService
params[:stage].each do |section| params[:stage].each do |section|
stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id, stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id,
start_time: section["start_time"], end_time: section["end_time"], start_time: section["start_time"], end_time: section["end_time"],
mission_count: section["mission_count"], entry: section["entry"], entry: section["entry"], score_source: section["score_source"])
score_source: section["score_source"])
section["identifiers"].each do |identifier| section["identifiers"].each do |identifier|
CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id, CompetitionEntry.create!(competition_stage_section_id: stage_section.id, competition_stage_id: stage.id,
shixun_identifier: identifier) shixun_identifier: identifier)

28
app/views/admins/competition_settings/index.html.erb
Unescape View File

@ -176,6 +176,7 @@
</label> </label>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<input type="hidden" value="<%= com_module.id %>" name="navbar[][module_id]">
<%= text_field_tag('navbar[][name]', com_module.name, id: nil, class: 'form-control', placeholder: '首页') %> <%= text_field_tag('navbar[][name]', com_module.name, id: nil, class: 'form-control', placeholder: '首页') %>
<input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]"> <input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]">
</div> </div>
@ -192,6 +193,7 @@
</label> </label>
</div> </div>
<div class="col-md-8 color-blue mt-1"> <div class="col-md-8 color-blue mt-1">
<input type="hidden" value="<%= com_module.id %>" name="navbar[][module_id]">
<input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]"> <input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]">
<input type="hidden" value="报名" name="navbar[][name]"> <input type="hidden" value="报名" name="navbar[][name]">
报名 报名
@ -261,6 +263,7 @@
</label> </label>
</div> </div>
<div class="col-md-label mt-2"> <div class="col-md-label mt-2">
<input type="hidden" value="<%= com_module.id %>" name="navbar[][module_id]">
<input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]"> <input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]">
<input type="hidden" value="<%= com_module.name %>" name="navbar[][name]"> <input type="hidden" value="<%= com_module.name %>" name="navbar[][name]">
<%= com_module.name %> <%= com_module.name %>
@ -283,6 +286,7 @@
</label> </label>
</div> </div>
<div class="col-md-label mt-1"> <div class="col-md-label mt-1">
<input type="hidden" value="<%= com_module.id %>" name="navbar[][module_id]">
<input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]"> <input type="hidden" value="<%= com_module.module_type %>" name="navbar[][module_type]">
<%= text_field_tag('navbar[][name]', com_module.name, id: nil, class: 'form-control', placeholder: '请输入模块名称') %> <%= text_field_tag('navbar[][name]', com_module.name, id: nil, class: 'form-control', placeholder: '请输入模块名称') %>
</div> </div>
@ -325,6 +329,12 @@
<div class="card mb-5 competition-chart-stages"> <div class="card mb-5 competition-chart-stages">
<div class="card-header d-flex justify-content-between align-items-center"> <div class="card-header d-flex justify-content-between align-items-center">
<span>排行榜设置</span> <span>排行榜设置</span>
<i class="fa fa-question-circle font-14" data-toggle="tooltip" data-html="true" data-placement="top" title="温馨提示：<br/>
需要参赛选手完成几个实训，请相应的创建几个阶段；<br/>
若多个实训只需要参赛选手选择完成1个，请将其配置在同一个阶段；<br/>
一个阶段多个实训时，请注意实训关卡数及各关卡的经验值设置保持相同；<br/>
同阶段的各个实训，请保持相同的成绩来源；<br/>
每阶段每个实训关卡的得分，将按照组内成员最高得分计算，总分为各阶段得分加和。"></i>
<a href="javascript:void(0)" class="btn btn-primary btn-custom waves-effect add-new-tab waves-light ml20" data-competition-id="<%= @competition.id %>">+ 新增tab</a> <a href="javascript:void(0)" class="btn btn-primary btn-custom waves-effect add-new-tab waves-light ml20" data-competition-id="<%= @competition.id %>">+ 新增tab</a>
<span class="flex-1 text-right color-orange">实训ID填写示例：实训地址为https://www.educoder.net/shixuns/u5plmgka/challenges，则填写“u5plmgka”</span> <span class="flex-1 text-right color-orange">实训ID填写示例：实训地址为https://www.educoder.net/shixuns/u5plmgka/challenges，则填写“u5plmgka”</span>
@ -346,7 +356,7 @@
<input type="number" class="form-control" name="score_rate" value="<%= (stage.score_rate * 100).to_i %>"/> <input type="number" class="form-control" name="score_rate" value="<%= (stage.score_rate * 100).to_i %>"/>
</div><span class=" mt-2">%</span> </div><span class=" mt-2">%</span>
<div class="flex-1"> <div class="flex-1">
<a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add-task-sub">新增子阶段</a> <a href="javascript:void(0)" class="btn btn-outline-primary export-action ml20 add-task-sub">新增子阶段</a>
<% if stage.max_end_time > Time.now %> <% if stage.max_end_time > Time.now %>
<%= agree_link '发送短信提醒', send_message_admins_competition_competition_stage_path(@competition, stage, element: ".send-message-#{stage.id}"), <%= agree_link '发送短信提醒', send_message_admins_competition_competition_stage_path(@competition, stage, element: ".send-message-#{stage.id}"),
class: 'btn btn-outline-primary ml20', 'data-confirm': '确认执行发送短信操作？' %> class: 'btn btn-outline-primary ml20', 'data-confirm': '确认执行发送短信操作？' %>
@ -374,15 +384,10 @@
<div class="col-2 no_padding input_middle"> <div class="col-2 no_padding input_middle">
<%= text_field_tag 'stage[][end_time]', section.end_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %> <%= text_field_tag 'stage[][end_time]', section.end_time&.strftime('%Y-%m-%d %H:%M'), autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %>
</div> </div>
<span class="col-2 text-right mt-2 no_padding">任务完成要求:</span> <span class="col-2 text-right mt-2 no_padding">总任务数:</span>
<div class="col-1 no_padding input_small">
<input type="number" class="form-control" value="<%= section.mission_count %>" name="stage[][mission_count]"/>
</div>
<span class="mt-2 ml10 mr10">/</span>
<div class="col-1 no_padding input_small"> <div class="col-1 no_padding input_small">
<input type="number" class="form-control task_all" value="<%= section.entry %>" onchange="change_total(this)" name="stage[][entry]"/> <input type="number" class="form-control task_all" value="<%= section.entry %>" onchange="change_total(this)" name="stage[][entry]"/>
</div> </div>
<span class=" mt-2">(总任务)</span>
<span class="col-1 text-right mt-2 no_padding">成绩来源:</span> <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>
<div class="col-2 no_padding input_middle"> <div class="col-2 no_padding input_middle">
<select class="form-control" name="stage[][score_source]"> <select class="form-control" name="stage[][score_source]">
@ -425,7 +430,7 @@
<input type="number" class="form-control" name="score_rate" value="100"/> <input type="number" class="form-control" name="score_rate" value="100"/>
</div><span class=" mt-2">%</span> </div><span class=" mt-2">%</span>
<div class="flex-1"> <div class="flex-1">
<a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add_task_sub" onclick="add_task_sub(this)">新增子阶段</a> <a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add-task-sub">新增子阶段</a>
</div> </div>
<a href="javascript:void(0)" class="btn btn-default ml20" onclick="Del_tab(this)">删除</a> <a href="javascript:void(0)" class="btn btn-default ml20" onclick="Del_tab(this)">删除</a>
<a href="javascript:void(0)" class="btn btn-outline-primary update-stage export-action ml20">保存</a> <a href="javascript:void(0)" class="btn btn-outline-primary update-stage export-action ml20">保存</a>
@ -443,15 +448,10 @@
<div class="col-2 no_padding input_middle"> <div class="col-2 no_padding input_middle">
<%= text_field_tag 'stage[][end_time]', '', autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %> <%= text_field_tag 'stage[][end_time]', '', autocomplete: 'off', class: 'section-end-time form-control', placeholder: '有效结束时间' %>
</div> </div>
<span class="col-2 text-right mt-2 no_padding">任务完成要求:</span> <span class="col-2 text-right mt-2 no_padding">总任务数:</span>
<div class="col-1 no_padding input_small">
<input type="number" class="form-control" name="stage[][mission_count]" value="1"/>
</div>
<span class="mt-2 ml10 mr10">/</span>
<div class="col-1 no_padding input_small"> <div class="col-1 no_padding input_small">
<input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]"/> <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]"/>
</div> </div>
<span class=" mt-2">(总任务)</span>
<span class="col-1 text-right mt-2 no_padding">成绩来源:</span> <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>
<div class="col-2 no_padding input_middle"> <div class="col-2 no_padding input_middle">
<select class="form-control" name="stage[][score_source]"> <select class="form-control" name="stage[][score_source]">

2
public/assets/.sprockets-manifest-4627fa5586ef7fed55ca286af7c028e9.json
View File

File diff suppressed because one or more lines are too long

139246
public/assets/admin-52d692608c620ae47717a2ac88377e55b9b58af0acdf3f777814a1fd47b6594b.js
View File

File diff suppressed because one or more lines are too long

BIN
public/assets/admin-52d692608c620ae47717a2ac88377e55b9b58af0acdf3f777814a1fd47b6594b.js.gz
View File

Binary file not shown.

8
public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
Unescape View File

@ -76,7 +76,7 @@ class CompetitionsIndex extends Component{
<div> <div>
<div className="clearfix"> <div className="clearfix">
<div> <div>
<div className="newMain clearfix"> <div className="clearfix">
<style> <style>
{ {
` `
@ -117,7 +117,7 @@ class CompetitionsIndex extends Component{
</div> </div>
</div> </div>
<div className={"educontent clearfix mtf10 CompetitionsIndex "}> <div className={"educontent clearfix mtf10 CompetitionsIndex mb20"}>
{datas===undefined?"":datas.length===0?"":<List {datas===undefined?"":datas.length===0?"":<List
itemLayout="vertical" itemLayout="vertical"
@ -199,13 +199,13 @@ class CompetitionsIndex extends Component{
} }
/>} />}
{datas===undefined?"":datas.task_count >20 ?<div className="mb40 edu-txt-center padding20-30" {count===undefined?"":count >15 ?<div className="mb40 edu-txt-center padding20-30"
> >
<Pagination <Pagination
showQuickJumper showQuickJumper
defaultCurrent={1} defaultCurrent={1}
pageSize={20} pageSize={15}
total={count===undefined?"":count} total={count===undefined?"":count}
current={page} current={page}
onChange={this.PaginationCourse} onChange={this.PaginationCourse}

41
public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
Unescape View File

@ -189,7 +189,7 @@
} }
.Competitionsecondary{ .Competitionsecondary{
width:234px; width:234px;
height:277px; height:298px;
background:rgba(250,250,250,1); background:rgba(250,250,250,1);
box-shadow:0px 3px 5px 0px rgba(254,190,154,1); box-shadow:0px 3px 5px 0px rgba(254,190,154,1);
border-radius:5px; border-radius:5px;
@ -197,7 +197,7 @@
.Competitionthird{ .Competitionthird{
width: 234px; width: 234px;
height: 270px; height: 298px;
background: rgba(250,250,250,1); background: rgba(250,250,250,1);
box-shadow: 0px 4px 5px 0px rgba(200,200,202,1); box-shadow: 0px 4px 5px 0px rgba(200,200,202,1);
border-radius: 5px; border-radius: 5px;
@ -215,24 +215,12 @@
position: absolute; position: absolute;
right: -5px; right: -5px;
width:93px; width:93px;
top: 20px; top: 10px;
}
.Competitionthirdbox{
width:234px;
height:163px;
background:rgba(223,223,225,1);
} }
.Competitionthirdbox{ .Competitionthirdbox{
width:234px; width:234px;
height:163px; height:167px;
background:rgba(223,223,225,1);
}
.Competitionthirdbox{
width:234px;
height:163px;
background:rgba(223,223,225,1); background:rgba(223,223,225,1);
position: relative; position: relative;
} }
@ -246,7 +234,7 @@
.Competitionsecondarybox{ .Competitionsecondarybox{
width:234px; width:234px;
height:155px; height:167px;
background:rgba(253,230,217,1); background:rgba(253,230,217,1);
position: relative; position: relative;
} }
@ -275,9 +263,9 @@
zoom: 1; zoom: 1;
} }
.Competitionthird .ant-card-meta-title{ /*.Competitionthird .ant-card-meta-title{*/
margin-bottom: 0px !important; /*margin-bottom: 0px !important;*/
} /*}*/
.Competitionfirst .ant-card-body { .Competitionfirst .ant-card-body {
padding: 12px; padding: 12px;
@ -347,8 +335,8 @@
} }
.image_urlbox{ .image_urlbox{
width: 705px; width: 790px;
/*height: 400px;*/ height: 340px;
} }
.CompetitionContents{ .CompetitionContents{
@ -397,4 +385,13 @@
width: 18%; width: 18%;
padding-left: 12px; padding-left: 12px;
margin-right: 28px; margin-right: 28px;
}
.Commonimgbox{
width: 800px !important;
}
.CompetitionCommonbannerfont{
width: 350px !important;
margin-left:10px;
} }

20
public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
Unescape View File

@ -50,7 +50,7 @@ class CompetitionCommon extends Component{
if(response.status===200){ if(response.status===200){
this.setState({ this.setState({
data:response.data, data:response.data,
thiskeys:response.data.competition_modules[0].position thiskeys:response.data.competition_modules[0].id
}) })
this.getrightdata( this.getrightdata(
response.data.competition_modules[0].id, response.data.competition_modules[0].id,
@ -93,7 +93,7 @@ class CompetitionCommon extends Component{
}) })
data&&data.competition_modules.map((item,key)=>{ data&&data.competition_modules.map((item,key)=>{
if(item.module_type!="enroll") { if(item.module_type!="enroll") {
if (keys === item.position) { if (keys === item.id) {
this.getrightdata(item.id, item.module_type, item.module_url, item.has_url, listkey) this.getrightdata(item.id, item.module_type, item.module_url, item.has_url, listkey)
return return
} }
@ -251,12 +251,12 @@ class CompetitionCommon extends Component{
this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""} this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
<img className={"Commonimg"} <img className={"Commonimg"}
src={data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} /> src={data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} />
<Col span={15}> <Col span={15} className={"Commonimgbox"}>
<img className={"image_urlbox"} src={data===undefined?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):data.avatar_url===null?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):getImageUrl(data.avatar_url)}/> <img className={"image_urlbox"} src={data===undefined?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):data.avatar_url===null?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):getImageUrl(data.avatar_url)}/>
</Col> </Col>
<Col className={"CompetitionCommonbannerfont"} span={9}> <Col className={"CompetitionCommonbannerfont"} span={9}>
<Col className={data&&data.name.length>15?"competitionbannerdiv":"competitionbannerdiv mt30"}>{data&&data.name}</Col> <Col className={data&&data.name.length>15?"competitionbannerdiv mt30":"competitionbannerdiv mt30"}>{data&&data.name}</Col>
<Col className={"competitionbannerdiv"}> <Col className={"competitionbannerdiv"}>
<Col className={"Competitioncolor9b"}>竞赛时间：</Col> <Col className={"Competitioncolor9b"}>竞赛时间：</Col>
@ -268,10 +268,10 @@ class CompetitionCommon extends Component{
<Col className="gutter-row" span={6}> <Col className="gutter-row" span={6}>
<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">奖金</div> <div className="gutter-box CompetitionsIndexdadels Competitioncolor77">奖金</div>
</Col> </Col>
<Col className="gutter-row ml20" span={6}> <Col className="gutter-row ml20 rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">浏览数</div> <div className="gutter-box CompetitionsIndexdadels Competitioncolor77">浏览数</div>
</Col> </Col>
<Col className="gutter-row" span={6}> <Col className="gutter-row rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">报名数</div> <div className="gutter-box CompetitionsIndexdadels Competitioncolor77">报名数</div>
</Col> </Col>
</Row> </Row>
@ -280,10 +280,10 @@ class CompetitionCommon extends Component{
<Col className="gutter-row" span={6}> <Col className="gutter-row" span={6}>
<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥{data&&data.bonus}</div> <div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥{data&&data.bonus}</div>
</Col> </Col>
<Col className="gutter-row ml20" span={6}> <Col className="gutter-row ml20 rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div> <div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div>
</Col> </Col>
<Col className="gutter-row" span={6}> <Col className="gutter-row rankbeicenter" span={6}>
<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div> <div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div>
</Col> </Col>
</Row> </Row>
@ -327,11 +327,11 @@ class CompetitionCommon extends Component{
<Layout className={'teamsLayout mt40'}> <Layout className={'teamsLayout mt40'}>
<Sider> <Sider>
<Menu mode="inline" className="CompetitionMenu" defaultSelectedKeys={['1']} onClick={(e)=>this.getrightdatas(e)}> <Menu mode="inline" className="CompetitionMenu" defaultSelectedKeys={[`${this.state.thiskeys}`]} onClick={(e)=>this.getrightdatas(e)}>
{data&&data.competition_modules.map((item,key)=>{ {data&&data.competition_modules.map((item,key)=>{
if(item.module_type!="enroll"){ if(item.module_type!="enroll"){
return( return(
<Menu.Item key={item.position}> <Menu.Item key={item.id}>
{/*{item.has_url===false?<span*/} {/*{item.has_url===false?<span*/}
{/*// onClick={()=>this.getrightdata(item.id,item.module_type,item.module_url,item.has_url)}*/} {/*// onClick={()=>this.getrightdata(item.id,item.module_type,item.module_url,item.has_url)}*/}
{/*>{item.name}</span>:<a*/} {/*>{item.name}</span>:<a*/}

18
public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
Unescape View File

@ -167,7 +167,7 @@ class CompetitionContents extends Component{
{chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{ {chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{
if(key===2){ if(key===1){
return( return(
<Col className="mt40" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 2 }}> <Col className="mt40" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 2 }}>
<Card <Card
@ -239,7 +239,7 @@ class CompetitionContents extends Component{
} }
})} })}
{chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{ {chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{
if(key===1){ if(key===2){
return( return(
<Col className="mt30" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 1 }}> <Col className="mt30" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 1 }}>
<Card <Card
@ -297,10 +297,10 @@ class CompetitionContents extends Component{
<span className={"ranknames"}>您当前排名:{item.rank}</span> <span className={"ranknames"}>您当前排名:{item.rank}</span>
</Col> </Col>
<Col className="userranksclass" span={3} order={2}> <Col className="userranksclass" span={3} order={2}>
{item.user_name} {personal===undefined||personal===null?item.record_user_name:personal===true?item.user_name:item.team_name}
</Col> </Col>
<Col className="textleft" span={9} order={3}> <Col className="textleft" span={9} order={3}>
{item.team_name} {/*{item.team_name}*/}
</Col> </Col>
<Col span={3} order={4}> <Col span={3} order={4}>
{item.cost_time} {item.cost_time}
@ -313,6 +313,16 @@ class CompetitionContents extends Component{
})} })}
</div>} </div>}
<Row className={"mt20 mb80"}> <Row className={"mt20 mb80"}>
<style>
{
`
.ant-table-tbody > tr > td:nth-last-child(3) a{
width: 300px;
display: inline-block;
}
`
}
</style>
{chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<4?"":<Table className="Competitiontransparent" columns={columns} dataSource={data} showHeader={false} pagination={false}/>} {chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<4?"":<Table className="Competitiontransparent" columns={columns} dataSource={data} showHeader={false} pagination={false}/>}
</Row> </Row>

10
public/react/src/modules/competitions/Competitioncommon/CompetitionContentsMd.js
Unescape View File

@ -130,10 +130,10 @@ class CompetitionContentsMd extends Component{
handleSubmit = () => { handleSubmit = () => {
let {contentFileList}=this.state; let {contentFileList}=this.state;
const mdContnet = this.contentMdRef.current.getValue().trim(); const mdContnet = this.contentMdRef.current.getValue().trim();
if(mdContnet.length>10000){ // if(mdContnet.length>10000){
this.props.showNotification("内容超过10000个字"); // this.props.showNotification("内容超过10000个字");
return // return
} // }
let attachment_ids=undefined let attachment_ids=undefined
if(contentFileList!=undefined){ if(contentFileList!=undefined){
attachment_ids= contentFileList.map(item => { attachment_ids= contentFileList.map(item => {
@ -210,7 +210,7 @@ class CompetitionContentsMd extends Component{
})} })}
</Tabs>:""} </Tabs>:""}
<TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制10000个字符" mdID={'courseContentMD'} refreshTimeout={1500} <TPMMDEditor ref={this.contentMdRef} placeholder="请输入内容说明" mdID={'courseContentMD'} refreshTimeout={1500}
className="courseMessageMD" initValue={this.state.description}></TPMMDEditor> className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
{this.props.module_type==="chart"?"":<Upload {...uploadProps} className="upload_1 newWorkUpload"> {this.props.module_type==="chart"?"":<Upload {...uploadProps} className="upload_1 newWorkUpload">
<Button className="uploadBtn"> <Button className="uploadBtn">

Write Preview
Loading…
Cancel
Save