Merge remote-tracking branch 'origin/develop' into develop

dev_new_shixunsrepository
杨树明 5 years ago
commit 28d9f2584b

@ -33,8 +33,8 @@ class ExportShixunReportService
base_css = %w(app/templates/shared/main.css app/templates/shixun_work/shixun_work.css app/templates/shared/codemirror.css)
base_css.each { |css| kit.stylesheets << Rails.root.join(css) }
file_name = "#{Rails.root}/files/archiveZip/#{filename}"
kit.to_pdf(file_name)
file = Tempfile.new(filename)
kit.to_pdf(file.path)
file
end

Loading…
Cancel
Save