m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_ec
杨树明 6 years ago
parent 05d7c03b03
commit cef1ca9799
2 changed files with 160 additions and 93 deletions
Show Stats Download Patch File Download Diff File

9
public/react/src/modules/ecs/css/ecCourseEvaluations.css
Unescape View File

@ -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;

244
public/react/src/modules/ecs/subroute/ecCompletion_calculation/EcCompletionCalculation.js
Unescape View File

@ -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(<span className="column-1 operationleft color-666" key={i}>目标{length-i}</span>)
// target_listres.push(<span className="column-2 operationleft color-666" key={i}>目标{i+1}</span>)
target_listres.push(<span className="column-1 operationright color-666" key={i}>目标{length-i}</span>)
target_listres.push(<span className="column-1 color-666" key={i}>目标{i+1}</span>)
}
return target_listres
}
@ -325,28 +346,30 @@ class EcCompletionCalculation extends Component {
let target_listress = [];
for(let i = 0; i < length; i++) {
// target_listres.push(<span className="column-1 operationleft color-666" key={i}>目标{length-i}</span>)
target_listress.push(<span className="column-2 operationleft color-666" key={i}>目标{i+1}</span>)
target_listress.push(<span className="column-2 operationleft color-666" key={i}>目标{i+1}</span>)
// target_listres.push(<span className="column-1 operationright color-666" key={i}>目标{length-i}</span>)
}
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(<span className="column-1 operationright color-green" key={i}><i class="iconfont icon-gouxuan color-green font-16 mr5"></i></span>)
}else{
target_listres.push(<span className="column-1 operationright color-666" key={i}><i class="iconfont icon-guanbi font-14 mr5"></i></span>)
}
}
target_listres.reverse()
return target_listres
}
}
let TargetresContentList = (data,value) => {
let target_listres = [];
if(data){
if(data.length>0){
for(var i=0;i<data.length;i++){
console.log("TargetresContentList");
if(data[i].id===value[0]){
target_listres.push(<span className={i===0?" column-1 color-green":" column-1 color-green"} key={i}><i class="iconfont icon-gouxuan color-green font-16 mr5"></i></span>)
} else{
target_listres.push(<span className={i===0?" column-1 color-666":"column-1 color-666"} key={i}><i class="iconfont icon-guanbi font-14 mr5"></i></span>)
}
}
}
}
// 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 (
<div className="newMain clearfix">
<Modal
@ -554,6 +579,7 @@ class EcCompletionCalculation extends Component {
<p className="clearfix lipadding20im" style={{minWidth:'1200px'}}>
<span className="column-1 color-666 mr16">毕业要求</span>
<span className="nowrap329">{5}</span>
<span className="column-1 operationright color-666">达成结果</span>
<span className="column-1 operationright color-666">达成目标值</span>
<span className="column-1 operationright color-666">达成实际值</span>
@ -579,41 +605,75 @@ class EcCompletionCalculation extends Component {
</li>
:""
}
<style>
{
`
.myliysls{
display: flex;
flex-direction:initial;
        }
`
}
</style>
{
Spintype===false?graduation_list.map((item,key)=>{
if(key===0){
return(
<p key={key} className="clearfix lipadding20im" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
<span className="column-1 color-666 mr16">毕业要求</span>
<span className="nowrap329">{item.ec_subitem_content}</span>
<span className="column-1 operationright color-666">达成结果</span>
<span className="column-1 operationright color-666">达成目标值</span>
<span className="column-1 operationright color-666">达成实际值</span>
<span className="column-1 operationright color-666">课程权重</span>
<li key={key} className="clearfix lipadding20im myliysls" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
<div className="myliysls">
<span className="column-1 color-666 mr16">毕业要求</span>
</div>
<span className="column-500 ">{item.ec_subitem_content}</span>
<div className="myliysls" >
{TargetresList(ec_course_targets_count)}
</p>
</div>
<div className="myliysls">
<span className="column-1 color-666">达成结果</span>
<span className="column-1 color-666">达成目标值</span>
<span className="column-1 color-666">达成实际值</span>
<span className="column-1 color-666">课程权重</span>
</div>
</li>
)
}
}):""
}
<div className="mynewtarget_scoreclassysls">
{/*mynewtarget_scoreclassysls*/}
<style>
{
`
.myliysls{
display: flex;
flex-direction:initial;
        }
`
}
</style>
<div className="">
{
Spintype===false?graduation_list.map((item,key)=>{
return(
<p key={key} className="clearfix lipadding20im" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
<span className="column-1 color-05101A ec_graduation_name " >{key+1}</span>
<li key={key} className="clearfix lipadding20im myliysls" style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380+15):1200+"px"}}>
<div className="myliysls ">
<span className="column-1 color-05101A mr16" >{key+1}</span>
</div>
<span className="column-500 color-05101A" data-tip-down={item.content}>{item.content}</span>
<span className={item.status==="not_achieved"?"column-1 operationright Systemnum mrj15":"column-1 operationright color-green mrj15"} style={{textAlign:"left"}}>{item.status==="not_achieved"?"未完成":"完成"}</span>
<span className="column-1 operationright color-05101A" style={{textAlign:"left"}}>{item.objective_achievement===null?0:item.objective_achievement}</span>
<span className="column-1 operationright" style={{textAlign:"left"}}>{item.actually_achievement===null?0:item.actually_achievement}</span>
{item.weights===null||item.weights===0?<span className="column-1 operationright" ><a href={schooldata.requirement_vs_courses} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 operationright" style={{textAlign:"left"}}>{item.weights}</span>}
{TargetresContentList(ec_course_targets_count,item.target_position)}
</p>
<div className="myliysls">
{TargetresContentList(target_list,item.support_course_target_ids)}
</div>
<div className="myliysls">
{item.weights===null||item.weights===0?<span className="column-1 " ><a href={schooldata.requirement_vs_courses} style={{color:'rgb(76, 172, 255)'}}>立即配置</a></span>:<span className="column-1 " style={{textAlign:"center"}}>{item.weights}</span>}
<span className="column-1 " style={{textAlign:"center"}}>{item.actually_achievement===null?0:item.actually_achievement}</span>
<span className="column-1 color-05101A" style={{textAlign:"center"}}>{item.objective_achievement===null?0:item.objective_achievement}</span>
<span className={item.status==="not_achieved"?"column-1 Systemnum mrj15":"column-1 color-green mrj15"} style={{textAlign:"center"}}>{item.status==="not_achieved"?"未完成":"完成"}</span>
</div>
</li>
// <li className={key+1===target_list.length?"clearfix newtarget_scoreclass marlr19":"clearfix newtarget_scoreclass marlr19"} key={key} style={{minWidth: ec_course_targets_count > 5 ? (76*(ec_course_targets_count+4)+380):1200+"px"}}>
@ -683,9 +743,9 @@ class EcCompletionCalculation extends Component {
{/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent"> 平均数 </span>*/}
{/*<span className="column-1 color-05101A ec_graduation_name mr16 colorTransparent "> 平均数 </span>*/}
{Total_rate_dataList(course_total_score)}
{
course_total_score.length===0? <span className="column-1 operationright">--</span>:""
}
{
course_rate===undefined||course_rate===null||course_rate===""||course_rate==="0"||course_rate===0? <span className="column-1 operationright">--</span>:<span className="column-1 color-red operationright">{course_rate}</span>
}
</li>:""
}
{/*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)}
{/* <span className="column-1 color-red operationright">{course_total_score.length===0?"":course_total_score[course_total_score-1].total_score}</span> */}
{
course_total_score.length===0? <span className="column-1 operationright">--</span>:<span className="column-1 color-red operationright">{course_total_scoreaverage}</span>
course_achievement===undefined||course_achievement===null||course_achievement===""||course_achievement==="0"||course_achievement===0? <span className="column-1 operationright">--</span>:<span className="column-1 color-red operationright">{course_achievement}</span>
}
</li>:""
}
@ -747,23 +807,24 @@ class EcCompletionCalculation extends Component {
<span className="column-1 color-666">平均分</span>
<span className="column-1 color-666">最高分数</span>
<span className="column-1 color-666">最低分数</span>
<span className="column-1 color-666">90分以上</span>
<span className="column-1 color-666">80-89分</span>
<span className="column-1 color-666">70-79分</span>
<span className="column-1 color-666">60-69分</span>
<span className="column-1 color-666">50-59分</span>
<span className="column-1 color-666">低于50分</span>
{
score_levels&&score_levels.map((i,k)=>{
return(
<span className="column-1 color-666">{i.description}</span>
)
})
}
</p>
{
Spintype===false?target_score.map((i,k)=>{
Spintype===false?target_list.map((i,k)=>{
return(
<li className={"clearfix newtarget_scoreclass lipadding10im"} key={k}>
<span className="column-1 color-05101A">{k+1}</span>
<span className="column-1 color-05101A">{i.average_score}</span>
<span className="column-1 colorFF6800">{i.top_score}</span>
<span className="column-1 color-green">{i.low_score}</span>
<span className="column-1 color-05101A">{i.standard_grade}</span>
<span className="column-1 colorFF6800">{i.maximum_score}</span>
<span className="column-1 color-green">{i.minimum_score}</span>
<span className="column-1 color-05101A">
<div>{i.from90[0]}人</div>
<div className="color999">{(i.from90[1]).toFixed(2)}%</div>
@ -788,45 +849,46 @@ class EcCompletionCalculation extends Component {
<div>{i.from_down[0]}人</div>
<div className="color999">{(i.from_down[1]).toFixed(2)}%</div>
</span>
</li>
)
}):""
}
{ Spintype===true?<Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }
{target_score.length===0&&Spintype===false?
<li className={"clearfix newtarget_scoreclass lipadding10im"}>
<span className="column-1 color-05101A">--</span>
<span className="column-1 color-05101A">--</span>
<span className="column-1 colorFF6800">--</span>
<span className="column-1 color-green">--</span>
<span className="column-1 color-05101A">
<div>--人</div>
<div className="color999">--%</div>
</span>
<span className="column-1 color-05101A">
<div>--人</div>
<div className="color999">--%</div>
</span>
<span className="column-1 color-05101A">
<div>--人</div>
<div className="color999">--%</div>
</span>
<span className="column-1 color-05101A">
<div>--人</div>
<div className="color999">--%</div>
</span>
<span className="column-1 color-05101A">
<div>--人</div>
<div className="color999">--%</div>
</span>
<span className="column-1 color-05101A">
<div>--人</div>
<div className="color999">--%</div>
</span>
</li>:""}
{/*{ Spintype===true?<Spin className="Spinlarge" indicator={<Icon type="loading" style={{ fontSize: 30 }} spin />}/>:"" }*/}
{/*{target_list.length===0&&Spintype===false?*/}
{/*<li className={"clearfix newtarget_scoreclass lipadding10im"}>*/}
{/*<span className="column-1 color-05101A">--</span>*/}
{/*<span className="column-1 color-05101A">--</span>*/}
{/*<span className="column-1 colorFF6800">--</span>*/}
{/*<span className="column-1 color-green">--</span>*/}
{/*<span className="column-1 color-05101A">*/}
{/*<div>--人</div>*/}
{/*<div className="color999">--%</div>*/}
{/*</span>*/}
{/*<span className="column-1 color-05101A">*/}
{/*<div>--人</div>*/}
{/*<div className="color999">--%</div>*/}
{/*</span>*/}
{/*<span className="column-1 color-05101A">*/}
{/*<div>--人</div>*/}
{/*<div className="color999">--%</div>*/}
{/*</span>*/}
{/*<span className="column-1 color-05101A">*/}
{/*<div>--人</div>*/}
{/*<div className="color999">--%</div>*/}
{/*</span>*/}
{/*<span className="column-1 color-05101A">*/}
{/*<div>--人</div>*/}
{/*<div className="color999">--%</div>*/}
{/*</span>*/}
{/*<span className="column-1 color-05101A">*/}
{/*<div>--人</div>*/}
{/*<div className="color999">--%</div>*/}
{/*</span>*/}
{/*</li>:""}*/}
</div>

Write Preview
Loading…
Cancel
Save