From 76c4c435ec36e1378f0099fd9497329c65cda925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 24 May 2019 14:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E7=A8=8B=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ec/ecCompletion_calculation/ecCompletion_calculation.js    | 1 +
 .../src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js  | 1 +
 .../ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js        | 1 +
 public/react/src/modules/ec/ecCourseSupportSetting/index.js    | 1 +
 .../react/src/modules/ec/ecCourseSupports/ecCourseSupports.js  | 1 +
 .../src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js    | 1 +
 public/react/src/modules/ec/ecStudentList/ecStudentList.js     | 3 ++-
 public/react/src/modules/ec/ecTitle/ecTitle.css                | 2 +-
 public/react/src/modules/ec/ecTitle/ecTitle.js                 | 3 ++-
 .../modules/ec/graduatesRequirement/GraduatesRequirement.js    | 1 +
 10 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
index 46a61ef0..eb7a43e3 100644
--- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
+++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js
@@ -432,6 +432,7 @@ class EcCompletionCalculation extends Component {
                 <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecComponentState={'ecCompletion'}
                         ecpath={"show"}
diff --git a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
index 0fc7dc54..3a2884dc 100644
--- a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
+++ b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
@@ -859,6 +859,7 @@ class ecCourseEvaluations extends Component {
                 <div className="educontent mb40">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecComponentState={ecComponentState}
                         ecpath={"show"}
diff --git a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js
index 7f82aa46..6d8622c8 100644
--- a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js
+++ b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js
@@ -703,6 +703,7 @@ class EcCourseEvaluationsbottom extends Component {
 
               {/*</div>*/}
               <EcTitleCourseEvaluations
+                  {...this.props}
                   schooldata={schooldata}
                   ecpath={"show"}
               />
diff --git a/public/react/src/modules/ec/ecCourseSupportSetting/index.js b/public/react/src/modules/ec/ecCourseSupportSetting/index.js
index ee18e430..82eec19e 100644
--- a/public/react/src/modules/ec/ecCourseSupportSetting/index.js
+++ b/public/react/src/modules/ec/ecCourseSupportSetting/index.js
@@ -245,6 +245,7 @@ class EcCourseSupportSetting extends Component {
       <div className="newMain clearfix courseSupport">
         <div className="educontent mb50">
             <EcTitleCourseEvaluations
+                {...this.props}
                 schooldata={schooldata}
                 ecComponentState={'ecCompletion'}
                 ecpath={"ec_course_support_setting"}
diff --git a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js
index 63ae4f90..b7a51bfd 100644
--- a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js
+++ b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js
@@ -473,6 +473,7 @@ class ecCourseSupports extends Component {
                 <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecComponentState={ecComponentState}
                         ecpath={"requirement_vs_courses"}
diff --git a/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js b/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js
index e99bed9c..6ae818d9 100644
--- a/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js
+++ b/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js
@@ -262,6 +262,7 @@ class ecGradeEvaluations extends Component {
                 <div className="educontent mb40">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecpath={"show"}
                     />
diff --git a/public/react/src/modules/ec/ecStudentList/ecStudentList.js b/public/react/src/modules/ec/ecStudentList/ecStudentList.js
index 66554a77..6d59ed36 100644
--- a/public/react/src/modules/ec/ecStudentList/ecStudentList.js
+++ b/public/react/src/modules/ec/ecStudentList/ecStudentList.js
@@ -319,6 +319,7 @@ class ecStudentList extends Component {
                 <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
+                        {...this.props}
                         schooldata={schooldata}
                         ecpath={this.state.ecComponentState}
                     />
@@ -333,7 +334,7 @@ class ecStudentList extends Component {
                             className=" font-18 courseSystem">学生列表（
                             {majorschoollist===undefined?"":majorschoollist.total_student}
                             ）</span>
-                            <div className="color-grey-9 mr10">提供模板支持导入学生信息(请先下载模板)  <a className={"color-blue"} onClick={document.body.elasticLayer(3533)}>查看详情</a></div>
+                            {/*<div className="color-grey-9 mr10">提供模板支持导入学生信息(请先下载模板)  <a className={"color-blue"} onClick={document.body.elasticLayer(3533)}>查看详情</a></div>*/}
                         </div>
 
                         <div className="padding20-30 padbottom" id="training_objective_contents">
diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.css b/public/react/src/modules/ec/ecTitle/ecTitle.css
index 332e6142..c6e612bc 100644
--- a/public/react/src/modules/ec/ecTitle/ecTitle.css
+++ b/public/react/src/modules/ec/ecTitle/ecTitle.css
@@ -21,7 +21,7 @@
     margin-right: 10px;
 }
 #traningNav>li>.ecTitles {
-    line-height: 18px !important;
+    line-height: 16px !important;
 }
 
 #traningNav>li>.ecTitlefont:hover{
diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.js b/public/react/src/modules/ec/ecTitle/ecTitle.js
index 02b31a84..21aec303 100644
--- a/public/react/src/modules/ec/ecTitle/ecTitle.js
+++ b/public/react/src/modules/ec/ecTitle/ecTitle.js
@@ -21,6 +21,7 @@ class EcTitleCourseEvaluations extends Component {
 
     render() {
         let{schooldata,ecComponentState,ecpaths}=this.state;
+
         return (
             <div>
                 <div className="mb10 mt10 eaSystemp">
@@ -51,7 +52,7 @@ class EcTitleCourseEvaluations extends Component {
                     </li>
                     <li className={ecpaths==="ecStudentList"||ecpaths==="show"?"ecimgs11":"ecimgs"} style={{width: ecpaths==="ecStudentList"?'126px':'83px'}}>
                         <a className={ ecpaths==="ecStudentList"||ecpaths==="show"?"ml18 ecTitleFFF ecTitles":"ecTitle"} >5</a>
-                        <a  className={ ecpaths==="ecStudentList"||ecpaths==="show"?"ecTitlefontFFF":"ecTitlefont"} href={schooldata.course_setting_url}>学生</a>
+                        <a  className={ ecpaths==="ecStudentList"||ecpaths==="show"?"ecTitlefontFFF":"ecTitlefont"} href={"/ec_major_schools/"+this.props.match.params.major_school_id+"/academic_years/"+this.props.match.params.ec_year_id+"/student_lists"}>学生</a>
                     </li>
                     <li className={ecpaths==="ec_course_support_setting"||ecpaths==="show"?"ecimgs11":"ecimgs"}>
                         <a className={ ecpaths==="ec_course_support_setting"||ecpaths==="show"?"ml18 ecTitleFFF ecTitles":"ecTitle ecTitles"} >6</a>
diff --git a/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js b/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js
index 00b72e1e..475f7afd 100644
--- a/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js
+++ b/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js
@@ -599,6 +599,7 @@ class GraduatesRequirement extends Component {
         <div className="newMain clearfix">
           <div className="educontent mb290">
             <EcTitleCourseEvaluations
+                {...this.props}
               schooldata={schooldata}
               ecComponentState={'ecCompletion'}
               ecpath={"reach_calculation_info"}