Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js =================================================================== diff -u -r31282 -r31288 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 31282) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 31288) @@ -440,17 +440,6 @@ handler: function () { // excel的文件名称 var fileName = document.getElementById('thisIframe').contentWindow.document.getElementById('title').innerHTML; - if (myChart) { - var chartsvg = myChart.getSVG(); - var svgContainer = document.getElementById('thisIframe').contentWindow.document.getElementById("container"); - canvg(svgContainer, chartsvg); - var img = svgContainer.toDataURL("image/png"); - var chartImg = encodeURIComponent(img); - // 图片宽度和高度,为了计算图片比例,以便在excel中以正常比例显示,不至于拉伸 - var chartSize = svgContainer.width + ":" + svgContainer.height; - 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)); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp =================================================================== diff -u -r31282 -r31288 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp (.../showEchartsAndTable.jsp) (revision 31282) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/showEchartsAndTable.jsp (.../showEchartsAndTable.jsp) (revision 31288) @@ -52,7 +52,6 @@ #table table .sum2 { background-color: #005FB3; color: #fff; - border-right: 1px solid #fff; } #table table tr td { font-size:12px;