diff --git a/app/controllers/ec_course_evaluations_controller.rb b/app/controllers/ec_course_evaluations_controller.rb index f2a54e6f..52da9c86 100644 --- a/app/controllers/ec_course_evaluations_controller.rb +++ b/app/controllers/ec_course_evaluations_controller.rb @@ -169,7 +169,8 @@ class EcCourseEvaluationsController < ApplicationController else score_count = @ce.evluation_count * length EcStudentAchievement.where(:ec_course_evaluation_subitem_id => subitems.pluck(:id)).destroy_all - score_type = worksheet.cell(2, score_count+1) && worksheet.cell(2, score_count+2) ? 1 : 2 + score_type = worksheet.cell(1, 1) && worksheet.cell(1, 1).try(:strip) == "学号" ? 1 : 2 + if score_type == 2 && rows > 3 render :json => {status: 0, message: "平均成绩只能有一行数据"} else diff --git a/app/controllers/ec_courses_controller.rb b/app/controllers/ec_courses_controller.rb index 8ad9f4e4..cec0f862 100644 --- a/app/controllers/ec_courses_controller.rb +++ b/app/controllers/ec_courses_controller.rb @@ -361,8 +361,8 @@ class EcCoursesController < ApplicationController respond_to do |format| format.json{ courses_data = [] - courses.each do |c| - courses_data << {id: c.id, name: c.name, created_at: (c.created_at).strftime('%Y-%m-%d'), end_time: c.end_date.present? ? c.end_date.strftime('%Y-%m-%d') : ''} + courses.includes(:teacher).each do |c| + courses_data << {id: c.id, name: c.name, creator_name: c.teacher.show_real_name, created_at: (c.created_at).strftime('%Y-%m-%d'), end_time: c.end_date.present? ? c.end_date.strftime('%Y-%m-%d') : ''} end render :json => {courses: courses_data} } diff --git a/app/views/competitions/_gq_second_code_competition.html.erb b/app/views/competitions/_gq_second_code_competition.html.erb index 1af1cf52..4e6ecdd5 100644 --- a/app/views/competitions/_gq_second_code_competition.html.erb +++ b/app/views/competitions/_gq_second_code_competition.html.erb @@ -109,7 +109,7 @@

- 标注说明：每个小组选择一种编程语言的题目，针对标注任务中指定的标注模块，要求对代码模块、模块中的代码文件， 以及文件中的函数必须进行标注，关键代码块、代码行及关键变量等由参赛者自由选择进行标注。 正式赛第一阶段的比赛在标注阶段就开放查看所有人的标注，请大家根据个人理解，写出自己的风格。我们将综合考虑标注的原创性、准确性、 完整性和多样性等不同的维度对标注质量进行评分。<%= challenge_description_extra[i] %> + 标注说明：每个小组选择一个项目，针对标注任务中指定的标注模块，要求对代码模块、模块中的代码文件， 以及文件中的函数必须进行标注，关键代码块、代码行及关键变量等由参赛者自由选择进行标注。请大家根据个人理解，写出自己的风格。我们将综合考虑标注的原创性、准确性、 完整性和多样性等不同的维度对标注质量进行评分。<%= challenge_description_extra[i] %>

) })} @@ -856,7 +858,7 @@ class ecCourseEvaluations extends Component { >确定 -
+
-
+
-
+
-
+
tr:hover:not(.ant-table-expanded-row) > td, .graduatesRequirement .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td { background: transparent !important; +} + +.mt60{ + margin-top:60px; } \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 6947ac54..e768d86d 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -1,6 +1,8 @@ /*--------------------------首页*/ /*头部导航条样式---2018-03-19--by-cs*/ -.newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);} +.newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px; + /*position: fixed;*/ + top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);} .newHeader .logoimg{ margin-top: 16px; float: left; @@ -610,7 +612,9 @@ p .activity-item:first-child{border-top: 1px solid #eee;} #competition-content img,#competition-db-content img,#ccfPage img{vertical-align: bottom;} #hnpage1{background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;min-height: 820px;} -#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;position: fixed;top: 0px;left: 0px;width: 100%;z-index: 1000;} +#competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box; + /*position: fixed;*/ + top: 0px;left: 0px;width: 100%;z-index: 1000;} #competition-header .logoimg{ margin-top: 5px; float: left; diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 94d38790..aee805f4 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -192,7 +192,9 @@ input::-ms-clear{display:none;} .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/ .educontents{margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/ -.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/ +.newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px; + /*padding-top: 60px*/ +}/*padding-bottom根据底部的高度而定*/ .newMain{ padding-bottom: 110px !important; } /*高度*/ @@ -925,7 +927,7 @@ html>body #ajax-indicator { position: fixed; } margin: 0 auto; padding-bottom: 235px; min-width: 1200px; - padding-top: 60px; + /*padding-top: 60px;*/ } /* css3 radio */