1

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>

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";
 }

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",

src/components/byTable/index.vue

@@ -17,7 +17,7 @@
   <div
     class="stat-warp"
     v-if="statConfig.length != 0"
-    :class="statWarpHeight > 110 && isMore ? 'show-more' : ''"
+    :class="statWarpHeight > 200 && isMore ? 'show-more' : ''"
   >
     <div class="title">
       <select
@@ -31,13 +31,10 @@
       </select>
       <div v-if="statConfig.length === 1">{{ statConfig[0].label }}</div>
     </div>
-    <div class="more-btn">
-      <span @click="isMore = !isMore" v-if="statWarpHeight > 110">
-        {{ isMore ? "收起" : "展开" }}
-        <i
-          class="el-icon-arrow-down"
-          :class="isMore ? 'el-icon-arrow-up' : ''"
-        ></i>
+    <div class="more-btn" @click="isMore = !isMore" v-if="statWarpHeight > 200">
+      <span>
+        <i v-if="!isMore" class="iconfont icon-btn_xiala22"></i>
+        <i v-else class="iconfont icon-btn_shouqi22"></i>
       </span>
     </div>
     <ul id="statWarp">
@@ -73,7 +70,7 @@
       </li>
     </ul>
   </div>
-  <div class="table-list-container by-table">
+  <div class="table-list-container by-table" v-loading="loading">
     <!-- v-if="!hideHeader" -->
     <header v-if="false" class="header">
       <h2>{{ title }}</h2>
@@ -101,11 +98,7 @@
             <li
               @click="searchItemSelct('all', i, index)"
               v-if="i.isShowAll === false ? i.isShowAll : true"
-              style="
-                display: flex;
-                align-items: center;
-                justify-content: center;
-              "
+              style=""
             >
               {{ $t("common.all") }}
             </li>
@@ -113,11 +106,7 @@
               v-for="j in i.data"
               :key="j.value"
               @click="searchItemSelct(j, i)"
-              style="
-                display: flex;
-                align-items: center;
-                justify-content: center;
-              "
+              style=""
             >
               {{ j.label }}
             </li>
@@ -157,7 +146,6 @@
 
       <el-table
         ref="hocElTable"
-        v-loading="loading"
         :data="source"
         v-if="!hideTable"
         style="width: 100%"
@@ -231,14 +219,7 @@
 import { isFunction as isFn, isBoolean } from "./type";
 import ElementsMapping from "./ElementsMapping";
 import ComponentsMapping from "./ComponentsMapping";
