Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jasper =================================================================== diff -u -r27617 -r28097 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml =================================================================== diff -u -r28019 -r28097 --- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml (.../QualityMonitoringReport.jrxml) (revision 28019) +++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml (.../QualityMonitoringReport.jrxml) (revision 28097) @@ -1,5 +1,5 @@ - + @@ -86,8 +86,8 @@ <band height="41" splitType="Stretch"> <textField> - <reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="3000" height="41"/> - <textElement verticalAlignment="Middle"> + <reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="699" height="41"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml =================================================================== diff -u -r27617 -r28097 --- ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml (.../sterilizingStoveUseCountDetail.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml (.../sterilizingStoveUseCountDetail.jrxml) (revision 28097) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="yearWorkloadReport" language="groovy" pageWidth="760" pageHeight="842" columnWidth="760" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d9e5c598-08b2-4b9c-b6c8-46674b3aec2b"> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="yearWorkloadReport" language="groovy" pageWidth="199" pageHeight="842" columnWidth="199" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d9e5c598-08b2-4b9c-b6c8-46674b3aec2b"> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> <property name="ireport.y" value="0"/> @@ -59,8 +59,8 @@ <title> <band height="25" splitType="Stretch"> <textField> - <reportElement uuid="a70c7921-055d-4e07-8f4b-ad40d72ec6aa" x="0" y="0" width="740" height="25"/> - <textElement verticalAlignment="Middle"> + <reportElement uuid="a70c7921-055d-4e07-8f4b-ad40d72ec6aa" x="0" y="0" width="550" height="25"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper =================================================================== diff -u -r28019 -r28097 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r28096 -r28097 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 28096) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 28097) @@ -282,8 +282,8 @@ parametMap.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE); JRDataSource dataSourceForPrint = new JRBeanCollectionDataSource(dataSourceList);//打印用数据源 JasperPrint jasperPrintForPrint = JasperFillManager.fillReport(jasperReport, parametMap, dataSourceForPrint); - session.setAttribute("jasperPrintForPrint", jasperPrintForPrint); setPrintTextWidth(jasperPrintForPrint, reportName); + session.setAttribute("jasperPrintForPrint", jasperPrintForPrint); String fileName = (String) (parametMap.get("title")==null?"未命名":parametMap.get("title")); StrutsParamUtils.getRequest().getSession() @@ -345,7 +345,7 @@ * @return */ private boolean canCalcframeWidth(String reportName){ - String canCalcStr = "tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport"; + String canCalcStr = "QualityMonitoring,sterilizingStoveUseCount,tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport"; if(canCalcStr.indexOf(reportName) != -1){ return true; }