From 2a3e7090ae4aa450926abb0ba522cd2e6c97dd1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 24 May 2019 15:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/common/index.html.erb | 2 +- .../ec_major_schools/_year_list.html.erb | 12 +++---- app/views/ec_major_schools/show.html.erb | 33 +++++++++++-------- app/views/ec_years/ec_course_setting.html.erb | 7 ++-- .../ec_years/graduation_requirement.html.erb | 11 ++++--- .../requirement_vs_objective.html.erb | 11 ++++--- .../ec_years/requirement_vs_standard.html.erb | 11 ++++--- .../ec_years/training_objectives.html.erb | 11 ++++--- app/views/ecs/_ec_top_navigation.html.erb | 8 +++-- app/views/ecs/department.html.erb | 11 ++++--- .../javascripts/educoder/edu_application.js | 16 +++++++++ public/react/.vscode/settings.json | 3 -- public/react/src/App.js | 15 ++++++--- .../ecCompletion_calculation.js | 3 ++ .../ecCourseEvaluations.js | 3 +- .../ecCourseEvaluationsbottom.js | 5 ++- .../ec/ecCourseSupportSetting/index.js | 1 + .../ec/ecCourseSupports/ecCourseSupports.js | 5 ++- .../ecGradeEvaluations/ecGradeEvaluations.js | 2 ++ .../modules/ec/ecStudentList/ecStudentList.js | 10 ++++-- .../react/src/modules/ec/ecTitle/ecTitle.css | 2 +- .../react/src/modules/ec/ecTitle/ecTitle.js | 11 +++++-- .../GraduatesRequirement.js | 14 ++++++-- public/stylesheets/educoder/edu-all.css | 8 ++--- public/stylesheets/educoder/edu-main.css | 9 +++++ 25 files changed, 153 insertions(+), 71 deletions(-) delete mode 100644 public/react/.vscode/settings.json diff --git a/app/views/common/index.html.erb b/app/views/common/index.html.erb index 4ffc07d1..e5922129 100644 --- a/app/views/common/index.html.erb +++ b/app/views/common/index.html.erb @@ -1 +1 @@ -Educoder
\ No newline at end of file +Educoder
\ No newline at end of file diff --git a/app/views/ec_major_schools/_year_list.html.erb b/app/views/ec_major_schools/_year_list.html.erb index 45a85d29..1e561782 100644 --- a/app/views/ec_major_schools/_year_list.html.erb +++ b/app/views/ec_major_schools/_year_list.html.erb @@ -15,12 +15,12 @@ <%= graduation_requirements > 0 ? graduation_requirements : @btn_text %> - - <% students = year.ec_year_students.count %> - - <%= students > 0 ? students : @btn_text %> - - + + + + + + <% courses = year.ec_courses.count %> diff --git a/app/views/ec_major_schools/show.html.erb b/app/views/ec_major_schools/show.html.erb index 05b58399..c3e4c924 100644 --- a/app/views/ec_major_schools/show.html.erb +++ b/app/views/ec_major_schools/show.html.erb @@ -4,21 +4,26 @@

-

- <%= @major.name %> +

@@ -31,7 +36,7 @@ 届别 培养目标 毕业要求 - 学生 + 课程体系 课程目标
（达成情况） 毕业要求指标点
（达成情况） diff --git a/app/views/ec_years/ec_course_setting.html.erb b/app/views/ec_years/ec_course_setting.html.erb index 865d7733..9a697ba3 100644 --- a/app/views/ec_years/ec_course_setting.html.erb +++ b/app/views/ec_years/ec_course_setting.html.erb @@ -1,9 +1,10 @@
<%= render :partial => "ecs/ec_top_navigation" %> -

- 课程体系（<%= @ec_courses.count %>） -

+
    +
  • 课程体系（<%= @ec_courses.count %>）
    • +

    提供模板支持课程信息导入，亦可直接新增课程；并继续完成每门课程的评估机制配置查看详情

    +

温馨提醒：请下载课程模板（点击下载），将本届所有参与认证的课程名称导入系统，以便录入教学活动相关数据 <%= file_field_tag 'attachments[dummy][file]', diff --git a/app/views/ec_years/graduation_requirement.html.erb b/app/views/ec_years/graduation_requirement.html.erb index 955f226d..eab92924 100644 --- a/app/views/ec_years/graduation_requirement.html.erb +++ b/app/views/ec_years/graduation_requirement.html.erb @@ -10,12 +10,15 @@

<%= render :partial => "ecs/ec_top_navigation" %>
-

