From 720e8c9403947d5b77963ecabfe8752f79cda5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 8 Oct 2019 10:56:19 +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

---
 .../ecCompletion_calculation/EcCompletionCalculation.js    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 a0744cc6c..b99131754 100644
--- a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
+++ b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
@@ -47,6 +47,7 @@ class EcCompletionCalculation extends Component {
 				    course_rate:"--",
 				  	score_levels:[],
 					  score_levelsdata:[],
+            hife:"/ecs/major_schools/3/years/60/requirement_vs_courses",
         }
     }
 
@@ -55,6 +56,8 @@ class EcCompletionCalculation extends Component {
     }
 
     componentDidMount(){
+        console.log("componentDidMount");
+        // console.log(this.props);
         // let ec_course_id =this.props.match.params.ec_course_id;
         // this.UpdateClassData(true);
 
@@ -600,7 +603,7 @@ class EcCompletionCalculation extends Component {
                         <span className={"column-1 operationright Systemnum mrj15"}>{"--"}</span>
                         <span className="column-1 operationright color-05101A">{"--"}</span>
                         <span className="column-1 operationright">{"--"}</span>
-                        <span className="column-1 operationright"> <a href={schooldata.requirement_vs_courses} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>
+                        <span className="column-1 operationright"> <a href={`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/requirement_vs_courses`} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>
                         {TargetresContentList(5,[2,2,2,2,2])}
                     </li>
                     :""
@@ -668,7 +671,7 @@ class EcCompletionCalculation extends Component {
 															{TargetresContentList(target_list,item.support_course_target_ids)}
 															</div>
 															<div className="myliysls">
-															{item.weights===null||item.weights===0?<span className="column-1 " ><a href={schooldata.requirement_vs_courses} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 " style={{textAlign:"center"}}>{item.weights}</span>}
+															{item.weights===null||item.weights===undefined||item.weights==="0.00"||item.weights===0.00||item.weights===0?<span className="column-1 " ><a href={`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/requirement_vs_courses`} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 " style={{textAlign:"center"}}>{item.weights}</span>}
 															<span className="column-1 " style={{textAlign:"center"}}>{item.actually_achievement===null?0:item.actually_achievement}</span>
 															<span className="column-1  color-05101A" style={{textAlign:"center"}}>{item.objective_achievement===null?0:item.objective_achievement}</span>
 															<span className={item.status==="not_achieved"?"column-1  Systemnum mrj15":"column-1  color-green mrj15"} style={{textAlign:"center"}}>{item.status==="not_achieved"?"未完成":"完成"}</span>