TASK #3729(报表全屏)

app/public/report/js/rpt_main.js

@@ -486,6 +486,7 @@ let zTreeOprObj = {
     displayPageValue: function() {
         let me = zTreeOprObj;
         $("#rpt_page_num")[0].value = me.currentPage + "/" + me.maxPages;
+        $("#rpt_fullscreen_page_num")[0].value = me.currentPage + "/" + me.maxPages;
     }
 };
 
@@ -521,6 +522,21 @@ let canvasOprObj = {
                 zTreeOprObj.showPage(zTreeOprObj.currentPage + 1, canvas);
             }
         }
+    },
+    showFullSreen: function () {
+        if (zTreeOprObj.currentRptPageRst) {
+            let orgH = zTreeOprObj.canvas.height;
+            let orgW = zTreeOprObj.canvas.width;
+            zTreeOprObj.canvas = document.getElementById("fullScrCanvas");
+            zTreeOprObj.canvas.height = orgH;
+            zTreeOprObj.canvas.width = orgW;
+            zTreeOprObj.showPage(zTreeOprObj.currentPage, zTreeOprObj.canvas);
+            $("#btn_show_full_screen").trigger("click");
+            $('#fullscreen').on('hide.bs.modal', function () {
+                zTreeOprObj.canvas = document.getElementById("rptCanvas");
+                zTreeOprObj.showPage(zTreeOprObj.currentPage, zTreeOprObj.canvas);
+            });
+        }
     }
 };
 

app/view/report/index.ejs

@@ -159,6 +159,17 @@
                                     翻页
                                 </div>
                             </div>
+                            <div class="panel">
+                                <div class="panel-body">
+                                    <div class="btn-group" role="group">
+                                        <button class="btn btn-outline-primary btn-sm" type="button" onclick="canvasOprObj.showFullSreen()">
+                                            <i class="fa fa-window-maximize"></i><br>
+                                            全屏显示
+                                        </button>
+                                        <button id="btn_show_full_screen" class="btn btn-outline-primary btn-sm" type="button" data-toggle="modal" data-target="#fullscreen" style="display: none;"></button>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="panel" id="material" style="display: none;">
                                 <div class="panel-body">
                                     <div class="btn-group" role="group">

app/view/report/rpt_all_popup.ejs

@@ -518,6 +518,7 @@
             <div class="modal-header d-flex justify-content-between">
                 <h5 class="modal-title" id="fullScrTitle"></h5>
                 <div class="print-toolsbar">
+                    <!--
                     <div class="panel">
                         <div class="panel-body">
                             <div class="btn-group" role="group">
@@ -527,30 +528,29 @@
                             </div>
                         </div>
                     </div>
+                    -->
                     <div class="panel">
                         <div class="panel-body">
                             <div class="input-group input-group-sm">
                                 <div class="input-group-prepend">
-                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="第一页"><i class="fa fa-angle-double-left "></i></button>
-                                    <button type="button" class="btn btn-outline-primary btn-sm" disabled="" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上一页"><i class="fa fa-angle-left "></i></button>
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上一页" onclick="rptControlObj.prePage(this)"><i class="fa fa-angle-left "></i></button>
                                 </div>
-                                <input class="form-control" value="1/10" style="width:60px" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="输入页码按回车键，快速跳转">
+                                <input id="rpt_fullscreen_page_num" class="form-control" value="1/10" style="width:60px" onKeydown="rptControlObj.onKeydown(event, this)" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="输入页码按回车键，快速跳转">
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下一页"><i class="fa fa-angle-right"></i></button>
-                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="尾页"><i class="fa fa-angle-double-right "></i></button>
+                                    <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下一页" onclick="rptControlObj.nextPage(this)"><i class="fa fa-angle-right"></i></button>
                                 </div>
                             </div>
                         </div>
                     </div>
                     <div class="panel">
                         <div class="panel-body">
-                            <button type="button" class="btn btn-outline-primary btn-sm" data-dismiss="modal"><i class="fa fa-window-close-o"></i> 退出全屏</button>
+                            <button type="button" class="btn btn-outline-primary btn-sm" data-dismiss="modal" ><i class="fa fa-window-close-o"></i> 退出全屏</button>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="modal-body">
-                <div class="modal-fullscreen">
+                <div class="modal-fullscreen pageContainer">
                     <canvas id="fullScrCanvas" height="100%" width="100%"></canvas>
                 </div>
             </div>