Index: ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
===================================================================
diff -u -r30796 -r30904
--- ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 30796)
+++ ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 30904)
@@ -2,6 +2,7 @@
<%@ page import="com.forgon.tools.*,org.apache.commons.lang.*"%>
<%@page import="java.io.IOException"%>
<%@page import="sun.misc.BASE64Decoder"%>
+<%@ page import="com.forgon.tools.*,com.forgon.disinfectsystem.reportforms.service.*"%>
@@ -28,25 +29,16 @@
<%
- String htmlTable = request.getParameter("htmlTable");
String fileName = request.getParameter("htmlFileName");
- if(htmlTable != null){
+ if(fileName != null){
ServletOutputStream servletOutputStream = response.getOutputStream();
- response.setContentType("application/octet-stream");
- response.addHeader("Content-Disposition","attachment;filename=" + new String(fileName.getBytes("GBK"), "ISO8859_1"));
try{
- BASE64Decoder decoder = new BASE64Decoder();
- servletOutputStream.write(new String(decoder.decodeBuffer(htmlTable)).getBytes("UTF-8"));
- }catch(IllegalArgumentException e){
- e.printStackTrace();
+ response.setContentType("application/vnd.ms-excel");
+ response.addHeader("Content-Disposition","inline;filename=" + new String(fileName.getBytes("GBK"), "ISO8859_1"));
+ ReportFormsManager reportFormsManager = (ReportFormsManager)SpringBeanManger.getBean("reportFormsManager");
+ reportFormsManager.exportHtmlTable(request,servletOutputStream);
}catch (Exception e) {
e.printStackTrace();
- }finally {
- try {
- servletOutputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
}
servletOutputStream.flush();
out.clear();
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r30855 -r30904
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 30855)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 30904)
@@ -501,13 +501,26 @@
var fileName = data.fileName + data.fileType;
var type = 'application/vnd.ms-excel';
if (isIE()) {
+ var url = WWWROOT + '/jasperreports/jasperreportsAction!exportHtmlTable1.do';
var tableHtml = '';
tableHtml += data.html;
tableHtml += '';
- var html = Base64.encode(tableHtml);
- sessionStorage.setItem('htmlTable', html);
- sessionStorage.setItem('htmlFileName', fileName);
- window.open(WWWROOT + '/homepage/exportMonitorData.jsp', "_blank");
+ tableHtml = Base64.encode(tableHtml);
+ var params = {
+ htmlTable: tableHtml
+ }
+ Ext.Ajax.request({
+ url: url,
+ async: false,
+ params: params,
+ success: function (response) {
+ sessionStorage.setItem('htmlFileName', fileName);
+ window.open(WWWROOT + '/homepage/exportMonitorData.jsp', "_blank");
+ },
+ failure: function (response, options) {
+ showResult(response.responseText);
+ }
+ });
} else {
var lHtml = data.html;
var tableHtml = '';