Procházet zdrojové kódy

导出报表延时

TonyKang před 5 roky
rodič
revize
5a28961517

+ 2 - 2
modules/reports/util/rpt_excel_util.js

@@ -808,9 +808,9 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, ap
     let colStr = private_getCellIdxStr(xPos.length - 3);
     rst.push('<dimension ref="A1:' + colStr + '' + yPos.length + '"/>');
     if (isFirstSheet) {
-        rst.push('<sheetViews><sheetView tabSelected="1" workbookViewId="0">');
+        rst.push('<sheetViews><sheetView showGridLines="1" tabSelected="1" workbookViewId="0">');
     } else {
-        rst.push('<sheetViews><sheetView workbookViewId="0">');
+        rst.push('<sheetViews><sheetView showGridLines="1" workbookViewId="0">');
     }
     //rst.push('<selection sqref="A1:' + colStr + '1"/>');
     rst.push('<selection sqref="A1:A1"/>');

+ 7 - 7
web/building_saas/report/js/rpt_main.js

@@ -8,7 +8,7 @@ const NEXT_PAGE_OFFSET = 160;
 const FIRST_PAGE_OFFSET = 50;
 const LAST_PAGE_OFFSET = 60;
 
-const WAIT_TIME_EXPORT = 12000;
+const WAIT_TIME_EXPORT = 300000;
 
 let fontSuffixMapObj = {"表标题": "title", "列标题": "column", "正文内容": "content", "合计": "summary", "表眉/表脚": "header_footer"};
 
@@ -298,7 +298,7 @@ let zTreeOprObj = {
                     params.rpt_bill_tpl_ids = refBillSumPrjsIds;
                     params.rpt_glj_tpl_ids = refGljSumPrjsIds;
                     params.custCfg = me.reportPageCfg;
-                    CommonAjax.postEx("report_api/getMultiReports", params, 10000, true,
+                    CommonAjax.postEx("report_api/getMultiReports", params, 300000, true,
                         function(result){
                             hintBox.unWaitBox();
                             let pageRst = result[0];
@@ -457,7 +457,7 @@ let zTreeOprObj = {
                 params.prjIds.push(node.ID);
                 me.selectedPrjIDs.push(node.ID);
             }
-            CommonAjax.postEx("report_api/getBillsSummaryReport", params, 26000, true,
+            CommonAjax.postEx("report_api/getBillsSummaryReport", params, 60000, true,
                 function(result){
                     hintBox.unWaitBox();
                     let pageRst = result;
@@ -504,7 +504,7 @@ let zTreeOprObj = {
                 params.prjIds.push(node.ID);
                 zTreeOprObj.selectedPrjIDs.push(node.ID);
             }
-            CommonAjax.postEx("report_api/getGljSummaryReport", params, 26000, true,
+            CommonAjax.postEx("report_api/getGljSummaryReport", params, 60000, true,
                 function(result){
                     hintBox.unWaitBox();
                     let pageRst = result;
@@ -567,7 +567,7 @@ let zTreeOprObj = {
         params.sum_rpt_names = bill_rpt_names.concat(glj_rpt_names);
         params.rpt_names = rpt_names;
         params.isOneSheet = true;
-        CommonAjax.postEx("report_api/getMultiReports", params, 30000, true,
+        CommonAjax.postEx("report_api/getMultiReports", params, WAIT_TIME_EXPORT, true,
             function(result){
                 let pageSize = rptControlObj.getCurrentPageSize();
                 for (let idx = 0; idx < result.length; idx++) {
@@ -1043,7 +1043,7 @@ let rptControlObj = {
                 params.rpt_names = rpt_names;
                 params.isOneSheet = true;
                 params.rptName = projectObj.project.projectInfo.name;
-                CommonAjax.postEx("report_api/getMultiReports", params, 30000, true,
+                CommonAjax.postEx("report_api/getMultiReports", params, WAIT_TIME_EXPORT, true,
                     function(result){
                         $.bootstrapLoading.end();
                         if ($('#ini_PDF_cover').is(':visible')) {
@@ -1091,7 +1091,7 @@ let rptControlObj = {
                         params.orientation = ((zTreeOprObj.checkedRptTplNodes.length > 1)?null:me.getCurrentOrientation());
                         params.custCfg = zTreeOprObj.reportPageCfg;
                         params.option = "normal";
-                        CommonAjax.postEx("report_api/getMultiReports", params, 30000, true,
+                        CommonAjax.postEx("report_api/getMultiReports", params, WAIT_TIME_EXPORT, true,
                             function(result){
                                 $.bootstrapLoading.end();
                                 if ($('#ini_PDF_cover').is(':visible')) {