Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

工程认证

Browse Source
dev_ec
caishi 6 years ago
parent 22bddecf47
commit 7d2730cfa5
13 changed files with 101 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
Gemfile
Unescape View File

@ -63,8 +63,8 @@ gem 'elasticsearch-rails'
gem 'oauth2' gem 'oauth2'
# xlsx # xlsx
gem 'axlsx', '3.0.0.pre' # gem 'axlsx', '3.0.0.pre'
gem 'axlsx_rails', '0.3.0' # gem 'axlsx_rails', '0.3.0'
#Ruby 2.2+ has removed test/unit from the core library. #Ruby 2.2+ has removed test/unit from the core library.
if RUBY_VERSION>='2.2' if RUBY_VERSION>='2.2'

12
app/views/ec_major_schools/_year_list.html.erb
Unescape View File

@ -15,12 +15,12 @@
<%= graduation_requirements > 0 ? graduation_requirements : @btn_text %> <%= graduation_requirements > 0 ? graduation_requirements : @btn_text %>
</a> </a>
</span> </span>
<span class="column-5 fl"> <!--<span class="column-5 fl">-->
<% students = year.ec_year_students.count %> <!--<%# students = year.ec_year_students.count %>-->
<a href="<%= student_lists_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>" class="<%= students > 0 ? '' : 'color-blue' %>"> <!--<a href="<%#= student_lists_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>" class="<%#= students > 0 ? '' : 'color-blue' %>">-->
<%= students > 0 ? students : @btn_text %> <!--<%#= students > 0 ? students : @btn_text %>-->
</a> <!--</a>-->
</span> <!--</span>-->
<span class="column-5 fl"> <span class="column-5 fl">
<% courses = year.ec_courses.count %> <% courses = year.ec_courses.count %>
<a href="<%= ec_course_setting_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>" class="<%= courses > 0 ? '' : 'color-blue' %>"> <a href="<%= ec_course_setting_ec_major_school_ec_year_path(year, :ec_major_school_id => @major_school) %>" class="<%= courses > 0 ? '' : 'color-blue' %>">

33
app/views/ec_major_schools/show.html.erb
Unescape View File

@ -4,21 +4,26 @@
</p> </p>
<div> <div>
<div style="position: relative"> <div style="position: relative">
<p class="clearfix padding20-30 bor-bottom-greyE edu-back-white"> <ul class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
<span class="fl font-18"><%= @major.name %></span> <li class="fl">
<p class="font-18 clearfix">
<span class="fl"><%= @major.name %></span>
<% if @major.schools && User.current.admin? %>
<i class="iconfont icon-youjiantou font-14 newxiajiantou fl ml20" ></i>
<ul class="edu-menu-list" id="ecmajorschools">
<% @major.schools.each do |school| %>
<% ec_major_school = school.ec_major_schools.where(:ec_major_id => @major.id).first %>
<li><a href="<%= ec_major_school_path(ec_major_school) %>" target="_blank" ><%= school.name %></a></li>
<% end %>
</ul>
<% end %>
</p>
<p><span class="color-grey-9 mr10">请选择添加参与认证的学生界别，多个界别分次添加</span><a href="javascript:void(0)" onclick="elasticLayer(3528);" class="color-blue">查看详情</a></p>
</li>
<% if @major_manager %> <% if @major_manager %>
<a href="javascript:void(0)" class="fr white-btn edu-blueback-btn mt4" onclick="addAcademicYear();">添加届别</a> <a href="javascript:void(0)" class="fr white-btn edu-blueback-btn mt25" onclick="addAcademicYear();">添加届别</a>
<% end %> <% end %>
<% if @major.schools && User.current.admin? %> </ul>
<i class="iconfont icon-youjiantou font-14 newxiajiantou" ></i>
<ul class="edu-menu-list" id="ecmajorschools">
<% @major.schools.each do |school| %>
<% ec_major_school = school.ec_major_schools.where(:ec_major_id => @major.id).first %>
<li><a href="<%= ec_major_school_path(ec_major_school) %>" target="_blank" ><%= school.name %></a></li>
<% end %>
</ul>
<% end %>
</p>
</div> </div>
<div class="clearfix padding20-30 edu-back-white"> <div class="clearfix padding20-30 edu-back-white">
<div class="fr" id="pollingPanel"> <div class="fr" id="pollingPanel">
@ -31,7 +36,7 @@
<span class="column-1">届别</span> <span class="column-1">届别</span>
<span class="column-5 fl">培养目标</span> <span class="column-5 fl">培养目标</span>
<span class="column-5 fl">毕业要求</span> <span class="column-5 fl">毕业要求</span>
<span class="column-5 fl">学生</span> <!--<span class="column-5 fl">学生</span>-->
<span class="column-5 fl">课程体系</span> <span class="column-5 fl">课程体系</span>
<span class="column-6 fl lineh-20">课程目标<br/>（达成情况）</span> <span class="column-6 fl lineh-20">课程目标<br/>（达成情况）</span>
<span class="column-5 fl edu-txt-center lineh-20">毕业要求指标点<br/>（达成情况）</span> <span class="column-5 fl edu-txt-center lineh-20">毕业要求指标点<br/>（达成情况）</span>

