BUG #2261

test/unit/reports/test_rpt_test_template.js

@@ -39,7 +39,7 @@ let demoPrjId = - 1;
 // let demoRptId = 56; //24
 // let demoRptId = 36; //5.1
 // let demoRptId = 46; //5.5测试
-// let demoRptId = 49; //5.5
+let demoRptId = 49; //5.5
 // let demoRptId = 66; //5.4
 // let demoRptId = 67; //21-2
 // let demoRptId = 31; //21-1
@@ -47,7 +47,7 @@ let demoPrjId = - 1;
 // let demoRptId = 68; //01-2
 // let demoRptId = 71; //21-2
 // let demoRptId = 74; //22
-let demoRptId = 83; //02 预算
+// let demoRptId = 83; //02 预算
 // let demoRptId = 84; //02 清单
 
 let pagesize = "A4";
@@ -71,7 +71,7 @@ let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
 // demoPrjId = 618; //PROD:
 // demoPrjId = 2580; //PROD:
 // demoPrjId = 815; //PROD:
-demoPrjId = 3261; //UAT:
+demoPrjId = 5289; //UAT:
 // demoPrjId = 738; //UAT:
 // demoPrjId = 670; //UAT: 清单项目
 //*/
@@ -136,9 +136,9 @@ test('测试 - 测试模板啦: ', function (t) {
                     if (pageRst) {
                         // fsUtil.writeObjToFile(pageRst, "D:/GitHome/YangHuCost/tmp/testBuiltPageResult_测试模板" + dt.getTime() + ".jsp");
                         // fsUtil.writeObjToFile(pageRst, "D:/GitHome/YangHuCost/tmp/testBuiltPageResult_测试模板.jsp");
-                        rpt_xl_util.exportExcel(pageRst, pagesize, "local_test_rpt_excel", true, null, null, function(uuidName){
-                            console.log("excel uuid: " + uuidName);
-                        });
+                        // rpt_xl_util.exportExcel(pageRst, pagesize, "local_test_rpt_excel", true, null, null, function(uuidName){
+                        //     console.log("excel uuid: " + uuidName);
+                        // });
                         // rpt_pdf_util.export_pdf_file(pageRst, pagesize, 'local_test_rpt_pdf', function(uuidName){
                         //     console.log("pdf uuid: " + uuidName);
                         // });

web/building_saas/report/js/rpt_main.js

@@ -598,14 +598,10 @@ let canvasOprObj = {
         if (zTreeOprObj.currentNode) {
             let x = event.offsetX - JpcCanvasOutput.offsetX, canvas = event.originalTarget;
             if (!(canvas)) canvas = event.target; //chrome浏览器不认event.originalTarget,只认event.target或event.currentTarget
-            if (x < FIRST_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/FirstPageSimple.cur), auto";
-            } else if (x < PRE_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/PreviousPageSimple.cur), auto";
-            } else if ((canvas.width - x) < LAST_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/LastPageSimple.cur), auto";
+            if (x < PRE_PAGE_OFFSET) {
+                canvas.style.cursor = "url(/web/building_saas/img/PreviousPage.cur), auto";
             } else if ((canvas.width - x) < NEXT_PAGE_OFFSET) {
-                canvas.style.cursor = "url(/web/building_saas/img/NextPageSimple.cur), auto";
+                canvas.style.cursor = "url(/web/building_saas/img/NextPage.cur), auto";
             } else {
                 canvas.style.cursor = "";
             }