Browse Source

矢量图替换,bug修改

asd26269546 1 year ago
parent
commit
dc3918031d

+ 532 - 3
src/assets/icons/iconfont/demo_index.html

@@ -55,6 +55,144 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe8e4;</span>
+                <div class="name">btn_penren</div>
+                <div class="code-name">&amp;#xe8e4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8e5;</span>
+                <div class="name">btn_下拉22</div>
+                <div class="code-name">&amp;#xe8e5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8e6;</span>
+                <div class="name">btn_jiagong</div>
+                <div class="code-name">&amp;#xe8e6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8e7;</span>
+                <div class="name">btn_shouqi22</div>
+                <div class="code-name">&amp;#xe8e7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8df;</span>
+                <div class="name">iconx_goutong</div>
+                <div class="code-name">&amp;#xe8df;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8e0;</span>
+                <div class="name">iconx_waimaoerp</div>
+                <div class="code-name">&amp;#xe8e0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8e1;</span>
+                <div class="name">iconm_xitonggl</div>
+                <div class="code-name">&amp;#xe8e1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8e2;</span>
+                <div class="name">iconm_goutong</div>
+                <div class="code-name">&amp;#xe8e2;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8e3;</span>
+                <div class="name">iconm_waimaoerp</div>
+                <div class="code-name">&amp;#xe8e3;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8de;</span>
+                <div class="name">iconx_xitonggl</div>
+                <div class="code-name">&amp;#xe8de;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8da;</span>
+                <div class="name">btn_mine</div>
+                <div class="code-name">&amp;#xe8da;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8db;</span>
+                <div class="name">btn_xiaox</div>
+                <div class="code-name">&amp;#xe8db;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8dc;</span>
+                <div class="name">btn_gongz</div>
+                <div class="code-name">&amp;#xe8dc;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8dd;</span>
+                <div class="name">btn_wulw</div>
+                <div class="code-name">&amp;#xe8dd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d6;</span>
+                <div class="name">btn_mine_gray</div>
+                <div class="code-name">&amp;#xe8d6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d7;</span>
+                <div class="name">btn_shengc_gray</div>
+                <div class="code-name">&amp;#xe8d7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d8;</span>
+                <div class="name">btn_kanban_gray</div>
+                <div class="code-name">&amp;#xe8d8;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d9;</span>
+                <div class="name">btn_shebei_blue</div>
+                <div class="code-name">&amp;#xe8d9;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6aa;</span>
+                <div class="name">icon_tdgl</div>
+                <div class="code-name">&amp;#xe6aa;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6ac;</span>
+                <div class="name">icon_yhgl</div>
+                <div class="code-name">&amp;#xe6ac;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6ae;</span>
+                <div class="name">icon_ddgl_2</div>
+                <div class="code-name">&amp;#xe6ae;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6af;</span>
+                <div class="name">icon_ddgl_1</div>
+                <div class="code-name">&amp;#xe6af;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6b1;</span>
+                <div class="name">icon_ddgl</div>
+                <div class="code-name">&amp;#xe6b1;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe8d2;</span>
                 <div class="name">iconm_gongncd</div>
                 <div class="code-name">&amp;#xe8d2;</div>
