调整

public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js

@@ -3,7 +3,7 @@ import classNames from 'classnames'
 
 import axios from 'axios';
 
-import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
+// import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
 
 import { SnackbarHOC } from 'educoder'
 
@@ -431,12 +431,12 @@ class EcCompletionCalculation extends Component {
 
                 <div className="educontent mb290">
 
-                    <EcTitleCourseEvaluations
-                        {...this.props}
-                        schooldata={schooldata}
-                        ecComponentState={'ecCompletion'}
-                        ecpath={"show"}
-                    />
+                    {/*<EcTitleCourseEvaluations*/}
+                    {/*    {...this.props}*/}
+                    {/*    schooldata={schooldata}*/}
+                    {/*    ecComponentState={'ecCompletion'}*/}
+                    {/*    ecpath={"show"}*/}
+                    {/*/>*/}
 
                     <div className="edu-back-white eacourse">
 
@@ -809,5 +809,5 @@ class EcCompletionCalculation extends Component {
     }
 }
 
-export default SnackbarHOC() ( TPMIndexHOC  ( EcCompletionCalculation ) );
+export default SnackbarHOC() (EcCompletionCalculation);
 

public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js

@@ -6,7 +6,7 @@ import classNames from 'classnames'
 
 import axios from 'axios';
 
-import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
+// import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
 
 import { SnackbarHOC } from 'educoder'
 
@@ -703,11 +703,11 @@ class EcCourseEvaluationsbottom extends Component {
                   {/*</div>*/}
 
               {/*</div>*/}
-              <EcTitleCourseEvaluations
-                  {...this.props}
-                  schooldata={schooldata}
-                  ecpath={"show"}
-              />
+              {/*<EcTitleCourseEvaluations*/}
+              {/*    {...this.props}*/}
+              {/*    schooldata={schooldata}*/}
+              {/*    ecpath={"show"}*/}
+              {/*/>*/}
 
                 {/*<div className="edu-back-white eacourse">*/}
 
@@ -1036,4 +1036,4 @@ class EcCourseEvaluationsbottom extends Component {
   	}
 }
 
-export default SnackbarHOC() ( TPMIndexHOC  ( EcCourseEvaluationsbottom ) );
+export default SnackbarHOC() (EcCourseEvaluationsbottom);

public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js

@@ -5,7 +5,7 @@ import { Spin } from 'antd';
 
 import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC';
 
-import { SnackbarHOC } from 'educoder'
+import { SnackbarHOC,getImageUrl } from 'educoder'
 
 import { Pagination,Upload,Modal,Checkbox } from 'antd';
 
@@ -21,10 +21,9 @@ class EcStudentList extends Component {
     constructor(props) {
         super(props)
         this.state={
-            schooldata:{},
             majorschoollist:undefined,
             titlemessage:"提示",
-            ecComponentState:"ecStudentList",
+            // ecComponentState:"ecStudentList",
             visible:false,
             Modallist:'',
             Modallisttypes:0,
@@ -40,24 +39,6 @@ class EcStudentList extends Component {
         let major_id=this.props.match.params.major_id;
         let year_id=this.props.match.params.year_id;
 
-        const jol =`/ec_major_schools/get_navigation_data?ec_year_id=`+year_id;
-            axios.get(jol, {
-                withCredentials: true,
-            }).then((response) => {
-     
-                if(response.status===200){
-                    // if(response.data.allow_visit===false){
-                    //     window.location.href="/403"
-                    //  }
-                    this.setState({
-                        schooldata:response.data
-                    })
-                }
-            })
-            .catch(function (error) {
-                console.log(error);
-            });
-
         const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data';
             axios.get(url, {
                 withCredentials: true,
@@ -267,7 +248,7 @@ class EcStudentList extends Component {
     }
 
     render() {
-        let {schooldata,
+        let {
             majorschoollist,
             Modallisttype,
             titlemessage,
@@ -322,12 +303,6 @@ class EcStudentList extends Component {
                     </div>
                 </Modal>
                 <div className="educontent mb290">
-
-                    <EcTitleCourseEvaluations
-                        {...this.props}
-                        schooldata={schooldata}
-                        ecpath={this.state.ecComponentState}
-                    />
                    <div className="clearfix padding20-30 bor-bottom-greyE mb10 edu-back-white">
                         <span className="fl font-18 courseSystem ">学生列表</span>
                         <a className="fr font-15 courseSystem" onClick={this.windowsgoblack}>返回</a>
@@ -381,12 +356,12 @@ class EcStudentList extends Component {
                                 {
                                     majorschoollist===undefined?
                                     <div className="edu-txt-center color-grey-9 pt50">
-                                        <p className="mb20"><img className="edu-nodata-img mb20" src={require('./nodata.png')} /></p>
+                                        <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} /></p>
                                         <p>学生数据为空，请导入数据</p>
                                     </div>
                                     :majorschoollist.ec_students.length===0?
                                     <div className="edu-txt-center color-grey-9 pt50">
-                                        <p className="mb20"><img className="edu-nodata-img mb20" src={require('./nodata.png')}/></p>
+                                        <p className="mb20"><img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/></p>
                                         <p>学生数据为空，请导入数据</p>
                                     </div>:majorschoollist.ec_students.map((item,key)=>{
                                         // console.log(item)
@@ -427,4 +402,4 @@ class EcStudentList extends Component {
     }
 }
 
-export default SnackbarHOC() ( TPMIndexHOC  ( EcStudentList ) );
+export default SnackbarHOC() (EcStudentList);