From 0a0dc4160f4c98ddfec6879f4ca1db152d566c0f Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Tue, 26 Dec 2023 08:55:54 +0800
Subject: [PATCH] 'commit'

---
 WebRoot/view/tb/org/clone_task.html          |   4 +-
 WebRoot/view/tb/org/fields_set.html          |   7 +-
 WebRoot/view/tb/org/iconfont/demo_index.html |  52 ++++++++-
 WebRoot/view/tb/org/iconfont/iconfont.css    |  14 ++-
 WebRoot/view/tb/org/iconfont/iconfont.js     |   2 +-
 WebRoot/view/tb/org/iconfont/iconfont.json   |  14 +++
 WebRoot/view/tb/org/iconfont/iconfont.ttf    | Bin 2012 -> 2828 bytes
 WebRoot/view/tb/org/iconfont/iconfont.woff   | Bin 1268 -> 1900 bytes
 WebRoot/view/tb/org/iconfont/iconfont.woff2  | Bin 880 -> 1456 bytes
 WebRoot/view/tb/org/imgs/yjz.svg             |   1 +
 WebRoot/view/tb/org/postpone.html            | 116 +++++++++++++++++++
 WebRoot/view/tb/org/publish.html             |   9 --
 WebRoot/view/tb/org/rename_task.html         |   4 +-
 WebRoot/view/tb/org/task_list.html           |  70 ++++++++---
 14 files changed, 252 insertions(+), 41 deletions(-)
 create mode 100644 WebRoot/view/tb/org/imgs/yjz.svg
 create mode 100644 WebRoot/view/tb/org/postpone.html

