Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_aliyun
caishi 5 years ago
parent fdcffdf335 b5fc687e01
commit f1546b6f89
15 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/ec_course_evaluations_controller.rb
Unescape View File

@ -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

4
public/react/public/css/css_min_all.css
Unescape View File

@ -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;}

4
public/react/public/css/edu-common.css
Unescape View File

@ -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;}

4
public/react/src/modules/ec/css/ecCourseEvaluations.css
Unescape View File

@ -555,3 +555,7 @@ a.TrainingLecturer:hover{
.ant-input{
border-color: #d9d9d9 !important;
}
.mt60{
margin-top:60px;
}

4
public/react/src/modules/ec/css/ecCourseSupports.css
Unescape View File

@ -346,3 +346,7 @@ input{
-webkit-box-shadow: 0 0 0 2px transparent !important;
box-shadow: 0 0 0 2px transparent !important;
}
.mt60{
margin-top:60px;
}

2
public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
Unescape View File

@ -859,7 +859,7 @@ class ecCourseEvaluations extends Component {
>确定</a>
</div>
</Modal>
<div className="educontent mb40">
<div className="educontent mb40 mt60">
<EcTitleCourseEvaluations
{...this.props}

2
public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js
Unescape View File

@ -663,7 +663,7 @@ class EcCourseEvaluationsbottom extends Component {
} = this.state;
return (
<div className="newMain clearfix">
<div className="educontent mb50">
<div className="educontent mb50 mt60">
<Modal
title={titlemessages}
// visible={modeldelet===true&&listid===list.id?true:false}

2
public/react/src/modules/ec/ecCourseSupportSetting/EditableCourseSupportSetting.js
Unescape View File

@ -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
})

2
public/react/src/modules/ec/ecCourseSupportSetting/index.js
Unescape View File

@ -243,7 +243,7 @@ class EcCourseSupportSetting extends Component {
return (
<div className="newMain clearfix courseSupport">
<div className="educontent mb50">
<div className="educontent mb50 mt60">
<EcTitleCourseEvaluations
{...this.props}
schooldata={schooldata}

2
public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js
Unescape View File

@ -470,7 +470,7 @@ class ecCourseSupports extends Component {
</Modal>
<div className="educontent mb290">
<div className="educontent mb290 mt60">
<EcTitleCourseEvaluations
{...this.props}

4
public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.css
Unescape View File

@ -20,3 +20,7 @@
margin-top: 2px;
display: inline-block;
}
.mt60{
margin-top:60px;
}

4
public/react/src/modules/ec/ecStudentList/ecStudentList.css
Unescape View File

@ -38,3 +38,7 @@
background:#fff;
line-height:24px;
}
.mt60{
margin-top:60px;
}

4
public/react/src/modules/ec/graduatesRequirement/style.css
Unescape View File

@ -68,3 +68,7 @@
.graduatesRequirement .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
background: transparent !important;
}
.mt60{
margin-top:60px;
}

8
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -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;

6
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -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 */

Write Preview
Loading…
Cancel
Save