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

调整

Browse Source
dev_ec
杨树林 5 years ago
parent 7cd79e92ad
commit 17043017d6
3 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -165,6 +165,9 @@ input{
margin-left: 8px;
padding-left: 25px !important;
}
.percentages{
margin-left: 8px;
}
.Coursetitle{
margin-bottom:0px !important;
}
@ -172,6 +175,11 @@ input{
padding-left: 30px !important;
width: 70px !important;
}
.textaligncenters{
width: 133px !important;
display: block;
float: left;
}
.ml72{
margin-left:72px;
}
@ -218,6 +226,10 @@ input{
width: 589px !important;
display: inline-block;
}
.evaluationdataClassy{
width: 589px !important;
display: inline-block;
}
.absolute{
position:absolute;
}

74
public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js
Unescape View File

@ -16,7 +16,7 @@ import 'antd/dist/antd.css';
import '../../css/ecCourseEvaluations.css';
import EcTitleCourseEvaluations from "../../ecTitle/ecTitle";
import './eccourseevalut.css'
const $ = window.$;
// 课程目标评价方法
@ -48,7 +48,7 @@ class EcCourseEvaluationsbottom extends Component {
meweacoursetype:false,
newshowredvalue:false,
percentagetype:false,
ismanager:false
ismanager:true
}
}
getec_course_achievement_methods=()=>{
@ -62,9 +62,9 @@ class EcCourseEvaluationsbottom extends Component {
})
.then((response)=>{
this.setState({
achievement_list:response.data.achievement_list,
achievement_list:response.data.course_targets,
spinningstate:false,
ismanager:response.data.is_manager
ismanager:true
})
}).catch(function (error) {
console.log(error);
@ -72,11 +72,11 @@ class EcCourseEvaluationsbottom extends Component {
}
// this.setState({
// achievement_list:[
// {target_evaluate_data: [
// {course_achievement_methods: [
// {
// evaluate_id: 24,
// evaluate_name: "期末考试",
// evaluation_relates_data: [
// course_evaluation_subitems: [
// {evaluation_relates_id: 31, evaluation_relates_name: "期末考试1目标1考题"},
// {evaluation_relates_id: 32, evaluation_relates_name: "期末考试1目标2考题"}
// ],
@ -120,14 +120,12 @@ class EcCourseEvaluationsbottom extends Component {
const url =`/ec_courses/${course_id}/course_targets/with_achievement_methods.json`;
// /ec_courses//course_targets/course_achievement_methods.json
// const url = `/ec_course_achievement_methods?ec_course_id=`+course_id;
axios.get(url, {
withCredentials: true,
})
axios.get(url)
.then((response)=>{
this.setState({
achievement_list:response.data.achievement_list,
achievement_list:response.data.course_targets,
spinningstate:false,
ismanager:response.data.is_manager
ismanager:true
})
}).catch(function (error) {
console.log(error);
@ -232,7 +230,7 @@ class EcCourseEvaluationsbottom extends Component {
newec_course_target_id:id,
methodologytype:true,
ec_course_target_name:response.data.ec_course_target_name,
ismanager:response.data.is_manager
ismanager:true
})
// this.setState({
@ -440,9 +438,9 @@ class EcCourseEvaluationsbottom extends Component {
})
.then((response)=>{
this.setState({
achievement_list:response.data.achievement_list,
achievement_list:response.data.course_targets,
spinningstate:false,
ismanager:response.data.is_manager
ismanager:true
})
}).catch(function (error) {
@ -584,7 +582,7 @@ class EcCourseEvaluationsbottom extends Component {
achievement_methods:undefined,
eacoursesavetypes:false,
newshowredvalue:false,
ismanager:response.data.is_manager
ismanager:true
})
// $("#ecCourseEvaluationsbottomsubmit").hide();
// $("#SystemParametersbottom").hide();
@ -671,8 +669,8 @@ class EcCourseEvaluationsbottom extends Component {
percentagetype,
ismanager
} = this.state;
console.log("EcCourseEvaluationsbottom12345");
console.log(achievement_list);
// console.log("EcCourseEvaluationsbottom12345");
// console.log(achievement_list);
return (
<div className="newMain clearfix">
<div className="educontent mb50">
@ -775,15 +773,15 @@ class EcCourseEvaluationsbottom extends Component {
return(
<div key={key} >
{
item.target_evaluate_data.length===0?
<li key={key} className="clearfix" style={{width:"1140px"}}>
<div style={{ width:'99.8%'}} style={{display:parseInt(target_id)===item.id?"none":"block"}}>
<span className="column-1 mt4 textaligncenter"><span>{key+1}</span></span>
item.course_achievement_methods.length===0?
<li key={key} className="clearfix" >
<div style={{ width:'99.8%'}} className={"yslpadding"} style={{display:parseInt(target_id)===item.id?"none":"block"}}>
<span className="column-1 mt4 textaligncenters"><span>{key+1}</span></span>
<span>
<span className="column-1 ml80 mt4">
<span className="column-1 textaligncenters mt4">
<span></span>
</span>
<span className="column-1 ml80 color99 mt4 newtextaligncenter">
<span className="column-1 ml15 textaligncenters color99 mt4 newtextaligncenter evaluationdataClassy">
<span></span>
</span>
<span className="column-1 operationright mt4">
@ -795,11 +793,11 @@ class EcCourseEvaluationsbottom extends Component {
</span>
<span className="column-1 ml15 operationright mt4 percentage">
<span className="column-1 operationright mt4 percentages">
<div></div>
</span>
<span className="column-1 ml15 operationright mt4">
<span className="column-1 mr20 operationright mt4">
<div className="ColorF68"></div>
</span>
@ -894,20 +892,20 @@ class EcCourseEvaluationsbottom extends Component {
</li>
:item.target_evaluate_data.map((i,k)=>{
:item.course_achievement_methods.map((i,k)=>{
return(
<li key={key} className={achievement_list&&achievement_list.length-1===key?item.target_evaluate_data.length-1===k?"clearfix":"bordereaeaea clearfix":item.target_evaluate_data.length-1===k?"bordereaeaeas clearfix":" bordereaeaea clearfix" } style={{width:"1140px",display:parseInt(target_id)===item.target_id&&methodologytype===true?item.target_evaluate_data.length-1===k?'block':"none":"block"}}>
<div style={{ width:'99.8%'}} style={{display:parseInt(target_id)===item.target_id&&methodologytype===true?"none":"block"}} >
<span className="column-1 mt4 textaligncenter absolute"><span>{key-k===key?key+1:""}</span></span>
<li key={key} className={achievement_list&&achievement_list.length-1===key?item.course_achievement_methods.length-1===k?"clearfix yslinitials ":" yslinitials bordereaeaea clearfix":item.course_achievement_methods.length-1===k?" yslinitials bordereaeaeas clearfix":" yslinitials bordereaeaea clearfix" } style={{display:parseInt(target_id)===item.target_id&&methodologytype===true?item.course_achievement_methods.length-1===k?'block':"none":"block"}}>
<div style={{ width:'99.8%'}} className={"yslpadding"} style={{display:parseInt(target_id)===item.target_id&&methodologytype===true?"none":"block"}} >
<span className="column-1 mt4 textaligncenters">{key-k===key?key+1:""}</span>
<span>
<span className="column-1 ml100 mt4 absolute">
<span>{i.evaluate_name}</span>
<span className="column-1 textaligncenters mt4 ">
{i.course_evaluation.name}
</span>
<span className="column-1 ml80 color99 mt4 newtextaligncenter evaluationdataClass" style={{marginLeft: '72px'}}>
<span className="column-1 ml15 textaligncenters color99 mt4 newtextaligncenter evaluationdataClassy" >
{
i.evaluation_relates_data.map((y,e)=>{
i.course_evaluation_subitems.map((y,e)=>{
return(
<div key={y} className="boxinline">{y.evaluation_relates_name+" "} </div>
<div key={y} >{y.name+" "} </div>
)
})
}
@ -930,11 +928,11 @@ class EcCourseEvaluationsbottom extends Component {
}
<span className="column-1 ml15 operationright mt4 percentage">
<span className="column-1 operationright mt4 percentages">
<div>{i.percentage+"%"}</div>
</span>
<span className="column-1 ml15 operationright mt4">
<span className="column-1 mr20 operationright mt4">
<div className="ColorF68">{i.score}</div>
</span>
@ -942,8 +940,8 @@ class EcCourseEvaluationsbottom extends Component {
</div>
{/* 修改start*/}
<div className="ListTableLine newSystem" id="EvaluationsList">
<div style={{display:parseInt(target_id)===item.target_id&&item.target_evaluate_data.length-1===k?"block":"none"}} >
<div className="edu-back-white eacourse" id="SystemParametersbottom" style={{display:parseInt(target_id)===item.target_id&&item.target_evaluate_data.length-1===k?"block":"none"}}>
<div style={{display:parseInt(target_id)===item.target_id&&item.course_achievement_methods.length-1===k?"block":"none"}} >
<div className="edu-back-white eacourse" id="SystemParametersbottom" style={{display:parseInt(target_id)===item.target_id&&item.course_achievement_methods.length-1===k?"block":"none"}}>
<div className="padding20-30" id="SystemParameters" style={{paddingLeft:'0px'}}>
{/* <span className="fl SystemParameters">课程目标{sequenceid}：{ec_course_target_name}</span> */}
<span className="fl SystemParameters">课程目标{key+1}：{ec_course_target_name}</span>

8
public/react/src/modules/ecs/subroute/ecCourseEvaluations/eccourseevalut.css
Unescape View File

@ -0,0 +1,8 @@
.yslinitials{
display: flex;
flex-direction:initial;
}
.yslpadding{
padding: 0px 30px;
}
Write Preview
Loading…
Cancel
Save