7
app/views/ec_years/ec_course_setting.html.erb
Unescape View File

@ -1,9 +1,10 @@
<!-------------------------------------课程列表begin----------------------------------> <!-------------------------------------课程列表begin---------------------------------->
<div class="educontent mb50"> <div class="educontent mb50">
<%= render :partial => "ecs/ec_top_navigation" %> <%= render :partial => "ecs/ec_top_navigation" %>
<p class="clearfix padding20-30 bor-bottom-greyE edu-back-white"> <ul class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
<span class="fl font-18">课程体系（<%= @ec_courses.count %>）</span> <li class="font-18">课程体系（<%= @ec_courses.count %>）</li>
</p> <p><span class="color-grey-9 mr10">提供模板支持课程信息导入，亦可直接新增课程；并继续完成每门课程的评估机制配置</span><a href="javascript:void(0)" onclick="elasticLayer(3533);" class="color-blue">查看详情</a></p>
</ul>
<p class="padding20-30 edu-back-white clearfix"> <p class="padding20-30 edu-back-white clearfix">
<span class="mr30">温馨提醒：请下载课程模板（<a href="<%= @file_url %>" class="color-green"><i class="iconfont icon-fujian mr5 color-green font-16"></i>点击下载</a>），将本届所有参与认证的课程名称导入系统，以便录入教学活动相关数据</span> <span class="mr30">温馨提醒：请下载课程模板（<a href="<%= @file_url %>" class="color-green"><i class="iconfont icon-fujian mr5 color-green font-16"></i>点击下载</a>），将本届所有参与认证的课程名称导入系统，以便录入教学活动相关数据</span>
<%= file_field_tag 'attachments[dummy][file]', <%= file_field_tag 'attachments[dummy][file]',

11
app/views/ec_years/graduation_requirement.html.erb
Unescape View File

@ -10,12 +10,15 @@
<div class="educontent mb50"> <div class="educontent mb50">
<%= render :partial => "ecs/ec_top_navigation" %> <%= render :partial => "ecs/ec_top_navigation" %>
<div class="edu-back-white minH-560 mb50 pb20"> <div class="edu-back-white minH-560 mb50 pb20">
<p class="clearfix padding20-30 bor-bottom-greyE"> <ul class="clearfix padding20-30 bor-bottom-greyE">
<span class="fl font-18">毕业要求(及其指标点)</span> <li class="fl">
<p class="font-18">毕业要求(及其指标点)</p>
<p><span class="color-grey-9 mr10">请结合本专业特色修改毕业要求文字描述及指标点，需完全覆盖12项通用标准</span><a href="javascript:void(0)" onclick="elasticLayer(3530);" class="color-blue">查看详情</a></p>
</li>
<% if @template_major || @ec_major_school.template_major %> <% 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 %> <% end %>
</p> </ul>
<div class="ListTableLine"> <div class="ListTableLine">
<p class="clearfix"> <p class="clearfix">
<span class="column-second">指标点</span> <span class="column-second">指标点</span>

11
app/views/ec_years/requirement_vs_objective.html.erb
Unescape View File

