Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp
===================================================================
diff -u -r31205 -r31209
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp	(.../showEchartsAndTable.jsp)	(revision 31205)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp	(.../showEchartsAndTable.jsp)	(revision 31209)
@@ -90,7 +90,7 @@
 			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.exportExcelForImg(fileContents,htmlTable,fileName,fileSizes,jsFileName,request,response);
+			reportFormsManager.exportExcelForImgAndTable(fileContents,htmlTable,fileName,fileSizes,jsFileName,request,response);
 		}catch (Exception e) {
 			e.printStackTrace();
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
===================================================================
diff -u -r31205 -r31209
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js	(.../materialTypeWorkloadReportView.js)	(revision 31205)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js	(.../materialTypeWorkloadReportView.js)	(revision 31209)
@@ -1,5 +1,6 @@
 var entityName = "清洗区材料分类工作量统计报表";
 var grid;
+var myChart;
 
 function getTableAndEchartsData(resultData) {
 	var html = "";
@@ -444,16 +445,18 @@
 				}
 				// excel的文件名称
 				var fileName = document.getElementById('thisIframe').contentWindow.document.getElementById("title").innerHTML;
-				var chartImg = encodeURIComponent(myChart.getDataURL());
-				// 图片宽度和高度，为了计算图片比例，以便在excel中以正常比例显示，不至于拉伸
-				var chartSize = myChart.getWidth() + ":" + myChart.getHeight();
+				if(myChart){
+					var chartImg = encodeURIComponent(myChart.getDataURL());
+					// 图片宽度和高度，为了计算图片比例，以便在excel中以正常比例显示，不至于拉伸
+					var chartSize = myChart.getWidth() + ":" + myChart.getHeight();
+					document.getElementById('thisIframe').contentWindow.document.getElementById('fileContents').value = chartImg;
+					document.getElementById('thisIframe').contentWindow.document.getElementById('fileSizes').value = chartSize;
+				}
 				var jsFileName = "\\disinfectsystem\\reportforms\\js\\LZString.js";
 				var tableHtml = document.getElementById('thisIframe').contentWindow.document.getElementById('table').innerHTML;
 				tableHtml = Base64.encode(encodeURI(tableHtml));
 				var htmlTable = LZString.compressToEncodedURIComponent(tableHtml)
-				document.getElementById('thisIframe').contentWindow.document.getElementById('fileName').value = fileName;
-				document.getElementById('thisIframe').contentWindow.document.getElementById('fileContents').value = chartImg;
-				document.getElementById('thisIframe').contentWindow.document.getElementById('fileSizes').value = chartSize;
+				document.getElementById('thisIframe').contentWindow.document.getElementById('fileName').value = fileName+'.xls';
 				document.getElementById('thisIframe').contentWindow.document.getElementById('jsFileName').value = jsFileName;
 				document.getElementById('thisIframe').contentWindow.document.getElementById('htmlTable').value = htmlTable;
 				document.getElementById('thisIframe').contentWindow.document.getElementById('submitForm').click();