预览页边距 + 删除测试代码

modules/reports/controllers/rpt_controller.js

@@ -607,40 +607,6 @@ module.exports = {
             callback(req, res, err, pageRst);
         });
     },
-    getMultiReports: function (req, res) {
-        //打印预览用
-        let params = JSON.parse(req.body.params),
-            prj_id = params.prj_id,
-            rpt_ids = params.rpt_ids.split(','),
-            pageSize = params.pageSize,
-            orientation = params.orientation,
-            customizeCfg = params.custCfg,
-            option = params.option;
-        let user_id = req.session.sessionUser.id;
-        let parallelFunctions = [];
-        let dftOption = option||JV.PAGING_OPTION_NORMAL;
-        for (let id of rpt_ids) {
-            parallelFunctions.push((function (rpt_id) {
-                return function (cb) {
-                    getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, dftOption, JV.OUTPUT_TYPE_NORMAL, function (err, pageRst) {
-                        if(err){
-                            cb(err);
-                        }
-                        else{
-                            cb(null, pageRst);
-                        }
-                    })
-                }
-            })(parseInt(id)));
-        }
-        async.parallel(parallelFunctions, function (err, pageRstArray) {
-            if (err) {
-                callback(req, res, '数据有误', null);
-            } else {
-                callback(req, res, err, pageRstArray);
-            }
-        })
-    },
     getMultiReportsEx: function (req, res) {
         //原则说明：把所有报表模板集中获取，统一filter，只读一次数据！
         let params = JSON.parse(req.body.params),
@@ -706,18 +672,6 @@ module.exports = {
         });
     },
 
-    createSummaryReportFiles: function (req, res) {
-        let params = JSON.parse(req.body.params),
-            rpt_bill_tpl_ids = params.rpt_bill_tpl_ids,
-            rpt_glj_tpl_ids = params.rpt_glj_tpl_ids,
-            prjIds = params.prjIds,
-            pageSize = params.pageSize,
-            orientation = params.orientation,
-            customizeCfg = params.custCfg
-        ;
-        let user_id = req.session.sessionUser.id;
-    },
-
     getReportAllPagesSvg: function (req, res) {
         let params = JSON.parse(req.body.params),
             rpt_id = params.rpt_tpl_id,
@@ -733,45 +687,6 @@ module.exports = {
         });
     },
 
-    createExcelFilesInOneBook: function (req, res) {
-        let params = JSON.parse(req.body.params),
-            prj_id = params.prj_id,
-            rpt_ids = params.rpt_ids,
-            rptName = params.rptName,
-            pageSize = params.pageSize,
-            orientation = params.orientation,
-            customizeCfg = params.custCfg,
-            option = params.option;
-        let user_id = req.session.sessionUser.id;
-        let parallelFunctions = [];
-        let dftOption = option||JV.PAGING_OPTION_NORMAL;
-        for (let idx = 0; idx < rpt_ids.length; idx++) {
-            let r_id = rpt_ids[idx];
-            parallelFunctions.push((function (rpt_id) {
-                return function (cb) {
-                    getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, dftOption, JV.OUTPUT_TYPE_EXCEL, function (err, pageRst) {
-                        if(err){
-                            cb(err);
-                        }
-                        else{
-                            cb(err, pageRst);
-                        }
-                    })
-                }
-            })(parseInt(r_id)));
-        }
-        async.parallel(parallelFunctions, function (err, pageRstArray) {
-            if (err) {
-                callback(req, res, '数据有误', null);
-            } else {
-                rpt_xl_util.exportExcelInOneBook(pageRstArray, pageSize, rptName, function(uuidName){
-                    let fileRst = {uuid: uuidName, reportName: rptName};
-                    callback(req, res, err, fileRst);
-                });
-            }
-        })
-    },
-
     createExcelFilesInOneBookEx: function (req, res) {
         //采用了优化策略
         let params = JSON.parse(req.body.params),
@@ -821,47 +736,6 @@ module.exports = {
         }
     },
 