@ -1,12 +1,15 @@
<div class="educontent mb50"> <div class="educontent mb50">
<%= render :partial => "ecs/ec_top_navigation" %> <%= render :partial => "ecs/ec_top_navigation" %>
<div class="minH-560 edu-back-white mb50"> <div class="minH-560 edu-back-white mb50">
<p class="clearfix padding20-30 bor-bottom-greyE"> <ul class="clearfix padding20-30 bor-bottom-greyE">
<span class="fl font-18">毕业要求对培养目标的支撑</span> <li class="fl">
<p class="font-18">毕业要求对培养目标的支撑</p>
<p><span class="color-grey-9 mr10">用矩阵图的形式说明本专业毕业要求对培养目标的支撑关系，鼠标左键单击单元格即可</span><a href="javascript:void(0)" onclick="elasticLayer(3531);" class="color-blue">查看详情</a></p>
</li>
<% if @template_major || @ec_major_school.template_major %> <% 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 %> <% end %>
</p> </ul>
<div class="padding30"> <div class="padding30">
<p class="clearfix mb20"> <p class="clearfix mb20">
<span class="fl mr30"><i class="iconfont icon-gouxuan color-green font-16 mr5"></i>表示支撑</span> <span class="fl mr30"><i class="iconfont icon-gouxuan color-green font-16 mr5"></i>表示支撑</span>

11
app/views/ec_years/requirement_vs_standard.html.erb
Unescape View File

@ -1,12 +1,15 @@
<div class="educontent mb50"> <div class="educontent mb50">
<%= render :partial => "ecs/ec_top_navigation" %> <%= render :partial => "ecs/ec_top_navigation" %>
<div class="minH-560 edu-back-white mb50"> <div class="minH-560 edu-back-white mb50">
<p class="clearfix padding20-30 bor-bottom-greyE"> <ul class="clearfix padding20-30 bor-bottom-greyE">
<span class="fl font-18">毕业要求对通用标准的支撑</span> <li class="fl">
<p class="font-18">毕业要求对通用标准的支撑</p>
<p><span class="color-grey-9 mr10">用矩阵图的形式说明本专业毕业要求对12项通用标准的覆盖关系，鼠标左键单击单元格即可</span><a href="javascript:void(0)" onclick="elasticLayer(3532);" class="color-blue">查看详情</a></p>
</li>
<% if @template_major || @ec_major_school.template_major %> <% 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 %> <% end %>
</p> </ul>
<div class="padding30"> <div class="padding30">
<p class="clearfix mb20"> <p class="clearfix mb20">
<span class="fl mr30"><i class="iconfont icon-gouxuan color-green font-16 mr5"></i>表示支撑</span> <span class="fl mr30"><i class="iconfont icon-gouxuan color-green font-16 mr5"></i>表示支撑</span>

11
app/views/ec_years/training_objectives.html.erb
Unescape View File

@ -2,12 +2,15 @@
<%= render :partial => "ecs/ec_top_navigation" %> <%= render :partial => "ecs/ec_top_navigation" %>
<div class="mb50 mb50"> <div class="mb50 mb50">
<p class="edu-back-white clearfix padding20-30 bor-bottom-greyE"> <ul class="edu-back-white clearfix padding20-30 bor-bottom-greyE">
<span class="fl font-18">培养目标</span> <li class="fl">
<p class=" font-18">培养目标</p>
<p><span class="color-grey-9 mr10">请结合本专业特色修改培养目标文字描述及目标分解</span><a href="javascript:void(0)" onclick="elasticLayer(3529);" class="color-blue">查看详情</a></p>
</li>
<% if @template_major || @ec_major_school.template_major %> <% if @template_major || @ec_major_school.template_major %>
<a href="<%= training_objectives_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 mt4">导出培养目标</a> <a href="<%= training_objectives_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">导出培养目标</a>
<% end %> <% end %>
</p> </ul>
<div class="edu-back-white padding20-30" id="training_objective_contents"> <div class="edu-back-white padding20-30" id="training_objective_contents">
<%= render :partial => "training_objective_contents" %> <%= render :partial => "training_objective_contents" %>
</div> </div>

8
app/views/ecs/_ec_top_navigation.html.erb
Unescape View File