diff --git a/WebRoot/view/tb/org/clone_task.html b/WebRoot/view/tb/org/clone_task.html
index 39a83973..de5db99d 100644
--- a/WebRoot/view/tb/org/clone_task.html
+++ b/WebRoot/view/tb/org/clone_task.html
@@ -68,7 +68,7 @@
 
             form.on('submit(save)', function (data) {
                 $.ajax({
-                    url: '/QingLong/collect/saveJob',
+                    url: '/QingLong/collect/cloneJob',
                     type: 'post',
                     data: {
                         "job_id": jobId,
@@ -81,7 +81,7 @@
                                 time: 1000
                             }, function () {
                                 parent.layer.close(parent.layer.getFrameIndex(window.name));
-                                parent.returnTaskList();
+                                parent.refresh();
                             });
                         } else {
                             layer.msg(result.message, {
diff --git a/WebRoot/view/tb/org/fields_set.html b/WebRoot/view/tb/org/fields_set.html
index d03edcdc..783cef5c 100644
--- a/WebRoot/view/tb/org/fields_set.html
+++ b/WebRoot/view/tb/org/fields_set.html
@@ -44,9 +44,10 @@
 
     <div style="background-color: #fff;display: flex;justify-content: space-between;align-items:center;margin: 0 5px">
         <div class="layui-layer-title" style="font-weight: bolder;">创建任务</div>
-        <div style="width: 140px;"><button type="button" class="layui-btn layui-btn-sm" lay-on="save">保
-                存</button><button type="button" class="layui-btn layui-btn-primary layui-btn-sm" lay-on="returnList">返
-                回</button></div>
+        <div style="width: 140px;">
+            <button type="button" class="layui-btn layui-btn-sm" lay-on="save">保存</button>
+            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" lay-on="returnList">返回</button>
+        </div>
     </div>
 
 
diff --git a/WebRoot/view/tb/org/iconfont/demo_index.html b/WebRoot/view/tb/org/iconfont/demo_index.html
index 971b1576..4d632837 100644
--- a/WebRoot/view/tb/org/iconfont/demo_index.html
+++ b/WebRoot/view/tb/org/iconfont/demo_index.html
@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe60c;</span>
+                <div class="name">延期完成</div>
+                <div class="code-name">&amp;#xe60c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe62d;</span>
+                <div class="name">延期</div>
+                <div class="code-name">&amp;#xe62d;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe712;</span>
                 <div class="name">重命名</div>
@@ -84,9 +96,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1703463057775') format('woff2'),
-       url('iconfont.woff?t=1703463057775') format('woff'),
-       url('iconfont.ttf?t=1703463057775') format('truetype');
+  src: url('iconfont.woff2?t=1703551476571') format('woff2'),
+       url('iconfont.woff?t=1703551476571') format('woff'),
+       url('iconfont.ttf?t=1703551476571') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -112,6 +124,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-delay_completed"></span>
+            <div class="name">
+              延期完成
+            </div>
+            <div class="code-name">.icon-delay_completed
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yanchi"></span>
+            <div class="name">
+              延期
+            </div>
+            <div class="code-name">.icon-yanchi
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-zhongmingming"></span>
             <div class="name">
@@ -157,6 +187,22 @@
       <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-delay_completed"></use>
+                </svg>
+                <div class="name">延期完成</div>
+                <div class="code-name">#icon-delay_completed</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yanchi"></use>
+                </svg>
+                <div class="name">延期</div>
+                <div class="code-name">#icon-yanchi</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zhongmingming"></use>
diff --git a/WebRoot/view/tb/org/iconfont/iconfont.css b/WebRoot/view/tb/org/iconfont/iconfont.css
index af969ae3..f3584743 100644
--- a/WebRoot/view/tb/org/iconfont/iconfont.css
+++ b/WebRoot/view/tb/org/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4386424 */
-  src: url('iconfont.woff2?t=1703463057775') format('woff2'),
-       url('iconfont.woff?t=1703463057775') format('woff'),
-       url('iconfont.ttf?t=1703463057775') format('truetype');
+  src: url('iconfont.woff2?t=1703551476571') format('woff2'),
+       url('iconfont.woff?t=1703551476571') format('woff'),
+       url('iconfont.ttf?t=1703551476571') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-delay_completed:before {
+  content: "\e60c";
+}
+
+.icon-yanchi:before {
+  content: "\e62d";
+}
+
 .icon-zhongmingming:before {
   content: "\e712";
 }
diff --git a/WebRoot/view/tb/org/iconfont/iconfont.js b/WebRoot/view/tb/org/iconfont/iconfont.js
index 04269af1..07a4a389 100644
--- a/WebRoot/view/tb/org/iconfont/iconfont.js
+++ b/WebRoot/view/tb/org/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4386424='<svg><symbol id="icon-zhongmingming" viewBox="0 0 1024 1024"><path d="M548.409 763.272H111.502c-20.098 0-36.409-16.311-36.409-36.409V289.956c0-20.098 16.311-36.409 36.409-36.409h436.907c20.098 0 36.409 16.311 36.409 36.409s-16.311 36.409-36.409 36.409H147.911v364.089h400.498c20.098 0 36.409 16.311 36.409 36.409s-16.311 36.409-36.409 36.409zM257.138 472.001c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409h218.453c20.098 0 36.409-16.311 36.409-36.409s-16.311-36.409-36.409-36.409H257.138zM839.68 908.907H730.453V107.912H839.68c20.098 0 36.409-16.311 36.409-36.409s-16.311-36.409-36.409-36.409H548.409C528.311 35.094 512 51.405 512 71.503s16.311 36.409 36.409 36.409h109.227v800.995H548.409c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409H839.68c20.098 0 36.409-16.311 36.409-36.409s-16.311-36.409-36.409-36.409z m72.818-655.36H839.68c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409h36.409v364.089H839.68c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409h72.818c20.098 0 36.409-16.311 36.409-36.409V289.956c0-20.098-16.311-36.409-36.409-36.409z"  ></path></symbol><symbol id="icon-fuzhi" viewBox="0 0 1024 1024"><path d="M394.666667 106.666667h448a74.666667 74.666667 0 0 1 74.666666 74.666666v448a74.666667 74.666667 0 0 1-74.666666 74.666667H394.666667a74.666667 74.666667 0 0 1-74.666667-74.666667V181.333333a74.666667 74.666667 0 0 1 74.666667-74.666666z m0 64a10.666667 10.666667 0 0 0-10.666667 10.666666v448a10.666667 10.666667 0 0 0 10.666667 10.666667h448a10.666667 10.666667 0 0 0 10.666666-10.666667V181.333333a10.666667 10.666667 0 0 0-10.666666-10.666666H394.666667z m245.333333 597.333333a32 32 0 0 1 64 0v74.666667a74.666667 74.666667 0 0 1-74.666667 74.666666H181.333333a74.666667 74.666667 0 0 1-74.666666-74.666666V394.666667a74.666667 74.666667 0 0 1 74.666666-74.666667h74.666667a32 32 0 0 1 0 64h-74.666667a10.666667 10.666667 0 0 0-10.666666 10.666667v448a10.666667 10.666667 0 0 0 10.666666 10.666666h448a10.666667 10.666667 0 0 0 10.666667-10.666666v-74.666667z" fill="#000000" ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,o,c,a,s,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4386424,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(c=i,a=n.document,s=!1,r(),a.onreadystatechange=function(){"complete"==a.readyState&&(a.onreadystatechange=null,l())})}function l(){s||(s=!0,c())}function r(){try{a.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}l()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_4386424='<svg><symbol id="icon-delay_completed" viewBox="0 0 1024 1024"><path d="M577.828571 577.828571c-7.314286 0-21.942857 7.314286-29.257142 7.314286h-219.428572c-21.942857 0-36.571429-14.628571-36.571428-36.571428s14.628571-36.571429 36.571428-36.571429H512V329.142857c0-21.942857 14.628571-36.571429 36.571429-36.571428s36.571429 14.628571 36.571428 36.571428v219.428572c0 7.314286-7.314286 21.942857-7.314286 29.257142zM804.571429 804.571429V694.857143c0-21.942857 14.628571-36.571429 36.571428-36.571429s36.571429 14.628571 36.571429 36.571429V804.571429h109.714285c21.942857 0 36.571429 14.628571 36.571429 36.571428s-14.628571 36.571429-36.571429 36.571429H877.714286v109.714285c0 21.942857-14.628571 36.571429-36.571429 36.571429s-36.571429-14.628571-36.571428-36.571429V877.714286H694.857143c-21.942857 0-36.571429-14.628571-36.571429-36.571429s14.628571-36.571429 36.571429-36.571428H804.571429z m219.428571-292.571429c0 21.942857-14.628571 36.571429-36.571429 36.571429S950.857143 533.942857 950.857143 512c0-241.371429-197.485714-438.857143-438.857143-438.857143S73.142857 270.628571 73.142857 512s197.485714 438.857143 438.857143 438.857143c21.942857 0 36.571429 14.628571 36.571429 36.571428s-14.628571 36.571429-36.571429 36.571429c-285.257143 0-512-226.742857-512-512s226.742857-512 512-512 512 226.742857 512 512z"  ></path></symbol><symbol id="icon-yanchi" viewBox="0 0 1024 1024"><path d="M831.34464 205.38368c93.00992 98.16576 135.53664 230.12352 120.3968 364.21632-12.75904 113.03424-74.56768 216.3712-161.18784 288.36864-183.59808 152.61696-460.8512 120.09984-615.65952-55.76192C38.88128 647.7056 35.62496 414.49984 153.93792 249.6768c131.89632-183.74656 390.61504-230.85056 583.65952-118.66112 28.60544 16.62464 54.36416-27.63264 25.84064-44.2112C542.07488-41.84064 260.87936 19.46112 109.72672 223.83616c-140.20096 189.57312-116.15232 459.25888 42.39872 629.42208 160.21504 171.94496 429.34784 201.3952 626.21696 76.416 208.61952-132.43904 282.14272-403.5584 181.41184-626.432-22.4256-49.60768-54.86592-94.64832-92.2112-134.06208-22.74304-24.0128-58.89024 12.25728-36.1984 36.20352z" fill="#231815" ></path><path d="M390.71744 423.3984c41.85088-1.52576 58.12736 20.92544 48.82432 67.42528-6.21056 34.10944-26.37312 81.37728-60.45184 141.824l-2.32448 4.64896c43.37664 52.7104 102.2976 79.04768 176.70144 79.04768h204.60032c13.952 0 21.68832 6.97344 23.24992 20.92544-1.5616 15.47264-9.29792 23.24992-23.24992 23.24992h-202.27584c-86.82496 1.52576-155.01312-25.5744-204.60032-81.37728-27.89888 34.10944-55.79776 61.21472-83.70176 81.37728-12.42624 7.74144-23.24992 6.17472-32.54784-4.64896-7.77728-12.42624-6.21056-24.04864 4.64896-34.87744 26.3424-17.03936 52.67456-44.93824 79.04768-83.70176a574.67904 574.67904 0 0 1-44.17536-111.60064c-4.64896-17.03936 0-28.66688 13.952-34.87744 15.47264-3.09248 26.3424 3.88608 32.54784 20.92544l20.92544 62.77632c1.52576 6.21056 3.09248 10.85952 4.64896 13.952 20.12672-32.54784 33.31584-64.30208 39.5264-95.32416 6.17472-18.60096 0.76288-27.10016-16.27648-25.5744H300.04224c-18.60096 0-31.0272-5.41696-37.20192-16.27648-4.64896-10.82368-1.5616-23.24992 9.29792-37.20192 9.29792-12.3904 21.68832-27.89888 37.20192-46.49984 13.952-18.60096 24.0128-31.74912 30.22336-39.5264 4.64896-6.17472 6.17472-11.62752 4.64896-16.27648-3.1232-3.09248-9.29792-4.64896-18.60096-4.64896H267.4944c-15.50848 0-23.24992-7.74144-23.24992-23.24992 0-13.952 7.74144-20.92544 23.24992-20.92544H383.744c34.0736 4.64896 40.28928 24.81152 18.60096 60.45184-7.77728 10.85952-18.60096 24.04864-32.54784 39.5264-15.50848 18.60096-25.5744 32.54784-30.22336 41.85088-4.64896 6.21056-6.21056 10.85952-4.64896 13.952 1.52576 3.1232 5.41696 4.64896 11.62752 4.64896h44.16512z m244.12672-2.32448h90.6752c15.47264 1.5616 24.0128 9.29792 25.5744 23.24992-1.5616 15.50848-10.10176 24.04864-25.5744 25.5744h-90.6752v148.80256h106.95168c12.3904 0 19.36384 7.77728 20.92544 23.24992-1.5616 15.50848-8.53504 23.24992-20.92544 23.24992h-202.27584c-48.06144 0-71.31136-24.0128-69.75488-72.07424V397.824c1.52576-15.47264 10.06592-24.0128 25.5744-25.5744 13.952 1.5616 21.69344 10.10176 23.25504 25.5744v195.3024c1.52576 13.952 7.74144 21.72416 18.60096 23.24992h51.1488V314.12736c-17.0752 3.1232-48.06144 6.21056-93.0048 9.29792h-16.27648c-17.0752 0-26.37312-7.74144-27.89888-23.24992 0-13.952 7.74144-21.68832 23.24992-23.24992 85.22752-1.52576 165.84192-13.14816 241.80224-34.87744 15.47264-3.08736 26.3424 1.5616 32.54784 13.952 3.09248 17.0752-2.32448 27.89888-16.27648 32.54784-43.41248 10.85952-75.96032 17.83296-97.64864 20.92544v111.60064z" fill="#231815" ></path></symbol><symbol id="icon-zhongmingming" viewBox="0 0 1024 1024"><path d="M548.409 763.272H111.502c-20.098 0-36.409-16.311-36.409-36.409V289.956c0-20.098 16.311-36.409 36.409-36.409h436.907c20.098 0 36.409 16.311 36.409 36.409s-16.311 36.409-36.409 36.409H147.911v364.089h400.498c20.098 0 36.409 16.311 36.409 36.409s-16.311 36.409-36.409 36.409zM257.138 472.001c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409h218.453c20.098 0 36.409-16.311 36.409-36.409s-16.311-36.409-36.409-36.409H257.138zM839.68 908.907H730.453V107.912H839.68c20.098 0 36.409-16.311 36.409-36.409s-16.311-36.409-36.409-36.409H548.409C528.311 35.094 512 51.405 512 71.503s16.311 36.409 36.409 36.409h109.227v800.995H548.409c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409H839.68c20.098 0 36.409-16.311 36.409-36.409s-16.311-36.409-36.409-36.409z m72.818-655.36H839.68c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409h36.409v364.089H839.68c-20.098 0-36.409 16.311-36.409 36.409s16.311 36.409 36.409 36.409h72.818c20.098 0 36.409-16.311 36.409-36.409V289.956c0-20.098-16.311-36.409-36.409-36.409z"  ></path></symbol><symbol id="icon-fuzhi" viewBox="0 0 1024 1024"><path d="M394.666667 106.666667h448a74.666667 74.666667 0 0 1 74.666666 74.666666v448a74.666667 74.666667 0 0 1-74.666666 74.666667H394.666667a74.666667 74.666667 0 0 1-74.666667-74.666667V181.333333a74.666667 74.666667 0 0 1 74.666667-74.666666z m0 64a10.666667 10.666667 0 0 0-10.666667 10.666666v448a10.666667 10.666667 0 0 0 10.666667 10.666667h448a10.666667 10.666667 0 0 0 10.666666-10.666667V181.333333a10.666667 10.666667 0 0 0-10.666666-10.666666H394.666667z m245.333333 597.333333a32 32 0 0 1 64 0v74.666667a74.666667 74.666667 0 0 1-74.666667 74.666666H181.333333a74.666667 74.666667 0 0 1-74.666666-74.666666V394.666667a74.666667 74.666667 0 0 1 74.666666-74.666667h74.666667a32 32 0 0 1 0 64h-74.666667a10.666667 10.666667 0 0 0-10.666666 10.666667v448a10.666667 10.666667 0 0 0 10.666666 10.666666h448a10.666667 10.666667 0 0 0 10.666667-10.666666v-74.666667z" fill="#000000" ></path></symbol></svg>',function(c){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var n,i,o,s,a,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}n=function(){var t,e=document.createElement("div");e.innerHTML=c._iconfont_svg_string_4386424,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(n,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),n()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=n,s=c.document,a=!1,h(),s.onreadystatechange=function(){"complete"==s.readyState&&(s.onreadystatechange=null,l())})}function l(){a||(a=!0,o())}function h(){try{s.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}l()}}(window);
\ No newline at end of file
diff --git a/WebRoot/view/tb/org/iconfont/iconfont.json b/WebRoot/view/tb/org/iconfont/iconfont.json
index 18401428..8fc279df 100644
--- a/WebRoot/view/tb/org/iconfont/iconfont.json
+++ b/WebRoot/view/tb/org/iconfont/iconfont.json
@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "3513166",
+      "name": "延期完成",
+      "font_class": "delay_completed",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "5315866",
+      "name": "延期",
+      "font_class": "yanchi",
+      "unicode": "e62d",
+      "unicode_decimal": 58925
+    },
     {
       "icon_id": "6695487",
       "name": "重命名",
diff --git a/WebRoot/view/tb/org/iconfont/iconfont.ttf b/WebRoot/view/tb/org/iconfont/iconfont.ttf
index 37db54d21ae4c288f4bc89a97fcb25a55d133bbc..52b2fbeb0d98d1ec587d33ce9ba505af37d7967a 100644
GIT binary patch
delta 1284
zcmYjQOKcle6n&rZOvbUDu{|@-aZKVkWX7bVEg65L*iD)eqBe;HDj?J(D6t%WqWYKM
zC?5efEKn9zg%q(wfLI}ch#I7BP=(Y5QYAKBunGl4ak8jbfY@U08>f)>bUpWX&VA=f
zKI*xpe;970BXdoJ@GXSUO17M-{rJKs>j)7D@ts0xC;xWKe*+=<9YVrhF_&32-Z^;;
z#b3Y@MMy|L(GS4?7VOz#xxTHUb{nuyAXZD&Y=*4TJAnTNVpln{UBiC#71RR|hbx(K
zBd2_xK0v7JDhw^us&CaF{q=eSAt&U}0>S`owwq{4uxSNALjLS=*cr&~x9+u;d(wZS
zZs>yZ>(>wKPrvPUyCDD*#9g*FUf@g)f<D_1<1eEv*U5oB3DG0;-f5M0bq?X2{0;k0
z@W73Y(^r%bwY}%z>jc6LXt@lHPJ0Szxmu&gzLNvKkh6Y=5|GZ*%iltPLpXeexN(D1
z@B=eju8#3Bt<jEg0mr_M0SKMIs<`of`!sO{KPJ<N{wLdyE}$it5)segh!IPqa6Fb6
z)1Ser$WA?LOjn_*sbV8yT*5=V&4PNwh{sIBG$N8Hi7L~XZg&nv%=6eZV#x`dOpLL9
z%ye=^(CLw)s>)q;P?dgzpR!j~y=8DJ+`-qtOQ*8=Kl0gBnmb#HrYUR7OSg?^)VRI0
z{E)kiD4vj@^Dd`4qWZB7uAHUA!yLHvl*Z<R`u`jqI=-Fu9{rQnPy%hCPhkW7nCsw|
zi!zNw5-y0E05PUvR~jN$!}I*|v<Ev9lGuaw6dq%+B+<0-P=;bMF@SXjof7N>q7Df5
z9FL{2-kGIa!<NoOX-Kndf=Du+Na{?}ndOCS#Efwi<K1+!F*DKaJU4P>VROAyn}4yl
zcQ`eb&pujl2Z*Qi?rvp$_9dTp`r~S8V>44ojf>(~INjYR|8sr9?X<{L^#_d*?ZNwV
zBO^YK%WFnMUP%kc8lnBN+&dGJCB?%ur$hx$im^>=(4{g-5}Y`^$OvJJHyb`meGjft
z!Zb=0t9M!n64u;cPC=Urlf&72xmV|BlXG658GU0uyYl_@g^QzdvP%hdO$tIhk$bbg
z{__{6>2hD1x>?xXsm@&PmivAuGuEQ;vKAn(Sp(gQUkQ%K$AhvXI4KJkFNCO9(foZO
zmn=EhbD9+QvXDoXK}Udm#MssQj8b-ABlx^SU?6YM;SWlRaJWa~Ldt;&rdYrZETW#(
oTq(1&oUN8?rCdF?D(++|+2Wdew^*$d%4;2S<TrPVYy7YBFKe&;@&Et;

delta 500
zcmY*Vze_?<7(Mr0e^rL*AT{L>)?h<XPDXz~YePes4^yAu^9Na|1Uf_nIRve4Z6P5@
zTVs3B&?I3H=+G1dZLf2E7I@*@?>px^-}k+Do57y%I#l0U-e~}$2_TU)^<ruD<%|4>
zxX9$H>4o6O6Cf|i+eS)13ZF&8^!ACULBahd&zV0GONLplc$v`q$;+E7Bz2tPmHiEJ
zkEvIR!jA;&^W>qtZq`$Cx3Lc3+yJypv2a`t^dk>|yG6q`gle@K*msZuys1naIZ~)T
zH?P(XeX(!M*xvX1s$V(nXx%v=4@f=G#{FuN)UbOK67BjRFzk#rLH5vKWpa<EX8wVx
zlaNHjmPLH*-=nHJBaG7=5@(b0xEKXAwZ*c4zsQPU&4nqI@WX_wThcVK4*MBbXi$fh
qLBNI@Kjecc{QnByxZ84VIu@nSgcJ_U){H_vV`gnQ(<e0}OaCv<mRU>y

diff --git a/WebRoot/view/tb/org/iconfont/iconfont.woff b/WebRoot/view/tb/org/iconfont/iconfont.woff
index e7b363e13e02c70ce0906f569896169da345aa88..d2cbe764cb222d83b0f5b58bcb46dc53aacae530 100644
GIT binary patch
delta 1435
zcmYLJ2~d)082$loz%-A%@(fMFvk)mfR>iZ_qFl{f54;66^Oi(b3%gcXwKcR{YtxD_
zOVUzPv{DPqtM!U3)6_~+S1mk>{he)Q-<fBg_kHGh=lSNF`MzcOSw+<}A6HiZ0)Qn;
z0pObqN3c{0bb_H*4w)L72mp|LP>con-k?>*@hD10B-k$l04xXqr1EJ~Dgn_Eq2T}^
zeHipvfv_<?IWrjzilDZ+s}Ev_>}%NRXlimgsNDc()lH}Z5(y=Nyy<HOXT&C;;jnwu
z&~!W)EZqePdLZ;6DgZY=lo|nQGhnzQ06?RZt`TYz6HX+92j2;LTtFNhTRK87l7mFi
z7n_IqqJ>rlgR!dUY~)+2OjK3@(w32W>E&~*He`-If~c3@q2w(z*k@a4VsZkV2&bCL
zG8b?KJcqxS!67onp(@Y^D$I{cLn(B_REJuDPQap=9UHUSaz(b~TVWC1Z!~M9vT0lP
z_3xj_3hXPDF+*YQVLZxA%4dOoGo6&J3EpLT`2o^_Xl*yuD;2LtZc{v(MlWjy`l0R&
zj$!M|q`17R7tI77u{r`@cPL}nK;Bpp^&5q$)nLb~^xdi2uRA)X@TlId-k>3@%b>7d
zH<Rn3SgD#hQ#qab8pn|nV&)&MPOa;%cefCi#bU8DvQM__r>I^Trw7mJk%`zFoo1pN
zo!CXK)JwD@MC^FGX<7i*pWhNj^rvdASjy$zYC}wU8W25~IpZ-pGAohVxCu6fY}$oC
z&}$?};da(cYgrhG>Vk$^WQjg%V#C8r+-`1bgH7PlE!$e#hOw5ri<YHq1>Ja&*v#zs
zE8rdZ?+^KB9Z1yqa5|1~Gg&s*JZ4{x56|7pMS1V{yzkCw2hS_^;@-BNFG1cfuC~lC
ztL2llIYAPajF^sZ*L!sa$+_?EMvt@ew8KKt%n8S*3hG-+Wkl|lN^L0IM>EVClDJ1x
z{u!deEhaa%P8oM<(#h3^)Yy2)<7w47!Ca+Kxco3~J?m9d9DUl&%_Pt(u&gH`(#<`7
zJ@;!?7AHY{79KoLdGn?<r5fAmPo-r?3-_Dfue+3wncHZWAMdgM=<TyD>2a#<k$Xt{
zup}oz6~6J9HFB3pM#rB=Yf$gACy`D4mOO-R@E>_yD^1d#@E-F+hIo|Up3FA%*44Ky
z!f0Ad`9|&90DVpn$LX#KlB=$%p^niqKa7qHbx)acl4B1JXf4itnxB0nwm~rK;9hC-
z&Ff<?lA^kF)^jm#pGE^|dB@J6oiCErrnOEGNfzep(UIM#*g%oyE@ath^M`%45vEb>
zw_$lS)A!F+JZ{q3<?Xp~TZI{oq&*m9%mTIbTER>T{RxYy-W!o;Y^UL;-7)B8^0ICK
zv3vfO&$c0$-g;`W`Y(FClO>ETr4toTih)e&aKix7<I{8@oaK|cI9*s2yi`6-{~40-
zH4|;(hW-*qfGl26LzR~L9+%!rLx_#|0>Y|OG5$+NfTMTg%Lz5bo>q%Bxm61P!!9My
zX|V-;O-*fQ0eXfYw6dM3|7SQ2!$H*FR9@+~-@YM&L5DpgpH&DOruMgm!o$CNN2JzY
z-CZ@|e8Flis(MC<R(;VJ(D^J??d+Bm*VP<u@%AdzWyWmlJgKUmKZ4<fWcD9)O8+K-
zp!)<^@YSc6lS9HoLV$PAdcN45n{HTr&Zl>`1JEr)!DvRGL?XEp6&ex`B;hqm9j^jx
zEk)-4OY!12e5J?j3lawy3=V_&N=es3ffSJxMGEvtf#1`AyxIS#97sH566*3JG$g{m
ziw|b)cN9wJArO)_nhc;Z1%b5HF=6{5_!8C`)+N>{Rtf6@!vTdgxod5YcWBTzxxWK@
iife6Ufj25@KpQz&*x^)u4H)p`SX*mq00jd|W&Z*!<!Z|S

delta 798
zcmaFE_k~lW+~3WOfsp|SSiUfDgJ||U6Gd$5ZPmRSl5-Oa7#J8kfP&#bx~)+6(x>#C
z$}}MR0T8PJ@fu07Cr2_;6H^!%m^pyz^nut+t;S3(11Ja-vjFmCfLMk79&<}ZZb=1D
zECk5s0bvl4lb;MymjGmf^m8zjF<i?{tgr-H%$xxfkOyJ~MnQ&zyu{p8pcv3Gj1CM8
zOz8rPZ8j9-7ncAXegddQ6Nv4F9_VbH%)yvm&%O7?fjb}eH#Ro@<YS(YlHd|}goUAE
zH?L~NoVOD;3N{$<FyHs{I2dTi%E}yQs2n{}x9QOVu@~>wZhqr+fJJ3vH&0noiL96I
zrz0|zee;#f|HQq%DpjL5Gf(x7DcAmKGj8v$%+J0sd+l|GdWI?&fhdNGIlciKy^c5t
z%-!j`&APrwal1B0ny1+^&s8xz9UP3an{Pz^W-t0793~dkA-{0#_2uG!7+I_LJBFtV
zHL;)Gb94K9-p^t-4foYIicVjk&=|af!NTX#AB{D$LxWx}-QsDXu&ijM|AwqrcNX!6
zJ5TOO$&mE)k4Y)FG`p~-X4=lrtwG#1oLl(rnBEiKwcTN5{e!vOak*wa@0wrVNOt>L
zakfq8@vdc@=11~7`=?f4*yyx6$@hiTM2*ESYU=yWyve)N!^a>n<*T<17cZlP1+#<K
zGN*GEYWKWVW7`$>Y!NLDe#!htJV54G7gKpjMfYA!uE$Zq(~eEQbo}1rOVz#K7Eg+-
zdi^ZW<o%4J_oh4fW|h@%yHxx(<#(mrls5~vPjd6Pzcpvc*Z&ML_dFLe0D~$yAtfP!
z;n8Q?yKNu;n8i!(h?H=6@Nk!xBg@}<QEuj9oe8H89$*n-WzbCE5`?MG`*Ht(z~Ms-
zOb(MKGKv~7Gq`gy<*)!_9fpBS22kn&nlA&gAR&z-F(DC{OckCnIkC0<Pq1TV5Y%QY
s+Wef=hf#6n#LkH`C$=_j*HX6Ew>1}TioEQ#+Q>*!f+1Oz{Q}S=0Qqeq^8f$<

diff --git a/WebRoot/view/tb/org/iconfont/iconfont.woff2 b/WebRoot/view/tb/org/iconfont/iconfont.woff2
index 67fec5c8242bec73540eef363d1ea36545f89fbb..035324c0b8425517e81db38bd5f016f4ab158cda 100644
GIT binary patch
delta 1446
zcmV;X1zGy=2CxelcTYw#00961000HB01E&B000XN000GIkr*C-G75<Zhj0Nl0we<z
z3k(1RAO(bH2U;7X3CIp5EWyBFU?4$6f4rOZVwD7%)MQH9WuazDR}2Yw!a{0tVsu5!
zzV7_<raaIet@qCk4l%*7iK2kclLCs;fCCHT+QU}&|KHE$sfVI>!y3Ijojt+C+ob)F
zpwxwin6$>>baJMD7LMT+UZ_Ui%&!0ffRv;F+O4Q-1FxZ4<RJu(?L~mK85x=kYVf$X
z!6QNl5A6oMGDFT#0J=eM0l-}C`;lKr2_67NB<xvDgK{05`y%<a4;vX90eiuB`4!=#
zQ2+!03_x7XI*?IxpA}~0<1|4A{T{9e0LcRieM`Q?fA#r)wr^|<SlPBIk`vO0!t(v&
zRZK{*t*C(a9FrOV0=~pI02F-nX#g1bwvW#pL6GA~08)Tl0P>G)a)I^s8?a7Td}eWU
zfFvw{VdPHNCX(Fl_--df1$pD>b}+K6-N;cmI<k!<jk|Ur2tXKY-QTI6@Sv;hQE;UF
zF^kpXQauTO82+x~=~K}&+Wz>P>z7G1kw|QWaUkL=9=9*vx-!7Q2#M9+@sz$<^`vFV
zre!m(wykUPdrVQg;AJHFRGrJ(6tF^hvh+ZTa=)#?$&3B>%2vurSICmkm9aYmmj*1U
z{nL=|DC$wPENYwIqQ#V!+8n%0PD0}8Z3nVa=~@YY%l#?r+LmVD@03qFwgxYkKavZQ
zhUBp(32E)yBvG5uyS9yNFM0jW?{<(J>8?wOPg`x%g7oE`PIkt2Y@CmCNB_)eh~rc5
z{2AxS*<{zEOMY?u{8Buygq+gF*-%Bjiy?;>=i@5u6_Xl~${anau6%`YAHMM3W}i22
z!!{d#^Etap&ZI@8G2OXbjz*Ki<^C=ZLFQmC_q*o~-ArjjDPx+ZoIHN^?D3P8(;iSn
z5k>Z0)07Va{$-H*cd)!V|1_!dY>BCjt}f1)SR*oaZ;L`u)~ZTsgET?Y<yUf=izaf3
znz+{<(=)CPhd#9w3}U^QEzO=@tt*@2?PTnKrEgYk;}sUgOiGl@$kP|)n6vdnH_?;K
z%gWF0*yh^(>As|VLCPfGq6Xo%zh9vLjqi|})&*-q-X5S$y@xzaRpM_ALF3-e8U4N@
zY()6?fw^|2QIY1A8yM&x*r~wxWms&+EK-I{R{I62Coi`6C=@<7s?o}e0h$uUMZdp)
zQWJhG#h8!)fAugjlhrNAt|+4aF>Zc{DWeb5Wy~SEExe7MXPrm4YmZKjq|3s~>6dhQ
zco}Uu#7FRSnXHVKE7XA_%<{ghIaP_ma;v<ZuF7f~1l|45$#%#j(@xXL8YliB+VOJ{
z;vBvmztJX*42hK125K2d)_Qm-j=3CvhaLc9Z2#d5*cgnh)8ENXXKv{*Hubjfla^os
z=fY9&!<RE(rqg-<c~HxL^8MZiqE?ii?#mLubkA?;<=ok(Zh*}a89)Tnm_z~ng!ML>
z58J<scJ(12Z;0{*vlC1CT7YsF3K$QOCfpVS1WF3H@sJOsSmoDKeA!`;+ybC~@B;z_
zV>_U{90v^JstLC}1ww$Y;D+%(kW@i>H;N)?OC6kA<aDg2mo;exUN5w$RolWDI<0Dl
z-?WNzI8AtxO-@L1FII9q=g8t5XO|&G6!om$A=uc8>+?9PRbcH7!OUsJ1fwY0a}pEv
zLHAD33N|R^z)=%%bXXd_N@Ej$Edft&EINN)3ywi2D>Vnur0Q{SQbMX{B}<S5FjWd3
zRJJBNow^vL5Xp=lOMlxauwhlC>)}}WoPcEyKFo}xB}!mSF=Lk_kr?TrBB6X`o51XN
ztH|y{gcwrDp@fR=b5?cl^p5MXTe&{J%B@$;YmFvppHbiqHj~s%=sTSSy(Rzv09AX*
ACjbBd

delta 865
zcmV-n1D^b_3-AUQcTYw#00961000AU01E&B000Nv0009bkr*C-1`2~Lf_?!u0we<r
z3kU!NAO(bH2R|F*2FNb3ZP=4ofX1*UsER9N1Rn9h!?%|HfrZQln02BE*b?l?Bqg$S
z0b3&7SK-PINXYx&rTeUzDwYaE->70QHT{jBG)->2+-GUfxFKwZMX?=1;;;yX<h20;
z%x3q8E9|*aRsa8g?;Zcfro#BP0c5N}V{Ym^usono`5sgjVJ8pBTMlR5fk)*l2*6Nj
zS$los;Ry_{&rk{zI<dzE#MNSbMF!9-+0ixC0vCbZcCSX<01M=C`v-vQ<n!V;ROf=k
zQrHi5Z!3n+qkq)lw|qc-0)M<dm@fefP(bO*oMN)xKdgg)rAl>R%JiMM*hV9eqefdn
zh}<yRYyRU&5H@yYC;)|Em7J8qlR&_aWWWW~VjFOP2f#x_j(tX>;s;YlN~M`>@T4JB
zpy`F3*8MXRD#^aZlbV0-d8f_5g;_9;U<fU++Xm~xRMwPnNz+(54z015ctiTHn)W>%
z_^3L$!)xz<n`<9o+JhMnG*8c=Qrby2@u+EYUe4{K$a?me)ki)>^rxS&8|DTZAm{m0
ztUi5<ePj*kn{4e-nw7Hp4AAEW@|3iOkn5klYwpC(H8T#@JX9THk9)^OhKF5ZF9lxw
zw+8e(j`gl{seXSFmOU{w)Rys_(aO-4Q&vhFKB$?020&29<Bka+xZ_?&{LlLhZ?BwI
zO|hCk*V6!e_d1FMgF0#N#JwxOfL~=8Z;8}K7?duPdu<3n(Vv)y1PliFH?;uKe)=0@
zT33R=B_;-mLkcKdvN26A1`CgBuyLscLy4`!9x-wq2pt0CyFnm`R0l~o&p{FC3)AFp
zu!#463pSDd!7y0Zc^>)A)maP(V;){}6=kV#O+@e>p*%N%EsCF^Efhq#?|9kl4yI^_
z*ic-^GLhiIW(nUG9z$a?p4+U75jhp2eBO0M*;||_OJIYA0tCgl&^1npWKtqPQ~LXk
zAnBYDur0B(lvPlGpYu7q7TAtHZ8dZymlQ5QNM(cwoM2HV!EH-kWb{;q%gbj~p$KtQ
rdL(l5Tn8oE>Ye$G$-|uh4EA0nq)<W=w!56AGEttVYjGp(Qvd(}r%I2*

diff --git a/WebRoot/view/tb/org/imgs/yjz.svg b/WebRoot/view/tb/org/imgs/yjz.svg
new file mode 100644
index 00000000..2465d80d
--- /dev/null
+++ b/WebRoot/view/tb/org/imgs/yjz.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1703551977923" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4862" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M338.733176 468.645647c2.816 11.369412 5.857882 22.317176 9.09553 32.858353l10.61647 34.424471c4.005647 13.040941 8.222118 25.675294 12.67953 37.888l-20.464941 6.279529-4.306824-13.959529-122.834823 37.842823 19.215058 62.358588c3.328 15.284706 13.296941 20.028235 29.846589 14.260706l92.144941-28.400941c10.736941-2.635294 17.528471-6.445176 20.434823-11.399529 2.876235-4.954353 2.575059-16.414118-0.903529-34.349177a92.009412 92.009412 0 0 0 26.413176 3.072c1.430588 17.889882 0.722824 30.479059-2.108235 37.842824-2.831059 7.303529-8.523294 12.649412-17.001412 15.917176l-124.687058 38.430118c-22.151529 7.499294-35.689412 1.129412-40.523295-19.109647l-24.666352-80.037647a1184.466824 1184.466824 0 0 0-11.52-34.153412l22.317176-6.881882c2.063059 8.914824 4.427294 17.679059 7.092706 26.352941l121.916235-37.526588-18.070588-58.654118-103.303529 31.819294c-14.275765 4.412235-30.298353 9.667765-48.097883 15.826824l-5.722353-18.597648a1499.783529 1499.783529 0 0 0 47.75153-13.68847l124.687058-38.415059zM443.437176 516.879059l30.704942-9.456941a76.634353 76.634353 0 0 0-11.068236-12.875294c4.397176-3.403294 9.607529-7.378824 15.676236-11.956706 6.595765 8.161882 11.459765 14.125176 14.667294 17.889882a482.243765 482.243765 0 0 0 30.433882-10.375529l5.165177 16.76047c-11.384471 2.831059-23.898353 6.324706-37.526589 10.526118l4.848942 15.811765a542.268235 542.268235 0 0 0 33.234823-11.248942l4.848941 15.841883c-9.472 2.228706-20.736 5.360941-33.761882 9.366588l4.577882 14.863059c10.541176-3.237647 21.323294-6.896941 32.301177-10.947765l4.894117 15.811765c-10.119529 2.439529-21.112471 5.481412-32.88847 9.125647l5.150117 16.715294a524.348235 524.348235 0 0 0 33.204706-11.248941l4.909177 15.841882c2.514824-2.816 5.255529-6.023529 8.222117-9.682823a127.533176 127.533176 0 0 0 16.655059-28.566589c-6.776471-8.749176-14.230588-20.239059-22.287059-34.394353-8.116706-14.140235-17.287529-34.56-27.557647-61.30447l-101.451294 31.262117c-9.321412 2.846118-18.838588 6.144-28.551529 9.803295l-5.180235-16.760471a259.207529 259.207529 0 0 0 29.44-7.017412l27.919058-8.598588-5.180235-16.745412a709.210353 709.210353 0 0 0-40.643765 13.537883l-5.165176-16.745412c9.697882-1.626353 23.521882-5.210353 41.517176-10.752a327.920941 327.920941 0 0 0-7.243294-20.178824l18.612706-5.737411c1.475765 7.032471 3.267765 13.944471 5.376 20.751058l11.158588-3.44847a546.032941 546.032941 0 0 0 27.632942-9.532236l4.848941 15.826824a536.244706 536.244706 0 0 0-28.190118 7.664941l-11.158588 3.433412 5.150117 16.730353 55.853177-17.197177c-3.328-8.478118-9.231059-25.359059-17.664-50.597647 7.860706-1.039059 14.953412-2.213647 21.338353-3.508706 0.256 7.408941 4.592941 23.717647 13.071059 48.956236l37.24047-11.459765a465.889882 465.889882 0 0 0 27.602824-9.532235l4.848941 15.811764c-10.089412 2.454588-19.501176 4.999529-28.16 7.664942l-36.321882 11.173647c2.891294 7.243294 7.378824 17.799529 13.281882 31.563294 5.963294 13.808941 14.381176 29.545412 25.283765 47.269647 4.487529-25.178353 4.954353-50.115765 1.415529-74.842353 5.089882 1.144471 12.574118 1.219765 22.497882 0.210823a1707.821176 1707.821176 0 0 0-2.93647 46.742589 292.894118 292.894118 0 0 1-5.647059 44.528941c11.489882 8.688941 20.269176 14.486588 26.217412 17.392941 6.023529 2.861176 8.538353 1.776941 7.634823-3.373176a128.451765 128.451765 0 0 0-3.930353-16.082824c7.770353 0.993882 15.134118 1.761882 22.121412 2.319059 2.228706 18.326588 2.379294 29.831529 0.421647 34.529882-1.957647 4.668235-8.161882 6.038588-18.567529 4.171294-10.420706-1.897412-24.018824-9.065412-40.749177-21.579294a184.847059 184.847059 0 0 1-14.938353 25.99153c-5.421176 7.800471-11.595294 15.826824-18.567529 24.079058a65.761882 65.761882 0 0 0-18.522353-10.586352l12.589177-12.047059c-9.487059 2.228706-17.965176 4.517647-25.419295 6.821647l-55.838117 17.197176 5.180235 16.745412-17.709176 5.451294c-1.882353-8.282353-3.915294-17.167059-6.159059-26.639059l-19.787294-64.225882c-2.575059 4.879059-5.496471 10.872471-8.719059 17.980235a626.537412 626.537412 0 0 0-15.465412-10.541176c3.177412-5.029647 7.243294-13.959529 12.167529-26.654118 4.879059-12.724706 8.448-25.524706 10.571295-38.430118 6.731294 2.017882 13.673412 3.614118 20.826353 4.788706l-8.357648 15.917177z m37.104942 21.157647l-4.864-15.811765-32.572236 10.029177 4.879059 15.826823 32.557177-10.044235z m8.899764 28.867765l-4.577882-14.908236-32.572235 10.044236 4.562823 14.893176 32.587294-10.029176z m9.456942 30.704941l-5.150118-16.715294-32.572235 10.014117 5.150117 16.730353 32.572236-10.029176z m87.190588-189.891765a75.143529 75.143529 0 0 0-14.817883 14.757647c-3.132235-5.812706-11.866353-13.296941-26.247529-22.467765 4.201412-4.005647 8.824471-8.839529 13.869176-14.471529l27.196236 22.181647zM685.688471 439.220706l29.500235 95.86447 48.414118-14.923294-44.16753-143.299764a690.326588 690.326588 0 0 0-11.806118-35.087059l20.464942-6.294588c2.816 11.369412 6.128941 23.235765 9.953882 35.644235l9.743059 31.638588 37.225412-11.459765c10.541176-3.237647 22.226824-7.183059 35.056941-11.821176l5.737412 18.612706c-13.206588 3.418353-25.072941 6.716235-35.659295 9.968941l-37.210353 11.444706 29.274353 94.900706 51.154824-15.766588a828.235294 828.235294 0 0 0 37.872941-12.67953l5.752471 18.612706c-13.251765 3.388235-26.051765 7.002353-38.490353 10.827294l-135.845647 41.848471c-13.010824 4.020706-25.946353 8.342588-38.79153 12.980706l-5.722353-18.597647a641.129412 641.129412 0 0 0 37.51153-10.541177l-29.545412-95.864471c-3.222588-10.541176-6.912-21.308235-10.947765-32.286117l21.398589-6.595765c2.816 11.369412 5.842824 22.317176 9.125647 32.873412z" fill="#d81e06" p-id="4863"></path><path d="M884.841412 179.742118L28.897882 449.837176l129.551059 410.639059 855.94353-270.095059-129.551059-410.639058zM46.742588 459.233882l828.792471-261.647058 121.133176 383.518117-828.958117 261.616941-120.96753-383.488z" fill="#d81e06" p-id="4864"></path><path d="M862.343529 217.840941L69.240471 468.088471l111.826823 354.258823L974.155294 572.114824l-111.811765-354.273883zM77.854118 472.591059l780.107294-246.136471 107.610353 341.142588-780.137412 246.15153L77.854118 472.591059z" fill="#d81e06" p-id="4865"></path></svg>
\ No newline at end of file
diff --git a/WebRoot/view/tb/org/postpone.html b/WebRoot/view/tb/org/postpone.html
new file mode 100644
index 00000000..6d9e3c07
--- /dev/null
+++ b/WebRoot/view/tb/org/postpone.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <link rel="stylesheet" href="../../../component/pear/css/pear.css" />
+    <style>
+        .require-star {
+            position: absolute;
+            width: 3px;
+            height: 14px;
+            background-color: #ea4335;
+            top: 12px;
+            right: 8px;
+            border-radius: 1.5px;
+        }
+
+        .input-width {
+            max-width: 475px
+        }
+    </style>
+</head>
+
+<body>
+    <form class="layui-form" action="">
+        <div class="mainBox">
+            <div class="main-container" style="margin-top: 25px;">
+                <div class="layui-form-item">
+                    <label class="layui-form-label" style="width: 100px !important;"><span
+                        class="require-star"></span>填报截止日期：</label>
+                <div class="layui-input-block" style="margin-left: 90px !important;">
+                    <input type="text" class="layui-input" style="width: 280px;" lay-verify="required" name="deadline_time"
+                        id="endDate" placeholder="请选择截止日期">
+                </div>
+                </div>
+            </div>
+        </div>
+        <div class="bottom">
+            <div class="button-container">
+                <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="save">
+                    <i class="layui-icon layui-icon-ok"></i>
+                    提交
+                </button>
+                <button type="reset" class="pear-btn pear-btn-sm">
+                    <i class="layui-icon layui-icon-refresh"></i>
+                    重置
+                </button>
+            </div>
+        </div>
+    </form>
+    <script src="../../../component/layui/layui.js"></script>
+    <script src="../../../component/pear/pear.js"></script>
+    <script>
+        layui.use(function () {
+            var form = layui.form;
+            var $ = layui.jquery;
+            var laydate = layui.laydate;
+
+            laydate.render({
+                elem: '#endDate'
+            });
+
+            var jobId = GetQueryString("job_id");
+
+
+            // 自定义验证
+            form.verify({
+                taskName: [/^.{2,32}$/, '任务名称长度必须为2到32位']
+
+            });
+
+            form.on('submit(save)', function (data) {
+                $.ajax({
+                    url: '/QingLong/collect/extensionJob',
+                    type: 'post',
+                    data: {
+                        "job_id": jobId,
+                        "deadline_time": $("#endDate").val()
+                    },                    
+                    success: function (result) {
+                        if (result.success) {
+                            layer.msg("成功！", {
+                                icon: 1,
+                                time: 1000
+                            }, function () {
+                                parent.layer.close(parent.layer.getFrameIndex(window.name));
+                                parent.refresh();
+                            });
+                        } else {
+                            layer.msg(result.message, {
+                                icon: 2,
+                                time: 2000
+                            });
+                        }
+                    }
+                });
+                return false;
+            });
+
+
+            function GetQueryString(name, istop) {
+                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+                var r = window.location.search.substr(1).match(reg);
+                if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
+
+                if (r != null) return unescape(r[2]);
+                return null;
+            }
+        });
+    </script>
+    <script>
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebRoot/view/tb/org/publish.html b/WebRoot/view/tb/org/publish.html
index 1849cbd9..d493bd5e 100644
--- a/WebRoot/view/tb/org/publish.html
+++ b/WebRoot/view/tb/org/publish.html
@@ -193,7 +193,6 @@
                 }
             });
 
-
             tag.on('delete(orgs)', function (data) {
                 var orgId = data.elem.prevObject.prevObject[0].getAttribute("lay-id");
                 bureauIds = bureauIds.filter(item => item !== orgId);
@@ -202,7 +201,6 @@
                 form.render();
             });
 
-
             util.on({
                 confirm: function () {
                     tableReload();
@@ -227,13 +225,6 @@
                 });
             }
 
-
-
-
-
-
-
-
             form.on('submit(publish)', function (data) {    
 
                 var shiZhiSchool = 0;
diff --git a/WebRoot/view/tb/org/rename_task.html b/WebRoot/view/tb/org/rename_task.html
index 39a83973..2b0bcc58 100644
--- a/WebRoot/view/tb/org/rename_task.html
+++ b/WebRoot/view/tb/org/rename_task.html
@@ -68,7 +68,7 @@
 
             form.on('submit(save)', function (data) {
                 $.ajax({
-                    url: '/QingLong/collect/saveJob',
+                    url: '/QingLong/collect/renameJob',
                     type: 'post',
                     data: {
                         "job_id": jobId,
@@ -81,7 +81,7 @@
                                 time: 1000
                             }, function () {
                                 parent.layer.close(parent.layer.getFrameIndex(window.name));
-                                parent.returnTaskList();
+                                parent.refresh();
                             });
                         } else {
                             layer.msg(result.message, {
diff --git a/WebRoot/view/tb/org/task_list.html b/WebRoot/view/tb/org/task_list.html
index 6bc8918b..b5e08796 100644
--- a/WebRoot/view/tb/org/task_list.html
+++ b/WebRoot/view/tb/org/task_list.html
@@ -27,7 +27,7 @@
                         查询
                     </button>
                 </div>
-                
+
             </div>
         </div>
     </div>
@@ -42,11 +42,15 @@
                 </button>
                 {{# } else { }}
                     {{= d.fill_progress }}
-                {{#  } }}
-                <!-- <div class="layui-progress layui-progress-big" lay-showpercent="true">
-                    <div class="layui-progress-bar" lay-percent="5 / 10"></div>
-                </div> -->
+                {{#  } }}                
               </script>
+
+            <script type="text/html" id="jobName-Templet">
+                {{d.job_name}}
+                {{#if (d.jiezhi == true) { }}
+                    <img src="./imgs/yjz.svg" style="max-width: 50px;margin-top: -9px;margin-left: 10px;">
+                {{# } }}
+            </script>
         </div>
     </div>
 
@@ -62,19 +66,27 @@
             <button type="button" class="layui-btn layui-btn-sm" title="发布" lay-event="publish">
                 <i class="layui-icon layui-icon-release"></i>
             </button>
-            <button type="button" class="layui-btn layui-btn-sm" title="修改" lay-event="update">
-                <i class="layui-icon layui-icon-edit"></i>
+            {{#  if(d.is_clone === 0){ }}
+                <button type="button" class="layui-btn layui-btn-sm" title="修改" lay-event="update">
+                    <i class="layui-icon layui-icon-edit"></i>
+                </button>
+            {{#  } }}
+            <button type="button" class="layui-btn layui-btn-sm" title="重命名" lay-event="rename">
+                <i class="iconfont icon-zhongmingming"></i>
             </button>
         {{#  } }}     
-        <button type="button" class="layui-btn layui-btn-sm" title="重命名" lay-event="rename">
-            <i class="iconfont icon-zhongmingming"></i>
-        </button>
+        
         <button type="button" class="layui-btn layui-btn-sm" title="导出" lay-event="export">
             <i class="layui-icon layui-icon-export"></i>
-        </button>        
-        <button type="button" class="layui-btn layui-btn-sm" title="复制" lay-event="copy">
-            <i class="iconfont icon-fuzhi"></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>
+            </button>
+            <button type="button" class="layui-btn layui-btn-sm" title="复制" lay-event="copy">
+                <i class="iconfont icon-fuzhi"></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>
@@ -118,7 +130,7 @@
                     },
                     cols: [[
                         { title: '序号', align: 'center', width: "5%", type: 'numbers' },
-                        { title: '任务名称', field: 'job_name', align: 'center' },
+                        { title: '任务名称', align: 'center', templet: '#jobName-Templet' },
                         { title: '发布时间', field: 'publish_time', align: 'center', width: "10%" },
                         { title: '截止时间', field: 'deadline_time', align: 'center', width: "10%" },
                         { title: '填报格式', field: 'job_type_name', align: 'center', width: "10%" },
@@ -143,6 +155,8 @@
                     window.export(obj);
                 } else if (obj.event === 'copy') {
                     window.copy(obj);
+                } else if (obj.event === 'postpone') {
+                    window.postpone(obj);
                 } else if (obj.event === 'del') {
                     window.del(obj);
                 }
@@ -163,15 +177,38 @@
             }
 
             window.rename = function (obj) {
+                layer.open({
+                    type: 2,
+                    title: '重命名',
+                    shade: 0.1,
+                    area: ['450px', '230px'],
+                    content: './rename_task.html?job_id=' + obj.data.job_id
+                });
+            }
 
+            window.postpone = function (obj) {
+                layer.open({
+                    type: 2,
+                    title: '延长截止时间',
+                    shade: 0.1,
+                    area: ['450px', '400px'],
+                    content: './postpone.html?job_id=' + obj.data.job_id
+                });
             }
 
+
             window.export = function (obj) {
 
             }
 
             window.copy = function (obj) {
-
+                layer.open({
+                    type: 2,
+                    title: '复制任务',
+                    shade: 0.1,
+                    area: ['450px', '230px'],
+                    content: './clone_task.html?job_id=' + obj.data.job_id
+                });
             }
 
             window.del = function (obj) {
@@ -194,9 +231,6 @@
                 });
             }
 
-
-
-
             window.remove = function (obj) {
                 layer.confirm('确定要删除该系统吗？', {
                     icon: 3,