Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

WebRoot/view/jrgl/xtgl/index.html

@@ -83,11 +83,11 @@
 
     <i class="woo-tool-text-delimiter"></i>
     <span class="woo-tool-span woo-tool-text-span" lay-event="share"><a
-      class="woo-theme-color">共享管理</a></span>
+      class="woo-theme-color">共享</a></span>
   
     <i class="woo-tool-text-delimiter"></i>
     <span class="woo-tool-span woo-tool-text-span" lay-event="sub"><a
-      class="woo-theme-color">订阅管理</a></span>
+      class="woo-theme-color">订阅</a></span>
 
     <i class="woo-tool-text-delimiter"></i>
     <span class="woo-tool-span woo-tool-text-span" lay-event="reset"><a
@@ -106,6 +106,15 @@
       class="woo-theme-color" >下载文档</a></span>
     {{#  } }}
 
+    <i class="woo-tool-text-delimiter"></i>
+    {{#  if(d.url == null){ }}
+    <span class="woo-tool-span woo-tool-text-span" style="cursor:default"><a
+      class="woo-theme-color-none">预览文档</a></span>
+    {{# } else { }}    
+    <span class="woo-tool-span woo-tool-text-span" lay-event="preview"><a
+      class="woo-theme-color" >预览文档</a></span>
+    {{#  } }}
+
     <i class="woo-tool-text-delimiter"></i>
     <span class="woo-tool-span woo-tool-text-span" lay-event="remove"><a
         class="woo-theme-color">删除</a></span>    
@@ -152,9 +161,10 @@
           cols: [[
             { title: '序号', align: 'center', width: "5%", type: 'numbers' },
             { title: '系统名称', field: 'system_name', align: 'center' },
+            { title: '共享表数', field: 'share_table_count', align: 'center', width: "8%" },
+            { title: '已订阅系统数', field: 'subscribe_system_count', align: 'center', width: "10%" },
             { title: '访问账号', field: 'user_name', align: 'center', width: "15%" },
             { title: '访问密码', field: 'pwd', align: 'center', width: "15%" },
-            // { title: '已订阅表个数', field: 'table_cnt', align: 'center', width: "10%" },
             { title: '操作', toolbar: '#table-bar', align: 'center', width: "35%" }
           ]],
           skin: 'line',
@@ -210,7 +220,10 @@
           window.download(obj);
         } else if (obj.event === 'reset') {
           window.reset(obj);
+        } else if (obj.event === 'preview') {
+          window.preview(obj);
         }
+
       });
 
       table.on('toolbar(data-table)', function (obj) {
@@ -302,8 +315,10 @@
             }
           });
         });
+      }
 
-
+      window.preview = function (obj) {
+        window.open('/QingLong/dataShare/previewXlsx?system_id=' + obj.data.system_id, '_blank');
       }
 
 

WebRoot/view/jrgl/xtgl/share.html

@@ -134,7 +134,7 @@
                         if (result.success) {
                             layer.msg("保存成功！", {
                                 icon: 1,
-                                time: 1300
+                                time: 1500
                             }, function () {
                                 parent.layer.close(parent.layer.getFrameIndex(window.name));
                                 parent.layui.table.reload("data-table");

WebRoot/view/jrgl/xtgl/subscribe.html

@@ -138,7 +138,7 @@
                         if (result.success) {
                             layer.msg("保存成功！", {
                                 icon: 1,
-                                time: 1300
+                                time: 1500
                             }, function () {
                                 parent.layer.close(parent.layer.getFrameIndex(window.name));
                                 parent.layui.table.reload("data-table");