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

public/react/src/modules/ec/css/ecCourseEvaluations.css

@@ -333,6 +333,10 @@ input{
 .mrj15{
   margin-right: -15px;
 }
+
+.mrjf3{
+    margin-right: -3px;
+}
 .margin64px{
   margin: 0 64px!important;
 }

public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js

@@ -595,11 +595,11 @@ class EcCompletionCalculation extends Component {
                             Spintype===false?graduation_list.map((item,key)=>{
 
                                 return(
-                                    <li className={key+1===target_list.length?"clearfix newtarget_target marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}>
+                                    <li className={key+1===target_list.length?"clearfix newtarget_target marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380):1141+"px"}}>
                                         {/* <span className="column-1 color-05101A ec_graduation_name">{item.ec_graduation_name}</span> */}
                                         <span className="column-1 color-05101A ec_graduation_name">{key+1}</span>
                                         <span className="column-500 color-05101A" data-tip-down={item.content}>{item.ec_subitem_content}</span>
-                                        <span className={item.result==="未达成"?"column-1 operationright Systemnum mrj15":"column-1 operationright color-green mrj15"}>{item.result}</span>
+                                        <span className={item.result==="未达成"?"column-1 operationright Systemnum mrjf3":"column-1 operationright color-green mrjf3"}>{item.result}</span>
                                         <span className="column-1 operationright color-05101A">{item.reach_target===null?0:item.reach_target}</span>
                                         <span className="column-1 operationright">{item.reach_real_target===null?0:item.reach_real_target}</span>
                                         {item.weight===null||item.weight===0?<span className="column-1 operationright" ><a href={schooldata.requirement_vs_courses} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 operationright">{item.weight}</span>}