Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/symbol_no_color/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xeb2c;</span>
+                <div class="name">树状图</div>
+                <div class="code-name">&amp;#xeb2c;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe655;</span>
                 <div class="name">开票</div>
                 <div class="code-name">&amp;#xe655;</div>
@@ -270,9 +276,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1620111040685') format('woff2'),
-       url('iconfont.woff?t=1620111040685') format('woff'),
-       url('iconfont.ttf?t=1620111040685') format('truetype');
+  src: url('iconfont.woff2?t=1620268291007') format('woff2'),
+       url('iconfont.woff?t=1620268291007') format('woff'),
+       url('iconfont.ttf?t=1620268291007') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -299,6 +305,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-shuzhuangtu"></span>
+            <div class="name">
+              树状图
+            </div>
+            <div class="code-name">.icon-shuzhuangtu
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-kaipiao"></span>
             <div class="name">
               开票
@@ -624,6 +639,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shuzhuangtu"></use>
+                </svg>
+                <div class="name">树状图</div>
+                <div class="code-name">#icon-shuzhuangtu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-kaipiao"></use>
                 </svg>
                 <div class="name">开票</div>

src/assets/styles/symbol_no_color/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2293216 */
-  src: url('iconfont.woff2?t=1620111040685') format('woff2'),
-       url('iconfont.woff?t=1620111040685') format('woff'),
-       url('iconfont.ttf?t=1620111040685') format('truetype');
+  src: url('iconfont.woff2?t=1620268291007') format('woff2'),
+       url('iconfont.woff?t=1620268291007') format('woff'),
+       url('iconfont.ttf?t=1620268291007') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shuzhuangtu:before {
+  content: "\eb2c";
+}
+
 .icon-kaipiao:before {
   content: "\e655";
 }

src/assets/styles/symbol_no_color/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "5387669",
+      "name": "树状图",
+      "font_class": "shuzhuangtu",
+      "unicode": "eb2c",
+      "unicode_decimal": 60204
+    },
+    {
       "icon_id": "1868200",
       "name": "开票",
       "font_class": "kaipiao",

src/views/information/goods/components/rightSpot/index.vue

@@ -1,9 +1,13 @@
 <template>
     <div class="rightSpot">
         <div class="title">
-            <!-- <a-icon type="gold"/> -->
             <div class="tltLeft">
-                <span class="blue">铜杆（吨）</span>
+                <span class="blue">
+                    <svg class="icon svg-icon" aria-hidden="true">
+                        <use xlink:href="#icon-shuzhuangtu"></use>
+                    </svg>
+                    铜杆（吨）
+                </span>
                 <span class="green ml10">正常</span>
             </div>
             <div class="tltBtns">
@@ -172,6 +176,11 @@
             }
             .tltLeft {
                 font-size: 16px;
+                .icon {
+                    font-size: 20px;
+                    fill: @m-blue0;
+                    margin-right: 10px;
+                }
             }
             .tltBtns {
                 .ant-btn + .ant-btn {