Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

# Conflicts:
#	web/building_saas/main/js/views/sub_view.js

modules/reports/controllers/rpt_controller.js

@@ -18,6 +18,7 @@ import JpcEx from "../rpt_component/jpc_ex";
 import rptUtil from "../util/rpt_util";
 import rpt_xl_util from "../util/rpt_excel_util";
 import rpt_pdf_util from "../util/rpt_pdf_util";
+import rpt_svg_util from "../util/rpt_svg_util";
 import fs from "fs";
 import strUtil from "../../../public/stringUtil";
 import rptDataExtractor from "../util/rpt_construct_data_util";
@@ -264,6 +265,21 @@ module.exports = {
         });
     },
 
+    getReportAllPagesSvg: function (req, res) {
+        let params = JSON.parse(req.body.params),
+            rpt_id = params.rpt_tpl_id,
+            prj_id = params.prj_id,
+            pageSize = params.pageSize,
+            orientation = params.orientation,
+            customizeCfg = params.custCfg
+        ;
+        let user_id = req.session.sessionUser.id;
+        getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, null, function (err, pageRst) {
+            let svgRstStrArr = rpt_svg_util.exportSvgStr(pageRst, 0, 0);
+            callback(req, res, err, svgRstStrArr);
+        });
+    },
+
     getTestReportAllPages: function(req, res){
         let rpt_id = req.body.ID;
         let pageSize = req.body.pageSize;

modules/reports/routes/report_router.js

@@ -25,6 +25,7 @@ module.exports =function (app) {
     rptRouter.get('/getTestPDF/:id/:size/:rptName', reportController.getTestPDF);
     //now is the real:
     rptRouter.post('/getReport', reportController.getReportAllPages);
+    rptRouter.post('/getReportSvg', reportController.getReportAllPagesSvg);
     rptRouter.get('/getExcel/:prj_id/:rpt_id/:size/:orientation/:rptName/:isOneSheet/:option', reportController.getExcel);
     rptRouter.get('/getPDF/:prj_id/:rpt_id/:size/:orientation/:rptName', reportController.getPDF);
     // rptRouter.get('/getExcelInOneBook/:ids/:size/:rptName/:option', reportController.getExcelInOneBook);

modules/reports/util/rpt_svg_util.js

@@ -4,63 +4,129 @@
  */
 
 let JV = require('../rpt_component/jpc_value_define');
-const SCREEN_DPI = [96,96];
+let pdf = require('pdfkit');
+let jpcCmnHelper = require('../rpt_component/helper/jpc_helper_common');
+let SCREEN_DPI = jpcCmnHelper.getScreenDPI();
 
 module.exports = {
-    exportSvgStr: function (pagesData, callback) {
+    exportSvgStr: function (pagesData, offsetX, offsetY) {
+        let rst = [];
         let styles = pagesData[JV.NODE_STYLE_COLLECTION],
             fonts = pagesData[JV.NODE_FONT_COLLECTION],
             controls = pagesData[JV.NODE_CONTROL_COLLECTION]
         ;
-        for (let page of pagesData.items) {
+        let pdf_doc = new pdf({autoFirstPage: false});
+        for (let idx = 0; idx < pagesData.items.length; idx++) {
+            let page = pagesData.items[idx];
             let svgPageArr = [], pixelSize = getPixelSize(pagesData);
             svgPageArr.push("<svg width='" + pixelSize[0] + "' height='" + pixelSize[1] + "'>");
+            let adjustY = 0.5 * ((idx + 1) % 2);
+            // let cnt = 0;
             for (let cell of page.cells) {
-                svgPageArr.push(buildCellSvg(cell, fonts, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER]));
+                svgPageArr.push(buildCellSvg(cell, fonts, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND], offsetX, offsetY, adjustY, pdf_doc));
+                // cnt++;
+                // console.log(cnt);
             }
             svgPageArr.push("</svg>");
+            rst.push(svgPageArr);
         }
+        return rst;
     }
 }
 
-function buildCellSvg(cell, fonts, styles, controls, mergeBorder) {
+function getActualBorderStyle(cell, styles, mergeBorderStyle, pageBorderArea, borderStr) {
+    let rst = styles[cell[JV.PROP_STYLE]][borderStr];
+    if (mergeBorderStyle) {
+        if (parseFloat(cell[JV.PROP_AREA][borderStr]) === parseFloat(pageBorderArea[borderStr])) {
+            if (borderStr === JV.PROP_LEFT || borderStr === JV.PROP_RIGHT) {
+                if (parseFloat(cell[JV.PROP_AREA][JV.PROP_TOP]) >= parseFloat(pageBorderArea[JV.PROP_TOP]) &&
+                    parseFloat(cell[JV.PROP_AREA][JV.PROP_BOTTOM]) <= parseFloat(pageBorderArea[JV.PROP_BOTTOM])) {
+                    rst = mergeBorderStyle[borderStr];
+                }
+            } else if (borderStr === JV.PROP_TOP || borderStr === JV.PROP_BOTTOM) {
+                if (parseFloat(cell[JV.PROP_AREA][JV.PROP_LEFT]) >= parseFloat(pageBorderArea[JV.PROP_LEFT]) &&
+                    parseFloat(cell[JV.PROP_AREA][JV.PROP_RIGHT]) <= parseFloat(pageBorderArea[JV.PROP_RIGHT])) {
+                    rst = mergeBorderStyle[borderStr];
+                }
+            }
+        }
+    }
+    return rst;
+}
+
+function buildCellSvg(cell, fonts, styles, controls, pageMergeBorder, rptMergeBorder, offsetX, offsetY, adjustY, pdf_doc) {
     let rst = [];
     let style = styles[cell[JV.PROP_STYLE]];
+    let mergeBandStyle = null;
+    if (rptMergeBorder) {
+        mergeBandStyle = styles[rptMergeBorder[JV.PROP_STYLE][JV.PROP_ID]];
+    }
+    let font = cell[JV.PROP_FONT];
+    if (typeof font === 'string') {
+        font = fonts[cell[JV.PROP_FONT]];
+    }
+    let left = parseInt(cell[JV.PROP_AREA][JV.PROP_LEFT]) + offsetX + 0.5,
+        right = parseInt(cell[JV.PROP_AREA][JV.PROP_RIGHT]) + offsetX + 0.5,
+        top = parseInt(cell[JV.PROP_AREA][JV.PROP_TOP]) + offsetY + adjustY,
+        bottom = parseInt(cell[JV.PROP_AREA][JV.PROP_BOTTOM]) + offsetY + adjustY
+    ;
     if (style) {
-        if (style[JV.PROP_LEFT] && parseFloat(style[JV.PROP_LEFT][JV.PROP_LINE_WEIGHT]) > 0) {
-            rst.push("<line x1='" + cell[JV.PROP_AREA][JV.PROP_LEFT] + "' y1='" + cell[JV.PROP_AREA][JV.PROP_TOP] +
-                "' x2='" + cell[JV.PROP_AREA][JV.PROP_LEFT] + "' y2='" + cell[JV.PROP_AREA][JV.PROP_BOTTOM] +
-                "' style='stroke:rgb(0,0,0);stroke-width:1'/>")
+        let leftBS = getActualBorderStyle(cell, styles, mergeBandStyle, (pageMergeBorder)?pageMergeBorder:rptMergeBorder[JV.PROP_AREA], JV.PROP_LEFT);
+        // if (style[JV.PROP_LEFT] && parseFloat(style[JV.PROP_LEFT][JV.PROP_LINE_WEIGHT]) > 0) {
+        if (leftBS && parseFloat(leftBS[JV.PROP_LINE_WEIGHT]) > 0) {
+            rst.push("<line x1='" + left + "' y1='" + top +
+                "' x2='" + left + "' y2='" + bottom +
+                "' style='stroke:rgb(0,0,0);stroke-width:" + leftBS[JV.PROP_LINE_WEIGHT] +"'/>")
         }
-        if (style[JV.PROP_RIGHT] && parseFloat(style[JV.PROP_RIGHT][JV.PROP_LINE_WEIGHT]) > 0) {
-            rst.push("<line x1='" + cell[JV.PROP_AREA][JV.PROP_RIGHT] + "' y1='" + cell[JV.PROP_AREA][JV.PROP_TOP] +
-                "' x2='" + cell[JV.PROP_AREA][JV.PROP_RIGHT] + "' y2='" + cell[JV.PROP_AREA][JV.PROP_BOTTOM] +
-                "' style='stroke:rgb(0,0,0);stroke-width:1'/>")
+        let rightBS = getActualBorderStyle(cell, styles, mergeBandStyle, (pageMergeBorder)?pageMergeBorder:rptMergeBorder[JV.PROP_AREA], JV.PROP_RIGHT);
+        // if (style[JV.PROP_RIGHT] && parseFloat(style[JV.PROP_RIGHT][JV.PROP_LINE_WEIGHT]) > 0) {
+        if (rightBS && parseFloat(rightBS[JV.PROP_LINE_WEIGHT]) > 0) {
+            rst.push("<line x1='" + right + "' y1='" + top +
+                "' x2='" + right + "' y2='" + bottom +
+                "' style='stroke:rgb(0,0,0);stroke-width:" + rightBS[JV.PROP_LINE_WEIGHT] +"'/>")
         }
-        if (style[JV.PROP_TOP] && parseFloat(style[JV.PROP_TOP][JV.PROP_LINE_WEIGHT]) > 0) {
-            rst.push("<line x1='" + cell[JV.PROP_AREA][JV.PROP_LEFT] + "' y1='" + cell[JV.PROP_AREA][JV.PROP_TOP] +
-                "' x2='" + cell[JV.PROP_AREA][JV.PROP_RIGHT] + "' y2='" + cell[JV.PROP_AREA][JV.PROP_TOP] +
-                "' style='stroke:rgb(0,0,0);stroke-width:1'/>")
+        let topBS = getActualBorderStyle(cell, styles, mergeBandStyle, (pageMergeBorder)?pageMergeBorder:rptMergeBorder[JV.PROP_AREA], JV.PROP_TOP);
+        // if (style[JV.PROP_TOP] && parseFloat(style[JV.PROP_TOP][JV.PROP_LINE_WEIGHT]) > 0) {
+        if (topBS && parseFloat(topBS[JV.PROP_LINE_WEIGHT]) > 0) {
+            rst.push("<line x1='" + left + "' y1='" + top +
+                "' x2='" + right + "' y2='" + top +
+                "' style='stroke:rgb(0,0,0);stroke-width:" + topBS[JV.PROP_LINE_WEIGHT] +"'/>")
         }
-        if (style[JV.PROP_BOTTOM] && parseFloat(style[JV.PROP_BOTTOM][JV.PROP_LINE_WEIGHT]) > 0) {
-            rst.push("<line x1='" + cell[JV.PROP_AREA][JV.PROP_LEFT] + "' y1='" + cell[JV.PROP_AREA][JV.PROP_BOTTOM] +
-                "' x2='" + cell[JV.PROP_AREA][JV.PROP_RIGHT] + "' y2='" + cell[JV.PROP_AREA][JV.PROP_BOTTOM] +
-                "' style='stroke:rgb(0,0,0);stroke-width:1'/>")
+        let bottomBS = getActualBorderStyle(cell, styles, mergeBandStyle, (pageMergeBorder)?pageMergeBorder:rptMergeBorder[JV.PROP_AREA], JV.PROP_BOTTOM);
+        // if (style[JV.PROP_BOTTOM] && parseFloat(style[JV.PROP_BOTTOM][JV.PROP_LINE_WEIGHT]) > 0) {
+        if (bottomBS && parseFloat(bottomBS[JV.PROP_LINE_WEIGHT]) > 0) {
+            rst.push("<line x1='" + left + "' y1='" + bottom +
+                "' x2='" + right + "' y2='" + bottom +
+                "' style='stroke:rgb(0,0,0);stroke-width:" + bottomBS[JV.PROP_LINE_WEIGHT] +"'/>")
         }
     }
-    let font = cell[JV.PROP_FONT];
-    if (typeof font === 'string') {
-        font = fonts[cell[JV.PROP_FONT]];
-    }
-    let fontsize = parseInt(font[JV.FONT_PROPS[JV.FONT_PROP_IDX_HEIGHT]]);
-    let left = parseInt(cell[JV.PROP_AREA][JV.PROP_LEFT]),
-        right = parseInt(cell[JV.PROP_AREA][JV.PROP_RIGHT]),
-        top = parseInt(cell[JV.PROP_AREA][JV.PROP_TOP]),
-        bottom = parseInt(cell[JV.PROP_AREA][JV.PROP_BOTTOM]),
+    buildText(rst, cell, font, controls[cell[JV.PROP_CONTROL]], offsetX, offsetY, adjustY, pdf_doc);
+
+    return rst.join("");
+}
+
+function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY, pdf_doc) {
+    let orgFontHeight = parseInt(font[JV.FONT_PROPS[JV.FONT_PROP_IDX_HEIGHT]]);
+    let fontWeight = (font[JV.FONT_PROPS[JV.FONT_PROP_IDX_BOLD]] === 'T')?"bold":"normal";
+    let fontStyle = (font[JV.FONT_PROPS[JV.FONT_PROP_IDX_ITALIC]] === 'T')?"italic":"normal";
+    let left = parseInt(cell[JV.PROP_AREA][JV.PROP_LEFT]) + offsetX + 0.5,
+        right = parseInt(cell[JV.PROP_AREA][JV.PROP_RIGHT]) + offsetX + 0.5,
+        top = parseInt(cell[JV.PROP_AREA][JV.PROP_TOP]) + offsetY + adjustY,
+        bottom = parseInt(cell[JV.PROP_AREA][JV.PROP_BOTTOM]) + offsetY + adjustY,
         x = left, y = top,
         text_anchor = "start"
     ;
-    let control = controls[cell[JV.PROP_CONTROL]];
+    let value = cell[JV.PROP_VALUE];
+    if (!(value)) {
+        value = "";
+    }
+    let values = null;
+    if (typeof value === "string") {
+        values = value.split("|");
+    } else {
+        values = [value];
+    }
+    let stepHeight = (parseInt(cell[JV.PROP_AREA][JV.PROP_BOTTOM]) - parseInt(cell[JV.PROP_AREA][JV.PROP_TOP])) / values.length;
     if (control) {
         if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_HORIZON]] === "left") {
             text_anchor = "start";
@@ -72,16 +138,47 @@ function buildCellSvg(cell, fonts, styles, controls, mergeBorder) {
             text_anchor = "middle";
             x = Math.round((left + right) / 2);
         }
-        if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "top") {
-            y = top + JV.OUTPUT_OFFSET[JV.OFFSET_IDX_TOP];
-        } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "bottom") {
-            y = bottom - fontsize - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM];
-        } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "center") {
-            y = Math.round((top + bottom + fontsize) / 2 );
+    }
+    for (let vidx = 0; vidx < values.length; vidx++) {
+        //check whether need to adjust the font size
+        let dftFontHeight = orgFontHeight;
+        let dftFontBold = font[JV.FONT_PROPS[3]];
+        let dftFontItalic = font[JV.FONT_PROPS[4]];
+        if (dftFontBold && dftFontBold === 'T') {
+            pdf_doc.font(__dirname+'/pdf_base_files/hwxsb.ttf');
+        }else if(dftFontItalic && dftFontItalic === 'T'){
+            pdf_doc.font(__dirname+'/pdf_base_files/Smart-italic.ttf');
+        }else {
+            pdf_doc.font(__dirname+'/pdf_base_files/Smart.ttf');
+        }
+        pdf_doc.fontSize(dftFontHeight);
+        while ((right - left) <= pdf_doc.widthOfString(values[vidx])) {
+            if (dftFontHeight > 6) {
+                dftFontHeight--;
+                pdf_doc.fontSize(dftFontHeight);
+            } else {
+                break;
+            }
+        }
+        dftFontHeight = (dftFontHeight * 3 / 4); //SVG的字体与canvas的字体大小的切换, 不用考虑取整
+        if (control) {
+            if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "top") {
+                y = Math.round((top + vidx * stepHeight) + JV.OUTPUT_OFFSET[JV.OFFSET_IDX_TOP]);
+            } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "bottom") {
+                y = Math.round((top + (vidx + 1) * stepHeight) - JV.OUTPUT_OFFSET[JV.OFFSET_IDX_BOTTOM]);
+            } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "center") {
+                y = Math.round(((top + vidx * stepHeight) + (top + (vidx + 1) * stepHeight) + dftFontHeight) / 2 );
+            }
+        }
+        if (font[JV.PROP_NAME] === "宋体") {
+            y--;
         }
