From 3571c9771f04f9219b85292a5d7a1da83b509722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 26 Jun 2019 10:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/css/Courses.css |  8 +++++
 .../courses/shixunHomework/CommitSummary.js   | 16 ++++-----
 .../shixunHomework/Trainingjobsetting.js      | 34 +++++++++++++++++--
 public/stylesheets/educoder/edu-main.css      |  2 +-
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 8720dd860..197082dbe 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -837,6 +837,14 @@ a.white-btn.use_scope-btn:hover{
     font-weight: 400;
     margin-left: 28px;
 }
+.commitcontentsysl{
+    width: 43px;
+    height: 15px;
+    font-size: 16px;
+    font-family: MicrosoftYaHei;
+    font-weight: 400;
+    margin-left: -4px;
+}
 
 
 /*列表状态*/
diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
index 3e12e2bb6..64f975446 100644
--- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js
+++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
@@ -119,10 +119,10 @@ class CommitSummary extends Component{
                     <div className={"educontent mb20"}>
                         <div style={{
                           width:'100%',
-                          height:'100px'
+                          height:'20px'
                         }} >
                             <div className="educontent mb30">
-                                <p className="clearfix mb20 mt10">
+                                <p className="clearfix mb20 mt10 ml29">
                                     <WordsBtn className="btn colorgrey fl hovercolorblue "
                                               style="grey">{data === undefined ? "" :data.course_name===undefined?"": data.course_name}</WordsBtn>
                                     <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -135,23 +135,23 @@ class CommitSummary extends Component{
 
                         </div>
                         <div>
-                            <p className="ml15 fl color-black mt10 summaryname" onClick={this.asdasdsad}>提交总结</p>
-                                <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/openlist`} className="color-grey-6 fr font-16 ml30 mt10 mr20">返回</a>
+                            <p className="ml29 fl color-black mt10 summaryname" onClick={this.asdasdsad}>提交总结</p>
+                                <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/openlist`} className="color-grey-6 fr font-16 ml30 mt10">返回</a>
                         </div>
                         {/*educontentbox*/}
                       <div className="stud-class-set pt40 pb40">
 
-                              <div className={"ml30 mr30 mt10"}>
+                              <div className={"mt10"}>
                                   <div style={{ "background": "#fff", "padding": "15px"}}>
-                                     <span className="commitcontents ">
-                            <span className="color-red mt20">*</span>
+                                     <span className="commitcontentsysl">
+                            <span className="color-red">*</span>
                             内容</span>
                                   </div>
                                   <div className="new-wrap">
                                       <Form labelCol={{span: 5}}layout='vertical' onSubmit={this.handleSubmit}  wrapperCol={{span: 12}}>
                                           <Form.Item
                                           >
-                                              <div style={{ "background": "#fff","padding-bottom":"10px","padding-left":"10px","padding-right":"10px"}}>
+                                              <div style={{ "background": "#fff","padding-bottom":"20px","padding-left":"20px","padding-right":"20px"}}>
                                                   {getFieldDecorator('description', {
                                                       rules: [{
                                                           required: true, message: '请输入帖子内容',
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 6a3379222..bece9862f 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -750,12 +750,42 @@ class Trainingjobsetting extends Component {
                     srorelength++
                 }
             }
+            //算下面值是否是奇数
+            var srbool=false;
+            if( srorelength%2 ==0 ){
+                // 偶数
+                srbool=false;
+            }else{
+                // 奇数
+                srbool=true;
+            }
             //计算平均值
             Proportion= Proportion/srorelength;
+            var intkk=0;
+             if(srbool==true){
+                 var exams = Math.round(Proportion)
+                 var intk = srorelength*exams;
+                 intkk=100 - intk;
+
+             }
+             var mact=0;
+
             //给每到题目赋平均值
             for (var i=0;i<challenge_settingsdata.length;i++){
                 if(challenge_settingsdata[i].checked  === true) {
-                    challenge_settingsdata[i].challenge_score = Proportion.toFixed(2);
+                    if(srbool===false){
+                        challenge_settingsdata[i].challenge_score = Math.round(Proportion);
+
+                    }else{
+                        mact=mact+1;
+                        if(mact===srorelength){
+                            challenge_settingsdata[i].challenge_score = Math.round(Proportion)+intkk;
+
+                        }else {
+                            challenge_settingsdata[i].challenge_score = Math.round(Proportion);
+                        }
+
+                    }
                 }else{
                     challenge_settingsdata[i].challenge_score = 0;
                 }
@@ -1919,7 +1949,7 @@ class Trainingjobsetting extends Component {
                             <p className="ml95 mt15 c_grey font-13 " style={{"color":"#666666"}}> 关卡名称<span
                                 className="color-grey-9 font-10 ml30s" style={{"color":"#999999"}}>(选中的关卡将计入评分计算范围，暂时不支持跳关选择)</span><span
                                 className="color-grey-9 ml90" style={{"color":"#666666"}}>分值</span></p>
-                            <div>
+                            <div className="ml95 mt15">
                                 {this.state.challenge_settings === undefined ? "" : this.state.challenge_settings.map((object, index) => {
                                     return (
                                         <li>
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 074c4ed89..4c9bc616a 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -101,7 +101,7 @@ a.decoration{text-decoration: underline}
 /*通用内外边距*/
 .mt-10{ margin-top:-10px;}.mt-3{ margin-top:-3px;}.mt0{ margin-top:0px!important;} .mt1{ margin-top:1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt4{ margin-top:4px;}.mt5{ margin-top:5px!important;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px!important;}.mt8{ margin-top:8px;}.mt9{ margin-top:9px;}.mt10{ margin-top:10px!important;}.mt12{ margin-top:12px;}.mt13{ margin-top:13px;}.mt14{ margin-top:14px;}.mt15{ margin-top:15px!important;}.mt16{ margin-top:16px;}.mt17{ margin-top:17px;}.mt18{ margin-top:18px;}.mt20{ margin-top:20px!important;}.mt22{ margin-top:22px!important;}.mt23{ margin-top:23px!important;}.mt24{ margin-top:24px!important;}.mt25{ margin-top:25px;}.mt28{ margin-top:28px;}.mt30{ margin-top:30px!important;}.mt34{ margin-top:34px!important;}.mt35{ margin-top:35px!important;}.mt36{ margin-top:36px!important;}.mt40{ margin-top:40px;}.mt45{ margin-top:45px;}.mt46{ margin-top:46px;}.mt50{ margin-top:50px;!important;}.mt56{ margin-top:56px;!important;}.mt60{ margin-top:60px;}.mt70{ margin-top:70px;}.mt80{ margin-top:80px;}.mt95{ margin-top:95px;}.mt100{ margin-top:100px;}.mt110{ margin-top:110px;}.mt120{ margin-top:120px;}.mt130{ margin-top:130px;}.mt140{ margin-top:140px;}.mt150{ margin-top:150px;}.mt160{ margin-top:160px;}
 .mb0{margin-bottom: 0px!important;}.mb3{ margin-bottom: 3px;}.mb5{ margin-bottom: 5px;}.mb7{ margin-bottom: 7px;}.mb10{ margin-bottom: 10px;}.mb11{ margin-bottom: 11px;}.mb14{ margin-bottom: 14px;}.mb15{ margin-bottom: 15px;}.mb16{ margin-bottom: 16px;}.mb20{ margin-bottom: 20px!important;}.mb25{ margin-bottom: 25px;}.mb26{ margin-bottom: 26px;}.mb28{ margin-bottom: 28px;}.mb30{ margin-bottom: 30px!important;}.mb40{ margin-bottom: 40px!important;}.mb50{ margin-bottom: 50px!important;}.mb60{ margin-bottom: 60px!important;}.mb70{ margin-bottom: 70px!important;}.mb80{ margin-bottom: 80px!important;}.mb90{ margin-bottom: 90px!important;}.mb100{ margin-bottom: 100px!important;}.mb110{ margin-bottom: 110px;}
-.ml-3{ margin-left: -3px;}.ml1{margin-left: 1px;}.ml2{margin-left: 2px;}.ml3{margin-left: 3px;}.ml4{margin-left: 4px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml12{ margin-left:12px!important;}.ml13{ margin-left:13px!important;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml22{ margin-left: 22px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml45{ margin-left: 45px;}.ml50{ margin-left: 50px;}.ml55{ margin-left: 55px;}.ml60{ margin-left: 60px;}.ml72{ margin-left: 72px;}.ml73{ margin-left: 73px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml85{margin-left:85px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml123{ margin-left: 123px;}.ml150{ margin-left: 150px;}.ml180{ margin-left: 180px;}.ml230{ margin-left: 230px;}.ml240{margin-left: 240px;}.ml250{ margin-left: 250px;}.ml290{ margin-left: 290px;}
+.ml-3{ margin-left: -3px;}.ml1{margin-left: 1px;}.ml2{margin-left: 2px;}.ml3{margin-left: 3px;}.ml4{margin-left: 4px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml12{ margin-left:12px!important;}.ml13{ margin-left:13px!important;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml22{ margin-left: 22px;}.ml25{ margin-left: 25px;}.ml29{margin-left: 29px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml45{ margin-left: 45px;}.ml50{ margin-left: 50px;}.ml55{ margin-left: 55px;}.ml60{ margin-left: 60px;}.ml72{ margin-left: 72px;}.ml73{ margin-left: 73px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml85{margin-left:85px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml123{ margin-left: 123px;}.ml150{ margin-left: 150px;}.ml180{ margin-left: 180px;}.ml230{ margin-left: 230px;}.ml240{margin-left: 240px;}.ml250{ margin-left: 250px;}.ml290{ margin-left: 290px;}
 .mr3{margin-right: 3px}.mr4{margin-right: 4px}.mr5{ margin-right: 5px;}.mr8{ margin-right: 8px;}.mr10{ margin-right: 10px;}.mr12{ margin-right:12px!important;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr24{ margin-right: 24px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr35{margin-right:35px;}.mr40{margin-right:40px;}.mr45{margin-right:45px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}.mr70{ margin-right: 70px;}.mr75{ margin-right: 75px;}.mr80{ margin-right:80px;}.mr90{ margin-right:90px;}.mr100{ margin-right: 100px;}.mr110{ margin-right:110px;}.mr350{ margin-right:350px;}
 
 .pt1{ padding-top:1px;}.pt3{ padding-top:3px!important;}.pt5{ padding-top:5px!important;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt17{ padding-top:17px;}.pt20{ padding-top:20px!important;}.pt25{ padding-top:25px;}.pt30{ padding-top:30px;}.pt35{ padding-top:35px;}.pt37{ padding-top:37px;}.pt40{ padding-top:40px;}.pt47{ padding-top:47px;}.pt49{ padding-top:49px;}.pt50{ padding-top:50px;}.pt60{ padding-top:60px;}.pt70{ padding-top:70px;}.pt80{ padding-top:80px;}.pt90{ padding-top:90px;}.pt100{padding-top:100px;}.pt110{ padding-top:110px;}.pt120{ padding-top:120px;}.pt130{padding-top:130px;}