for code sync

test/unit/reports/test_tpl_09_1.js

@@ -26,16 +26,17 @@ let fsUtil = require("../../../public/fsUtil");
 
 let demoPrjId = - 1;
 // let demoRptId = 226;
-let demoRptId = 382; //copied
+let demoRptId = 453; //copied
 let pagesize = "A4";
 
 // let userId_Leng = "59cdf14a0034a1000ba52b97"; //小冷User Id 换成_id了 QQ号
-let userId_Leng = "5acac1e885bf55000bd055ba"; //小冷User Id2
+// let userId_Leng = "5acac1e885bf55000bd055ba"; //小冷User Id2
+let userId_HaiZhu = "5b5a66c4a3c23e000dccdd77"; //海珠user id
 // demoPrjId = 720; //QA: DW3
 //demoPrjId = 1626; //QA:
-demoPrjId = 2260; //QA:
+demoPrjId = 4529; //QA:
 //*/
-let userId_Dft = userId_Leng;
+let userId_Dft = userId_HaiZhu;
 /*/
  let userId_Dft = "595328da1934dc327cad08eb";
 //*/
@@ -61,9 +62,9 @@ test('测试 - 测试模板啦: ', function (t) {
         rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
             if (!err) {
                 try {
-                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_建筑09-1表.jsp");
+                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_建筑09-1表.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
-                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_建筑09-1表.jsp");
+                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_建筑09-1表.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_建筑09-1表.jsp");
                     //it's time to build the report!!!
                     let printCom = JpcEx.createNew();

web/building_saas/report/js/rpt_main.js

@@ -244,7 +244,7 @@ let zTreeOprObj = {
     requestReport: function (params) {
         let me = zTreeOprObj;
         hintBox.waitBox();
-        CommonAjax.postEx("report_api/getReport", params, 5000, true,
+        CommonAjax.postEx("report_api/getReport", params, 15000, true,
             function(result){
                 let pageRst = result;
                 if (pageRst) {