-    createExcelFiles: function (req, res) {
-        let params = JSON.parse(req.body.params),
-            prj_id = params.prj_id,
-            rpt_ids = params.rpt_ids,
-            rpt_names = params.rpt_names,
-            pageSize = params.pageSize,
-            orientation = params.orientation,
-            isOneSheet = params.isOneSheet,
-            customizeCfg = params.custCfg,
-            option = params.option;
-        let user_id = req.session.sessionUser.id;
-        let parallelFunctions = [];
-        let dftOption = option||JV.PAGING_OPTION_NORMAL;
-        for (let idx = 0; idx < rpt_ids.length; idx++) {
-            let r_id = rpt_ids[idx];
-            let r_name = rpt_names[idx];
-            parallelFunctions.push((function (rpt_id, rpt_name) {
-                return function (cb) {
-                    getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, dftOption, JV.OUTPUT_TYPE_EXCEL, function (err, pageRst) {
-                        if(err){
-                            cb(err);
-                        } else {
-                            rpt_xl_util.exportExcel(pageRst, pageSize, rpt_name, isOneSheet, null, null, function(uuidName){
-                                let fileRst = {uuid: uuidName, reportName: rpt_name};
-                                cb(err, fileRst);
-                            })
-                        }
-                    })
-                }
-            })(parseInt(r_id), r_name));
-        }
-        async.parallel(parallelFunctions, function (err, fileRstArray) {
-            if (err) {
-                callback(req, res, '数据有误', null);
-            } else {
-                // console.log(err);
-                callback(req, res, err, fileRstArray);
-            }
-        })
-    },
-
     createExcelFilesEx: function (req, res) {
         let params = JSON.parse(req.body.params),
             prj_id = params.prj_id,
@@ -1029,46 +903,6 @@ module.exports = {
             }
         })
     },
-    createPdfFiles: function (req, res) {
-        let params = JSON.parse(req.body.params),
-            prj_id = params.prj_id,
-            rpt_ids = params.rpt_ids,
-            rpt_names = params.rpt_names,
-            pageSize = params.pageSize,
-            orientation = params.orientation,
-            customizeCfg = params.custCfg,
-            option = params.option;
-        let user_id = req.session.sessionUser.id;
-        let parallelFunctions = [];
-        let dftOption = option||JV.PAGING_OPTION_NORMAL;
-        for (let idx = 0; idx < rpt_ids.length; idx++) {
-            let r_id = rpt_ids[idx];
-            let r_name = rpt_names[idx];
-            parallelFunctions.push((function (rpt_id, rpt_name) {
-                return function (cb) {
-                    getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, dftOption, JV.OUTPUT_TYPE_PDF, function (err, pageRst) {
-                        if(err){
-                            cb(err);
-                        }
-                        else{
-                            rpt_pdf_util.export_pdf_file(pageRst, pageSize, rpt_name, function(uuidName){
-                                let fileRst = {uuid: uuidName, reportName: rpt_name};
-                                cb(err, fileRst);
-                            })
-                        }
-                    })
-                }
-            })(parseInt(r_id), r_name));
-        }
-        async.parallel(parallelFunctions, function (err, fileRstArray) {
-            if (err) {
-                callback(req, res, '数据有误', null);
-            } else {
-                // console.log(err);
-                callback(req, res, err, fileRstArray);
-            }
-        })
-    },
     createPdfFilesEx: function (req, res) {
         let params = JSON.parse(req.body.params),
             prj_id = params.prj_id,
@@ -1169,104 +1003,6 @@ module.exports = {
 
         })
 
