Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/report/js/rpt_main.js

@@ -495,6 +495,9 @@ let rptControlObj = {
         let rst = document.getElementById("btnRptOrientation").innerHTML.trim();
         return rst;
     },
+    getCloseWatermark: function () {
+        return PAGE_SHOW['closeWatermark'];
+    },
     changeType: function(newType) {
         let me = rptControlObj;
         let excelDom = document.getElementById("EXCEL_TYPE");

app/public/report/js/rpt_preview_common.js

@@ -7,6 +7,7 @@ function printPageLoading() {
     if (sessionStorage.multiRptsData) {
         let multiRptData = JSON.parse(sessionStorage.multiRptsData);
         let scaleFactor = parseInt(sessionStorage.scaleFactor);
+        let closeWaterMark = parseInt(sessionStorage.closeWaterMark);
         for (let idx = 0; idx < multiRptData.length; idx++) {
             let pageData = multiRptData[idx];
             if (idx === 0) {
@@ -14,7 +15,7 @@ function printPageLoading() {
             }
             let orgPixelSize = getPixelSize(pageData);
             let actArea = getActualArea(pageData);
-            let svgArr = rptPrintHelper.buildSvgArr(pageData, actArea, G_OFFSET_X, G_OFFSET_Y);
+            let svgArr = rptPrintHelper.buildSvgArr(pageData, actArea, G_OFFSET_X, G_OFFSET_Y, closeWaterMark);
             //let orientation = (pageData[JV.NODE_PAGE_INFO][JV.NODE_PAGE_SIZE][0] < pageData[JV.NODE_PAGE_INFO][JV.NODE_PAGE_SIZE][1])?"纵向":"横向";
             let orientation = "纵向";
             // showPreviewData(svgArr, actArea, scaleFactor, sessionStorage.pageSize, orientation, orgPixelSize);

app/public/report/js/rpt_print.js

@@ -57,6 +57,7 @@ let rptPrintHelper = {
                     sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
                     sessionStorage.orientation = rptControlObj.getCurrentOrientation();
                     sessionStorage.scaleFactor = 1;
+                    sessionStorage.closeWaterMark = rptControlObj.getCloseWatermark();
                     if (sessionStorage.pageSize === 'A3') {
                         window.open('/printReport/A3');
                     } else {
@@ -79,7 +80,7 @@ let rptPrintHelper = {
     previewSvgData: function() {
         //
     },
-    buildSvgArr: function (pagesData, actAreaArr, offsetX, offsetY) {
+    buildSvgArr: function (pagesData, actAreaArr, offsetX, offsetY, closeWaterMark) {
         let styles = pagesData[JV.NODE_STYLE_COLLECTION],
             fonts = pagesData[JV.NODE_FONT_COLLECTION],
             controls = pagesData[JV.NODE_CONTROL_COLLECTION]
@@ -115,7 +116,7 @@ let rptPrintHelper = {
                 svgPageArr.push(buildSignatureCellSvg(cell, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
                     offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
             }
-            if (PAGE_SHOW['closeWatermark'] === 0) {
+            if (closeWaterMark === 0) {
                 for (let cell of page.watermark_cells) {
                     svgPageArr.push(buildSignatureCellSvg(cell, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
                         offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));