pdf导出调整

6 years ago · 5d8a0158ae
parent 523fb82aa1
commit 5d8a0158ae
2 changed files with 4 additions and 3 deletions
--- a/app/views/layouts/pdf.html.erb
+++ b/app/views/layouts/pdf.html.erb
@ -11,12 +11,11 @@
  <%= call_hook :view_layouts_base_html_head %>
  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2', 'css/edu-common','educoder/edu-main','educoder/edu-all', 'css/edu-public', 'css/font-awesome', 'css/edu-class', 'css/magic-check'%>
  <%= javascript_heads %>
-  <%= javascript_include_tag  "edu/application", 'educoder/edu_application'%>
+  <%= javascript_include_tag "edu/application", 'educoder/edu_application'%>
 </head>
 <body style="height: 100%; background: #fff;">
 <div class="newContainer" style="width: 1000px;">    <!-- 页面全部内容 -->
  <div class="clearfix" style="width: 1000px;">       <!-- 主题部分 -->
-    <%= render_flash_messages %>
    <%= yield %>
    <div class="cl"></div>
  </div>
--- a/app/views/student_work/shixun_work_report.html.erb
+++ b/app/views/student_work/shixun_work_report.html.erb
@ -101,7 +101,9 @@
      <div class="clearfix padding15 edu-back-white">

        <div class="fl <%= params[:pdf] ? 'with65' : 'with60' %>">
-          <%= render :partial => "student_work/echart_of_shixun_skills" %>
+          <% unless params[:pdf] %>
+            <%= render :partial => "student_work/echart_of_shixun_skills" %>
+          <% end %>
        </div>

        <div class="fr <%= params[:pdf] ? 'with25' : 'with30' %>">