Merge branches 'dev_aliyun' and 'dev_ec' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

@@ -61,13 +61,15 @@ class CourseSupports extends Component {
 								this.setState({
 										data:response.data
 								})
-						}
-						if(response.data.graduation_subitems.length===0){
-								this.setState({
+							  console.log(response.data.graduation_subitems.length)
+								if(response.data.graduation_subitems.length===0){
+									this.setState({
 										Supportstype:true,
 										Supportslist:'数据为空，请去毕业要求——>毕业要求指标点分解列表配置数据'
-								})
+									})
+								}
 						}
+
 				})
 				.catch(function (error) {
 						console.log(error);
@@ -426,7 +428,7 @@ class CourseSupports extends Component {
     }
     render() {
         const Option = Select.Option;
-        let {data,ec_courses_list,editcourse,editnum,index,ec_year_id,schooldata,ecComponentState,hidesupport,supportid,Editkey,titlemessage,Supportstype,Supportslist,Supportssum,Supportsclass,major_school_id} = this.state;
+        let {data,ec_courses_list,editcourse,editnum,index,ec_year_id,Supportsclasskey,ecComponentState,hidesupport,supportid,Editkey,titlemessage,Supportstype,Supportslist,Supportssum,Supportsclass,major_school_id} = this.state;
         var list = (length) => {
             var res = [];
             for(var i = 0; i < length; i++) {
@@ -510,15 +512,16 @@ class CourseSupports extends Component {
 
                                             {
                                                 item.course_supports.map((t,kes)=>{
+
                                                     return(
                                                         <span key={kes} className="column-1" 
                                                         style={{
                                                             display:Editkey!=key?"block":'none',
                                                             marginRight: '-1px'
                                                         }}>
-                                                        <div data-tip-down={t.name} className={t.top_relation===true?"DDred columnbox":"columnbox"}
+                                                        <div data-tip-down={t.ec_course_name} className={t.top_relation===true?"DDred columnbox":"columnbox"}
                                                         style={{textAlign: 'center'}}
-                                                        >{t.name.length>12?t.name.substring(0, 10)+"...":t.name}</div>
+                                                        >{t.ec_course_name.length>12?t.ec_course_name.substring(0, 10)+"...":t.ec_course_name}</div>
                                                         <div className={t.top_relation===true?"DDred":""}
                                                          style={{textAlign: 'center'}}
                                                         >（{t.weigths}）</div>