From a923e232a32d2c4f378d83a64f93f1f541aca902 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, 19 Sep 2019 13:47:31 +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

---
 .../src/modules/ecs/curriculum/Curriculum.js  |  4 +-
 .../EcCompletionCalculation.js                | 90 +++++++++----------
 .../EcCourseEvaluationsbottom.js              |  2 +-
 3 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/public/react/src/modules/ecs/curriculum/Curriculum.js b/public/react/src/modules/ecs/curriculum/Curriculum.js
index bf4c1cbc8..3dae260de 100644
--- a/public/react/src/modules/ecs/curriculum/Curriculum.js
+++ b/public/react/src/modules/ecs/curriculum/Curriculum.js
@@ -238,10 +238,10 @@ class Curriculum extends Component {
 					{/*成绩等级设置*/}
 					<Route extra path='/ecs/major_schools/:majorId/years/:yearId/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'
 								 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'
 								 render={ (props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
 				</Switch>
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 c24e7c13c..4be7c11d3 100644
--- a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
+++ b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
@@ -438,53 +438,49 @@ class EcCompletionCalculation extends Component {
                     {/*    ecpath={"show"}*/}
                     {/*/>*/}
 
-                    <div className="edu-back-white eacourse">
-
-                        <div className="clearfix padding20-30 bor-bottom-greyE">
-                            <a href={schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> >
-                            <a className="TrainingTheory major_name"> {schooldata.ec_course_name} 达成评价详情</a>
-                            {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
-                            <div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>
-
-                        </div>
-
-                     <div className="padding20-30" id="training_objective_contents"
-                            style={{
-                                position: 'relative'
-                              }}
-                     >
-                            <a className="fl SystemParameters" style={{display:schooldata.ec_course_support_setting_url===null?"none":"block"}}
-                               href={schooldata.ec_course_support_setting_url}>1.课程目标</a>
-                            <a className="fl SystemParameters ml40"
-                               style={{display:schooldata.ec_course_reach_setting_url===null?"none":"block"}}
-                               href={schooldata.ec_course_reach_setting_url}>2.课程考核方式与数据来源</a>
-                            <a className="fl SystemParameters4CACFF ml40 color4D4D4D"
-                              href={schooldata.score_level_setting_url}
-                            >3.成绩等级设置</a>
-                            <a className="fl SystemParameters ml40"
-                               style={{display:schooldata.evaluation_methods_url===null?"none":"block"}}
-                               href={schooldata.evaluation_methods_url}>4.课程目标评价方法</a>
-                            <a className="fl SystemParameters ml40"
-                               style={{display:schooldata.competition_calculation_info_url===null?"none":"block",color:'#4CACFF'}}
-                               href={schooldata.competition_calculation_info_url}>5.课程达成评价结果</a>
-                            {/* <span className="right ml20 SystemParameters">课程体系：
-                      {
-                        evaluate_result===false?<span className="Systemnum">未达成</span>:<span className="Systemnum color-green">达成</span>
-                      }
-                      </span> */}
-                            <span className={ismanager===false?"none":"right newrightcalculatebutton"}  
-                            style={{
-                                marginLeft: '26px',
-                                position: 'absolute',
-                                right: '157px'
-                            }}
-                            onClick={this.newrightcalculatebutton}>计算</span>
-                            <span className={ismanager===false?"none":"Importclassroomdata"} style={{top: "26px"}}>
-                                 <a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={"/ec_courses/"+ec_course_id+"/export_evaluation_result.xls"}>导出评价详情</a>
-                            </span>
-                        </div>
-
-                    </div>
+                    {/*<div className="edu-back-white eacourse">*/}
+                    {/*    <div className="clearfix padding20-30 bor-bottom-greyE">*/}
+                    {/*        <a href={schooldata.course_setting_url} className="color-grey-9 TrainingLecturer">课程体系</a> >*/}
+                    {/*        <a className="TrainingTheory major_name"> {schooldata.ec_course_name} 达成评价详情</a>*/}
+                    {/*        /!* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> *!/*/}
+                    {/*        <div className="color-grey-9 mr10">系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>*/}
+                    {/*    </div>*/}
+                    {/* <div className="padding20-30" id="training_objective_contents"*/}
+                    {/*        style={{*/}
+                    {/*            position: 'relative'*/}
+                    {/*          }}*/}
+                    {/* >*/}
+                    {/*        <a className="fl SystemParameters" style={{display:schooldata.ec_course_support_setting_url===null?"none":"block"}}*/}
+                    {/*           href={schooldata.ec_course_support_setting_url}>1.课程目标</a>*/}
+                    {/*        <a className="fl SystemParameters ml40"*/}
+                    {/*           style={{display:schooldata.ec_course_reach_setting_url===null?"none":"block"}}*/}
+                    {/*           href={schooldata.ec_course_reach_setting_url}>2.课程考核方式与数据来源</a>*/}
+                    {/*        <a className="fl SystemParameters4CACFF ml40 color4D4D4D"*/}
+                    {/*          href={schooldata.score_level_setting_url}*/}
+                    {/*        >3.成绩等级设置</a>*/}
+                    {/*        <a className="fl SystemParameters ml40"*/}
+                    {/*           style={{display:schooldata.evaluation_methods_url===null?"none":"block"}}*/}
+                    {/*           href={schooldata.evaluation_methods_url}>4.课程目标评价方法</a>*/}
+                    {/*        <a className="fl SystemParameters ml40"*/}
+                    {/*           style={{display:schooldata.competition_calculation_info_url===null?"none":"block",color:'#4CACFF'}}*/}
+                    {/*           href={schooldata.competition_calculation_info_url}>5.课程达成评价结果</a>*/}
+                    {/*        /!* <span className="right ml20 SystemParameters">课程体系：*/}
+                    {/*  {*/}
+                    {/*    evaluate_result===false?<span className="Systemnum">未达成</span>:<span className="Systemnum color-green">达成</span>*/}
+                    {/*  }*/}
+                    {/*  </span> *!/*/}
+                    {/*        <span className={ismanager===false?"none":"right newrightcalculatebutton"}  */}
+                    {/*        style={{*/}
+                    {/*            marginLeft: '26px',*/}
+                    {/*            position: 'absolute',*/}
+                    {/*            right: '157px'*/}
+                    {/*        }}*/}
+                    {/*        onClick={this.newrightcalculatebutton}>计算</span>*/}
+                    {/*        <span className={ismanager===false?"none":"Importclassroomdata"} style={{top: "26px"}}>*/}
+                    {/*             <a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={"/ec_courses/"+ec_course_id+"/export_evaluation_result.xls"}>导出评价详情</a>*/}
+                    {/*        </span>*/}
+                    {/*    </div>*/}
+                    {/*</div>*/}
 
                     <div className="ListTableLine newSystem mb20" id="school_major_list">
 
diff --git a/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
index 5d0488b2e..6e27711b2 100644
--- a/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
+++ b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
@@ -664,7 +664,7 @@ class EcCourseEvaluationsbottom extends Component {
       } = this.state;
 	    return (
         <div className="newMain clearfix">
-          <div className="educontent mb50 mt60">
+          <div className="educontent mb50">
               <Modal
                   title={titlemessages}
                   // visible={modeldelet===true&&listid===list.id?true:false}