+        destRst.push("<text style='fill:black;font-family:" + font[JV.PROP_NAME] +
+            ";font-weight:" + fontWeight +
+            ";font-style:" + fontStyle +
+            ";font-size:" + dftFontHeight + "pt' x='" +
+            x +"' y='" + y + "' text-anchor='" + text_anchor + "' xml:space='preserve'>" + values[vidx] + "</text>");
     }
-    rst.push("<text style='fill:black;font-size:" + fontsize + "pt' x='" + x +"' y='" + y + "'>" + cell[JV.PROP_VALUE] + "</text>");
-    return rst.join();
 }
 
 function getPixelSize(pagesData) {

test/unit/reports/rpt_cfg.js

@@ -3,8 +3,8 @@ module.exports = {
         {
             "ID" : "ReportTitle_Main",
             "CfgDispName" : "主标题",
-            "Name" : "smartSimSun",
-            "FontHeight" : "27",
+            "Name" : "宋体",
+            "FontHeight" : "32",
             "FontColor" : "BLACK",
             "FontBold" : "T",
             "FontItalic" : "F",
@@ -15,8 +15,20 @@ module.exports = {
         {
             "ID" : "ReportTitle_Vice_1",
             "CfgDispName" : "副标题",
-            "Name" : "smartSimSun",
-            "FontHeight" : "20",
+            "Name" : "宋体",
+            "FontHeight" : "22",
+            "FontColor" : "BLACK",
+            "FontBold" : "T",
+            "FontItalic" : "F",
+            "FontUnderline" : "F",
+            "FontStrikeOut" : "F",
+            "FontAngle" : "0"
+        },
+        {
+            "ID" : "ReportTitle_Vice_2",
+            "CfgDispName" : "副标题2",
+            "Name" : "宋体",
+            "FontHeight" : "18",
             "FontColor" : "BLACK",
             "FontBold" : "T",
             "FontItalic" : "F",
@@ -27,7 +39,7 @@ module.exports = {
         {
             "ID" : "HeaderColumn",
             "CfgDispName" : "栏头",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -39,7 +51,7 @@ module.exports = {
         {
             "ID" : "Header",
             "CfgDispName" : "表头",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -51,7 +63,7 @@ module.exports = {
         {
             "ID" : "FooterColumn",
             "CfgDispName" : "栏尾",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -63,7 +75,7 @@ module.exports = {
         {
             "ID" : "Footer",
             "CfgDispName" : "表尾",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -75,7 +87,7 @@ module.exports = {
         {
             "ID" : "GrandTotal",
             "CfgDispName" : "总合计",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -87,7 +99,7 @@ module.exports = {
         {
             "ID" : "SectionTotal",
             "CfgDispName" : "章合计",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -99,7 +111,19 @@ module.exports = {
         {
             "ID" : "Content",
             "CfgDispName" : "正文内容",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
+            "FontHeight" : "12",
+            "FontColor" : "BLACK",
+            "FontBold" : "F",
+            "FontItalic" : "F",
+            "FontUnderline" : "F",
+            "FontStrikeOut" : "F",
+            "FontAngle" : "0"
+        },
+        {
+            "ID" : "Content_Narrow",
+            "CfgDispName" : "正文内容-窄体",
+            "Name" : "Arial Narrow",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -110,7 +134,7 @@ module.exports = {
         },
         {
             "ID" : "Header_V1",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",
@@ -121,7 +145,7 @@ module.exports = {
         },
         {
             "ID" : "Header_V2",
-            "Name" : "smartSimSun",
+            "Name" : "宋体",
             "FontHeight" : "12",
             "FontColor" : "BLACK",
             "FontBold" : "F",

test/unit/reports/test_svg_data.js

@@ -0,0 +1,100 @@
+/**
+ * Created by Tony on 2018/7/5.
+ */
+
+let test = require('tape');
+import JpcEx from "../../../modules/reports/rpt_component/jpc_ex";
+import JV from "../../../modules/reports/rpt_component/jpc_value_define";
+let config = require("../../../config/config.js");
+config.setupDb(process.env.NODE_ENV);
+let mongoose = require("mongoose");
+let fileUtils = require("../../../modules/common/fileUtils");
+let path = require('path');
+let dbm = require("../../../config/db/db_manager");
+let rpt_cfg = require('./rpt_cfg');
+dbm.connect(process.env.NODE_ENV);
+
+//统一引用models
+fileUtils.getGlobbedFiles('../../../modules/all_models/*.js').forEach(function(modelPath) {
+    require(path.resolve(modelPath));
+});
+
+let cfgCacheUtil = require("../../../config/cacheCfg");
+cfgCacheUtil.setupDftCache();
+
+let fsUtil = require("../../../public/fsUtil");
+
+let demoPrjId = - 1;
+let demoRptId = 232, pagesize = "A4";
+
+// demoPrjId = 720; //QA: DW3
+demoPrjId = 2260; //QA:
+//*/
+// let userId_Leng = "59cdf14a0034a1000ba52b97"; //小冷User Id 换成_id了
+let userId_Leng = "5acac1e885bf55000bd055ba";
+let userId_Dft = userId_Leng;
+/*/
+ let userId_Dft = "595328da1934dc327cad08eb";
+ //*/
+
+let rptTplFacade = require("../../../modules/reports/facade/rpt_template_facade");
+let rptTplDataFacade = require("../../../modules/reports/facade/rpt_tpl_data_facade");
+
+import rptDataExtractor from "../../../modules/reports/util/rpt_construct_data_util";
+import rpt_svg_util from "../../../modules/reports/util/rpt_svg_util";
+
+let fs = require('fs');
+//设置Date Format函数
+fs.readFile(__dirname.slice(0, __dirname.length - 18) + '/public/web/date_util.js', 'utf8', 'r', function (err, data) {
+    eval(data);
+});
+
+test('测试 - 测试模板啦: ', function (t) {
+    rptTplFacade.getRptTemplate(demoRptId).then(function(rptTpl) {
+        let rptDataUtil = new rptDataExtractor();
+        rptDataUtil.initialize(rptTpl._doc);
+        let filter = rptDataUtil.getDataRequestFilter();
+        //正常应该根据报表模板定义的数据类型来请求数据
+        rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
+            if (!err) {
+                try {
+                    let tplData = rptDataUtil.assembleData(rawDataObj);
+                    //it's time to build the report!!!
+                    let printCom = JpcEx.createNew();
+                    rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pagesize;
+                    let defProperties = rpt_cfg;
+                    let dftOption = JV.PAGING_OPTION_NORMAL;
+                    printCom.initialize(rptTpl);
+                    printCom.analyzeData(rptTpl, tplData, defProperties, dftOption);
+                    let maxPages = printCom.totalPages;
+                    let pageRst = printCom.outputAsSimpleJSONPageArray(rptTpl, tplData, 1, maxPages, defProperties);
+                    if (pageRst) {
+                        let svgRstStrArr = rpt_svg_util.exportSvgStr(pageRst, 0, 0);
+                        fsUtil.writeObjToFile(svgRstStrArr, "D:/GitHome/ConstructionCost/tmp/rptPageResult_SVG格式.jsp");
+                    } else {
+                        console.log("oh! no pages were created!");
+                    }
+                } catch (ex) {
+                    console.log(ex);
+                    t.pass('pass with exception!');
+                    t.end();
+                }
+
+                t.pass('pass succeeded!');
+                t.end();
+            } else {
+                console.log(msg);
+                t.pass('pass with error!');
+                t.end();
+            }
+        })
+    });
+});
+
+test('close the connection', function (t) {
+    setTimeout(function () {
+        mongoose.disconnect();
+        t.pass('closing db connection');
+        t.end();
+    }, 3000);
+});

web/building_saas/main/js/models/calc_program.js

@@ -489,7 +489,9 @@ let calcTools = {
             (treeNode.data.type == rationType.gljRation) &&
             ((treeNode.data.subType === gljType.LABOUR && baseName === calcBaseNames.RGFJC) ||
                 (baseMaterialTypes.includes(treeNode.data.subType) && baseName === calcBaseNames.CLFJC) ||
-                (treeNode.data.subType === gljType.GENERAL_MACHINE && baseName === calcBaseNames.JXFJC))
+                (treeNode.data.subType === gljType.GENERAL_MACHINE && baseName === calcBaseNames.JXFJC) ||
+                (treeNode.data.subType === gljType.MAIN_MATERIAL && baseName === calcBaseNames.ZCFJC) ||
+                (treeNode.data.subType === gljType.EQUIPMENT && baseName === calcBaseNames.SBFJC))
         ) {
             let aprice = me.uiGLJPrice(treeNode.data.adjustPrice);
             let mprice = me.uiGLJPrice(treeNode.data.marketUnitFee);
@@ -778,6 +780,8 @@ const calcBaseNames = {
     RGFJC: '人工费价差',
     CLFJC: '材料费价差',
     JXFJC: '机械费价差',
+    ZCFJC: '主材费价差',
+    SBFJC: '设备费价差',
     ZCF: '主材费',
     SBF: '设备费',
     RGGR: '人工工日',
@@ -822,11 +826,17 @@ const rationCalcBases = {
     '机械费价差': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptDiffPrice, isTender);
     },
+    '主材费价差': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptDiffPrice, isTender);
+    },
+    '设备费价差': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptDiffPrice, isTender);
+    },
     '主材费': function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptMarketPrice, isTender);
+        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptBasePrice, isTender);
     },
     '设备费': function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
     },
     '人工工日': function (node, isTender) {
         if (!node.data.gljList) return 0;

web/building_saas/main/js/models/ration_glj.js

@@ -121,7 +121,8 @@ var ration_glj = {
                     glj.type = glj.subType;
                 };
 
-                glj.quantity = (glj.quantity / billQuantity).toDecimal(decimalObj.glj.quantity);
+                // glj.quantity = (glj.quantity / billQuantity).toDecimal(decimalObj.glj.quantity);
+                glj.quantity = (glj.quantity / billQuantity).toDecimal(decimalObj.process);  // 广联达这里没有取舍
             };
             return oneBill;
         }

web/building_saas/main/js/views/glj_col.js

@@ -25,12 +25,71 @@ let gljCol = {
         // 工料机类型是混凝土、砂浆、配合比、机械台班时，价格不可编辑。
         editedTyep:[GLJTypeConst.MAIN_MATERIAL,GLJTypeConst.EQUIPMENT]//主材设备
     },
+    project_glj_setting:{
+        header: [
+            {headerName: "编码", headerWidth: 80, dataCode: "code", dataType: "String"},
+            {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String"},
+            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", hAlign: "left", dataType: "String"},
+            {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
+            {headerName: "类型", headerWidth: 45, dataCode: "short_name", hAlign: "center", dataType: "String"},
+            {headerName: "总消耗量", headerWidth: 130, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
+            {headerName: "定额价", headerWidth: 70, dataCode: "basePrice", hAlign: "right", dataType: "Number",decimalField:'glj.unitPrice',validator:"number"},
+            {headerName: "调整价", headerWidth: 70, dataCode: "adjustPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice"},
+            {headerName: "市场价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice",validator:"number"},
+            {headerName: "是否暂估", headerWidth: 60, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "主要材料", headerWidth: 60, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "供货方式", headerWidth: 80, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
+            {headerName: "甲供数量", headerWidth: 100, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "三材类别", headerWidth: 80, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap},
+            {headerName: "三材系数", headerWidth: 100, dataCode: "materialCoe", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:'material'
+            {headerName: "交货方式", headerWidth: 90, dataCode: "delivery", hAlign: "left", dataType: "String"},
+            {headerName: "送达地点", headerWidth: 100, dataCode: "delivery_address", hAlign: "left", dataType: "String"},
+            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox"},
+            {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String"}
+        ],
+            view: {
+            lockColumns: [0,1,2,3,4,5,7]
+        }
+    },
+    mixRatio_Setting:{
+        header:[
+            {headerName: "编码", headerWidth: 120, dataCode: "code", dataType: "String"},
+            {headerName: "名称", headerWidth: 120, dataCode: "name", dataType: "String"},
+            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", dataType: "String"},
+            {headerName: "单位", headerWidth: 120, dataCode: "unit", hAlign: "center", dataType: "String"},
+            {headerName: "类型", headerWidth: 120, dataCode: "short_name", hAlign: "center", dataType: "String"},
+            {headerName: "定额价", headerWidth: 120, dataCode: "basePrice", hAlign: "right", dataType: "Number",decimalField:'glj.unitPrice',validator:"number"},
+            {headerName: "调整价", headerWidth: 120, dataCode: "adjustPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice"},
+            {headerName: "市场价", headerWidth: 120, dataCode: "marketPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice",validator:"number"},
+            {headerName: "消耗量", headerWidth: 120, dataCode: "consumption", hAlign: "right", dataType: "Number",decimalField:"glj.quantity",validator:"number"}
+        ],
+        view: {
+            lockColumns: [0,1,2,3,4,5,6,7]
+        }
+    },
     removeCol:function (dataCode,setting) {
-       // let colIndex =
-
-
-
+        let colIndex = _.findIndex(setting.header,{'dataCode':dataCode});
+        if(colIndex != -1){
+            setting.header.splice(colIndex,1);//去掉列;
+            let newArray = [];
+            for(let l of setting.view.lockColumns){
+                if(l == colIndex)  continue;
+                if(l > colIndex)  l = l -1;
+                newArray.push(l);
+            }
+            setting.view.lockColumns = newArray;
+        }
+    },
+    initGljCol:function (showAdjustPrice) {
+        let me = gljCol;
+        if(showAdjustPrice !== true){
+            me.removeCol('adjustPrice',me.ration_glj_setting);
+            me.removeCol('adjustPrice',me.project_glj_setting);
+            me.removeCol('adjustPrice',me.mixRatio_Setting);
+        }
+        gljOprObj.setting = me.ration_glj_setting;
+        projectGljObject.projectGljSetting = me.project_glj_setting;
+        projectGljObject.mixRatioSetting = me.mixRatio_Setting;
     }
 
-
 };

web/building_saas/main/js/views/glj_view.js

@@ -14,96 +14,12 @@ var gljOprObj = {
     selectedGLJClass: null,
     parentNodeIds: {},
     activeTab: '#linkGLJ',
-    setting: {
-        header: [
-            {headerName: "编码", headerWidth: 100, dataCode: "code", dataType: "String", formatter: "@"},
-            {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String"},
-            {headerName: "规格型号", headerWidth: 90, dataCode: "specs", dataType: "String", hAlign: "left"},
-            {headerName: "单位", headerWidth: 45, dataCode: "unit", dataType: "String", hAlign: "center"},
-            {headerName: "类型", headerWidth: 45, dataCode: "shortName", dataType: "String", hAlign: "center"},
-            {
-                headerName: "定额消耗",
-                headerWidth: 80,
-                dataCode: "rationItemQuantity",
-                dataType: "Number",
-                hAlign: "right",
-                decimalField: "glj.quantity"
-            },    // dataType: "Number", formatter: "0.00"
-            {
-                headerName: "自定消耗",
-                headerWidth: 80,
-                dataCode: "customQuantity",
-                dataType: "Number",
-                hAlign: "right",
-                decimalField: "glj.quantity"
-            },
-            {
-                headerName: "消耗量",
-                headerWidth: 80,
-                dataCode: "quantity",
-                dataType: "Number",
-                hAlign: "right",
-                decimalField: "glj.quantity"
-            },
-            {
-                headerName: "总消耗量",
-                headerWidth: 80,
-                dataCode: "totalQuantity",
-                dataType: "Number",
-                hAlign: "right",
-                decimalField: "glj.quantity"
-            },
-            {
-                headerName: "定额价",
-                headerWidth: 80,
-                dataCode: "basePrice",
-                dataType: "Number",
-                hAlign: "right",
-                decimalField: "glj.unitPrice"
-            },
-            {
-                headerName: "调整价",
-                headerWidth: 80,
-                dataCode: "adjustPrice",
-                dataType: "Number",
-                hAlign: "right",
-                decimalField: "glj.unitPrice"
-            },
-            {
-                headerName: "市场价",
-                headerWidth: 80,
-                dataCode: "marketPrice",
-                dataType: "Number",
-                hAlign: "right",
-                decimalField: "glj.unitPrice"
-            },
-            {
-                headerName: "是否暂估",
-                headerWidth: 65,
-                dataCode: "isEstimate",
-                dataType: "String",
-                hAlign: "center",
-                vAlign: "center",
-                cellType: "checkBox"
-            }
-        ],
-        view: {
-            lockColumns: [0, 4, 5, 7, 8, 10, 12]
-        },
-        // 工料机类型是混凝土、砂浆、配合比、机械台班时，价格不可编辑。
-        editedTyep:[GLJTypeConst.MAIN_MATERIAL,GLJTypeConst.EQUIPMENT]//主材设备
-    },
+    setting: {},
     detailSetting: {
         header: [
             {headerName: "名称", headerWidth: 100, dataCode: "name", dataType: "String"},
             {headerName: "计算式", headerWidth: 120, dataCode: "regex", dataType: "String"},
-            {
-                headerName: "结果（C）",
-                headerWidth: 120,
-                dataCode: "result",
-                dataType: "Number",
-                decimalField: "quantity_detail"
-            },
+            {headerName: "结果（C）", headerWidth: 120, dataCode: "result", dataType: "Number", decimalField: "quantity_detail"},
             {headerName: "累加", headerWidth: 120, dataCode: "isSummation", dataType: "String", cellType: "checkBox"}
         ],
         view: {
@@ -164,73 +80,14 @@ var gljOprObj = {
     gljLibSheetSetting: {
         owner: 'gljTree',
         header: [
-            {
-                headerName: "选择",
-                headerWidth: 40,
-                dataCode: "select",
-                hAlign: "center",
-                vAlign: "center",
-                cellType: "checkBox"
-            },
-            {
-                headerName: "编码",
-                headerWidth: 80,
-                dataCode: "code",
-                dataType: "String",
-                formatter: "@",
-                hAlign: "left",
-                vAlign: "center"
-            },
-            {
-                headerName: "名称",
-                headerWidth: 120,
-                dataCode: "name",
-                dataType: "String",
-                hAlign: "left",
-                vAlign: "center"
-            },
-            {
-                headerName: "规格型号",
-                headerWidth: 80,
-                dataCode: "specs",
-                dataType: "String",
-                hAlign: "center",
-                vAlign: "center"
-            },
-            {
-                headerName: "单位",
-                headerWidth: 40,
-                dataCode: "unit",
-                dataType: "String",
-                hAlign: "center",
-                vAlign: "center"
-            },
-            {
-                headerName: "单价",
-                headerWidth: 80,
-                dataCode: "basePrice",
-                dataType: "Number",
-                formatter: "0.00",
-                hAlign: "right",
-                vAlign: "center"
-            },
-            {
-                headerName: "类型",
-                headerWidth: 80,
-                dataCode: "gljType",
-                dataType: "String",
-                hAlign: "center",
-                vAlign: "center"
-            },
-            {
-                headerName: "是否新增",
-                headerWidth: 80,
-                dataCode: "isComplementary",
-                dataType: "String",
-                hAlign: "center",
-                vAlign: "center",
-                cellType: "checkBox"
-            }
+            {headerName: "选择", headerWidth: 40, dataCode: "select", hAlign: "center", vAlign: "center", cellType: "checkBox"},
+            {headerName: "编码", headerWidth: 80, dataCode: "code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName: "名称", headerWidth: 120, dataCode: "name", dataType: "String", hAlign: "left", vAlign: "center"},
+            {headerName: "规格型号", headerWidth: 80, dataCode: "specs", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName: "单位", headerWidth: 40, dataCode: "unit", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName: "单价", headerWidth: 80, dataCode: "basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
+            {headerName: "类型", headerWidth: 80, dataCode: "gljType", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName: "是否新增", headerWidth: 80, dataCode: "isComplementary", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox"}
         ],
         view: {
             lockColumns: [0, 1, 2, 3, 4, 5, 6]

web/building_saas/main/js/views/project_glj_view.js

@@ -7,52 +7,12 @@ projectGljObject={
     displayType:filterType.ALL,
     mixRatioType: [gljType.CONCRETE, gljType.MORTAR, gljType.MIX_RATIO,gljType.MAIN_MATERIAL],
     machineType: [gljType.GENERAL_MACHINE],
-    projectGljSetting:{
-        header: [
-            {headerName: "编码", headerWidth: 80, dataCode: "code", dataType: "String"},
-            {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String"},
-            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", hAlign: "left", dataType: "String"},
-            {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
-            {headerName: "类型", headerWidth: 45, dataCode: "short_name", hAlign: "center", dataType: "String"},
-            {headerName: "总消耗量", headerWidth: 130, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
-            {headerName: "定额价", headerWidth: 70, dataCode: "basePrice", hAlign: "right", dataType: "Number",decimalField:'glj.unitPrice',validator:"number"},
-            {headerName: "调整价", headerWidth: 70, dataCode: "adjustPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice"},
-            {headerName: "市场价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice",validator:"number"},
-            {headerName: "是否暂估", headerWidth: 60, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
-            {headerName: "主要材料", headerWidth: 60, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox'},
-            {headerName: "供货方式", headerWidth: 80, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
-            {headerName: "甲供数量", headerWidth: 100, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number"},
-            {headerName: "三材类别", headerWidth: 80, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap},
-            {headerName: "三材系数", headerWidth: 100, dataCode: "materialCoe", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:'material'
-            {headerName: "交货方式", headerWidth: 90, dataCode: "delivery", hAlign: "left", dataType: "String"},
-            {headerName: "送达地点", headerWidth: 100, dataCode: "delivery_address", hAlign: "left", dataType: "String"},
-            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox"},
-            {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String"}
-        ],
-        view: {
-            lockColumns: [0,1,2,3,4,5,7]
-        }
-    },
+    projectGljSetting:{},
     projectGljSpread:null,
     projectGljSheet:null,
     materialTreeSheet:null,
     projectGljSheetData:[],
-    mixRatioSetting:{
-        header:[
-            {headerName: "编码", headerWidth: 120, dataCode: "code", dataType: "String"},
-            {headerName: "名称", headerWidth: 120, dataCode: "name", dataType: "String"},
-            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", dataType: "String"},
-            {headerName: "单位", headerWidth: 120, dataCode: "unit", hAlign: "center", dataType: "String"},
-            {headerName: "类型", headerWidth: 120, dataCode: "short_name", hAlign: "center", dataType: "String"},
-            {headerName: "定额价", headerWidth: 120, dataCode: "basePrice", hAlign: "right", dataType: "Number",decimalField:'glj.unitPrice',validator:"number"},
-            {headerName: "调整价", headerWidth: 120, dataCode: "adjustPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice"},
-            {headerName: "市场价", headerWidth: 120, dataCode: "marketPrice", hAlign: "right", dataType: "Number",decimalField:"glj.unitPrice",validator:"number"},
-            {headerName: "消耗量", headerWidth: 120, dataCode: "consumption", hAlign: "right", dataType: "Number",decimalField:"glj.quantity",validator:"number"}
-        ],
-        view: {
-            lockColumns: [0,1,2,3,4,5,6,7]
-        }
-    },
+    mixRatioSetting:{},
     materialTreeSetting:{
         "emptyRows":0,
         "headRows":1,
@@ -266,6 +226,7 @@ projectGljObject={
         let data = null, setting=null;
         let sheet = me.projectGljSpread.getActiveSheet();
         if(sheet.name() ==  'projectGljSheet'){
+            if(row>=me.projectGljSheetData.length) return false;
             data = me.projectGljSheetData[row];
             setting = me.projectGljSetting;
         }else if(sheet.name() ==  'materialTreeSheet'){
@@ -887,6 +848,7 @@ projectGljObject={
         parentMarketPrice = parentMarketPrice.toDecimal(getDecimal("glj.unitPrice"));
         parentBasePrice = parentBasePrice.toDecimal(getDecimal("glj.unitPrice"));
         return [parentMarketPrice, parentBasePrice];
+        
     },
     onProjectGLJValueChange:function (e,info) {//me.projectGljSetting
         let projectGLJ = projectObj.project.projectGLJ;

web/building_saas/main/js/views/project_view.js

@@ -603,6 +603,9 @@ var projectObj = {
             console.log(`get data时间——${mTime - startTime}`);
             if (!err) {
                 that.project.projectGLJ.calcQuantity(true);//计算分部分项和技术措施项目消耗量;
+                gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false);
+                subObj.initSubSpread();//初始化主界面下方的表格
+
                 let quantityTime = +new Date();
                 console.log(`计算quantity时间——${quantityTime - mTime}`);
                 that.project.property = projectInfoObj.projectInfo.property;

web/building_saas/main/js/views/sub_fee_rate_views.js

@@ -93,8 +93,6 @@ var subRateObject={
         }
         subRateObject.datas = projectObj.project.FeeRate.getSubViewData(item);
         subRateObject.valueMap=projectObj.project.FeeRate.getValueMap(item);
-        console.log(subRateObject.datas);
-        console.log(subRateObject.valueMap);
         subRateObject.showSubRateData();
         disableRightMenu("subRate",this.subRateSpread);
         if(projectReadOnly){

web/building_saas/main/js/views/sub_view.js

@@ -6,35 +6,40 @@
 //特征及内容spread，解决不能正确显示spread
 
 //zhang 5-31  删除附注条件、辅助定额tab,增加子目换算tab
-contentOprObj.buildSheet($("#jobSpread")[0]);
-characterOprObj.buildSheet($("#itemSpread")[0]);
-$("#tzjnrCon").hide();
-$("#subSpread").show();
-var subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 4);
-subSpread.options.allowUserDragDrop = false;
-subSpread.options.allowUserDragFill = false;
-subSpread.getSheet(2).name('JSCX');
-
-pageCCOprObj.active = false;
-
-// 工料机
-gljOprObj.initSheet(subSpread.getSheet(0));
-//sheetCommonObj.shieldAllCells(subSpread.getSheet(0), gljOprObj.setting);
-SheetDataHelper.protectdSheet(subSpread.getSheet(0));
-// assistOprObj.initSheet(subSpread.getSheet(1));
-// sheetCommonObj.shieldAllCells(subSpread.getSheet(1), assistOprObj.setting);
-
-
-//工程量明细
-gljOprObj.initDetailSheet(subSpread.getSheet(1));
-SheetDataHelper.protectdSheet(subSpread.getSheet(1));
-
-//安装增加费
-installationFeeObj.initRationInstallSheet(subSpread.getSheet(3));
-SheetDataHelper.protectdSheet(subSpread.getSheet(3));
+
+let subSpread = null;
+let subObj = {
+  initSubSpread:function () {
+      contentOprObj.buildSheet($("#jobSpread")[0]);
+      characterOprObj.buildSheet($("#itemSpread")[0]);
+      $("#tzjnrCon").hide();
+      $("#subSpread").show();
+      subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 4);
+      subSpread.options.allowUserDragDrop = false;
+      subSpread.options.allowUserDragFill = false;
+      subSpread.getSheet(2).name('JSCX');
+
+      pageCCOprObj.active = false;
+
+       // 工料机
+      gljOprObj.initSheet(subSpread.getSheet(0));
+        //sheetCommonObj.shieldAllCells(subSpread.getSheet(0), gljOprObj.setting);
+      SheetDataHelper.protectdSheet(subSpread.getSheet(0));
+        // assistOprObj.initSheet(subSpread.getSheet(1));
+        // sheetCommonObj.shieldAllCells(subSpread.getSheet(1), assistOprObj.setting);
+
+
 if(!projectReadOnly){
     gljContextMenu.loadGLJSpreadContextMenu();
 }
+        //安装增加费
+      installationFeeObj.initRationInstallSheet(subSpread.getSheet(3));
+      SheetDataHelper.protectdSheet(subSpread.getSheet(3));
+      gljContextMenu.loadGLJSpreadContextMenu();
+  }
+};
+
+
 
 $("#linkGLJ").click(function(){
     $("#subItems").children().hide();//控制显示subSpread,隐藏特征及内容spread
@@ -321,7 +326,7 @@ function refreshSubSpread(){
         characterOprObj.workBook.refresh();
     }
     else{
-        subSpread.refresh();
+        subSpread?subSpread.refresh():'';
     }
 }
 

web/building_saas/report/html/rpt_print.html

@@ -37,12 +37,10 @@
 <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">
-    let canvasArr = [];
     function loading() {
         if (sessionStorage.currentPageData) {
             let pageData = JSON.parse(sessionStorage.currentPageData);
-//            let scaleFactor = parseInt(sessionStorage.scaleFactor);
-            let scaleFactor = 1;
+            let scaleFactor = parseInt(sessionStorage.scaleFactor);
             $(document).attr("title", pageData[JV.NODE_PAGE_INFO][JV.NODE_MAIN_INFO_RPT_NAME]);
             let orgHeight = 793, orgWidth = 1122;
             let pageHeight = orgHeight * scaleFactor, pageWidth = orgWidth * scaleFactor;
@@ -76,13 +74,12 @@
                     elementSvg.setAttribute('width', pageWidth);
                 });
             });
-//            $("body").css({"page": "page"});
             window.print();
-            //document.execCommand("print");
         } else {
             //alert("没有报表数据！");
         }
     }
+
     function closing() {
         //
     }

web/building_saas/report/js/rpt_print.js

@@ -5,7 +5,6 @@
 let rptPrintHelper = {
     preview: function () {
         if (zTreeOprObj.currentRptPageRst) {
-            // window.location.href = '/rpt_print';
             sessionStorage.currentPageData = JSON.stringify(zTreeOprObj.currentRptPageRst);
             sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
             sessionStorage.orientation = rptControlObj.getCurrentOrientation();
@@ -16,7 +15,6 @@ let rptPrintHelper = {
         }
     },
     buildSvgArr: function (pagesData, offsetX, offsetY) {
-        let me = this;
         let styles = pagesData[JV.NODE_STYLE_COLLECTION],
             fonts = pagesData[JV.NODE_FONT_COLLECTION],
             controls = pagesData[JV.NODE_CONTROL_COLLECTION]