@ -45,12 +45,16 @@
<a class="<%= ['requirement_vs_standard'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml22":"ecTitle" %>">4</a> <a class="<%= ['requirement_vs_standard'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml22":"ecTitle" %>">4</a>
<a class="<%= ['requirement_vs_standard'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">毕业要求 vs 通用标准</a> <a class="<%= ['requirement_vs_standard'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">毕业要求 vs 通用标准</a>
</li> </li>
<li class="<%= ['student_lists'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>">
<a class="<%= ['student_lists'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml22":"ecTitle" %>">5</a>
<a class="<%= ['student_lists'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= student_lists_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">学生</a>
</li>
<li class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>"> <li class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>">
<a class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">5</a> <a class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">6</a>
<a class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= ec_course_setting_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系</a> <a class="<%= ['ec_course_setting'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= ec_course_setting_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系</a>
</li> </li>
<li class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>"> <li class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecimgs3" : "ecimgs" %>">
<a class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">6</a> <a class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecmarginleft ecTitleFFF ml12":"ecTitle" %>">7</a>
<a class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= requirement_vs_courses_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系 vs 毕业要求</a> <a class="<%= ['requirement_vs_course'].include?(params[:action]) ? "ecTitlefontFFF":"ecTitlefont" %>" href="<%= requirement_vs_courses_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id) %>">课程体系 vs 毕业要求</a>
</li> </li>
<li class="ecimgs"> <li class="ecimgs">

11
app/views/ecs/department.html.erb
Unescape View File

@ -19,12 +19,15 @@
<% end %> <% end %>
<div class="educontent mb30"> <div class="educontent mb30">
<p class="clearfix padding20-30 bor-bottom-greyE edu-back-white"> <ul class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
<span class="fl font-18">专业列表</span> <li class="fl">
<p class="font-18">专业列表</p>
<p><span class="color-grey-9 mr10">请添加参与认证的专业名称</span><a href="javascript:void(0)" onclick="elasticLayer(3527);" class="color-blue">查看详情</a></p>
</li>
<% if @is_school_manager %> <% if @is_school_manager %>
<a href="javascript:void(0)" class="fr white-btn edu-blueback-btn" onclick="addNewMajorPanel();">添加专业</a> <a href="javascript:void(0)" class="fr white-btn edu-blueback-btn mt25" onclick="addNewMajorPanel();">添加专业</a>
<% end %> <% end %>
</p> </ul>
<div class="clearfix padding20-30 bor-bottom-greyE edu-back-white"> <div class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
<span class="fl font-12 mt5"> <span class="fl font-12 mt5">
<span class="color-orange-tip mr3" id="search_major_count"><%= @obj_count %></span> <span class="color-orange-tip mr3" id="search_major_count"><%= @obj_count %></span>

16
public/javascripts/educoder/edu_application.js
Unescape View File

@ -1229,3 +1229,19 @@ $(document).bind('ajaxError', function(event, xhr, settings) {
} }
}); });
/** tpm实训开启按钮，不允许多次点击 END */ /** tpm实训开启按钮，不允许多次点击 END */
//工程认证各个页面的查看详情弹层
function elasticLayer(forumId){
var html='<div class="layerContent"><div class="educontent">' +
'<p class="clearfix pt25 pb25 color-grey-3 bor-bottom-greyE"><span class="fl font-24">工程教育专业认证【培养目标】</span>' +
'<a href="javascript:void(0)" onclick="removeElasticLayer();" class="fr font-16 mt5">返回</a></p>' +
'</div></div>'
$(".newMain").after(html).hide();
document.body.addEventListener('touchmove',bodyScroll,false);
$('body').css({'position':'fixed',"width":"100%"});
}
function removeElasticLayer(){
$(".layerContent").remove();
$(".newMain").show();
}

8
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -3089,17 +3089,17 @@ a.singlepublishtwo{
.MajorName > i:hover{color: #4CACFF} .MajorName > i:hover{color: #4CACFF}
/*培养目标*/ /*培养目标*/
#traningNav{margin-bottom: 0px!important;} #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>a,#traningNav li>i{color: #666!important;position: relative}
#traningNav>li.active > a,#traningNav li.active > i{color: #05101A!important;} #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.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; #traningNav>li>.ecTitle {width: 16px;height: 16px;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;} 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;} #traningNav>li>.ecTitlefont:hover{color: rgba(65, 140, 205, 1) !important;}
.ecimgs{height: 90px;line-height: 90px;box-sizing: border-box;} .ecimgs{height: 90px;line-height: 90px;box-sizing: border-box;}
#traningNav>li>.ecTitlefontFFF{color:#fff!important;} #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;} display: inline-block;color: #fff !important;margin-right: 8px;}
.traningNavs>li {padding: 0px 10px 30px 12px !important;} .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%; .ecimgs1{background: url("/images/educoder/auth/1.png");background-repeat: no-repeat;background-size: 100% 100%;-moz-background-size: 100% 100%;

9
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -904,3 +904,12 @@ html>body #ajax-indicator { position: fixed; }
text-indent: 25px; text-indent: 25px;
min-height: 100px; min-height: 100px;
} }
/*工程认证 各页面公用弹层*/
.layerContent{
margin: 0 auto;
padding-bottom: 235px;
min-width: 1200px;
padding-top: 60px;
}
Write Preview
Loading…
Cancel
Save