From b604f79dbf42cd3413f6fcc0eea43491e88e26ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 15 Aug 2019 10:50:16 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/css_min_all.css | 4 +++- public/react/public/css/edu-common.css | 4 +++- public/stylesheets/educoder/edu-all.css | 4 +++- public/stylesheets/educoder/edu-main.css | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css index a011c4d4..cc900282 100644 --- a/public/react/public/css/css_min_all.css +++ b/public/react/public/css/css_min_all.css @@ -4,7 +4,9 @@ html{height:100%;} .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} .newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px } .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} -.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998} +.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px; + /*position: fixed;*/ + top: 0px;left: 0px;z-index:99998} /* 重置样式 */ body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;} table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;} diff --git a/public/react/public/css/edu-common.css b/public/react/public/css/edu-common.css index cd21d94c..a53b2975 100644 --- a/public/react/public/css/edu-common.css +++ b/public/react/public/css/edu-common.css @@ -4,7 +4,9 @@ html{height:100%;} .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} .newMain{ margin: 0 auto; padding-bottom: 155px; min-width:1200px } .newFooter{ position: absolute; bottom: 0; width: 100%; height: 155px;background: #323232; clear:both; min-width: 1200px;z-index:99999;left: 0px;} -.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:99998} +.newHeader{background: #171616;width:100%; height: 50px; min-width: 1200px; + /*position: fixed;*/ + top: 0px;left: 0px;z-index:99998} /* 重置样式 */ body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;} table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9; background:#f5f5f5; color:#333;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 6947ac54..2c216700 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; diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 94d38790..f87f9b28 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; } /*高度*/ From e33d263e6f96d7b3d26e3eb902d568868c8d8447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 15 Aug 2019 10:52:17 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-all.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 2c216700..e768d86d 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -612,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; From d7bde5db9cb04c5e49a0be7fd728a927267c46e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 15 Aug 2019 11:08:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/ec/css/ecCourseEvaluations.css | 6 +++++- public/react/src/modules/ec/css/ecCourseSupports.css | 6 +++++- .../ec/ecCompletion_calculation/ecCompletion_calculation.js | 2 +- .../modules/ec/ecCourseEvaluations/ecCourseEvaluations.js | 2 +- .../ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js | 2 +- public/react/src/modules/ec/ecCourseSupportSetting/index.js | 2 +- .../src/modules/ec/ecCourseSupports/ecCourseSupports.js | 2 +- .../modules/ec/ecGradeEvaluations/ecGradeEvaluations.css | 4 ++++ .../src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js | 2 +- public/react/src/modules/ec/ecStudentList/ecStudentList.css | 4 ++++ public/react/src/modules/ec/ecStudentList/ecStudentList.js | 2 +- .../modules/ec/graduatesRequirement/GraduatesRequirement.js | 2 +- public/react/src/modules/ec/graduatesRequirement/style.css | 4 ++++ 13 files changed, 30 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/ec/css/ecCourseEvaluations.css b/public/react/src/modules/ec/css/ecCourseEvaluations.css index 5b2a1764..11ee74bb 100644 --- a/public/react/src/modules/ec/css/ecCourseEvaluations.css +++ b/public/react/src/modules/ec/css/ecCourseEvaluations.css @@ -554,4 +554,8 @@ a.TrainingLecturer:hover{ .ant-input{ border-color: #d9d9d9 !important; - } \ No newline at end of file + } + +.mt60{ + margin-top:60px; +} \ No newline at end of file diff --git a/public/react/src/modules/ec/css/ecCourseSupports.css b/public/react/src/modules/ec/css/ecCourseSupports.css index f29970bc..3f1dc000 100644 --- a/public/react/src/modules/ec/css/ecCourseSupports.css +++ b/public/react/src/modules/ec/css/ecCourseSupports.css @@ -345,4 +345,8 @@ input{ .ant-select-selection{ -webkit-box-shadow: 0 0 0 2px transparent !important; box-shadow: 0 0 0 2px transparent !important; - } \ No newline at end of file + } + +.mt60{ + margin-top:60px; +} \ No newline at end of file diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js index f76e065d..b1d7eae4 100644 --- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js +++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js @@ -429,7 +429,7 @@ class EcCompletionCalculation 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 From 63eb79280aaf434cea3b1bc559163fe3cd8ca869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 15 Aug 2019 11:13:43 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index f87f9b28..aee805f4 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -927,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 */ From 8dd226f77aab08d31864bfff01d485d9431677af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 15 Aug 2019 11:23:46 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ec/ecCompletion_calculation/ecCompletion_calculation.js | 2 +- .../src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js | 2 +- public/react/src/modules/ec/ecStudentList/ecStudentList.js | 2 +- .../src/modules/ec/graduatesRequirement/GraduatesRequirement.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js index b1d7eae4..f76e065d 100644 --- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js +++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js @@ -429,7 +429,7 @@ class EcCompletionCalculation extends Component { -
+
确定
-
+
-
+
-
+
Date: Thu, 15 Aug 2019 14:11:44 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=AF=BC=E5=85=A5=E6=88=90=E7=BB=A9=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ec_course_evaluations_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/ec_course_evaluations_controller.rb b/app/controllers/ec_course_evaluations_controller.rb index f2a54e6f..649fe3de 100644 --- a/app/controllers/ec_course_evaluations_controller.rb +++ b/app/controllers/ec_course_evaluations_controller.rb @@ -170,6 +170,12 @@ class EcCourseEvaluationsController < ApplicationController 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 + + logger.info("####evluation_count: #{@ce.evluation_count}") + logger.info("####length: #{length}") + logger.info("####score_type: #{score_type}") + logger.info("####worksheet.cell(2, score_count+1): #{worksheet.cell(2, score_count+1)}") + logger.info("####worksheet.cell(2, score_count+2): #{worksheet.cell(2, score_count+2)}") if score_type == 2 && rows > 3 render :json => {status: 0, message: "平均成绩只能有一行数据"} else From cf82b7ad971666ab15d77090c966a9afa5967961 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 15 Aug 2019 14:23:47 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ec_course_evaluations_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/ec_course_evaluations_controller.rb b/app/controllers/ec_course_evaluations_controller.rb index 649fe3de..a144c655 100644 --- a/app/controllers/ec_course_evaluations_controller.rb +++ b/app/controllers/ec_course_evaluations_controller.rb @@ -169,13 +169,12 @@ 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) == "学号" ? 1 : 2 logger.info("####evluation_count: #{@ce.evluation_count}") logger.info("####length: #{length}") logger.info("####score_type: #{score_type}") - logger.info("####worksheet.cell(2, score_count+1): #{worksheet.cell(2, score_count+1)}") - logger.info("####worksheet.cell(2, score_count+2): #{worksheet.cell(2, score_count+2)}") + logger.info("#### worksheet.cell(1, 1): #{ worksheet.cell(1, 1)}") if score_type == 2 && rows > 3 render :json => {status: 0, message: "平均成绩只能有一行数据"} else From 9873bffa7804b2b841ef2efb8cc518c179a75380 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 15 Aug 2019 14:25:30 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ec_course_evaluations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ec_course_evaluations_controller.rb b/app/controllers/ec_course_evaluations_controller.rb index a144c655..2d3c2d05 100644 --- a/app/controllers/ec_course_evaluations_controller.rb +++ b/app/controllers/ec_course_evaluations_controller.rb @@ -169,7 +169,7 @@ 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(1, 1) == "学号" ? 1 : 2 + score_type = worksheet.cell(1, 1) && worksheet.cell(1, 1).try(:strip) == "学号" ? 1 : 2 logger.info("####evluation_count: #{@ce.evluation_count}") logger.info("####length: #{length}") From abe242b1c0df5366074b91ec7797a3291674051a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 15 Aug 2019 14:27:39 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=98=8E=E7=BB=86=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5=E6=88=90=E7=BB=A9=EF=BC=8C?= =?UTF-8?q?=E6=8A=A5=E5=B9=B3=E5=9D=87=E6=88=90=E7=BB=A9=E5=8F=AA=E8=83=BD?= =?UTF-8?q?1=E8=A1=8C=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ec_course_evaluations_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/ec_course_evaluations_controller.rb b/app/controllers/ec_course_evaluations_controller.rb index 2d3c2d05..52da9c86 100644 --- a/app/controllers/ec_course_evaluations_controller.rb +++ b/app/controllers/ec_course_evaluations_controller.rb @@ -171,10 +171,6 @@ class EcCourseEvaluationsController < ApplicationController EcStudentAchievement.where(:ec_course_evaluation_subitem_id => subitems.pluck(:id)).destroy_all score_type = worksheet.cell(1, 1) && worksheet.cell(1, 1).try(:strip) == "学号" ? 1 : 2 - logger.info("####evluation_count: #{@ce.evluation_count}") - logger.info("####length: #{length}") - logger.info("####score_type: #{score_type}") - logger.info("#### worksheet.cell(1, 1): #{ worksheet.cell(1, 1)}") if score_type == 2 && rows > 3 render :json => {status: 0, message: "平均成绩只能有一行数据"} else From 5f167c38f40f2183d8210fca1bee69c8fcafad60 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 15 Aug 2019 16:16:48 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E7=A9=BA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ec/ecCourseSupportSetting/EditableCourseSupportSetting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/ec/ecCourseSupportSetting/EditableCourseSupportSetting.js b/public/react/src/modules/ec/ecCourseSupportSetting/EditableCourseSupportSetting.js index 099cbf2d..ec580594 100644 --- a/public/react/src/modules/ec/ecCourseSupportSetting/EditableCourseSupportSetting.js +++ b/public/react/src/modules/ec/ecCourseSupportSetting/EditableCourseSupportSetting.js @@ -289,7 +289,7 @@ class EditableCourseSupportSetting extends Component { standard_grade[item.position] = (item.standard_grade); // biyeYaoqiuZhibiaodian[item.position] = (item.biyeYaoqiuZhibiaodian); - subitem_id[item.position] = (item.subitem_id).toString(); + subitem_id[item.position] = item.subitem_id ? (item.subitem_id).toString() : item.subitem_id; this.position2Target_idMap[item.position] = item.target_id })