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

WebRoot/view/tb/iconfont/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe81e;</span>
+                <div class="name">操作-汇总表</div>
+                <div class="code-name">&amp;#xe81e;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe645;</span>
                 <div class="name">提交</div>
@@ -156,9 +162,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1704955156389') format('woff2'),
-       url('iconfont.woff?t=1704955156389') format('woff'),
-       url('iconfont.ttf?t=1704955156389') format('truetype');
+  src: url('iconfont.woff2?t=1705040199204') format('woff2'),
+       url('iconfont.woff?t=1705040199204') format('woff'),
+       url('iconfont.ttf?t=1705040199204') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -184,6 +190,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-cz-hzb"></span>
+            <div class="name">
+              操作-汇总表
+            </div>
+            <div class="code-name">.icon-cz-hzb
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-tijiao"></span>
             <div class="name">
@@ -337,6 +352,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-cz-hzb"></use>
+                </svg>
+                <div class="name">操作-汇总表</div>
+                <div class="code-name">#icon-cz-hzb</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tijiao"></use>

WebRoot/view/tb/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4386424 */
-  src: url('iconfont.woff2?t=1704955156389') format('woff2'),
-       url('iconfont.woff?t=1704955156389') format('woff'),
-       url('iconfont.ttf?t=1704955156389') format('truetype');
+  src: url('iconfont.woff2?t=1705040199204') format('woff2'),
+       url('iconfont.woff?t=1705040199204') format('woff'),
+       url('iconfont.ttf?t=1705040199204') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-cz-hzb:before {
+  content: "\e81e";
+}
+
 .icon-tijiao:before {
   content: "\e645";
 }

WebRoot/view/tb/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "8220817",
+      "name": "操作-汇总表",
+      "font_class": "cz-hzb",
+      "unicode": "e81e",
+      "unicode_decimal": 59422
+    },
     {
       "icon_id": "788023",
       "name": "提交",

WebRoot/view/tb/org/task_list.html

@@ -131,8 +131,12 @@
                 <i class="iconfont icon-fuzhi"></i>
             </button>
 
-            <button type="button" class="layui-btn layui-btn-sm" title="导出表结构" lay-event="exportStruct">
+            <!-- <button type="button" class="layui-btn layui-btn-sm" title="导出表结构" lay-event="exportStruct">
                 <i class="iconfont icon-shujiegou"></i>
+            </button> -->
+
+            <button type="button" class="layui-btn layui-btn-sm" title="导出汇总表" lay-event="exportHz">
+                <i class="iconfont icon-cz-hzb"></i>
             </button>
         {{#  } }} 
 
@@ -224,7 +228,11 @@
                     window.del(obj);
                 } else if (obj.event === 'exportStruct') {
                     window.exportStruct(obj);
+                }else if (obj.event === 'exportHz') {
+                    window.exportHz(obj);
                 }
+
+                
             });
 
             window.fill_progress = function (job_id, total_count, finish_count, job_type) {
@@ -313,6 +321,11 @@
                 // window.location = "/QingLong/Excel/" + obj.data.upload_excel_filename;
             }
 
+            
+            window.exportHz = function (obj) {
+                window.location = "/QingLong/collect/getSummaryExcel?job_id=" + obj.data.job_id;
+            }
+
             window.exportStruct = function (obj) {
                 window.location = "/QingLong/collect/exportTableStructExcel?job_id=" + obj.data.job_id;
             }