- 毕业要求(及其指标点) +

    +
  • +

    毕业要求(及其指标点)

    +

    请结合本专业特色修改毕业要求文字描述及指标点，需完全覆盖12项通用标准查看详情

    +
    • <% if @template_major || @ec_major_school.template_major %> - <%=link_to "导出毕业要求", graduation_requirement_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn" %> + <%=link_to "导出毕业要求", graduation_requirement_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn mt25" %> <% end %> -

    +

指标点 diff --git a/app/views/ec_years/requirement_vs_objective.html.erb b/app/views/ec_years/requirement_vs_objective.html.erb index ad49d552..fc5c9198 100644 --- a/app/views/ec_years/requirement_vs_objective.html.erb +++ b/app/views/ec_years/requirement_vs_objective.html.erb @@ -1,12 +1,15 @@

<%= render :partial => "ecs/ec_top_navigation" %>
-

- 毕业要求对培养目标的支撑 +

    +
  • +

    毕业要求对培养目标的支撑

    +

    用矩阵图的形式说明本专业毕业要求对培养目标的支撑关系，鼠标左键单击单元格即可查看详情

    +
    • <% if @template_major || @ec_major_school.template_major %> - <%=link_to "导出矩阵", requirement_vs_objective_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn" %> + <%=link_to "导出矩阵", requirement_vs_objective_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn mt25" %> <% end %> -

    +

表示支撑 diff --git a/app/views/ec_years/requirement_vs_standard.html.erb b/app/views/ec_years/requirement_vs_standard.html.erb index 90c4ecce..64acade8 100644 --- a/app/views/ec_years/requirement_vs_standard.html.erb +++ b/app/views/ec_years/requirement_vs_standard.html.erb @@ -1,12 +1,15 @@

<%= render :partial => "ecs/ec_top_navigation" %>
-

- 毕业要求对通用标准的支撑 +

    +
  • +

    毕业要求对通用标准的支撑

    +

    用矩阵图的形式说明本专业毕业要求对12项通用标准的覆盖关系，鼠标左键单击单元格即可查看详情

    +
    • <% if @template_major || @ec_major_school.template_major %> - <%=link_to "导出矩阵", requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn" %> + <%=link_to "导出矩阵", requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id, :format => 'xls'), :class => "fr white-btn edu-blueback-btn mt25" %> <% end %> -

    +

表示支撑 diff --git a/app/views/ec_years/training_objectives.html.erb b/app/views/ec_years/training_objectives.html.erb index 585e8e22..fb8d860b 100644 --- a/app/views/ec_years/training_objectives.html.erb +++ b/app/views/ec_years/training_objectives.html.erb @@ -2,12 +2,15 @@ <%= render :partial => "ecs/ec_top_navigation" %>

-

- 培养目标 +

