diff --git a/public/react/src/modules/ecs/css/ecCourseEvaluations.css b/public/react/src/modules/ecs/css/ecCourseEvaluations.css index 8c8452b43..cb6c29a01 100644 --- a/public/react/src/modules/ecs/css/ecCourseEvaluations.css +++ b/public/react/src/modules/ecs/css/ecCourseEvaluations.css @@ -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; } diff --git a/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js index ae09b7886..3c2014bf2 100644 --- a/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js +++ b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/EcCourseEvaluationsbottom.js @@ -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 (
@@ -775,15 +773,15 @@ class EcCourseEvaluationsbottom extends Component { return(
{ - item.target_evaluate_data.length===0? -
  • -
    - {key+1} + item.course_achievement_methods.length===0? +
  • +
    + {key+1} - + - + @@ -795,11 +793,11 @@ class EcCourseEvaluationsbottom extends Component { - +
    - +
    @@ -894,20 +892,20 @@ class EcCourseEvaluationsbottom extends Component {
  • - :item.target_evaluate_data.map((i,k)=>{ + :item.course_achievement_methods.map((i,k)=>{ return( -
  • -
    - {key-k===key?key+1:""} +
  • +
    + {key-k===key?key+1:""} - - {i.evaluate_name} + + {i.course_evaluation.name} - + { - i.evaluation_relates_data.map((y,e)=>{ + i.course_evaluation_subitems.map((y,e)=>{ return( -
    {y.evaluation_relates_name+" "}
    +
    {y.name+" "}
    ) }) } @@ -930,11 +928,11 @@ class EcCourseEvaluationsbottom extends Component { } - +
    {i.percentage+"%"}
    - +
    {i.score}
    @@ -942,8 +940,8 @@ class EcCourseEvaluationsbottom extends Component {
    {/* 修改start*/}
    -
    -
    +
    +
    {/* 课程目标{sequenceid}:{ec_course_target_name} */} 课程目标{key+1}:{ec_course_target_name} diff --git a/public/react/src/modules/ecs/subroute/ecCourseEvaluations/eccourseevalut.css b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/eccourseevalut.css new file mode 100644 index 000000000..c9a05d7ec --- /dev/null +++ b/public/react/src/modules/ecs/subroute/ecCourseEvaluations/eccourseevalut.css @@ -0,0 +1,8 @@ +.yslinitials{ + + display: flex; + flex-direction:initial; +} +.yslpadding{ + padding: 0px 30px; +} \ No newline at end of file