调整

public/react/src/modules/courses/css/members.css

@@ -70,3 +70,11 @@
 .tabletd {
   background-color:#E6F7FF;
 }
+
+.yslminheigth{
+  min-height: 20px;
+}
+
+.yslminheigths{
+  min-height: 21px;
+}

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

@@ -236,11 +236,11 @@ class TraineetraininginformationModal extends Component {
                     </div>
                         <div className="fl  edu-back-white ml20  mt15">
                             <li>{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.username}<span style={{"color":"#323232"}}> 通关：</span><span style={{"color": '#FF6800'}}>{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.complete_count}/{this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.challenges_count}</span></li>
-                          {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.efficiency === undefined ? "" :this.props.viewtrainingdata.efficiency === null ? "" :this.props.viewtrainingdata.efficiency === "" ? "" : <li><span   style={{"color":"#989898"}} >完成效率：</span><span  style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata.efficiency}</span></li>}
+                          {this.props.viewtrainingdata === undefined ? <li className="yslminheigth"></li> :this.props.viewtrainingdata.efficiency === undefined ? <li className="yslminheigth"></li> :this.props.viewtrainingdata.efficiency === null ? <li className="yslminheigth"></li> :this.props.viewtrainingdata.efficiency === "null" ? <li className="yslminheigth"></li> :this.props.viewtrainingdata.efficiency === "" ? <li className="yslminheigth"></li> : <li><span   style={{"color":"#989898"}} >完成效率：</span><span  style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata.efficiency}</span></li>}
                             <li><span style={{"color":"#989898"}}>通关时间：</span> <span style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata === undefined ? "":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"--":moment(this.props.viewtrainingdata.passed_time).format('YYYY-MM-DD HH:mm')}</span> </li>
                         </div>
                         <div className="fl  edu-back-white ml20  mt15">
-                          {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.max_efficiency === undefined ? "" :this.props.viewtrainingdata.max_efficiency === null ? "" :this.props.viewtrainingdata.max_efficiency === "" ? "" :  <li className="mt20"> <span style={{"color":"#989898"}}>课堂最高完成效率：</span> <span style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata.max_efficiency} </span> </li>}
+                          {this.props.viewtrainingdata === undefined ? <li className="yslminheigth mt20"></li> :this.props.viewtrainingdata.max_efficiency === undefined ? <li className="yslminheigth mt20"></li> :this.props.viewtrainingdata.max_efficiency === null ? <li className="yslminheigth mt20"></li> :this.props.viewtrainingdata.max_efficiency === "null" ? <li className="yslminheigth mt20"></li>: this.props.viewtrainingdata.max_efficiency === "" ? <li className="yslminheigth mt20"></li> :  <li className="mt20"> <span style={{"color":"#989898"}}>课堂最高完成效率：</span> <span style={{"color":"#4C4C4C"}}>{this.props.viewtrainingdata.max_efficiency} </span> </li>}
                             <li><span style={{"color":"#989898"}}>总耗时:</span>  <span style={{"color":"#4C4C4C"}}> {this.props.viewtrainingdata === undefined ? "" :this.props.viewtrainingdata.total_spend_time}</span> </li>
 
                         </div>

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

@@ -322,9 +322,14 @@ class Trainingjobsetting extends Component {
                 };
                 challenge_scoredata.push(datas[i].challenge_score);
                 array.push(object)
+                console.log("datas[i].challenge_score");
+                console.log(i);
+                console.log(datas[i].challenge_score);
             }
 
         }
+        console.log("提交的数据"+"pustdate");
+        console.log("提交的数据"+"pustdate");
 
         if (this.state.jobsettingsdata.data.unified_setting === true) {
             if (this.state.unifiedsetting === true) {
@@ -560,14 +565,20 @@ class Trainingjobsetting extends Component {
         if(challenge_scoredata.length>0){
             var len = 0;
             for (var k = 0; k < challenge_scoredata.length; k++) {
-                len = len + challenge_scoredata[k];
+                len = len + parseFloat(challenge_scoredata[k]);
+                 console.log(len);
+                 console.log(challenge_scoredata[k]);
+                 console.log(len);
+
             }
             var max = latedeductiontwos + len;
             if (max > 100) {
+                console.log("max>100");
                 this.props.showNotification(`总分值+效率占比分之和要等于100，现在分值为` + max);
                 return;
             }
             if(max<100){
+                console.log("max<100");
                 this.props.showNotification(`总分值+效率占比分之和要等于100，现在分值为` + max);
                 return;
             }