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

WebRoot/view/tb/org/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">&#xe666;</span>
+                <div class="name">导出</div>
+                <div class="code-name">&amp;#xe666;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe60c;</span>
                 <div class="name">延期完成</div>
@@ -96,9 +102,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1703551476571') format('woff2'),
-       url('iconfont.woff?t=1703551476571') format('woff'),
-       url('iconfont.ttf?t=1703551476571') format('truetype');
+  src: url('iconfont.woff2?t=1703553854725') format('woff2'),
+       url('iconfont.woff?t=1703553854725') format('woff'),
+       url('iconfont.ttf?t=1703553854725') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -124,6 +130,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-daochu"></span>
+            <div class="name">
+              导出
+            </div>
+            <div class="code-name">.icon-daochu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-delay_completed"></span>
             <div class="name">
@@ -187,6 +202,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-daochu"></use>
+                </svg>
+                <div class="name">导出</div>
+                <div class="code-name">#icon-daochu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-delay_completed"></use>

WebRoot/view/tb/org/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4386424 */
-  src: url('iconfont.woff2?t=1703551476571') format('woff2'),
-       url('iconfont.woff?t=1703551476571') format('woff'),
-       url('iconfont.ttf?t=1703551476571') format('truetype');
+  src: url('iconfont.woff2?t=1703553854725') format('woff2'),
+       url('iconfont.woff?t=1703553854725') format('woff'),
+       url('iconfont.ttf?t=1703553854725') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-daochu:before {
+  content: "\e666";
+}
+
 .icon-delay_completed:before {
   content: "\e60c";
 }

WebRoot/view/tb/org/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "12331658",
+      "name": "导出",
+      "font_class": "daochu",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
     {
       "icon_id": "3513166",
       "name": "延期完成",

WebRoot/view/tb/org/task_list.html

@@ -76,9 +76,7 @@
             </button>
         {{#  } }}     
         
-        <button type="button" class="layui-btn layui-btn-sm" title="导出原始Excel" lay-event="export">
-            <i class="layui-icon layui-icon-export"></i>
-        </button>
+       
         {{#  if(d.publish_state === 1){ }}
             <button type="button" class="layui-btn layui-btn-sm" title="延期" lay-event="postpone">
                 <i class="iconfont icon-delay_completed"></i>
@@ -87,6 +85,9 @@
                 <i class="iconfont icon-fuzhi"></i>
             </button>
         {{#  } }} 
+        <button type="button" class="layui-btn layui-btn-sm" title="导出原始Excel" lay-event="export">
+            <i class="iconfont icon-daochu"></i>
+        </button>
         <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" title="删除" lay-event="del">
             <i class="layui-icon layui-icon-delete"></i>
         </button>