Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js
===================================================================
diff -u -r41478 -r41481
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js (.../washDataChartOfExt.js) (revision 41478)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js (.../washDataChartOfExt.js) (revision 41481)
@@ -200,13 +200,16 @@
})
html += '
' + item + ': ' + result.data.keyValues[item] + '
';
}
+ var actualWidth = document.body.clientWidth;
+ var actualHeight = document.body.clientHeight;
var formObj = new Ext.FormPanel({
frame: true,
border: 0,
labelSeparator: ':',
bodyStyle: 'padding:5px 5px 0px 5px',
labelAlign: 'right',
- autoWidth: true,
+ width: actualWidth,
+ height:actualHeight,
autoScroll: true,
id: 'printForm',
items: [{
@@ -263,6 +266,7 @@
function exportAll() {
var reportContainer = document.getElementById("report-container");
+ reportContainer.style.display = 'block';
html2canvas(reportContainer, {}).then((canvas) => {
var pageWidth = 595.28; // A4 宽度
var chunkHeight = 820; // A4 高度
@@ -296,6 +300,7 @@
pdf.addImage(dataUrl, 'JPEG', 10, 10, pageWidth, chunkHeight);
pdf.addPage();
}
+ reportContainer.style.display = 'none';
}
pdf.save("清洗机运行参数.pdf");
});
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp
===================================================================
diff -u -r41478 -r41481
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp (.../washDataChartOfExt.jsp) (revision 41478)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp (.../washDataChartOfExt.jsp) (revision 41481)
@@ -29,8 +29,8 @@
var WWWROOT = '${basePath}';
清洗机运行参数
-