@@ -2958,9 +3096,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1687672153417') format('woff2'),
-       url('iconfont.woff?t=1687672153417') format('woff'),
-       url('iconfont.ttf?t=1687672153417') format('truetype');
+  src: url('iconfont.woff2?t=1690168598112') format('woff2'),
+       url('iconfont.woff?t=1690168598112') format('woff'),
+       url('iconfont.ttf?t=1690168598112') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -2987,6 +3125,213 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-btn_penren"></span>
+            <div class="name">
+              btn_penren
+            </div>
+            <div class="code-name">.icon-btn_penren
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_xiala22"></span>
+            <div class="name">
+              btn_下拉22
+            </div>
+            <div class="code-name">.icon-btn_xiala22
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_jiagong"></span>
+            <div class="name">
+              btn_jiagong
+            </div>
+            <div class="code-name">.icon-btn_jiagong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_shouqi22"></span>
+            <div class="name">
+              btn_shouqi22
+            </div>
+            <div class="code-name">.icon-btn_shouqi22
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_goutong"></span>
+            <div class="name">
+              iconx_goutong
+            </div>
+            <div class="code-name">.icon-iconx_goutong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_waimaoerp"></span>
+            <div class="name">
+              iconx_waimaoerp
+            </div>
+            <div class="code-name">.icon-iconx_waimaoerp
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_xitonggl"></span>
+            <div class="name">
+              iconm_xitonggl
+            </div>
+            <div class="code-name">.icon-iconm_xitonggl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_goutong"></span>
+            <div class="name">
+              iconm_goutong
+            </div>
+            <div class="code-name">.icon-iconm_goutong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_waimaoerp"></span>
+            <div class="name">
+              iconm_waimaoerp
+            </div>
+            <div class="code-name">.icon-iconm_waimaoerp
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_xitonggl"></span>
+            <div class="name">
+              iconx_xitonggl
+            </div>
+            <div class="code-name">.icon-iconx_xitonggl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_mine"></span>
+            <div class="name">
+              btn_mine
+            </div>
+            <div class="code-name">.icon-btn_mine
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_xiaox"></span>
+            <div class="name">
+              btn_xiaox
+            </div>
+            <div class="code-name">.icon-btn_xiaox
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_gongz"></span>
+            <div class="name">
+              btn_gongz
+            </div>
+            <div class="code-name">.icon-btn_gongz
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_wulw"></span>
+            <div class="name">
+              btn_wulw
+            </div>
+            <div class="code-name">.icon-btn_wulw
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_mine_gray1"></span>
+            <div class="name">
+              btn_mine_gray
+            </div>
+            <div class="code-name">.icon-btn_mine_gray1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_shengc_gray1"></span>
+            <div class="name">
+              btn_shengc_gray
+            </div>
+            <div class="code-name">.icon-btn_shengc_gray1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_kanban_gray1"></span>
+            <div class="name">
+              btn_kanban_gray
+            </div>
+            <div class="code-name">.icon-btn_kanban_gray1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-btn_shebei_blue1"></span>
+            <div class="name">
+              btn_shebei_blue
+            </div>
+            <div class="code-name">.icon-btn_shebei_blue1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_tdgl"></span>
+            <div class="name">
+              icon_tdgl
+            </div>
+            <div class="code-name">.icon-icon_tdgl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_yhgl"></span>
+            <div class="name">
+              icon_yhgl
+            </div>
+            <div class="code-name">.icon-icon_yhgl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_ddgl_2"></span>
+            <div class="name">
+              icon_ddgl_2
+            </div>
+            <div class="code-name">.icon-icon_ddgl_2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_ddgl_1"></span>
+            <div class="name">
+              icon_ddgl_1
+            </div>
+            <div class="code-name">.icon-icon_ddgl_1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon_ddgl"></span>
+            <div class="name">
+              icon_ddgl
+            </div>
+            <div class="code-name">.icon-icon_ddgl
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-iconm_gongncd"></span>
             <div class="name">
               iconm_gongncd
@@ -7344,6 +7689,190 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_penren"></use>
+                </svg>
+                <div class="name">btn_penren</div>
+                <div class="code-name">#icon-btn_penren</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_xiala22"></use>
+                </svg>
+                <div class="name">btn_下拉22</div>
+                <div class="code-name">#icon-btn_xiala22</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_jiagong"></use>
+                </svg>
+                <div class="name">btn_jiagong</div>
+                <div class="code-name">#icon-btn_jiagong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_shouqi22"></use>
+                </svg>
+                <div class="name">btn_shouqi22</div>
+                <div class="code-name">#icon-btn_shouqi22</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_goutong"></use>
+                </svg>
+                <div class="name">iconx_goutong</div>
+                <div class="code-name">#icon-iconx_goutong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_waimaoerp"></use>
+                </svg>
+                <div class="name">iconx_waimaoerp</div>
+                <div class="code-name">#icon-iconx_waimaoerp</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_xitonggl"></use>
+                </svg>
+                <div class="name">iconm_xitonggl</div>
+                <div class="code-name">#icon-iconm_xitonggl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_goutong"></use>
+                </svg>
+                <div class="name">iconm_goutong</div>
+                <div class="code-name">#icon-iconm_goutong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_waimaoerp"></use>
+                </svg>
+                <div class="name">iconm_waimaoerp</div>
+                <div class="code-name">#icon-iconm_waimaoerp</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_xitonggl"></use>
+                </svg>
+                <div class="name">iconx_xitonggl</div>
+                <div class="code-name">#icon-iconx_xitonggl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_mine"></use>
+                </svg>
+                <div class="name">btn_mine</div>
+                <div class="code-name">#icon-btn_mine</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_xiaox"></use>
+                </svg>
+                <div class="name">btn_xiaox</div>
+                <div class="code-name">#icon-btn_xiaox</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_gongz"></use>
+                </svg>
+                <div class="name">btn_gongz</div>
+                <div class="code-name">#icon-btn_gongz</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_wulw"></use>
+                </svg>
+                <div class="name">btn_wulw</div>
+                <div class="code-name">#icon-btn_wulw</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_mine_gray1"></use>
+                </svg>
+                <div class="name">btn_mine_gray</div>
+                <div class="code-name">#icon-btn_mine_gray1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_shengc_gray1"></use>
+                </svg>
+                <div class="name">btn_shengc_gray</div>
+                <div class="code-name">#icon-btn_shengc_gray1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_kanban_gray1"></use>
+                </svg>
+                <div class="name">btn_kanban_gray</div>
+                <div class="code-name">#icon-btn_kanban_gray1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-btn_shebei_blue1"></use>
+                </svg>
+                <div class="name">btn_shebei_blue</div>
+                <div class="code-name">#icon-btn_shebei_blue1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_tdgl"></use>
+                </svg>
+                <div class="name">icon_tdgl</div>
+                <div class="code-name">#icon-icon_tdgl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_yhgl"></use>
+                </svg>
+                <div class="name">icon_yhgl</div>
+                <div class="code-name">#icon-icon_yhgl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_ddgl_2"></use>
+                </svg>
+                <div class="name">icon_ddgl_2</div>
+                <div class="code-name">#icon-icon_ddgl_2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_ddgl_1"></use>
+                </svg>
+                <div class="name">icon_ddgl_1</div>
+                <div class="code-name">#icon-icon_ddgl_1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_ddgl"></use>
+                </svg>
+                <div class="name">icon_ddgl</div>
+                <div class="code-name">#icon-icon_ddgl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-iconm_gongncd"></use>
                 </svg>
                 <div class="name">iconm_gongncd</div>

