Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r31314 -r31340 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 31314) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 31340) @@ -3692,9 +3692,14 @@ showResult('请先查询数据'); return } + var re=/([a-zA-Z]+\=)([#a-zA-Z0-9]+)/ig; var jsFileName = "\\disinfectsystem\\reportforms\\js\\LZString.js"; var tableHtml = doc.contentWindow.document.getElementById('table').innerHTML; - tableHtml = Base64.encode(encodeURI(tableHtml)); + //兼容IE,IE获取table会过滤引号,把引号补上去 + tableHtml = tableHtml.replace(re,'$1"$2"'); + //兼容IE,IE获取table是大写,要转换小写 + tableHtml = tableHtml.toLowerCase(); + tableHtml = Base64.encode(encodeURIComponent(tableHtml)); var htmlTable = LZString.compressToEncodedURIComponent(tableHtml); var w = doc.contentWindow.document.body.clientWidth; doc.contentWindow.document.getElementById('imgWidth').value = (w - 40); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js =================================================================== diff -u -r31318 -r31340 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 31318) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 31340) @@ -11,7 +11,7 @@ var newLegendData = []; var maxArr = []; var data = {}; - html += "
日期 | "; for (var i = 0; i < resultData.header.length; i++) { html += "" + resultData.header[i].split(',')[0] + " | "; @@ -29,7 +29,7 @@ xAxisData.push(parseInt(item.split('-')[1])+'月'); } html += "||
---|---|---|---|
" + item + " | "; + html += "" + item + " | "; for (var i = 0; i < resultData.header.length; i++) { var materialType = resultData.header[i].split(',')[0]; var amount = 0;