diff --git a/app/controllers/competitions_controller.rb b/app/controllers/competitions_controller.rb
index 57ff871c..cd3a9ef6 100644
--- a/app/controllers/competitions_controller.rb
+++ b/app/controllers/competitions_controller.rb
@@ -327,9 +327,9 @@ class CompetitionsController < ApplicationController
elsif @type == "决赛"
# '92b7vt8x','a7fxenvc','wt2xfzny','xa4m9cng','tng6heyf','am5o73er','9fla2zry','fzp3iu4w','qlsy6xb4'
# 预赛的实训id 第一阶段:1289,1373,1256 第二阶段:1488, 1453, 1487 第三阶段:1470, 1473, 1408
- shixun1_id = Shixun.where(:identifier => ['92b7vt8x','a7fxenvc','wt2xfzny']).pluck(:id)
- shixun2_id = Shixun.where(:identifier => ['xa4m9cng','tng6heyf','am5o73er']).pluck(:id)
- shixun3_id = Shixun.where(:identifier => ['9fla2zry','fzp3iu4w','qlsy6xb4']).pluck(:id)
+ shixun1_id = Shixun.where(:identifier => ['ftlc4x38']).pluck(:id)
+ shixun2_id = Shixun.where(:identifier => ['y9npgih2','ucqt7fw3','2p7ouzwk']).pluck(:id)
+ shixun3_id = Shixun.where(:identifier => ['fj49r7xv','gf2cvxfh','cmoxhtbs']).pluck(:id)
end
if @competition.competition_scores.where(:competition_stage_id => @stage.id).count == 0
@@ -385,7 +385,7 @@ class CompetitionsController < ApplicationController
f_score = team.competition_scores.where(:competition_stage_id => final_stage.try(:id)).first
# 预赛记录
p_score = team.competition_scores.where(:competition_stage_id => pre_stage.try(:id)).first
- team[:s_score] = (f_score.try(:score).to_f * 0.85 + p_score.try(:score).to_f * 0.15).try(:round, 2)
+ team[:s_score] = (f_score.try(:score).to_f * 0.80 + p_score.try(:score).to_f * 0.20).try(:round, 2)
team[:s_spend_time] = f_score.try(:cost_time).to_i + p_score.try(:cost_time).to_i
end
end
diff --git a/app/views/competitions/_gq_second_code_competition.html.erb b/app/views/competitions/_gq_second_code_competition.html.erb
index 4e6ecdd5..7cba08a8 100644
--- a/app/views/competitions/_gq_second_code_competition.html.erb
+++ b/app/views/competitions/_gq_second_code_competition.html.erb
@@ -76,13 +76,13 @@
extra_data = [
{
name: 'C++项目',
- description: "本项目的paddle/fluid/operators/optimizers目录中包含了常见的优化器(如,Momentum,Adam等等)的c++实现。",
+ description: "飞桨(PaddlePaddle)由百度公司开发,是目前国内唯一功能完备的端到端开源深度学习平台,集深度学习训练和预测框架、模型库、工具组件、服务平台为一体,其兼具灵活和效率的开发机制、工业级应用效果的模型、超大规模并行深度学习能力、推理引擎一体化设计以及系统化的服务支持,致力于让深度学习技术的创新与应用更简单。
本项目的paddle/fluid/operators/optimizers目录中包含了常见的优化器(如,Momentum,Adam等等)的c++实现。",
task: '标注../fluid/operators/optimizers/目录下的所有代码文件',
link_name: '官方,优化器',
link_url: 'https://www.paddlepaddle.org.cn/documentation/docs/zh/1.5/api_guides/low_level/optimizer.html'
},{
name: 'Python项目',
- description: "本项目的python/paddle/fluid/layers/nn.py中包含了神经网络中大量常见层和操作符的python实现,如fc、conv、gru等等。",
+ description: "飞桨(PaddlePaddle)由百度公司开发,是目前国内唯一功能完备的端到端开源深度学习平台,集深度学习训练和预测框架、模型库、工具组件、服务平台为一体,其兼具灵活和效率的开发机制、工业级应用效果的模型、超大规模并行深度学习能力、推理引擎一体化设计以及系统化的服务支持,致力于让深度学习技术的创新与应用更简单。
本项目的python/paddle/fluid/layers/nn.py中包含了神经网络中大量常见层和操作符的python实现,如fc、conv、gru等等。",
task: '标注../paddle/fluid/layers/nn.py代码文件',
link_name: '官方,nn',
link_url: 'https://www.paddlepaddle.org.cn/documentation/docs/zh/1.5/api_cn/layers_cn/nn_cn.html'
@@ -152,10 +152,6 @@
<% if index == 4 %>
-
- 飞桨(PaddlePaddle)由百度公司开发,是目前国内唯一功能完备的端到端开源深度学习平台,集深度学习训练和预测框架、模型库、工具组件、服务平台为一体,其兼具灵活和效率的开发机制、工业级应用效果的模型、超大规模并行深度学习能力、推理引擎一体化设计以及系统化的服务支持,致力于让深度学习技术的创新与应用更简单。 -
-项目简介
-<%= raw row_data[:description] %>
+<%= raw row_data[:description] %>
标注任务
<% if index ==2 %><%= row_data[:task] %>
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 0275558c..ba201074 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -502,8 +502,11 @@ function imageAddInputFiles(inputEl){ addInputFiles(inputEl) } -function addInputFiles(inputEl,btnId) { +function addInputFiles(inputEl,btnId) { // var clearedFileInput = $(inputEl).clone().val(''); + if($("#ajax-indicator").length>0){ + $("#ajax-indicator").show(); + } if (inputEl.files) { // if(inputEl.files.length >= 5){ // alert('一次选择的文件不能超过5个') @@ -527,6 +530,9 @@ function addInputFiles(inputEl,btnId) { if (count <= 0) count = 1; $('#upload_file_count').html("" + count + "" + $(inputEl).data('fileCount')); } + if($("#ajax-indicator").length>0){ + $("#ajax-indicator").hide(); + } } //clearedFileInput.insertAfter('#attachments_fields'); @@ -605,6 +611,9 @@ function uploadAndAttachFiles(files, inputEl,btnId) { addFile(inputEl, this, true,btnId); }); } + if($("#ajax-indicator").length>0){ + $("#ajax-indicator").hide(); + } } function uploadAndAttachFiles_board(files, inputEl, id,btnId) { diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index e768d86d..c3a76385 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -673,7 +673,7 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important; .second_code_2{min-height: 436px;} .second_code_3{min-height: 1460px;padding-top: 190px;box-sizing: border-box;position: relative} .second_code_4{min-height: 1459px;padding-top: 190px;box-sizing: border-box;position: relative} -.second_code_5{min-height: 2314px;padding-top: 190px;box-sizing: border-box;position: relative} +.second_code_5{min-height: 2384px;padding-top: 190px;box-sizing: border-box;position: relative} .second_code_6{min-height: 1060px;} .second_code_7{min-height: 1116px;} .second_code_8{min-height: 711px;}