From e7a6146d19da8efc114fc8b7b0762ad5353d906e Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 24 Sep 2019 17:34:16 +0800
Subject: [PATCH] init

---
 .../react/src/modules/ecs/EcSetting/index.js  |  5 +-
 .../EcSetting/reachCalculationInfo/index.js   | 18 ++---
 .../EcSetting/reachCalculationInfo/index.scss | 74 +++++++++++++++++++
 3 files changed, 83 insertions(+), 14 deletions(-)
 create mode 100644 public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.scss

diff --git a/public/react/src/modules/ecs/EcSetting/index.js b/public/react/src/modules/ecs/EcSetting/index.js
index 7c546c595..7d6f8de9d 100644
--- a/public/react/src/modules/ecs/EcSetting/index.js
+++ b/public/react/src/modules/ecs/EcSetting/index.js
@@ -142,8 +142,11 @@ class EcSetting extends React.Component {
 								<Route extra path='/ecs/major_schools/:major_school_id/years/:ec_year_id/requirement_vs_courses'
 											 render={ (props) => (<CourseSupports {...this.props} {...props} {...this.state} />) }></Route>
 
+                
+								{/*达成度评价结果*/}
+								<Route extra path='/ecs/major_schools/:major_school_id/years/:ec_year_id/reach_calculation_info'
+											 render={ (props) => (<CourseSupports {...this.props} {...props} {...this.state} />) }></Route>
 
-								
               </Switch>
             )
           }
diff --git a/public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.js b/public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.js
index da53acc7b..170b8d7fe 100644
--- a/public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.js
+++ b/public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.js
@@ -6,12 +6,12 @@ import axios from 'axios';
 
 import { Table, Divider, Tag, Checkbox, InputNumber, Spin, Icon } from 'antd';
 
-import EcTitleCourseEvaluations from '../ecTitle/ecTitle'
-import { ECModalHOC } from '../common/ECModalHOC'
+// import EcTitleCourseEvaluations from '../ecTitle/ecTitle'
+import { ECModalHOC } from '../../common/ECModalHOC'
 
 import 'antd/lib/style/index.css';
 
-import './style.css'
+import './style.scss'
 
 
 const onCheckBoxClick = (that, rowData) =>{
@@ -596,14 +596,7 @@ class GraduatesRequirement extends Component {
       //   showCalculateButton = true;
       // }
 	    return (
-        <div className="newMain clearfix">
-          <div className="educontent mb290">
-            <EcTitleCourseEvaluations
-                {...this.props}
-              schooldata={schooldata}
-              ecComponentState={'ecCompletion'}
-              ecpath={"reach_calculation_info"}
-            ></EcTitleCourseEvaluations>
+            
             <div className="contentWrap graduatesRequirement">
 
               <ul className="clearfix padding20-30 bor-bottom-greyE backgroundFFF"
@@ -676,8 +669,7 @@ class GraduatesRequirement extends Component {
               ></Table>
               
             </div>
-          </div>
-        </div>
+            
 	    );
   	}
 }
diff --git a/public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.scss b/public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.scss
new file mode 100644
index 000000000..56a260b5e
--- /dev/null
+++ b/public/react/src/modules/ecs/EcSetting/reachCalculationInfo/index.scss
@@ -0,0 +1,74 @@
+.newMain  {
+    height: 100%;
+  }
+  .contentWrap {
+      height: 100%;
+      overflow: auto;
+  }
+  .bor-bottom-greyE {
+      border-bottom: 1px solid #EEEEEE!important;
+  }
+  .padding20-30 {
+      padding: 20px 30px;
+      box-sizing: border-box;
+  }
+  .clearfix {
+      clear: both;
+      zoom: 1;
+  }
+  .bor-bottom-greyE {
+      border-bottom: 1px solid #EEEEEE!important;
+  }
+  .courseSystem, .SystemParameters {
+    font-family: MicrosoftYaHei;
+    font-weight: 400;
+    line-height: 45px;
+  }
+  .courseSystem {
+    font-size: 18px;
+    color: #05101a;
+  }
+  .font-18 {
+    font-size: 18px!important;
+  }
+  .fl {
+    float: left!important;
+  }
+  .backgroundFFF{
+    background: #FFF;
+  }
+  .ant-table-body  table thead tr th{
+    background: #FFF;
+  }
+  .ant-table-body  table .ant-table-thead :nth-child(1) th{
+    border-right: 1px solid #e8e8e8;
+  }
+  .ant-table-body  table .ant-table-thead :nth-child(1) :nth-child(4){
+    /* border-right: 1px solid transparent; */
+  }
+  .ant-table-body  table .ant-table-thead :nth-child(2) th{
+    border-top: 1px solid #e8e8e8;
+    border-right: 1px solid #e8e8e8;
+  }
+  
+  .ant-table-bordered .ant-table-thead > tr > th, .ant-table-bordered .ant-table-tbody > tr > td {
+    text-align: center;
+  }
+  
+  .graduatesRequirement .ant-table-wrapper {
+    padding: 20px 10px;
+    background: #fff;
+    margin-top: -16px;
+    margin-bottom: 40px;
+  }
+  
+  .graduatesRequirement .ant-table-thead > tr.ant-table-row-hover:not(.ant-table-expanded-row) > td, 
+  .graduatesRequirement .ant-table-tbody > tr.ant-table-row-hover:not(.ant-table-expanded-row) > td, 
+  .graduatesRequirement .ant-table-thead > tr:hover:not(.ant-table-expanded-row) > td, 
+  .graduatesRequirement .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
+    background: transparent !important;
+  }
+  
+  .mt60{
+      margin-top:60px;
+  }
\ No newline at end of file