Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r31205 -r31280 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 31205) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 31280) @@ -3658,52 +3658,28 @@ } /** - * 创建echarts图形 - * @param {应用图形的容器} doc - * @param {参数} res + * 创建am4charts图形 + * @param {参数} chartsData */ -function createEcharts(doc,res){ - myChart = echarts.init(doc); - myChart.clear(); - if(res.legendData.length > 0){ - doc.style.width = res.xAxisData.length>10?1500:1000 + 'px'; - var option = { - backgroundColor:"#fff", - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'shadow' - } - }, - legend: { - data: res.legendData, - type: 'scroll', - orient: 'vertical', - right: '10', - top: 'center', - bottom: 20 - }, - toolbox: { - show: false - }, - xAxis: [{ - type: 'category', - data: res.xAxisData, - axisLabel:{ - showMaxLabel:true, - interval:0, - rotate:res.xAxisData.length>10?40:0 - } - }], - yAxis: [{ - type: 'value' - }], - series: res.seriesData - }; - myChart.setOption(option); - myChart.resize({ - width: res.xAxisData.length>10?1500:1000, - height: 400 - }) +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; } + 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(); } \ No newline at end of file