4 年之前 · a48d1963f9
--- a/modules/reports/routes/rpt_tpl_router_fe.js
+++ b/modules/reports/routes/rpt_tpl_router_fe.js
@@ -20,6 +20,19 @@ module.exports = function (app) {
 
				             );
			
 
				         }
			
 
				     });
			
 
				+    app.get('/rpt_printA3',  function(req, res) {
			
 
				+        if (!req.session.sessionUser.id) {
			
 
				+            res.redirect('/login');
			
 
				+        }
			
 
				+        else {
			
 
				+            res.render('building_saas//report/html/rpt_printA3.html',
			
 
				+                {
			
 
				+                    userAccount: req.session.userAccount,
			
 
				+                    userID: req.session.sessionUser.id
			
 
				+                }
			
 
				+            );
			
 
				+        }
			
 
				+    });
			
 
				 
			
 
				     rptTplRouter.post('/getRptTplTree', reportTplController.getRptTplTree);
			
 
				 
			
--- a/web/building_saas/report/html/rpt_printA3.html
+++ b/web/building_saas/report/html/rpt_printA3.html
@@ -0,0 +1,26 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="zh-CN">
			
 
				+<head>
			
 
				+    <meta charset="UTF-8">
			
 
				+    <title></title>
			
 
				+</head>
			
 
				+<style type="text/css">
			
 
				+    .pageBreak {
			
 
				+        page-break-before: auto;
			
 
				+        page-break-after: auto;
			
 
				+    }
			
 
				+    @page {size: A3 portrait;}
			
 
				+    body {page: page}
			
 
				+    div {page: page}
			
 
				+</style>
			
 
				+<script type="text/javascript" src="/web/building_saas/report/js/jpc_output_value_define.js"></script>
			
 
				+<script src="/lib/jquery/jquery-3.2.1.min.js"></script>
			
 
				+<script type="text/javascript" src="/web/building_saas/report/js/jpc_output.js"></script>
			
 
				+<script type="text/javascript" src="/web/building_saas/report/js/rpt_print.js"></script>
			
 
				+<script type="text/javascript" src="/web/building_saas/report/js/rpt_preview_common.js"></script>
			
 
				+<body onload="loading()" onbeforeunload="closing()">
			
 
				+<canvas id="chkCanvas" style="display:none"></canvas>
			
 
				+</body>
			
 
				+<SCRIPT type="text/javascript">
			
 
				+</SCRIPT>
			
 
				+</html>
			
--- a/web/building_saas/report/js/rpt_print.js
+++ b/web/building_saas/report/js/rpt_print.js
@@ -43,7 +43,11 @@ let rptPrintHelper = {
 
				                     sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
			
 
				                     sessionStorage.orientation = rptControlObj.getCurrentOrientation();
			
 
				                     sessionStorage.scaleFactor = 1;
			
 
				-                    window.open('/rpt_print');
			
 
				+                    if (sessionStorage.pageSize === 'A3') {
			
 
				+                        window.open('/rpt_printA3');
			
 
				+                    } else {
			
 
				+                        window.open('/rpt_print');
			
 
				+                    }
			
 
				                 },
			
 
				                 function(failRst){
			
 
				                     sessionStorage.currentPageData = null;