From 7032fa8ea7973fbd8bdc4864d05639815d41ff97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 26 Sep 2019 11:49:02 +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        |  8 ++++----
 public/react/src/modules/ecs/curriculum/Curriculum.js  | 10 +++++-----
 .../src/modules/ecs/curriculum/CurriculumSubpage.js    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/ecs/EcSetting/index.js b/public/react/src/modules/ecs/EcSetting/index.js
index 69d309c46..601c68790 100644
--- a/public/react/src/modules/ecs/EcSetting/index.js
+++ b/public/react/src/modules/ecs/EcSetting/index.js
@@ -75,11 +75,11 @@ class EcSetting extends React.Component {
     let type = stepTypes[stepIndex];
 
     this.setState({ stepIndex: stepIndex });
-    if(type==="courses"){
-      this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}/ec_course_support_setting/1`);
-    }else {
+    // if(type==="courses"){
+    //   this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}/ec_course_support_setting/1`);
+    // }else {
       this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}`);
-    }
+    // }
   }
 
   setupStep = () => {
diff --git a/public/react/src/modules/ecs/curriculum/Curriculum.js b/public/react/src/modules/ecs/curriculum/Curriculum.js
index e75d118da..f00589781 100644
--- a/public/react/src/modules/ecs/curriculum/Curriculum.js
+++ b/public/react/src/modules/ecs/curriculum/Curriculum.js
@@ -233,19 +233,19 @@ class Curriculum extends Component {
 				<Switch>
 					{/*Curriculumtwo 测试用*/}
 					{/*课程目标*/}
-					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/courses/:type/1'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/: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/courses/:type/2'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/: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/courses/:type/3'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/: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/courses/:type/4'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/: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/courses/:type/5'
+					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/subpage/courses/:type/5'
 								 render={ (props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
 				</Switch>
 			</div>
diff --git a/public/react/src/modules/ecs/curriculum/CurriculumSubpage.js b/public/react/src/modules/ecs/curriculum/CurriculumSubpage.js
index 9037705d7..a0df7f63b 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/:majorId/years/:yearId/subpage/courses')
+		this.props.history.push(`/ecs/major_schools/${this.props.match.params.majorId}/years/${this.props.match.params.yearId}/subpage/courses`);
 	}