diff --git a/public/react/src/modules/ecs/css/ecCourseEvaluations.css b/public/react/src/modules/ecs/css/ecCourseEvaluations.css index 1b75574a1..8c8452b43 100644 --- a/public/react/src/modules/ecs/css/ecCourseEvaluations.css +++ b/public/react/src/modules/ecs/css/ecCourseEvaluations.css @@ -9,7 +9,12 @@ font-family:MicrosoftYaHei; font-weight:400; color:#05101A !important; + +} +.marginleft76{ + margin-left: 76px; } + #SystemParameters{ height: 81px; line-height: 40px; @@ -273,9 +278,9 @@ input{ min-width: 329px !important; } .ListTableLine li>.column-500{ - max-width: 310px !important; + max-width: 366px !important; text-align: left; - min-width: 310px !important; + min-width: 366px !important; } .color-666{ color:#666666 !important; diff --git a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js index bbb810429..04250c19e 100644 --- a/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js +++ b/public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js @@ -42,7 +42,11 @@ class EcCompletionCalculation extends Component { course_total_scoreaverage:0, calculatesetype:false, Spintype:false, - ismanager:false + ismanager:false, + course_achievement:"--", + course_rate:"--", + score_levels:[], + score_levelsdata:[], } } @@ -73,11 +77,18 @@ class EcCompletionCalculation extends Component { graduation_list:response.data.graduation_subitem_evaluations, target_list:response.data.course_targets, // target_score:response.data.target_score, - // ec_course_targets_count:response.data.graduation_subitem_evaluations, + ec_course_targets_count:response.data.course_targets.length, + course_achievement:response.data.course_achievement, + course_rate:response.data.course_rate, + score_levels:response.data.score_levels, + // score_levelsdata:response.data.course_targets.score_levels, // morelisttype:newmorelisttype, // course_total_scoreaverage:course_total_scoreaverage, // ismanager:response.data.is_manager }) + // console.log("componentDidMount"); + // console.log(response.data.score_levels); + // console.log(response.data.course_targets.score_levels); } }) .catch(function (error) { @@ -158,13 +169,23 @@ class EcCompletionCalculation extends Component { graduation_list:response.data.graduation_subitem_evaluations, target_list:response.data.course_targets, // target_score:response.data.target_score, - //ec_course_targets_count:response.data.graduation_subitem_evaluations, + ec_course_targets_count:response.data.course_targets.length, + course_achievement:response.data.course_achievement, + course_rate:response.data.course_rate, + score_levels:response.data.score_levels, + // score_levelsdata:, // morelisttype:newmorelisttype, // course_total_scoreaverage:course_total_scoreaverage, // ismanager:response.data.is_manager - }) - - + }); + // console.log("componentDidMount"); + // console.log(response.data.score_levels_map); + // Object.getOwnPropertyNames(response.data.score_levels_map).forEach(function(val) { + // console.log("正在循环"); + // console.log(val); + // }); + console.log(response.data.course_targets.score_levels); + // ec_course_targets:response.data.ec_course_targets, this.targetsget_navigation_data(response.data.ec_year_id,ec_course_id) if(calculatetype===true){ @@ -309,14 +330,14 @@ class EcCompletionCalculation extends Component { }) } render() { - let {Spintype,calculatesetype,ec_course_id,course_total_scoreaverage,ec_course_targets_count,schooldata,ecComponentState,course_total_score,total_rate_data,ec_course_targets,graduation_list,target_list,target_score,evaluate_result,morelisttype,titlemessage,completiontype,completionlist,ismanager} = this.state; + let {Spintype,calculatesetype,ec_course_id,course_total_scoreaverage,score_levels,ec_course_targets_count,course_achievement,schooldata,course_rate,ecComponentState,course_total_score,total_rate_data,ec_course_targets,graduation_list,target_list,target_score,evaluate_result,morelisttype,titlemessage,completiontype,completionlist,ismanager} = this.state; let TargetresList = (length) => { let target_listres = []; for(let i = 0; i < length; i++) { // target_listres.push(目标{length-i}) // target_listres.push(目标{i+1}) - target_listres.push(目标{length-i}) + target_listres.push(目标{i+1}) } return target_listres } @@ -325,28 +346,30 @@ class EcCompletionCalculation extends Component { let target_listress = []; for(let i = 0; i < length; i++) { // target_listres.push(目标{length-i}) - target_listress.push(目标{i+1}) + target_listress.push(目标{i+1}) // target_listres.push(目标{length-i}) } return target_listress } - let TargetresContentList = (length,value) => { - let target_listres = []; - if(value!=undefined){ - for(let i = 0; i < length; i++) { - - if(value[i]===1){ - target_listres.push() - }else{ - target_listres.push() - } - - } - target_listres.reverse() - return target_listres - } - } + let TargetresContentList = (data,value) => { + let target_listres = []; + if(data){ + if(data.length>0){ + for(var i=0;i) + } else{ + target_listres.push() + + } + } + } + } + // target_listres.reverse() + return target_listres + }; @@ -407,7 +430,9 @@ class EcCompletionCalculation extends Component { } return target_listres } - } + }; + // console.log(ec_course_targets_count); + // console.log("EcCompletionCalculation"); return (
毕业要求 {5} + 达成结果 达成目标值 达成实际值 @@ -579,41 +605,75 @@ class EcCompletionCalculation extends Component { :"" } + { Spintype===false?graduation_list.map((item,key)=>{ if(key===0){ return( -

5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}> - 毕业要求 - {item.ec_subitem_content} - 达成结果 - 达成目标值 - 达成实际值 - 课程权重 +

  • 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}> +
    + 毕业要求 +
    + {item.ec_subitem_content} +
    {TargetresList(ec_course_targets_count)} -

    +
    +
    + 达成结果 + 达成目标值 + 达成实际值 + 课程权重 +
    +
    • ) } }):"" } - -
    + {/*mynewtarget_scoreclassysls*/} + +
    { Spintype===false?graduation_list.map((item,key)=>{ return( -

    5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}> - {key+1} +

  • 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}> +
    + {key+1} +
    {item.content} - {item.status==="not_achieved"?"未完成":"完成"} - {item.objective_achievement===null?0:item.objective_achievement} - {item.actually_achievement===null?0:item.actually_achievement} - {item.weights===null||item.weights===0?立即配置:{item.weights}} - {TargetresContentList(ec_course_targets_count,item.target_position)} -

    +
    + {TargetresContentList(target_list,item.support_course_target_ids)} +
    +
    + {item.weights===null||item.weights===0?立即配置:{item.weights}} + {item.actually_achievement===null?0:item.actually_achievement} + {item.objective_achievement===null?0:item.objective_achievement} + {item.status==="not_achieved"?"未完成":"完成"} +
    +
    • //
  • 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}> @@ -683,9 +743,9 @@ class EcCompletionCalculation extends Component { {/* 平均数 */} {/* 平均数 */} {Total_rate_dataList(course_total_score)} - { - course_total_score.length===0? --:"" - } + { + course_rate===undefined||course_rate===null||course_rate===""||course_rate==="0"||course_rate===0? --:{course_rate} + }
    • :"" } {/*style={{width: 113*(total_rate_data+4)>1136?113*(total_rate_data+4):1136+"px"}}*/} @@ -718,7 +778,7 @@ class EcCompletionCalculation extends Component { {newTotal_rate_dataList(course_total_score-1,course_total_score)} {/* {course_total_score.length===0?"":course_total_score[course_total_score-1].total_score} */} { - course_total_score.length===0? --:{course_total_scoreaverage} + course_achievement===undefined||course_achievement===null||course_achievement===""||course_achievement==="0"||course_achievement===0? --:{course_achievement} } :"" } @@ -747,23 +807,24 @@ class EcCompletionCalculation extends Component { 平均分 最高分数 最低分数 - 90分以上 - 80-89分 - 70-79分 - 60-69分 - 50-59分 - 低于50分 + { + score_levels&&score_levels.map((i,k)=>{ + return( + {i.description} + ) + }) + }

    { - Spintype===false?target_score.map((i,k)=>{ + Spintype===false?target_list.map((i,k)=>{ return(
  • {k+1} - {i.average_score} - {i.top_score} - {i.low_score} + {i.standard_grade} + {i.maximum_score} + {i.minimum_score}
    {i.from90[0]}人
    {(i.from90[1]).toFixed(2)}%
    @@ -788,45 +849,46 @@ class EcCompletionCalculation extends Component {
    {i.from_down[0]}人
    {(i.from_down[1]).toFixed(2)}%
     +
    • ) }):"" } - { Spintype===true?}/>:"" } - - {target_score.length===0&&Spintype===false? -
  • - -- - -- - -- - -- - -
    --人
    -
    --%
    -     - -
    --人
    -
    --%
    -     - -
    --人
    -
    --%
    -     - -
    --人
    -
    --%
    -     - -
    --人
    -
    --%
    -     - -
    --人
    -
    --%
    -     -
    • :""} + {/*{ Spintype===true?}/>:"" }*/} + + {/*{target_list.length===0&&Spintype===false?*/} + {/*
  • */} + {/*--*/} + {/*--*/} + {/*--*/} + {/*--*/} + {/**/} + {/*
    --人
    */} + {/*
    --%
    */} + {/*    */} + {/**/} + {/*
    --人
    */} + {/*
    --%
    */} + {/*    */} + {/**/} + {/*
    --人
    */} + {/*
    --%
    */} + {/*    */} + {/**/} + {/*
    --人
    */} + {/*
    --%
    */} + {/*    */} + {/**/} + {/*
    --人
    */} + {/*
    --%
    */} + {/*    */} + {/**/} + {/*
    --人
    */} + {/*
    --%
    */} + {/*    */} + {/*
    • :""}*/}