Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1138,7 +1138,7 @@ class Listofworksstudentone extends Component {
 											<div className="fr">
 
 												<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-												{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+												{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:<div className={"computeTimes font-13"} onClick={this.setComputeTime}>

public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js

@@ -95,7 +95,7 @@ class ShixunWorkDetails extends Component {
 					</div>
 
 					<div className="padding10-30  edu-back-white clearfix" style={{
-						padding: '10px 2px'
+						padding: '10px 13px'
 					}}>
 						<span className="fl color-orange font-14">非编程类型任务，不参与查重</span>
 						<span className="fr mt4">

public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js

@@ -50,14 +50,20 @@ class ShixunCustomsPass extends Component {
 	              .backgroud4CACFF{
 	                  background: #4CACFF;
 	              }
+	              .fontpass{
+	              overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+								width: 346px;
+	              }
 	              `}
               </style>
             <span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF">
 		            <i className="fa fa-code font-16 color_white"></i>
 		        </span>
-						<span className="fl mt3 font-14">
+						<span className="fl mt3 font-14 fontpass">
 							<span className="font-bd mr15">第{record.customs.position}关</span>
-								<span className={"font-14"}>{record.customs.subject}</span>
+								<span className={"font-14"} title={record.customs.subject}>{record.customs.subject}</span>
 						</span>
         </span>
 			),

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -867,14 +867,15 @@ class Trainingjobsetting extends Component {
                             challenge_settingsdata[i].challenge_score =0;
                         }
                     }
-                    debugger
                     var expzsy=0;
                     var bool= true;
                     if(ionsp - expzs>0){
-                        expzsy=ionsp - expzs;
+                        expzsy=parseFloat(ionsp.toFixed(1))  - parseFloat(expzs.toFixed(1));
+                        expzsy=Math.abs(expzsy);
                         bool=true;
                     }else{
-                        expzsy=ionsp - expzs;
+                       expzsy= parseFloat(ionsp.toFixed(1)) -  parseFloat(expzs.toFixed(1));
+                        expzsy= Math.abs(expzsy);
                         bool=false;
 
                     }
@@ -884,9 +885,16 @@ class Trainingjobsetting extends Component {
                             macts= macts+1;
                              if(mact===macts){
                                  if(bool===true){
-                                     challenge_settingsdata[i].challenge_score =   challenge_settingsdata[i].challenge_score+expzsy;
+                                     challenge_settingsdata[i].challenge_score =  (parseFloat(challenge_settingsdata[i].challenge_score)+parseFloat(expzsy.toFixed(1))).toFixed(1);
+                                     console.log(parseFloat(challenge_settingsdata[i].challenge_score)+parseFloat(expzsy.toFixed(1)));
+                                     console.log(parseFloat(expzsy.toFixed(1)));
+
                                  }else {
-                                     challenge_settingsdata[i].challenge_score =   challenge_settingsdata[i].challenge_score-parseInt(expzsy);
+
+                                     challenge_settingsdata[i].challenge_score =  (parseFloat(challenge_settingsdata[i].challenge_score)-parseFloat(expzsy.toFixed(1))).toFixed(1);
+                                     console.log(parseFloat(challenge_settingsdata[i].challenge_score)-parseFloat(expzsy.toFixed(1)));
+                                     console.log(parseFloat(expzsy.toFixed(1)));
+
                                  }
                              }
                         }else{