Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
===================================================================
diff -u -r31303 -r31314
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js	(.../qualityMonitoringMonthView.js)	(revision 31303)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js	(.../qualityMonitoringMonthView.js)	(revision 31314)
@@ -3,7 +3,7 @@
 
 //创建表格，头部为名称
 function createTable2(chartsData) {
-	var xAxisData = chartsData.xAxisData;
+	var xAxisData = chartsData.xAxisData2;
 	var legendData = chartsData.legendData;
 	var seriesData = chartsData.seriesData;
 	var width = chartsData.width ? chartsData.width : 1200;
@@ -241,6 +241,7 @@
 					var legendData = [];
 					var legendData2 = [];
 					var xAxisData = [];
+					var xAxisData2 = [];
 					var seriesData = [];
 					var map = {};
 					document.getElementById('thisIframe2').contentWindow.document.getElementById("table").innerHTML = '';
@@ -257,6 +258,9 @@
 						if (xAxisData.indexOf(month) == -1) {
 							xAxisData.push(month);
 						}
+						if (xAxisData2.indexOf(result.data[i].month) == -1) {
+							xAxisData2.push(result.data[i].month);
+						}
 						if (map[result.data[i].type]) {
 							map[result.data[i].type].push(result.data[i].amount)
 						} else {
@@ -276,6 +280,7 @@
 					var chartsData = {
 						legendData: legendData2,
 						xAxisData: xAxisData,
+						xAxisData2:xAxisData2,
 						seriesData: seriesData,
 						chartType: chartType
 					}
@@ -378,7 +383,7 @@
 		// bodyStyle : 'padding: 10px 10px 0px 10px;',
 		frame: true,
 		bodyStyle: 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-		height: 170,
+		height: 130,
 		items: [{
 			layout: 'column',
 			height: 110,
@@ -608,7 +613,16 @@
 					{ boxLabel: '柱状图', value: 'barChart' },
 					{ boxLabel: '上下半年对比', value: 'firstSecondHalfForm' },
 					{ boxLabel: '跟去年对比', value: 'compareLastForm' },
-					{ boxLabel: '季度对比', value: 'quarterForm' }]
+					{ boxLabel: '季度对比', value: 'quarterForm' }],
+					listeners:{
+						change:function(){
+							if(Ext.getCmp("type").getValue() == "lineChart" || Ext.getCmp("type").getValue() == "barChart"){
+								Ext.getCmp("exportData").show();
+							}else {
+								Ext.getCmp("exportData").hide();
+							}
+						}
+					}
 				})]
 			}]
 		}],
@@ -640,6 +654,14 @@
 		autoScroll: true,//自动显示滚动条   
 		collapsible: true,//允许展开和收缩   
 		bodyPadding: 5,
+		tbar: [{
+			text: '导出',
+			hidden:true,
+			id:"exportData",
+			handler: function () {
+				exportCharts(document.getElementById('thisIframe2'));
+			}
+		}],
 		html: '<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src=""></iframe><iframe id="thisIframe2" style="display:none" name="thisIframe2" width="100%" height="100%" frameborder=0 src="./showEchartsAndTable.jsp"></iframe>'
 	});
 
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
===================================================================
diff -u -r31303 -r31314
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js	(.../materialTypeWorkloadReportView.js)	(revision 31303)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js	(.../materialTypeWorkloadReportView.js)	(revision 31314)
@@ -438,18 +438,7 @@
 		tbar: [{
 			text: '导出',
 			handler: function () {
-				// excel的文件名称
-				var fileName =  document.getElementById('thisIframe').contentWindow.document.getElementById('title').innerHTML;
-				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);
-				var w = document.getElementById('thisIframe').contentWindow.document.body.clientWidth;
-				document.getElementById('thisIframe').contentWindow.document.getElementById('imgWidth').value = (w - 40);
-				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();
+				exportCharts(document.getElementById('thisIframe'));
 			}
 		}],
 		html: '<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src="./showEchartsAndTable.jsp"></iframe>'
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp
===================================================================
diff -u -r31154 -r31314
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp	(.../qualityMonitoringMonthView.jsp)	(revision 31154)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp	(.../qualityMonitoringMonthView.jsp)	(revision 31314)
@@ -7,6 +7,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/radioGroup/radioGroup.js?version=${svnRevision}"></script>
@@ -17,6 +18,7 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDateField.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/qualityMonitoringMonthView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthPickerPlugin.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/LZString.js"></script>
 <%
 	SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
 	String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp
