code sync

modules/reports/routes/report_router_operation.js

@@ -4,7 +4,7 @@
 
 import express from "express";
 let rptRouter = express.Router();
-// import reportController from "../controllers/rpt_controller_operation";
+import reportController from "../controllers/rpt_controller_operation";
 
 
 // 完成历史任务，屏蔽
@@ -22,12 +22,12 @@ 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);
+    // 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('/getReport', reportController.getReportAllPages);
     rptRouter.post('/getPreviewPage', reportController.getPreviewPage);
     // rptRouter.get('/getExcel/:id/:size/:rptName/:isOneSheet/:option', reportController.getExcel);
     // rptRouter.get('/getExcelInOneBook/:ids/:size/:rptName/:option', reportController.getExcelInOneBook);
@@ -35,8 +35,7 @@ module.exports =function (app) {
 
     app.use("/report_api", rptRouter);
 };
-//*/
-
+/*/
 module.exports = function (app) {
     app.get('/outputDataForDesktopVersion',  function(req, res) {
         if (!req.session.managerData.username) {
@@ -52,3 +51,4 @@ module.exports = function (app) {
    
     app.use("/adHoc_report_api", rptRouter);
 };
+//*/