From 9f4ac8147a7b3daeb580ae64eecbaa29333dbda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sun, 29 Sep 2019 16:09:21 +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

---
 public/react/src/modules/ecs/EcSetting/index.js     |  2 --
 .../EcCompletionCalculation.js                      | 13 +++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/ecs/EcSetting/index.js b/public/react/src/modules/ecs/EcSetting/index.js
index b4a388744..0c6d1ab88 100644
--- a/public/react/src/modules/ecs/EcSetting/index.js
+++ b/public/react/src/modules/ecs/EcSetting/index.js
@@ -162,8 +162,6 @@ class EcSetting extends React.Component {
                 {/*课程体系VS毕业要求*/}
 								<Route extra path='/ecs/major_schools/:major_school_id/years/:ec_year_id/requirement_vs_courses'
 											 render={ (props) => (<CourseSupports {...this.props} {...props} {...this.state} />) }></Route>
-
-                
 								{/*达成度评价结果*/}
 								<Route extra path='/ecs/major_schools/:major_school_id/years/:ec_year_id/reach_calculation_info'
 											 render={ (props) => (<ReachCalculationInfo {...this.props} {...props} {...this.state} />) }></Route>
diff --git a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
index 65cac4540..be2a46145 100644
--- a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
+++ b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
@@ -70,10 +70,10 @@ class EcCompletionCalculation extends Component {
 										// evaluate_result:response.data.evaluate_result,
 										// course_total_score:response.data.course_total_score[response.data.course_total_score.length-1].total_rate,
 										// total_rate_data:response.data.course_total_score[response.data.course_total_score.length-1].total_rate.length,
-										// graduation_list:response.data.graduation_list,
+										graduation_list:response.data.graduation_subitem_evaluations,
 										target_list:response.data.course_targets,
 										// target_score:response.data.target_score,
-										ec_course_targets_count:response.data.graduation_subitem_evaluations,
+										// ec_course_targets_count:response.data.graduation_subitem_evaluations,
 										// morelisttype:newmorelisttype,
 										// course_total_scoreaverage:course_total_scoreaverage,
 										// ismanager:response.data.is_manager
@@ -155,10 +155,10 @@ class EcCompletionCalculation extends Component {
                         // evaluate_result:response.data.evaluate_result,
                         // course_total_score:response.data.course_total_score[response.data.course_total_score.length-1].total_rate,
                         // total_rate_data:response.data.course_total_score[response.data.course_total_score.length-1].total_rate.length,
-                        // graduation_list:response.data.graduation_list,
+                         graduation_list:response.data.graduation_subitem_evaluations,
                          target_list:response.data.course_targets,
                         // target_score:response.data.target_score,
-                        ec_course_targets_count:response.data.graduation_subitem_evaluations,
+                        //ec_course_targets_count:response.data.graduation_subitem_evaluations,
                         // morelisttype:newmorelisttype,
                         // course_total_scoreaverage:course_total_scoreaverage,
                         // ismanager:response.data.is_manager
@@ -495,7 +495,7 @@ class EcCompletionCalculation extends Component {
                     {/*        </span>*/}
                     {/*    </div>*/}
                     {/*</div>*/}
-
+								  	{/*课程目标*/}
                     <div className="ListTableLine newSystem mb20" id="school_major_list">
 
                         <p className="clearfix padding10im" >
@@ -537,7 +537,7 @@ class EcCompletionCalculation extends Component {
 
                    
                     </div>
-
+									  {/*毕业要求指标点达成评价结果*/}
                     <div className="edu-back-white eacourse">
 
                         <div className="padding1030" id="training_objective_contents">
@@ -620,6 +620,7 @@ class EcCompletionCalculation extends Component {
                         }
                     </div>
 
+								   	{/*课程总评成绩表*/}
                     <div className="edu-back-white eacourse">
 
                         <div className="padding1030" id="training_objective_contents">