===================================================================
diff -u -r31296 -r31314
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp	(.../showEchartsAndTable.jsp)	(revision 31296)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp	(.../showEchartsAndTable.jsp)	(revision 31314)
@@ -9,17 +9,18 @@
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/jquery-easyui-1.5.3/jquery.min.js?version=${svnRevision}"></script>
+<!--[if !IE]><!--> 
 <script type="text/javascript" src="./js/amcharts/core.js"></script>
 <script type="text/javascript" src="./js/amcharts/charts.js"></script>
 <script type="text/javascript" src="./js/amcharts/animated.js"></script>
-<script type="text/javascript" src="${ctx}/echarts-3.8-4/echarts.js?version=${svnRevision}"></script>
+<!--<![endif]-->
 <title></title>
 </head>
 <body>
 	<style>
 		#echartJs {
 			width: 1080px;
-			height: 400px;
+			height: 500px;
 			margin: 0 auto;
 			margin-top: 20px;
 		}
@@ -89,50 +90,6 @@
 </body>
 <script>
 	var chart;
-	var myChart;
-	/**
-	 * 创建echarts图形，兼容IE
-	 * @param {参数} res 
-	 */
-	function createEcharts(chartData,legendData,xAxisData){
-		myChart = echarts.init(document.getElementById('echartJs'));
-		myChart.clear();
-		if(legendData.length > 0){
-			document.getElementById('echartJs').style.width = (document.body.clientWidth - 40)+'px';
-			var option = {
-				backgroundColor:"#fff",
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'shadow'
-					}
-				},
-				legend: {
-					data: legendData
-				},
-				toolbox: {
-					show: false
-				},
-				xAxis: [{
-					type: 'category',
-					data: xAxisData,
-					axisLabel:{
-						showMaxLabel:true,
-						interval:0
-					}
-				}],
-				yAxis: [{
-					type: 'value'
-				}],
-				series: chartData
-			};
-			myChart.setOption(option);
-			myChart.resize({
-				width: document.body.clientWidth - 40,
-				height: 400
-			})
-		}
-	}
 	function exportCharts(){
 		// 提交表单
 		if (chart) {
@@ -171,14 +128,10 @@
 			return;
 		}
 		document.getElementById('echartJs').style.display = 'block';
-		if(isIE()){
-			createEcharts(chartData,legendData,xAxisData);
+		if(chartType == 'line'){
+			createAm4chartsForLine(chartData,legendData);
 		}else {
-			if(chartType == 'line'){
-				createAm4chartsForLine(chartData,legendData);
-			}else {
-				createAm4chartsForColunm(chartData,legendData);
-			}
+			createAm4chartsForColunm(chartData,legendData);
 		}
 	}
 	function createAm4chartsForColunm(chartData,legendData){
@@ -191,31 +144,38 @@
 		chart.legend = new am4charts.Legend();
 		chart.legend.position = 'top';
 		chart.scrollbarX = new am4core.Scrollbar();
+		chart.cursor = new am4charts.XYCursor();
 
 		// 添加数据
 		chart.data = chartData;
 
 		// 创建X轴
-		var categoryAxis = chart.xAxes.push(new am4charts.CategoryAxis());
+		categoryAxis = chart.xAxes.push(new am4charts.CategoryAxis());
 		categoryAxis.dataFields.category = "date";
 		categoryAxis.renderer.grid.template.location = 0;
-		categoryAxis.renderer.minGridDistance = 20;
 
 		chart.colors.list = [
 			am4core.color("#73ce99"),
 			am4core.color("#fe9a00"),
 			am4core.color("#ce64fd"),
 			am4core.color("#fdffa9"),
-			am4core.color("#00ce9d"),
-			am4core.color("#fffecf"),
 			am4core.color("#ff90cb"),
 			am4core.color("#63fe30"),
 			am4core.color("#94aff6"),
 			am4core.color("#73ffff"),
 			am4core.color("#845EC2"),
 			am4core.color("#D65DB1"),
-			am4core.color("#FF9671"),
-			am4core.color("#F9F871")
+			am4core.color("#FFC0CB"),
+			am4core.color("#556B2F"),
+			am4core.color("#FF1493"),
+			am4core.color("#00BFFF"),
+			am4core.color("#BDB76B"),
+			am4core.color("#FFEFD5"),
+			am4core.color("#FFA07A"),
+			am4core.color("#B22222"),
+			am4core.color("#FF00FF"),
+			am4core.color("#9370DB"),
+			am4core.color("#F0FFFF")
 		];
 
 		// 创建Y轴
@@ -224,6 +184,7 @@
 		valueAxis.renderer.labels.template.adapter.add("text", function (text) {
 			return text + formatter;
 		});
+		valueAxis.min = 0;
 
 		// 创建类
 		for(var i=0;i<legendData.length;i++){
@@ -235,9 +196,6 @@
 			series.tooltipText = "{name}: [bold]{valueY}[/]";
 			series.columns.template.fillOpacity = 1;
 		}
-
-		// 添加鼠标移动的事件
-		chart.cursor = new am4charts.XYCursor();
 	}
 
 	function createAm4chartsForLine(chartData,legendData){
@@ -291,10 +249,13 @@
 		// 添加鼠标移动的事件
 		chart.cursor = new am4charts.XYCursor();
 	}
-
-	am4core.ready(function () {
-		reloadData();
-	})
+	if(!isIE()){
+		am4core.ready(function () {
+			reloadData();
+		})
+	}else {
+		document.getElementById('echartJs').style.display = "none";
+	}
 </script>
 </html>
 <%
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r31296 -r31314
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 31296)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 31314)
@@ -3684,46 +3684,22 @@
 	doc.contentWindow.document.getElementById("reloadData").click();
 }
 