+ 95 - 3
src/assets/icons/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3933484 */
-  src: url('iconfont.woff2?t=1687672153417') format('woff2'),
-       url('iconfont.woff?t=1687672153417') format('woff'),
-       url('iconfont.ttf?t=1687672153417') format('truetype');
+  src: url('iconfont.woff2?t=1690168598112') format('woff2'),
+       url('iconfont.woff?t=1690168598112') format('woff'),
+       url('iconfont.ttf?t=1690168598112') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,98 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-btn_penren:before {
+  content: "\e8e4";
+}
+
+.icon-btn_xiala22:before {
+  content: "\e8e5";
+}
+
+.icon-btn_jiagong:before {
+  content: "\e8e6";
+}
+
+.icon-btn_shouqi22:before {
+  content: "\e8e7";
+}
+
+.icon-iconx_goutong:before {
+  content: "\e8df";
+}
+
+.icon-iconx_waimaoerp:before {
+  content: "\e8e0";
+}
+
+.icon-iconm_xitonggl:before {
+  content: "\e8e1";
+}
+
+.icon-iconm_goutong:before {
+  content: "\e8e2";
+}
+
+.icon-iconm_waimaoerp:before {
+  content: "\e8e3";
+}
+
+.icon-iconx_xitonggl:before {
+  content: "\e8de";
+}
+
+.icon-btn_mine:before {
+  content: "\e8da";
+}
+
+.icon-btn_xiaox:before {
+  content: "\e8db";
+}
+
+.icon-btn_gongz:before {
+  content: "\e8dc";
+}
+
+.icon-btn_wulw:before {
+  content: "\e8dd";
+}
+
+.icon-btn_mine_gray1:before {
+  content: "\e8d6";
+}
+
+.icon-btn_shengc_gray1:before {
+  content: "\e8d7";
+}
+
+.icon-btn_kanban_gray1:before {
+  content: "\e8d8";
+}
+
+.icon-btn_shebei_blue1:before {
+  content: "\e8d9";
+}
+
+.icon-icon_tdgl:before {
+  content: "\e6aa";
+}
+
+.icon-icon_yhgl:before {
+  content: "\e6ac";
+}
+
+.icon-icon_ddgl_2:before {
+  content: "\e6ae";
+}
+
+.icon-icon_ddgl_1:before {
+  content: "\e6af";
+}
+
+.icon-icon_ddgl:before {
+  content: "\e6b1";
+}
+
 .icon-iconm_gongncd:before {
   content: "\e8d2";
 }

File diff suppressed because it is too large
+ 0 - 0
src/assets/icons/iconfont/iconfont.js


+ 161 - 0
src/assets/icons/iconfont/iconfont.json