<%= render :partial => "training_objective_contents" %>
diff --git a/app/views/ecs/_ec_top_navigation.html.erb b/app/views/ecs/_ec_top_navigation.html.erb index 56583596..40f3b50e 100644 --- a/app/views/ecs/_ec_top_navigation.html.erb +++ b/app/views/ecs/_ec_top_navigation.html.erb @@ -45,12 +45,16 @@ ">4 " href="<%= requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">毕业要求 vs 通用标准 +
  • "> + ">5 + " href="<%= student_lists_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">学生 +
  • "> - ">5 + ">6 " href="<%= ec_course_setting_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系
  • "> - ">6 + ">7 " href="<%= requirement_vs_courses_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系 vs 毕业要求
  • diff --git a/app/views/ecs/department.html.erb b/app/views/ecs/department.html.erb index d31e0726..a072094a 100644 --- a/app/views/ecs/department.html.erb +++ b/app/views/ecs/department.html.erb @@ -19,12 +19,15 @@ <% end %>
    -

    - 专业列表 +

    <%= @obj_count %> diff --git a/public/javascripts/educoder/edu_application.js b/public/javascripts/educoder/edu_application.js index 437fb319..7cce4a21 100644 --- a/public/javascripts/educoder/edu_application.js +++ b/public/javascripts/educoder/edu_application.js @@ -1229,3 +1229,19 @@ $(document).bind('ajaxError', function(event, xhr, settings) { } }); /** tpm实训开启按钮，不允许多次点击 END */ + + +//工程认证各个页面的查看详情弹层 +function elasticLayer(forumId){ + var html='
    ' + + '

    工程教育专业认证【培养目标】' + + '返回

    ' + + '
    ' + $(".newMain").after(html).hide(); + document.body.addEventListener('touchmove',bodyScroll,false); + $('body').css({'position':'fixed',"width":"100%"}); +} +function removeElasticLayer(){ + $(".layerContent").remove(); + $(".newMain").show(); +} diff --git a/public/react/.vscode/settings.json b/public/react/.vscode/settings.json deleted file mode 100644 index 0e0dcd23..00000000 --- a/public/react/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/public/react/src/App.js b/public/react/src/App.js index d0451eaa..9c89cb1b 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -125,12 +125,13 @@ const NewContentCareerPathIndex =Loadable({ loader: () => import('./modules/careerPath/managementsCareerPath/New_Content_Career_Path_Index'), loading: Loading, }) - +{/*课程体系对毕业要求的支撑*/} const ecCourseSupports=Loadable({ loader: () => import('./modules/ec/ecCourseSupports/ecCourseSupports'), loading: Loading, }) +//课程体系 const ecCourseEvaluations=Loadable({ loader: () => import('./modules/ec/ecCourseEvaluations/ecCourseEvaluations'), loading: Loading, @@ -141,11 +142,12 @@ const ecGradeEvaluations=Loadable({ loading: Loading, }) +{/*课程目标评价方法*/} const EvaluationMethods=Loadable({ loader: () => import('./modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom'), loading: Loading, }) - +{/*达成评价详情*/} const EcCompletionCalculation=Loadable({ loader: () => import('./modules/ec/ecCompletion_calculation/ecCompletion_calculation'), loading: Loading, @@ -190,18 +192,21 @@ class App extends Component { - + {/*课程体系对毕业要求的支撑*/} + {/*课程体系*/} - + {/*达成评价详情*/} + {/*课程目标评价方法*/} + @@ -262,7 +267,7 @@ class App extends Component { - + {/*达成评价详情*/} 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 01506142..f76e065d 100644 --- a/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js +++ b/public/react/src/modules/ec/ecCompletion_calculation/ecCompletion_calculation.js @@ -432,6 +432,7 @@ class EcCompletionCalculation extends Component {
    课程体系 > {schooldata.ec_course_name} 达成评价详情 {/* 导出培养目标 */} +
    系统根据课程目标、课程考核方式与课程目标评价方法，一键计算评价课程目标的达成情况 window.elasticLayer(3533)}>查看详情
    +
    课程体系 > {schooldata.ec_course_name} +
    请结合本课程的教学情况，修改考核方式、并导入学生的对应考核成绩 window.elasticLayer(3533)}>查看详情
    {/*课程考核方式与数据来源*/} {/* */} {/* 导出培养目标 */} diff --git a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js index 4f04349f..ac80021d 100644 --- a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js +++ b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluationsbottom.js @@ -703,6 +703,7 @@ class EcCourseEvaluationsbottom extends Component { {/*
    */} @@ -712,7 +713,9 @@ class EcCourseEvaluationsbottom extends Component {

    课程体系 > {schooldata.ec_course_name} - {/*课程考核方式与数据来源*/} +

    请结合本课程的教学情况，修改说明每个课程目标的评价环节和评估方式 window.elasticLayer(3533)}>查看详情
    + + {/*课程考核方式与数据来源*/} {/* */} {/* 导出培养目标 */} diff --git a/public/react/src/modules/ec/ecCourseSupportSetting/index.js b/public/react/src/modules/ec/ecCourseSupportSetting/index.js index ee18e430..82eec19e 100644 --- a/public/react/src/modules/ec/ecCourseSupportSetting/index.js +++ b/public/react/src/modules/ec/ecCourseSupportSetting/index.js @@ -245,6 +245,7 @@ class EcCourseSupportSetting extends Component {
    - 课程体系对毕业要求的支撑 + 课程体系对毕业要求的支撑 {/* 导出培养目标 */} 导出课程体系支撑矩阵 +
    用矩阵图的形式说明本专业课程体系对毕业要求的支撑关系 window.elasticLayer(3534)} >查看详情
    +
    毕业要求指标点（{data.subitems_count}） diff --git a/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js b/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js index c8598e94..6ae818d9 100644 --- a/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js +++ b/public/react/src/modules/ec/ecGradeEvaluations/ecGradeEvaluations.js @@ -262,6 +262,7 @@ class ecGradeEvaluations extends Component {
    @@ -271,6 +272,7 @@ class ecGradeEvaluations extends Component {

    课程体系 > {schooldata.ec_course_name} + {/*课程考核方式与数据来源*/} {/* */} {/* 导出培养目标 */} diff --git a/public/react/src/modules/ec/ecStudentList/ecStudentList.js b/public/react/src/modules/ec/ecStudentList/ecStudentList.js index 63a56b43..911ee1c2 100644 --- a/public/react/src/modules/ec/ecStudentList/ecStudentList.js +++ b/public/react/src/modules/ec/ecStudentList/ecStudentList.js @@ -23,6 +23,7 @@ class ecStudentList extends Component { schooldata:{}, majorschoollist:undefined, titlemessage:"提示", + ecComponentState:"ecStudentList", visible:false, Modallist:'', Modallisttypes:0, @@ -318,8 +319,9 @@ class ecStudentList extends Component {

    学生列表 @@ -329,9 +331,11 @@ class ecStudentList extends Component {
    学生列表（ + className=" font-18 courseSystem">学生列表（ {majorschoollist===undefined?"":majorschoollist.total_student} - ）
    + ） +
    提供模板支持导入学生信息(请先下载模板) window.elasticLayer(3533)}>查看详情
    +
    {ismanager===false?"": diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.css b/public/react/src/modules/ec/ecTitle/ecTitle.css index 332e6142..c6e612bc 100644 --- a/public/react/src/modules/ec/ecTitle/ecTitle.css +++ b/public/react/src/modules/ec/ecTitle/ecTitle.css @@ -21,7 +21,7 @@ margin-right: 10px; } #traningNav>li>.ecTitles { - line-height: 18px !important; + line-height: 16px !important; } #traningNav>li>.ecTitlefont:hover{ diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.js b/public/react/src/modules/ec/ecTitle/ecTitle.js index 0c6d4e7d..21aec303 100644 --- a/public/react/src/modules/ec/ecTitle/ecTitle.js +++ b/public/react/src/modules/ec/ecTitle/ecTitle.js @@ -21,6 +21,7 @@ class EcTitleCourseEvaluations extends Component { render() { let{schooldata,ecComponentState,ecpaths}=this.state; + return (
    @@ -49,16 +50,20 @@ class EcTitleCourseEvaluations extends Component { 4 毕业要求 vs 通用标准
    • +
  • + 5 + 学生 +
  • - 5 + 6 课程体系
  • - 6 + 7 课程体系 vs 毕业要求
  • - 7 + 8 达成度评价结果
    • {/*
  • */} diff --git a/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js b/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js index 00b72e1e..95545d85 100644 --- a/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js +++ b/public/react/src/modules/ec/graduatesRequirement/GraduatesRequirement.js @@ -599,16 +599,24 @@ class GraduatesRequirement extends Component {
  • +

    毕业要求指标点达成计算

    +

    + 系统根据课程体系与毕业要求的支持关系，以课程的考核与成绩判定方式，一键计算毕业要求的达成度情况 + window.elasticLayer(3530)} class="color-blue">查看详情 +

    + +
    • +

    diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 18438c02..86d852de 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3089,17 +3089,17 @@ a.singlepublishtwo{ .MajorName > i:hover{color: #4CACFF} /*培养目标*/ #traningNav{margin-bottom: 0px!important;} -#traningNav>li{float: left;padding:0px 30px 30px 30px;font-size: 16px;} +#traningNav>li{float: left;padding:0px 30px 30px 30px;font-size: 15px;} #traningNav>li>a,#traningNav li>i{color: #666!important;position: relative} #traningNav>li.active > a,#traningNav li.active > i{color: #05101A!important;} #traningNav>li.active > a:after{content: '';position: absolute;width: 64px;left: 50%;margin-left: -32px;height: 2px;background-color: #05101A;bottom: -35px;} -#traningNav>li>.ecTitle {width: 20px;height: 20px;border: 1px solid rgba(65, 140, 205, 1);border-radius: 50%;text-align: center; -line-height: 20px;display: inline-block;color: rgba(65, 140, 205, 1) !important;margin-right: 8px;} +#traningNav>li>.ecTitle {width: 16px;height: 16px;border: 1px solid rgba(65, 140, 205, 1);border-radius: 50%;text-align: center; +line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;margin-right: 8px;font-size: 12px} #traningNav>li>.ecTitlefont:hover{color: rgba(65, 140, 205, 1) !important;} .ecimgs{height: 90px;line-height: 90px;box-sizing: border-box;} #traningNav>li>.ecTitlefontFFF{color:#fff!important;} -#traningNav>li>.ecTitleFFF {width: 20px;height: 20px;border: 1px solid #fff;border-radius: 50%;text-align: center;line-height: 20px; +#traningNav>li>.ecTitleFFF {width: 16px;height: 16px;border: 1px solid #fff;border-radius: 50%;text-align: center;line-height: 16px;font-size: 12px; display: inline-block;color: #fff !important;margin-right: 8px;} .traningNavs>li {padding: 0px 10px 30px 12px !important;} .ecimgs1{background: url("/images/educoder/auth/1.png");background-repeat: no-repeat;background-size: 100% 100%;-moz-background-size: 100% 100%; diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index d48700a3..266f9b7f 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -903,4 +903,13 @@ html>body #ajax-indicator { position: fixed; } margin-left: 20px; text-indent: 25px; min-height: 100px; +} + + +/*工程认证 各页面公用弹层*/ +.layerContent{ + margin: 0 auto; + padding-bottom: 235px; + min-width: 1200px; + padding-top: 60px; } \ No newline at end of file