-    },
-
-    getTestReportAllPages: function(req, res){
-        let rpt_id = req.body.ID;
-        let pageSize = req.body.pageSize;
-        getAllPagesCommonOrg(rpt_id, pageSize, JV.PAGING_OPTION_NORMAL, function(err, pageRst){
-            //fs.writeFileSync('D:/GitHome/ConstructionOperation/tmp/testRpt.js', JSON.stringify(pageRst));
-            callback(req, res, err, pageRst);
-        })
-    },
-    getTestExcel: function(req, res) {
-        let rpt_id = req.params.id,
-            pageSize = req.params.size,
-            rptName = req.params.rptName,
-            isOneSheet = req.params.isOneSheet,
-            option = req.params.option;
-        let dftOption = option||JV.PAGING_OPTION_NORMAL;
-        getAllPagesCommonOrg(rpt_id, pageSize, dftOption, function(err, pageRst){
-            fs.writeFileSync('D:/GitHome/ConstructionOperation/tmp/testRpt.js', JSON.stringify(pageRst));
-            try {
-                rpt_xl_util.exportExcel(pageRst, pageSize, rptName, isOneSheet, null, null, function(uuidName){
-                    res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-                    res.setHeader("Content-Disposition", "attachment; filename=" + strUtil.getPinYinCamelChars(rptName) + ".xlsx");
-                    let filestream = fs.createReadStream(__dirname.slice(0, __dirname.length - 28) + '/tmp/' + uuidName + '.xlsx');
-                    filestream.on('data', function(chunk) {
-                        res.write(chunk);
-                    });
-                    filestream.on('end', function() {
-                        res.end();
-                    });
-                });
-            } catch (e) {
-                console.log(e);
-            }
-        })
-    },
-    getTestExcelInOneBook: function(req, res) {
-        let rpt_ids = req.params.ids.split(','),
-            pageSize = req.params.size,
-            rptName = req.params.rptName,
-            option = req.params.option;
-        let parallelFunctions = [];
-        let dftOption = option||JV.PAGING_OPTION_NORMAL;
-        for (let id of rpt_ids) {
-            parallelFunctions.push((function (rpt_id) {
-                return function (cb) {
-                    getAllPagesCommonOrg(rpt_id, pageSize, dftOption, function (err, pageRst) {
-                        if(err){
-                            cb(err);
-                        }
-                        else{
-                            cb(null, pageRst);
-                        }
-                    })
-                }
-            })(parseInt(id)));
-        }
-        async.parallel(parallelFunctions, function (err, pageRstArray) {
-            if (err) {
-                callback(req, res, '数据有误', null);
-            } else {
-                rpt_xl_util.exportExcelInOneBook(pageRstArray, pageSize, rptName, function(tmpFilePath){
-                    res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-                    res.setHeader("Content-Disposition", "attachment; filename=" + strUtil.getPinYinCamelChars(rptName) + ".xlsx");
-                    let filestream = fs.createReadStream(__dirname.slice(0, __dirname.length - 28) + '/tmp/' + tmpFilePath + '.xlsx');
-                    filestream.on('data', function(chunk) {
-                        res.write(chunk);
-                    });
-                    filestream.on('end', function() {
-                        res.end();
-                    });
-                });
-                //callback(req, res, false, '', {compilation: rst, gljLibs: gljLibsRst});
-            }
-        })
-    },
-    getTestPDF:function (req, res) {
-        let rpt_id = req.params.id,
-            pageSize = req.params.size,
-            rptName = req.params.rptName;
-
-        getAllPagesCommonOrg(rpt_id, pageSize, JV.PAGING_OPTION_NORMAL, function(err, pageRst){
-            rpt_pdf_util.export_pdf_file(pageRst, pageSize, rptName,function (uuidName) {
-                res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-                // res.setHeader("Content-Disposition", "attachment; filename=" + strUtil.getPinYinCamelChars(rptName) + ".pdf");
-                let rptNameURI = encodeURI(rptName);
-                res.setHeader("Content-Disposition", "attachment; filename=\"" + rptNameURI + ".pdf\"; filename*=utf-8''" + rptNameURI + ".pdf"  );
-
-                let filestream = fs.createReadStream(__dirname.slice(0, __dirname.length - 28) + '/tmp/' + uuidName + '.pdf');
-                filestream.on('data', function(chunk) {
-                    res.write(chunk);
-                });
-                filestream.on('end', function() {
-                    res.end();
-                });
-            })
-
-        })
-
     }
+
 };

modules/reports/routes/report_router.js

@@ -18,11 +18,6 @@ module.exports =function (app) {
         }
     });
 
-    //test
-    rptRouter.post('/getTestReport', reportController.getTestReportAllPages);
-    rptRouter.get('/getTestExcel/:id/:size/:rptName/:isOneSheet/:option', reportController.getTestExcel);
-    rptRouter.get('/getTestExcelInOneBook/:ids/:size/:rptName/:option', reportController.getTestExcelInOneBook);
-    rptRouter.get('/getTestPDF/:id/:size/:rptName', reportController.getTestPDF);
     //now is the real:
     rptRouter.post('/getReport', reportController.getReportAllPages);
     rptRouter.post('/getReportSvg', reportController.getReportAllPagesSvg);

modules/reports/util/rpt_tmp_file_sweep.js

@@ -16,7 +16,7 @@ function chkIsRemoveType(file) {
     return rst;
 }
 let jobObj = {
-    createJob: function (rule, rootPath) {
+    createJob(rule, rootPath) {
         let localRule = rule;
         if (!localRule) {
             // setup schedule rule

web/building_saas/report/js/rpt_preview_common.js

@@ -74,7 +74,9 @@ function showPreviewData(svgArr, actAreaArr, scaleFactor, pageSize, orientation,
                 //横向强制改纵向(系统是以纵向为准)，那么计算offset的方式会有所不同
                 offsetWidth = actAreaArr[i].Top + (pageWidth - actAreaArr[i].Bottom) - DFT_MARGIN;
                 //横向转纵向时，还得考虑左上角转右上角的Left与Top之间的差，否则坐标还是会有偏差
-                offsetHeight = actAreaArr[i].Left + (pageHeight - actAreaArr[i].Right) - (actAreaArr[i].Left - actAreaArr[i].Top) - DFT_MARGIN;
+                //offsetHeight = actAreaArr[i].Left + (pageHeight - actAreaArr[i].Right) - (actAreaArr[i].Left - actAreaArr[i].Top) - DFT_MARGIN;
+                //新方式下，没那么复杂了
+                offsetHeight = actAreaArr[i].Left + (pageHeight - actAreaArr[i].Right) - DFT_MARGIN;
             }
         }
         // let div = $('<div class="pageBreak"></div>');