diff --git a/public/react/src/modules/ecs/EcSetting/index.js b/public/react/src/modules/ecs/EcSetting/index.js index 4dd6318bf..4b587f26f 100644 --- a/public/react/src/modules/ecs/EcSetting/index.js +++ b/public/react/src/modules/ecs/EcSetting/index.js @@ -6,16 +6,31 @@ import axios from 'axios'; import './index.scss'; import CustomLoadable from "../../../CustomLoadable"; -import Curriculum from "../../../modules/ecs/curriculum/Curriculum" +import Loadable from 'react-loadable'; +import Loading from "../../../Loading"; const { Step } = Steps; - -const TrainingObjective = CustomLoadable(() => import('./TrainingObjective/index')) -const GraduationRequirement = CustomLoadable(() => import('./GraduationRequirement/index')) -const CourseSupports = CustomLoadable(() => import('./CourseSupports/index')) - - const steps = ["培养目标", "毕业要求", "培养目标VS毕业要求", "毕业要求VS通用标准", "学生", "课程体系", "课程体系VS毕业要求", "达成度评价结果"]; const stepTypes = ["training_objectives", "graduation_requirement", "requirement_vs_objective", "requirement_vs_standard", "students", "courses", "requirement_vs_courses", "reach_calculation_info"]; +const EcStudentList=Loadable({ + loader: () => import('../subroute/ecStudentList/EcStudentList'), + loading: Loading, +}); +const Curriculum=Loadable({ + loader: () => import('../../../modules/ecs/curriculum/Curriculum'), + loading: Loading, +}); +const TrainingObjective=Loadable({ + loader: () => import('./TrainingObjective/index'), + loading: Loading, +}); +const GraduationRequirement=Loadable({ + loader: () => import('./GraduationRequirement/index'), + loading: Loading, +}); +const CourseSupports=Loadable({ + loader: () => import('./CourseSupports/index'), + loading: Loading, +}); class EcSetting extends React.Component { constructor (props) { @@ -50,7 +65,11 @@ class EcSetting extends React.Component { let type = stepTypes[stepIndex]; this.setState({ stepIndex: stepIndex }); - this.props.history.push(`/ecs/major_schools/${majorId}/years/${yearId}/${type}`); + 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 = () => { @@ -101,6 +120,11 @@ class EcSetting extends React.Component { () }> + + + {/*学生*/} + () }> {/*课程体系*/} () }> diff --git a/public/react/src/modules/ecs/curriculum/Curriculum.js b/public/react/src/modules/ecs/curriculum/Curriculum.js index a02eed61e..bf4c1cbc8 100644 --- a/public/react/src/modules/ecs/curriculum/Curriculum.js +++ b/public/react/src/modules/ecs/curriculum/Curriculum.js @@ -36,10 +36,7 @@ const EcCompletionCalculation =Loadable({ loader: () => import('../subroute/ecCompletion_calculation/EcCompletionCalculation'), loading: Loading, }); -const EcCourseSupports=Loadable({ - loader: () => import('../subroute/ecCourseSupports/EcCourseSupports'), - loading: Loading, -}); + class Curriculum extends Component { //课程体系