From 7cd79e92ad65d99d87497cd6ab03eea5907cbdbd 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 13:53:41 +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 +-
 .../react/src/modules/ecs/curriculum/Curriculum.js | 14 ++++++++------
 .../modules/ecs/curriculum/CurriculumSubpage.js    |  2 +-
 .../EcCompletionCalculation.js                     |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/ecs/EcSetting/index.js b/public/react/src/modules/ecs/EcSetting/index.js
index 0c6d1ab88..28c176f01 100644
--- a/public/react/src/modules/ecs/EcSetting/index.js
+++ b/public/react/src/modules/ecs/EcSetting/index.js
@@ -154,7 +154,7 @@ class EcSetting extends React.Component {
                 <Route extra path='/ecs/major_schools/:majorId/years/:yearId/students'
                        render={ (props) => (<EcStudentList {...this.props} {...props} {...this.state} />) }></Route>
                 {/*课程体系*/}
-                <Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses'
+                <Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage'
                        render={ (props) => (<Curriculum {...this.props} {...props} {...this.state} />) }></Route>
                 {/*课程体系资源子页面Subpage*/}
                 <Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses'
diff --git a/public/react/src/modules/ecs/curriculum/Curriculum.js b/public/react/src/modules/ecs/curriculum/Curriculum.js
index df7857501..b0f8bb898 100644
--- a/public/react/src/modules/ecs/curriculum/Curriculum.js
+++ b/public/react/src/modules/ecs/curriculum/Curriculum.js
@@ -125,6 +125,8 @@ class Curriculum extends Component {
 
 	};
 	Ontitine=(s)=>{
+		console.log("CurriculumCurriculum");
+		console.log(s);
 		if(s==="ec_course_support_setting"){
 			this.setState({
 				titine:1,
@@ -243,19 +245,19 @@ class Curriculum extends Component {
 				<Switch>
 					{/*Curriculumtwo 测试用*/}
 					{/*课程目标*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/:type/1'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/1'
 								 render={ (props) => (<EcCourseSupportSetting {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)} />) }></Route>
 					{/*课程考核方式与数据来源*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/:type/2'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/2'
 								 render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
 					{/*成绩等级设置*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/:type/3'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/3'
 								 render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
-					{/*4课程目标评价方法*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/:type/4'
+					{/*4课程目标评价方法*/ }
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/4'
 								 render={ (props) => (<EcCourseEvaluationsbottom {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
 					{/*5课程达成评价结果*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/:type/5'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/subpage/:type/5'
 								 render={ (props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)} triggerRef={this.bindRef}/>) }></Route>
 				</Switch>
 			</div>
diff --git a/public/react/src/modules/ecs/curriculum/CurriculumSubpage.js b/public/react/src/modules/ecs/curriculum/CurriculumSubpage.js
index a187e688d..f7efffd8a 100644
--- a/public/react/src/modules/ecs/curriculum/CurriculumSubpage.js
+++ b/public/react/src/modules/ecs/curriculum/CurriculumSubpage.js
@@ -16,7 +16,7 @@ class CurriculumSubpage extends Component {
 		console.log(this.props.match.params);
 	}
 	Curriculumstructure=()=>{
-		this.props.history.push(`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/subpage/courses/ec_course_support_setting/1`);
+		this.props.history.push(`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/courses/subpage/ec_course_support_setting/1`);
 	}
 
 
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 4149839a2..2b525284a 100644
--- a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
+++ b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
@@ -57,7 +57,7 @@ class EcCompletionCalculation extends Component {
 
     componentDidMount(){
         console.log("componentDidMount");
-
+        console.log("EcCompletionCalculation");
 
         // console.log(this.props);
         // let ec_course_id =this.props.match.params.ec_course_id;