micro tuning for report test

modules/reports/controllers/rpt_controller.js

@@ -8,8 +8,8 @@ import async from "async";
 import JV from "../rpt_component/jpc_value_define";
 
 let Template = mongoose.model('rpt_templates');
-let rptTplDataFacade = require("../facade/rpt_tpl_data_facade");
-//let fsUtil = require("../../../public/fsUtil");
+// let rptTplDataFacade = require("../facade/rpt_tpl_data_facade");
+// let fsUtil = require("../../../public/fsUtil");
 
 import rptTplFacade from "../facade/rpt_template_facade";
 import demoTemplateFacade from "../facade/rpt_tpl_data_demo_facade";
@@ -20,7 +20,7 @@ import rpt_xl_util from "../util/rpt_excel_util";
 import rpt_pdf_util from "../util/rpt_pdf_util";
 import fs from "fs";
 import strUtil from "../../../public/stringUtil";
-import rptDataExtractor from "../util/rpt_construct_data_util";
+// import rptDataExtractor from "../util/rpt_construct_data_util";
 
 //统一回调函数
 let callback = function(req, res, err, data){
@@ -72,6 +72,7 @@ function getAllPagesCommonOrg(rpt_id, pageSize, option, cb) {
     );
 }
 
+/*
 function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, option, cb) {
     let rptTpl = null;
     rptTplFacade.getRptTemplate(rpt_id).then(function(rst) {
@@ -107,14 +108,18 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, option, cb) {
         }
     })
 }
-
+//*/
 module.exports = {
+    // getReportAllPages: function (req, res) {
+    //     let rpt_id = req.body.rpt_tpl_id, prj_id = req.body.prj_id,
+    //         user_id = req.body.user_id, pageSize = req.body.pageSize;
+    //     getAllPagesCommon(rpt_id, prj_id, user_id, pageSize, function (err, pageRst) {
+    //         callback(req, res, err, pageRst);
+    //     });
+    // },
+
     getReportAllPages: function (req, res) {
-        let rpt_id = req.body.rpt_tpl_id, prj_id = req.body.prj_id,
-            user_id = req.body.user_id, pageSize = req.body.pageSize;
-        getAllPagesCommon(rpt_id, prj_id, user_id, pageSize, function (err, pageRst) {
-            callback(req, res, err, pageRst);
-        });
+        callback(req, res, 'default none!', null);
     },
 
     getTestReportAllPages: function(req, res){

modules/reports/routes/report_router.js

@@ -4,7 +4,7 @@
 
 import express from "express";
 let rptRouter = express.Router();
-import reportController from "./../controllers/rpt_controller";
+import reportController from "../controllers/rpt_controller_operation";
 
 module.exports =function (app) {
     app.get('/report',  function(req, res) {

web/maintain/report/rpt_test.html

@@ -133,7 +133,7 @@
             rpt_id = rpt.options[rpt.selectedIndex].value;
             rpt_size = size.options[size.selectedIndex].value;
         }
-        let url =  "/report_api/getExcel/" + rpt_id + "/" + rpt_size + "/" + rpt_name + "/" + isOneSheet + "/" + (optionChk.checked?'infinity':'normal');
+        let url =  "/report_api/getTestExcel/" + rpt_id + "/" + rpt_size + "/" + rpt_name + "/" + isOneSheet + "/" + (optionChk.checked?'infinity':'normal');
         window.location = url;//这里不能使用get方法跳转，否则下载不成功
     }
 
@@ -142,7 +142,7 @@
         let size = "A4";
         let rpt_name = 'OneBook';
         let optionChk = document.getElementById("outputOptionChk");
-        let url =  "/report_api/getExcelInOneBook/" + rptIds + "/" + size + "/" + rpt_name + "/" + (optionChk.checked?'infinity':'normal');
+        let url =  "/report_api/getTestExcelInOneBook/" + rptIds + "/" + size + "/" + rpt_name + "/" + (optionChk.checked?'infinity':'normal');
         window.location = url;//这里不能使用get方法跳转，否则下载不成功
     }
 
@@ -154,7 +154,7 @@
             rpt_id = rpt.options[rpt.selectedIndex].value;
             rpt_size = size.options[size.selectedIndex].value;
         }
-        let url =  "/report_api/getPDF/" + rpt_id + "/" + rpt_size + "/" + rpt_name;
+        let url =  "/report_api/getTestPDF/" + rpt_id + "/" + rpt_size + "/" + rpt_name;
         window.location = url;
     }
 
@@ -164,7 +164,7 @@
             canvas.style.cursor = "wait";
             $.ajax({
                 type:"POST",
-                url: 'report_api/getReport',
+                url: 'report_api/getTestReport',
                 data: {"ID": rpt_id, "pageSize": rpt_size},
                 dataType: 'json',
                 cache: false,