归档图标+切换期处理

app/public/report/js/rpt_archive.js

@@ -10,6 +10,9 @@ let rptArchiveObj = {
     iniPage: function() {
         //初始化页面的归档信息
         let me = rptArchiveObj;
+        me.currentNode = null;
+        me.currentArchiveUuid = null;
+        me.currentArchiveDateStr = null;
         const archivedRptIds = [];
         for (let aItem of ARCHIVE_LIST) {
             archivedRptIds.push(parseInt(aItem.rpt_id));
@@ -57,6 +60,8 @@ let rptArchiveObj = {
         zTreeHelper.createTreeDirectly(TOP_TREE_NODES, rpt_prj_folder_setting, "rptTplTree", me);
         me.treeObj.expandAll(true);
         me.refreshNodes();
+        rptArchiveObj._countChkedRptTpl();
+        rptArchiveObj._buildeArchiveDateSelect();
     },
     toggleBtn: function (enabled) {
         if (current_stage_status === 3 && enabled) {
@@ -131,11 +136,11 @@ let rptArchiveObj = {
 
     _buildeArchiveDateSelect: function () {
         let me = rptArchiveObj;
+        let targetDom = document.getElementById("currentDrpArchiveSelect");
+        targetDom.innerHTML = me.currentArchiveDateStr;
+        let drpDom = $("#drpArchiveSelect");
+        drpDom.empty();
         if (me.currentNode && me.currentArchiveUuid && me.currentArchiveDateStr) {
-            let targetDom = document.getElementById("currentDrpArchiveSelect");
-            targetDom.innerHTML = me.currentArchiveDateStr;
-            let drpDom = $("#drpArchiveSelect");
-            drpDom.empty();
             for (let aItem of ARCHIVE_LIST) {
                 if (me.currentNode.refId === parseInt(aItem.rpt_id)) {
                     for (let item of aItem.items) {

app/public/report/js/rpt_cfg_const.js

@@ -18,7 +18,8 @@ const rpt_tpl_setting = {
             leaf:true
         },
         key: {
-            children: "items"
+            children: "items",
+            title: "title"
         },
         simpleData: {
             enable: true,

app/public/report/js/rpt_main.js

@@ -213,8 +213,25 @@ let zTreeOprObj = {
     },
     refreshNodes: function() {
         let me = this;
+        const _set_archive_icon = function (tplNode) {
+            for (let aItem of ARCHIVE_LIST) {
+                let hasArchive = false;
+                if (parseInt(aItem.rpt_id) === parseInt(tplNode.refId)) {
+                    hasArchive = true;
+                    tplNode.icon = "/public/css/ztree/img/diy/10.png";
+                    break;
+                }
+                if (!hasArchive) {
+                    if (!tplNode.isParent) {
+                        tplNode.icon = null;
+                        tplNode.className = "button ico_docu";
+                    }
+                }
+            }
+        };
         let private_setupIsParent = function(node){
             node.isParent = (node.nodeType === RT.NodeType.NODE || node.level === 0);
+            _set_archive_icon(node);
             if (node.items && node.items.length) {
                 for (let i = 0; i < node.items.length; i++) {
                     private_setupIsParent(node.items[i]);

app/view/report/index.ejs

@@ -395,8 +395,11 @@
     buildTplTree();
 
     function chkAndSetNode(parentItem) {
+        parentItem.title = '';
         if (parentItem.nodeType === 1) {
             parentItem.isParent = true;
+        } else {
+            parentItem.title = parentItem.name + '(' + parentItem.refId + ')';
         }
         if (parentItem.items) {
             for (let dtlItem of parentItem.items) {
@@ -540,6 +543,7 @@
                 ARCHIVE_LIST = result.data;
                 buildStageSelection();
                 setupSignature();
+                zTreeOprObj.refreshNodes();
                 //还有必要触发报表刷新！
                 zTreeOprObj.onClick(null, null, zTreeOprObj.currentNode);
                 //console.log(ARCHIVE_LIST);

app/view/report/rpt_all_popup.ejs

@@ -511,6 +511,52 @@
         </div>
     </div>
 </div>
+<!--全屏显示报表-->
+<div class="modal fade" id="fullscreen" data-backdrop="static">
+    <div class="modal-dialog modal-full" role="document">
+        <div class="modal-content">
+            <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">
+                                <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="缩小">-</button>
+                                <button class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="重置默认大小">1000%</button>
+                                <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="放大">+</button>
+                            </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>
+                                </div>
+                                <input class="form-control" value="1/10" style="width:60px" 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>
+                                </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>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-body">
+                <div class="modal-fullscreen">
+                    <canvas id="fullScrCanvas" height="100%" width="100%"></canvas>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 
 <% include ../stage/audit_modal.ejs %>