@@ -6,6 +6,167 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "36562143",
+      "name": "btn_penren",
+      "font_class": "btn_penren",
+      "unicode": "e8e4",
+      "unicode_decimal": 59620
+    },
+    {
+      "icon_id": "36562142",
+      "name": "btn_下拉22",
+      "font_class": "btn_xiala22",
+      "unicode": "e8e5",
+      "unicode_decimal": 59621
+    },
+    {
+      "icon_id": "36562141",
+      "name": "btn_jiagong",
+      "font_class": "btn_jiagong",
+      "unicode": "e8e6",
+      "unicode_decimal": 59622
+    },
+    {
+      "icon_id": "36562140",
+      "name": "btn_shouqi22",
+      "font_class": "btn_shouqi22",
+      "unicode": "e8e7",
+      "unicode_decimal": 59623
+    },
+    {
+      "icon_id": "36521213",
+      "name": "iconx_goutong",
+      "font_class": "iconx_goutong",
+      "unicode": "e8df",
+      "unicode_decimal": 59615
+    },
+    {
+      "icon_id": "36521214",
+      "name": "iconx_waimaoerp",
+      "font_class": "iconx_waimaoerp",
+      "unicode": "e8e0",
+      "unicode_decimal": 59616
+    },
+    {
+      "icon_id": "36521215",
+      "name": "iconm_xitonggl",
+      "font_class": "iconm_xitonggl",
+      "unicode": "e8e1",
+      "unicode_decimal": 59617
+    },
+    {
+      "icon_id": "36521212",
+      "name": "iconm_goutong",
+      "font_class": "iconm_goutong",
+      "unicode": "e8e2",
+      "unicode_decimal": 59618
+    },
+    {
+      "icon_id": "36521211",
+      "name": "iconm_waimaoerp",
+      "font_class": "iconm_waimaoerp",
+      "unicode": "e8e3",
+      "unicode_decimal": 59619
+    },
+    {
+      "icon_id": "36521216",
+      "name": "iconx_xitonggl",
+      "font_class": "iconx_xitonggl",
+      "unicode": "e8de",
+      "unicode_decimal": 59614
+    },
+    {
+      "icon_id": "36469149",
+      "name": "btn_mine",
+      "font_class": "btn_mine",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
+    {
+      "icon_id": "36469150",
+      "name": "btn_xiaox",
+      "font_class": "btn_xiaox",
+      "unicode": "e8db",
+      "unicode_decimal": 59611
+    },
+    {
+      "icon_id": "36469151",
+      "name": "btn_gongz",
+      "font_class": "btn_gongz",
+      "unicode": "e8dc",
+      "unicode_decimal": 59612
+    },
+    {
+      "icon_id": "36469152",
+      "name": "btn_wulw",
+      "font_class": "btn_wulw",
+      "unicode": "e8dd",
+      "unicode_decimal": 59613
+    },
+    {
+      "icon_id": "34869433",
+      "name": "btn_mine_gray",
+      "font_class": "btn_mine_gray1",
+      "unicode": "e8d6",
+      "unicode_decimal": 59606
+    },
+    {
+      "icon_id": "34869434",
+      "name": "btn_shengc_gray",
+      "font_class": "btn_shengc_gray1",
+      "unicode": "e8d7",
+      "unicode_decimal": 59607
+    },
+    {
+      "icon_id": "34869435",
+      "name": "btn_kanban_gray",
+      "font_class": "btn_kanban_gray1",
+      "unicode": "e8d8",
+      "unicode_decimal": 59608
+    },
+    {
+      "icon_id": "34869436",
+      "name": "btn_shebei_blue",
+      "font_class": "btn_shebei_blue1",
+      "unicode": "e8d9",
+      "unicode_decimal": 59609
+    },
+    {
+      "icon_id": "29656290",
+      "name": "icon_tdgl",
+      "font_class": "icon_tdgl",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "29656292",
+      "name": "icon_yhgl",
+      "font_class": "icon_yhgl",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "29656294",
+      "name": "icon_ddgl_2",
+      "font_class": "icon_ddgl_2",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "29656295",
+      "name": "icon_ddgl_1",
+      "font_class": "icon_ddgl_1",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "29656300",
+      "name": "icon_ddgl",
+      "font_class": "icon_ddgl",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
       "icon_id": "36123929",
       "name": "iconm_gongncd",
       "font_class": "iconm_gongncd",

BIN
src/assets/icons/iconfont/iconfont.ttf


BIN
src/assets/icons/iconfont/iconfont.woff


BIN
src/assets/icons/iconfont/iconfont.woff2


+ 1 - 1
src/components/byTable/demo.vue

@@ -521,7 +521,7 @@ const getList = async (res) => {
 	console.log(sourceList.value)
 	console.log({ ...sourceList.value.pagination, ...res })
 	loading.value = true
-	proxy.get('/system/role/list?pageNum=1&pageSize=10').then((message) => {
+	proxy.post('flowExample/getToBeProcessedPage').then((message) => {
 		console.log(message)
 		sourceList.value.data = message.rows
 		setTimeout(() => {

+ 3 - 1
src/components/byTable/index.vue

@@ -33,7 +33,9 @@
     </div>
     <div class="more-btn">
       <span @click="isMore = !isMore" v-if="statWarpHeight > 200">
-        {{ isMore ? "收起" : "展开" }}
+        <i v-if="!isMore" class="iconfont icon-btn_xiala22"></i>
+        <i v-else class="iconfont icon-btn_shouqi22"></i>
+        
       </span>
     </div>
     <ul id="statWarp">

+ 11 - 1
src/components/notice/index.vue

@@ -178,6 +178,7 @@ const commonRead = (ids,type) => {
 		if(type == 'confirm'){
 			data.value[index].isRead = true
 		}else{
+			
 			getPushInfo()
 		}
 	})
@@ -264,9 +265,18 @@ const getPushInfo = () => {
 	proxy.post('/pushInfo/page',pushInfoReq.value).then(res=>{
 		noticeData.value = res.rows
 		pushInfoReq.value.total = res.total
-		console.log(pushInfoReq)
 		setTimeout(() => {
 			loading.value = false
+			proxy.post('/pushInfo/page',{
+				pageNum: 1,
+				pageSize: 5,
+				pushRead: 0,
+				type: '',
+				total:0,
+				whetherFlow:'',
+			}).then(res=>{
+				emit('changeNum',res.total * 1)
+			})
 		}, 500);
 	})
 }

+ 6 - 1
src/components/product/treeList.vue

@@ -31,7 +31,7 @@
         <template #default="{ node, data }">
           <div class="custom-tree-node">
             <div style="flex: 1">{{ node.label}}</div>
-            <div style="float: right; width: 71px; margin-left: 10px" v-if="activeNode == data.id">
+            <div class="icon-warp" style="float: right; width: 71px; margin-left: 10px" v-show="activeNode == data.id">
               <el-icon :size="17" @click.stop="() => edit(node, data)">
                 <Edit />
               </el-icon>
@@ -261,6 +261,11 @@ const handleMouseOver = (data) => {
   font-size: 14px;
   padding-right: 8px;
 }
+.custom-tree-node:hover{
+  .icon-warp{
+    display:block!important;
+  }
+}
 .treeList {
   display: block;
   height: 100%;

+ 8 - 8
src/views/index.vue

@@ -32,11 +32,11 @@
 					我的待审批
 				</div>
 				<el-table :data="toBeProcessedData.rows" style="width: 100%">
-					<el-table-column prop="flowName" label="流程类型" />
+					<el-table-column prop="flowName" label="流程类型" width="100" />
 					<el-table-column prop="title" label="流程标题" />
-					<el-table-column prop="createUserName" label="发起人" />
-					<el-table-column prop="createTime" label="发起时间" />
-					<el-table-column fixed="right" label="操作" width="120">
+					<el-table-column prop="createUserName" label="发起人"  width="100"/>
+					<el-table-column prop="createTime" label="发起时间" width="160" />
+					<el-table-column fixed="right" label="操作" width="60">
 						<template #default="scope">
 							<el-button
 								link
@@ -60,11 +60,11 @@
 					我的发起(未结束)
 				</div>
 				<el-table :data="haveInitiatedData.rows" style="width: 100%">
-					<el-table-column prop="flowName" label="流程类型" />
+					<el-table-column prop="flowName" label="流程类型"  width="100"/>
 					<el-table-column prop="title" label="流程标题" />
-					<el-table-column prop="createUserName" label="审批人" />
-					<el-table-column prop="createTime" label="发起时间" />
-					<el-table-column fixed="right" label="操作" width="120">
+					<el-table-column prop="createUserName" label="审批人" width="100" />
+					<el-table-column prop="createTime" label="发起时间"  width="160"/>
+					<el-table-column fixed="right" label="操作" width="60">
 						<template #default="scope">
 							<el-button
 								link

+ 9 - 0
src/views/system/userJoin/index.vue

@@ -101,6 +101,12 @@ const config = computed(() => {
 				label: '交接内容',
 				prop: 'content',
 			},
+			render(content) {
+				const a = content.split(',').map((item) => {
+					return contentObj[item]
+				})
+				return a.join(',')
+			},
 		},
         {
 			attrs: {
@@ -110,6 +116,9 @@ const config = computed(() => {
 		},
 	]
 })
+const contentObj = {
+	1: '客户信息',
+}
 const getDict = () => {
 	proxy
 		.post('/corporation/page', { pageNum: 1, pageSize: 999 })

Some files were not shown because too many files changed in this diff