修改 导出

public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.js

@@ -290,7 +290,7 @@ let tableData = []
           // }
         })
         // if (real_value_total >= target_value_total && real_value_total != 0) {
-          nameRowData.status = innerItem.status != "not_achieved" && parseFloat(course.actually_reach) != 0
+          nameRowData.status = innerItem.status != "not_achieved" && parseFloat(innerItem.actually_reach) != 0
         // }
         maxCouseCount = Math.max(maxCouseCount, innerItem.course_supports.length)
         tableData.push(nameRowData)
@@ -513,7 +513,9 @@ class GraduatesRequirement extends Component {
       let major_school_id =this.props.match.params.major_school_id;
       let ec_year_id =this.props.match.params.ec_year_id;
 
-      var Url = `/ec_major_schools/${major_school_id}/academic_years/${ec_year_id}/set_calculation_value`;
+      var url = `/ec_major_schools/${major_school_id}/academic_years/${ec_year_id}/set_calculation_value`;
+      url = `/ec_years/${this.state.ec_year_id}/reach_criteria.json`
+
       if (this.state.daChengYuZhi == undefined) {
         this.props.showSingleButtonModal('提示', '达成阈值不能为空！')
         return;
@@ -521,8 +523,8 @@ class GraduatesRequirement extends Component {
         this.props.showSingleButtonModal('提示', '达成阈值必须大于0，且小于等于1')
         return;
       }
-			axios.post(Url, {
-				calculation_value : this.state.daChengYuZhi
+			axios.post(url, {
+				reach_criteria : this.state.daChengYuZhi
 			}).then((response) => {
         
 				if( response.data.status === 1 ) {
@@ -545,23 +547,23 @@ class GraduatesRequirement extends Component {
       })
       this.fetchData(ec_year_id)
 
-      const Url =`/ec_major_schools/get_navigation_data?ec_year_id=`+ec_year_id;
-      axios.get(Url, {
-            // 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/get_navigation_data?ec_year_id=`+ec_year_id;
+      // axios.get(Url, {
+      //       // 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);
+      //     });
     }
     fetchData(ec_year_id) {
       // const url = `ec_courses/7/get_calculation_data`
@@ -581,8 +583,8 @@ class GraduatesRequirement extends Component {
             // 先计算，再触发render
             this.setState({
               calculationData: response.data.calculation_data,
-              daChengYuZhi: response.data.calculation_value,
-              daChengYuZhiSaved: response.data.calculation_value,
+              daChengYuZhi: response.data.reach_threshold,
+              daChengYuZhiSaved: response.data.reach_threshold,
               course_ids: response.data.course_ids,
               is_manager: response.data.is_manager,
               calculating: false,
@@ -632,7 +634,7 @@ class GraduatesRequirement extends Component {
 			const { match, history, current_user } = this.props
       const { daChengYuZhiEditableMode, daChengYuZhi, daChengYuZhiSaved, is_manager } = this.state
       let { schooldata } =this.state;
-      let { example_major, template_major } = schooldata;
+      // let { example_major, template_major } = schooldata;
       let showCalculateButton = is_manager;
       // let showCalculateButton = false;
       // if (example_major && current_user.admin || !example_major && template_major) {
@@ -640,7 +642,7 @@ class GraduatesRequirement extends Component {
       // }
 	    return (
             
-            <div className="contentWrap graduatesRequirement">
+            <div className="educontent graduatesRequirement">
 
               <ul className="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
                 style={{ 'marginBottom': '0px' }} >
@@ -685,7 +687,7 @@ class GraduatesRequirement extends Component {
 
                 <a href="javascript:void(0)" 
                   class="white-btn edu-orangeback-btn fr mr10" 
-                  href={`/ec_major_schools/${this.props.match.params.major_school_id}/academic_years/${this.props.match.params.ec_year_id}/export_reach_requirements_data.xls`}
+                  href={`/api/ec_years/${this.state.ec_year_id}/reach_evaluation.xlsx`}
                 >导出</a>
                 {/* /ec_major_schools/3/academic_years/5/export_reach_requirements_data.xls
                   let major_school_id =this.props.match.params.major_school_id;