diff --git a/app/views/ec_graduation_requirements/edit.js.erb b/app/views/ec_graduation_requirements/edit.js.erb index fab4ee00..e79b1e66 100644 --- a/app/views/ec_graduation_requirements/edit.js.erb +++ b/app/views/ec_graduation_requirements/edit.js.erb @@ -37,5 +37,10 @@ $("#requirementNew").find("input[name='requirement']").focus(); }else{ $("#edit_add_notice").removeClass("none").html("请先保存!"); } +var subInputs=document.getElementsByName("subitems[]"); +for (var i = 0; i < subInputs.length; i++) { + autoTextarea(subInputs[i], 0, 140); +} +autoTextarea(document.getElementsByName("requirement")[0], 0, 140); diff --git a/app/views/ec_years/graduation_requirement.html.erb b/app/views/ec_years/graduation_requirement.html.erb index 76833188..8de398e2 100644 --- a/app/views/ec_years/graduation_requirement.html.erb +++ b/app/views/ec_years/graduation_requirement.html.erb @@ -55,6 +55,11 @@ for(var i=0;i'; $(".ListTableLine").append(html); $("#requirementNew").find("input[name='requirement']").focus(); + var subInputs=document.getElementsByName("subitems[]"); + for (var i = 0; i < subInputs.length; i++) { + autoTextarea(subInputs[i], 0, 140); + } + autoTextarea(document.getElementsByName("requirement")[0], 0, 140); flagAdd=false; } diff --git a/public/react/src/modules/ec/css/ecCourseEvaluations.css b/public/react/src/modules/ec/css/ecCourseEvaluations.css index 11ee74bb..80bd587c 100644 --- a/public/react/src/modules/ec/css/ecCourseEvaluations.css +++ b/public/react/src/modules/ec/css/ecCourseEvaluations.css @@ -233,7 +233,7 @@ input{ .newSystem .newtarget_scoreclass{ padding: 10px 0px !important; - margin: 0px 30px !important; + margin: 0px 20px !important; } .newSystem .newtarget_target{ diff --git a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js index f76e065d..002bb0ab 100644 --- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js +++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js @@ -556,7 +556,7 @@ class EcCompletionCalculation extends Component { { Spintype===true?}/>:"" } - { + { graduation_list.length===0&&Spintype===false?
  • {/* {item.ec_graduation_name} */} @@ -575,7 +575,7 @@ class EcCompletionCalculation extends Component { if(key===0){ return( -

    1300?168.6*(ec_course_targets_count+3):1200+"px"}}> +

    5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}> 毕业要求 {item.ec_subitem_content} 达成结果 @@ -595,7 +595,7 @@ class EcCompletionCalculation extends Component { Spintype===false?graduation_list.map((item,key)=>{ return( -

  • 1300?162*(ec_course_targets_count+3):1137+"px"}}> +
  • 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}> {/* {item.ec_graduation_name} */} {key+1} {item.ec_subitem_content} @@ -621,7 +621,7 @@ class EcCompletionCalculation extends Component {
    -

    1200?(113*(total_rate_data+4.5))+63:1200+"px"}}> +

    5 ? (180 * total_rate_data+226+16) : 1200+"px"}}> {/*序号*/} 课程目标 {/*姓名*/} @@ -651,7 +651,7 @@ class EcCompletionCalculation extends Component { } { Spintype===true?}/>:"" } { - Spintype===false?

  • 1200?(113*(total_rate_data+4.5))+63:1200+"px"}}> + Spintype===false?
  • 5 ? (180 * total_rate_data+226+16) : 1200 + "px"}}> 占比 {/*colorTransparent*/} {/* 平均数 */}