Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js =================================================================== diff -u -r37640 -r37647 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js (.../yearWorkloadReportView2.js) (revision 37640) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js (.../yearWorkloadReportView2.js) (revision 37647) @@ -182,7 +182,6 @@ } //DGSFYBJY-76:增加簇状柱形图 -var myechart; function searchReportForChart(title, subtext, seriesData, legendData, xAxisData) { var option = { color: ['#5470c6', '#91cc75', '#fac858'], @@ -400,27 +399,23 @@ params: params, success: function (response) { var result = Ext.decode(response.responseText); - if (myechart) { - document.getElementById('thisIframe').contentWindow.document.getElementById('echarts').removeAttribute("_echarts_instance_") - } if (result.data.length > 0) { var showType = Ext.getCmp('showType2').getValue(); if (queryType !== '汇总' && showType == '簇状柱形图') { var legendData = []; var xAxisData = []; var seriesData = []; - var colorIndex = 0; for (var i = 0; i < result.parametMap.titleArr.length; i++) { var title = result.parametMap.titleArr[i].title; xAxisData.push(title); } + var dateArray = {}; var obj = {}; - for (var i = 0; i < result.data.length; i++) { - var month = result.data[i].month; - if (legendData.indexOf(month) == -1) { - legendData.push(month); + for (var i = 0; i < result.data.length; i++) { + var month = result.data[i].month; + if (!dateArray[month]) { if (month == '环比增减' || month == '同比增减') { - seriesData.push({ + dateArray[month] = { name: month, type: 'line', yAxisIndex: 1, @@ -430,15 +425,14 @@ } }, data: [] - }) + } } else { - seriesData.push({ + dateArray[month] = { name: month, type: 'bar', data: [] - }) + } } - colorIndex++ } obj[month] = [] } @@ -455,10 +449,11 @@ obj[month][xAxisData.indexOf(columnName)] = amount } } - for (var i = 0; i < seriesData.length; i++) { - var name = seriesData[i].name; - if (obj[name]) { - seriesData[i].data = obj[name]; + for(var item in dateArray){ + if (obj[item]) { + dateArray[item].data = obj[item]; + seriesData.push(dateArray[item]); + legendData.push(item); } } var subtext = '' Index: ssts-web/src/main/webapp/homepage/exportMonitorData.jsp =================================================================== diff -u -r37620 -r37647 --- ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 37620) +++ ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 37647) @@ -124,6 +124,7 @@ }; } function createEcharts(){ + document.getElementById('echarts').removeAttribute("_echarts_instance_") document.getElementById('echarts').style.display = 'block'; myechart = echarts.init(document.getElementById('echarts')); var option = document.getElementById('echartsOption').value;