-
-/**
- * 创建am4charts图形
- * @param {参数} chartsData 
- */
-function createCharts(doc,chartsData) {
-    var dataArr = [];
-    var w = doc.contentWindow.document.body.clientWidth;
-	for (var i = 0; i < chartsData.xAxisData.length; i++) {
-		var date = chartsData.xAxisData[i];
-		var obj = {};
-		obj['date'] = date;
-		dataArr[i] = obj;
-		for (var j = 0; j < chartsData.seriesData.length; j++) {
-			var data = chartsData.seriesData[j].data[i];
-			obj[chartsData.seriesData[j].name] = data;
-		}
-		dataArr[i] = obj;
+//导出图表
+function exportCharts(doc) {
+    // excel的文件名称
+    var fileName =  doc.contentWindow.document.getElementById('title').innerHTML || '';
+    if(fileName == ''){
+        showResult('请先查询数据');
+        return
     }
-    doc.contentWindow.document.getElementById("echartJs").style.width = (w - 40) + 'px';
-	doc.contentWindow.document.getElementById("chartData").value = JSON.stringify(dataArr);
-	doc.contentWindow.document.getElementById("legendData").value = JSON.stringify(chartsData.legendData);
-	doc.contentWindow.document.getElementById("chartType").value = chartsData.chartType;
-    doc.contentWindow.document.getElementById("formatter").value = chartsData.formatter || '';
-    doc.contentWindow.document.getElementById("title").innerHTML = chartsData.title || '';
-	doc.contentWindow.document.getElementById("reloadData").click();
-}
-
-/**
- * 创建echarts图形,兼容IE
- * @param {参数} chartsData 
- */
-function createEcharts(doc,chartsData) {
+    var jsFileName = "\\disinfectsystem\\reportforms\\js\\LZString.js";
+    var tableHtml = doc.contentWindow.document.getElementById('table').innerHTML;
+    tableHtml = Base64.encode(encodeURI(tableHtml));
+    var htmlTable = LZString.compressToEncodedURIComponent(tableHtml);
     var w = doc.contentWindow.document.body.clientWidth;
-    doc.contentWindow.document.getElementById("echartJs").style.width = (w - 40) + 'px';
-    doc.contentWindow.document.getElementById("xAxisData").value = JSON.stringify(chartsData.xAxisData);
-    doc.contentWindow.document.getElementById("chartData").value = JSON.stringify(chartsData.seriesData);
-	doc.contentWindow.document.getElementById("legendData").value = JSON.stringify(chartsData.legendData);
-	doc.contentWindow.document.getElementById("chartType").value = chartsData.chartType;
-    doc.contentWindow.document.getElementById("formatter").value = chartsData.formatter || '';
-    doc.contentWindow.document.getElementById("title").innerHTML = chartsData.title || '';
-	doc.contentWindow.document.getElementById("reloadData").click();
+    doc.contentWindow.document.getElementById('imgWidth').value = (w - 40);
+    doc.contentWindow.document.getElementById('fileName').value = fileName + '.xls';
+    doc.contentWindow.document.getElementById('jsFileName').value = jsFileName;
+    doc.contentWindow.document.getElementById('htmlTable').value = htmlTable;
+    doc.contentWindow.document.getElementById('submitForm').click();
 }
\ No newline at end of file