From 7d4c52f9a1dd059baa9584ab1de6d752cf3c52e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 23 Sep 2019 10:39:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/ec/css/ecCourseEvaluations.css       | 4 ++++
 .../ec/ecCompletion_calculation/ecCompletion_calculation.js   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/ec/css/ecCourseEvaluations.css b/public/react/src/modules/ec/css/ecCourseEvaluations.css
index 5931e9f8..a1f5a581 100644
--- a/public/react/src/modules/ec/css/ecCourseEvaluations.css
+++ b/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;
 }
diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
index 002bb0ab..8f511822 100644
--- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
+++ b/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>}

From 7011054aab4f7570c58aff309a4f3fad24dfc75c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 23 Sep 2019 10:50:42 +0800
Subject: [PATCH 2/2] b

---
 public/react/src/modules/ec/css/ecCourseEvaluations.css      | 5 +++++
 .../ec/ecCompletion_calculation/ecCompletion_calculation.js  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/ec/css/ecCourseEvaluations.css b/public/react/src/modules/ec/css/ecCourseEvaluations.css
index a1f5a581..0250eda8 100644
--- a/public/react/src/modules/ec/css/ecCourseEvaluations.css
+++ b/public/react/src/modules/ec/css/ecCourseEvaluations.css
@@ -337,6 +337,11 @@ input{
 .mrjf3{
     margin-right: -3px;
 }
+
+.mrjf11{
+    margin-right: -11px;
+}
+
 .margin64px{
   margin: 0 64px!important;
 }
diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
index 8f511822..63dc7a7c 100644
--- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
+++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
@@ -599,7 +599,7 @@ class EcCompletionCalculation extends Component {
                                         {/* <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 mrjf3":"column-1 operationright color-green mrjf3"}>{item.result}</span>
+                                        <span className={item.result==="未达成"? ec_course_targets_count > 5?"column-1 operationright Systemnum mrjf11":"column-1 operationright Systemnum mrjf3": ec_course_targets_count > 5?"column-1 operationright color-green mrjf3":"column-1 operationright color-green mrjf11"}>{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>}