Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

Gemfile

@@ -63,8 +63,8 @@ gem 'elasticsearch-rails'
 gem 'oauth2'
 
 # xlsx
-gem 'axlsx', '3.0.0.pre'
-gem 'axlsx_rails', '0.3.0'
+#gem 'axlsx', '3.0.0.pre'
+#gem 'axlsx_rails', '0.3.0'
 
 #Ruby 2.2+ has removed test/unit from the core library.
 if RUBY_VERSION>='2.2'

public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js

@@ -870,15 +870,28 @@ class ecCourseEvaluations extends Component {
                         <p className="clearfix padding20-30 bor-bottom-greyE" id="SystemParametersP">
                             <a href={schooldata.course_setting_url} className="TrainingLecturer color-grey-9">课程体系 </a> >
                             <a className="TrainingTheory major_name"> {schooldata.ec_course_name}</a>
+
+                            <div className={"fr"}>
+                                <span className=" fr " >
+                                <a className="white-btn edu-blueback-btn fr mr10 mt7"    style={{top: '22px',display:ecmanager===false?"none":""}} target="_blank" href={'/ec_courses/'+ec_course_id+'/export_ec_course_targets?format=xls'}>导出考核方法</a>
+                                </span>
+                                <a className="white-btn edu-blueline-btn fr mr10 mt7 mr20"
+                                   onClick={this.associatedclass}
+                                   style={{display: course_url === "" && ecmanager === true ? "block" : "none"}}
+                                 >关联课堂</a>
+                                <a className="white-btn edu-blueline-btn fr mr10 mt7 mr20"
+                                   onClick={this.deleteassociatedclass}
+                                   style={{display:course_url!=""&&ecmanager===true?"block":"none"}}
+                                 >取消关联</a>
+
+                            </div>
+
                             <div className="color-grey-9 mr10">请结合本课程的教学情况，修改考核方式、并导入学生的对应考核成绩  <a className={"color-blue"} onClick={() => window.elasticLayer(3533)}>查看详情</a></div>
                             {/*课程考核方式与数据来源*/}
                             {/* <span className="fl font-18 courseSystem"></span> */}
                             {/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
-                            <a class="white-btn edu-blueline-btn fr mr10 mt2 associatedclass" onClick={this.associatedclass} style={{display:course_url===""&&ecmanager===true?"block":"none"}}>关联课堂</a>
-                            <a class="white-btn edu-blueline-btn fr mr10 mt2 associatedclass" onClick={this.deleteassociatedclass} style={{display:course_url!=""&&ecmanager===true?"block":"none"}}>取消关联</a>
-                            <span className="Importclassroomdata" style={{top: '22px',display:ecmanager===false?"none":""}}>
-                                <a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={'/ec_courses/'+ec_course_id+'/export_ec_course_targets?format=xls'}>导出考核方法</a>
-                            </span>
+
+
                         </p>
 
                         <div style={{padding: '20px 21px 0px 21px',height:'40px'}} id="SystemParameters" className={"SystemParameters"}>

public/react/src/modules/ec/ecTitle/ecTitle.js

@@ -52,7 +52,7 @@ class EcTitleCourseEvaluations extends Component {
                     </li>
                     <li className={ecpaths==="ecStudentList"?"ecimgs11":"ecimgs"} style={{width: ecpaths==="ecStudentList"?'126px':'83px'}}>
                         <a className={ ecpaths==="ecStudentList"?"ml18 ecTitleFFF ecTitles":"ecTitle"} >5</a>
-                        <a  className={ ecpaths==="ecStudentList"?"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>
+                        <a  className={ ecpaths==="ecStudentList"?"ecTitlefontFFF":"ecTitlefont"} href={schooldata.students_url}>学生</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>