-import {
-  computed,
-  defineComponent,
-  getCurrentInstance,
-  nextTick,
-  ref,
-  watch,
-} from "vue";
+import { computed, defineComponent, getCurrentInstance, ref, watch } from "vue";
 import expand from "./expand";
 import Sortable from "sortablejs";
 export default defineComponent({
@@ -371,10 +352,7 @@ export default defineComponent({
     });
     let isMore = ref(false);
     const changeStatData = () => {
-      nextTick(() => {
-        statWarpHeight.value = document.getElementById("statWarp").offsetHeight;
-        console.log(statWarpHeight.value, "ada");
-      });
+      statWarpHeight.value = document.getElementById("statWarp").offsetHeight;
     };
     let statWarpHeight = ref(0);
     watch(
@@ -464,6 +442,7 @@ export default defineComponent({
       return isFn(fn);
     };
     const searchFn = (val) => {
+      if (props.loading) return;
       proxy.$emit(
         "getList",
         Object.assign(props.filterParams, {
@@ -604,13 +583,21 @@ export default defineComponent({
   .more-btn {
     position: absolute;
     right: 0;
-    top: 0;
-    width: 40px;
-    height: 30px;
+    bottom: 0;
+    left: 0;
+    height: 40px;
     cursor: pointer;
     font-size: 12px;
     line-height: 30px;
     text-align: center;
+    background: linear-gradient(
+      180deg,
+      rgba(255, 255, 255, 0) 0%,
+      rgba(255, 255, 255, 0.8) 100%
+    );
+    i {
+      color: #999;
+    }
   }
   .title {
     height: 60px;
@@ -764,11 +751,14 @@ export default defineComponent({
     z-index: 100;
     display: none;
     white-space: nowrap;
+    min-width: 80px;
     li {
       list-style: none;
       font-size: 12px;
       height: 30px;
       padding: 0 10px;
+      text-align: left;
+      line-height: 30px;
     }
     li:hover {
       background-color: #eff6ff;

src/views/connect/E-mail/mail/com/mailList.vue

@@ -22,7 +22,7 @@
             style="color: #39c55a"
           >
             未读邮件 </span
-          >{{ unReadCount }} 封）</span
+          ><span style="font-weight: 700">{{ unReadCount }}</span> 封）</span
         >
       </div>
       <el-button

src/views/product/material/index.vue

@@ -415,7 +415,6 @@ const fileList = ref([]);
 const fileListCopy = ref([]);
 
 const treeChange = (e) => {
-  console.log(e);
   sourceList.value.pagination.productClassifyId = e.id;
   getList({ productClassifyId: e.id });
 };

src/views/salesMange/shipmentMange/packing/index.vue

@@ -43,7 +43,16 @@
               v-for="(item, index) in getData(item.codeAPName, 'productName')"
               :key="index"
             >
-              {{ item }}
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="item"
+                placement="top-start"
+              >
+                <div class="hidden-text">
+                  {{ item }}
+                </div>
+              </el-tooltip>
             </div>
           </div>
         </template>
@@ -51,49 +60,61 @@
         <template #cases="{ item }">
           <div>
             <div v-for="(i, index) in item.dataJsonListCopy" :key="index">
-              {{ i.cases }}
+              <span v-if="i.cases && Number(i.cases) > 0"> {{ i.cases }}</span>
             </div>
           </div>
         </template>
         <template #netWeight="{ item }">
           <div>
             <div v-for="(i, index) in item.dataJsonListCopy" :key="index">
-              {{ i.netWeight + " kg" }}
+              <span v-if="i.netWeight && Number(i.netWeight) > 0">
+                {{ i.netWeight + " kg" }}</span
+              >
             </div>
           </div>
         </template>
         <template #roughWeight="{ item }">
           <div>
             <div v-for="(i, index) in item.dataJsonListCopy" :key="index">
-              {{ i.roughWeight + " kg" }}
+              <span v-if="i.roughWeight && Number(i.roughWeight) > 0">
+                {{ i.roughWeight + " kg" }}</span
+              >
             </div>
           </div>
         </template>
         <template #boxLong="{ item }">
           <div>
             <div v-for="(i, index) in item.dataJsonListCopy" :key="index">
-              {{ i.boxLong + " cm" }}
+              <span v-if="i.boxLong && Number(i.boxLong) > 0">
+                {{ i.boxLong + " cm" }}
+              </span>
             </div>
           </div>
         </template>
         <template #boxWide="{ item }">
           <div>
             <div v-for="(i, index) in item.dataJsonListCopy" :key="index">
-              {{ i.boxWide + " cm" }}
+              <span v-if="i.boxWide && Number(i.boxWide) > 0">
+                {{ i.boxWide + " cm" }}
+              </span>
             </div>
           </div>
         </template>
         <template #boxHigh="{ item }">
           <div>
             <div v-for="(i, index) in item.dataJsonListCopy" :key="index">
-              {{ i.boxHigh + " cm" }}
+              <span v-if="i.boxHigh && Number(i.boxHigh) > 0">
+                {{ i.boxHigh + " cm" }}
+              </span>
             </div>
           </div>
         </template>
         <template #bomVolume="{ item }">
           <div>
             <div v-for="(i, index) in item.dataJsonListCopy" :key="index">
-              {{ i.bomVolume + " m³" }}
+              <span v-if="i.bomVolume && Number(i.bomVolume) > 0">
+                {{ i.bomVolume + " m³" }}
+              </span>
             </div>
           </div>
         </template>
@@ -539,7 +560,7 @@ const config = computed(() => {
         label: "产品名称",
         prop: "codeAPName",
         slot: "productName",
-        "min-width": 150,
+        "min-width": 200,
       },
     },
 
@@ -635,6 +656,7 @@ const config = computed(() => {
         label: "出货状态",
         prop: "shipmentStatus",
         width: 90,
+        fixed: "right",
       },
       render(status) {
         return status == 1 ? "已出货" : status == 0 ? "未出货" : "";
@@ -645,6 +667,7 @@ const config = computed(() => {
         label: "出货时间",
         prop: "shipmentTime",
         width: 80,
+        fixed: "right",
       },
       render(shipmentTime) {
         if (shipmentTime) {
@@ -659,6 +682,7 @@ const config = computed(() => {
         label: "操作",
         width: "90",
         align: "center",
+        fixed: "right",
       },
       // 渲染 el-button，一般用在最后一列。
       renderHTML(row) {
@@ -1046,7 +1070,6 @@ const getData = (data, type) => {
     }
     return arrOne;
   }
-  return [];
 };
 
 const handleClose = () => {
@@ -1061,6 +1084,12 @@ getList();
 .tenant {
   padding: 20px;
 }
+.hidden-text {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  cursor: pointer;
+}
 :deep(.el-collapse-item__header) {
   background-color: #fde6c8;
   border: none;

src/views/systemTenant/tenant/deptTenant/index.vue

@@ -14,7 +14,8 @@
           action: () => openModal(),
         },
       ]"
-      @get-list="getList">
+      @get-list="getList"
+    >
     </byTable>
     <div style="padding: 0 20px 20px 20px; background-color: white">
       <el-table
@@ -22,7 +23,8 @@
         :data="sourceList.data"
         row-key="deptId"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-        default-expand-all>
+        default-expand-all
+      >
         <el-table-column prop="deptName" label="机构名称" min-width="260" />
         <el-table-column prop="type" label="机构类型" width="100">
           <template #default="{ row }">
@@ -30,7 +32,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="orderNum" label="排序" width="100" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          width="200"
+        >
           <template #default="{ row }">
             <span>{{ row.createTime }}</span>
           </template>
@@ -38,15 +45,35 @@
         <el-table-column label="操作" align="center" width="180">
           <template #default="{ row }">
             <el-button link type="primary" @click="getDtl(row)">修改</el-button>
-            <el-button link type="primary" @click="openModal(row.deptId)">添加子项</el-button>
-            <el-button v-if="row.parentId != 0" link type="primary" @click="listDelete(row)">删除</el-button>
+            <el-button link type="primary" @click="openModal(row.deptId)"
+              >添加子项</el-button
+            >
+            <el-button
+              v-if="row.parentId != 0"
+              link
+              type="primary"
+              @click="listDelete(row)"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
     </div>
 
-    <el-dialog :title="modalType == 'add' ? '添加机构' : '编辑机构'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loadingDialog">
-      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
+    <el-dialog
+      :title="modalType == 'add' ? '添加机构' : '编辑机构'"
+      v-if="dialogVisible"
+      v-model="dialogVisible"
+      width="600"
+      v-loading="loadingDialog"
+    >
+      <byForm
+        :formConfig="formConfig"
+        :formOption="formOption"
+        v-model="formData.data"
+        :rules="rules"
+        ref="submit"
+      >
         <template #parentId>
           <div style="width: 100%">
             <el-tree-select
@@ -55,7 +82,8 @@
               check-strictly
               :render-after-expand="false"
               node-key="deptId"
-              :props="defaultProps" />
+              :props="defaultProps"
+            />
           </div>
         </template>
         <template #orderNum>
@@ -67,13 +95,16 @@
               :precision="0"
               :controls="false"
               :min="0"
-              :max="99999" />
+              :max="99999"
+            />
           </div>
         </template>
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
+        <el-button type="primary" @click="submitForm()" size="large"
+          >确 定</el-button
+        >
       </template>
     </el-dialog>
   </div>
@@ -126,14 +157,20 @@ const config = computed(() => {
   return [];
 });
 const getDict = () => {
-  proxy.get("/tenantUser/list", { pageNum: 1, pageSize: 10000, tenantId: useUserStore().user.tenantId }).then((res) => {
-    userList.value = res.rows.map((item) => {
-      return {
-        label: item.nickName,
-        value: item.userId,
-      };
+  proxy
+    .get("/tenantUser/list", {
+      pageNum: 1,
+      pageSize: 10000,
+      tenantId: useUserStore().user.tenantId,
+    })
+    .then((res) => {
+      userList.value = res.rows.map((item) => {
+        return {
+          label: item.nickName,
+          value: item.userId,
+        };
+      });
     });
-  });
 };
 const getList = async (req) => {
   if (req) {
@@ -188,6 +225,7 @@ const formConfig = computed(() => {
       prop: "leaderId",
       label: "负责人",
       data: userList.value,
+      clearable: true,
       itemWidth: 50,
     },
     {
@@ -195,6 +233,7 @@ const formConfig = computed(() => {
       prop: "directorId",
       label: "总监",
       data: userList.value,
+      clearable: true,
       itemWidth: 50,
     },
     {
@@ -223,6 +262,12 @@ const openModal = (val) => {
 const submitForm = () => {
   submit.value.handleSubmit(() => {
     loadingDialog.value = true;
+    formData.data.leaderId = formData.data.leaderId
+      ? formData.data.leaderId
+      : "-1";
+    formData.data.directorId = formData.data.directorId
+      ? formData.data.directorId
+      : "-1";
     const method = modalType.value == "add" ? "POST" : "PUT";
     if (!formData.data.parentId) formData.data.parentId = 0;
     proxy.post("/tenantDept", formData.data, method).then(() => {
@@ -253,6 +298,10 @@ const listDelete = (row) => {
 const getDtl = (row) => {
   formData.data = { ...row };
   modalType.value = "edit";
+  formData.data.leaderId =
+    formData.data.leaderId == "-1" ? "" : formData.data.leaderId;
+  formData.data.directorId =
+    formData.data.directorId == "-1" ? "" : formData.data.directorId;
   dialogVisible.value = true;
 };
 </script>