Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

src/components/base/components/icon/iconfont/demo_index.html

@@ -55,6 +55,174 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe79d;</span>
+                <div class="name">sc_sc</div>
+                <div class="code-name">&amp;#xe79d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe79e;</span>
+                <div class="name">sc_shangc</div>
+                <div class="code-name">&amp;#xe79e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe79f;</span>
+                <div class="name">sc_shic</div>
+                <div class="code-name">&amp;#xe79f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe79a;</span>
+                <div class="name">rt_shit</div>
+                <div class="code-name">&amp;#xe79a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe79b;</span>
+                <div class="name">rt_rt</div>
+                <div class="code-name">&amp;#xe79b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe79c;</span>
+                <div class="name">rt_st</div>
+                <div class="code-name">&amp;#xe79c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe794;</span>
+                <div class="name">fjdc_canjiren_p</div>
+                <div class="code-name">&amp;#xe794;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe795;</span>
+                <div class="name">fjdc_canjiren_s</div>
+                <div class="code-name">&amp;#xe795;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe796;</span>
+                <div class="name">fjdc_xuliche</div>
+                <div class="code-name">&amp;#xe796;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe797;</span>
+                <div class="name">fjdc_renliche</div>
+                <div class="code-name">&amp;#xe797;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe798;</span>
+                <div class="name">fjdc_zixingche</div>
+                <div class="code-name">&amp;#xe798;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe799;</span>
+                <div class="name">fjdc_sanlunche</div>
+                <div class="code-name">&amp;#xe799;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe784;</span>
+                <div class="name">mb_dzlk</div>
+                <div class="code-name">&amp;#xe784;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe785;</span>
+                <div class="name">mb_gdlj</div>
+                <div class="code-name">&amp;#xe785;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe786;</span>
+                <div class="name">mb_gssfz</div>
+                <div class="code-name">&amp;#xe786;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe787;</span>
+                <div class="name">mb_gsld</div>
+                <div class="code-name">&amp;#xe787;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe788;</span>
+                <div class="name">mb_gsgw</div>
+                <div class="code-name">&amp;#xe788;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe789;</span>
+                <div class="name">mb_kbzld</div>
+                <div class="code-name">&amp;#xe789;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe78a;</span>
+                <div class="name">mb_szlk</div>
+                <div class="code-name">&amp;#xe78a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe78b;</span>
+                <div class="name">mb_zjwd</div>
+                <div class="code-name">&amp;#xe78b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe78c;</span>
+                <div class="name">mb_jkzd</div>
+                <div class="code-name">&amp;#xe78c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe78d;</span>
+                <div class="name">mb_ckzd</div>
+                <div class="code-name">&amp;#xe78d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe78e;</span>
+                <div class="name">mb_wclk</div>
+                <div class="code-name">&amp;#xe78e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe78f;</span>
+                <div class="name">mb_lclk</div>
+                <div class="code-name">&amp;#xe78f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe790;</span>
+                <div class="name">mb_snld</div>
+                <div class="code-name">&amp;#xe790;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe791;</span>
+                <div class="name">mb_sxwl</div>
+                <div class="code-name">&amp;#xe791;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe792;</span>
+                <div class="name">mb_jzwd</div>
+                <div class="code-name">&amp;#xe792;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe793;</span>
+                <div class="name">mb_wd</div>
+                <div class="code-name">&amp;#xe793;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe773;</span>
                 <div class="name">jg_q</div>
                 <div class="code-name">&amp;#xe773;</div>
@@ -732,9 +900,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1686539943595') format('woff2'),
-       url('iconfont.woff?t=1686539943595') format('woff'),
-       url('iconfont.ttf?t=1686539943595') format('truetype');
+  src: url('iconfont.woff2?t=1686814186940') format('woff2'),
+       url('iconfont.woff?t=1686814186940') format('woff'),
+       url('iconfont.ttf?t=1686814186940') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -761,6 +929,258 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-sc_sc"></span>
+            <div class="name">
+              sc_sc
+            </div>
+            <div class="code-name">.icon-sc_sc
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-sc_shangc"></span>
+            <div class="name">
+              sc_shangc
+            </div>
+            <div class="code-name">.icon-sc_shangc
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-sc_shic"></span>
+            <div class="name">
+              sc_shic
+            </div>
+            <div class="code-name">.icon-sc_shic
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-rt_shit"></span>
+            <div class="name">
+              rt_shit
+            </div>
+            <div class="code-name">.icon-rt_shit
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-rt_rt"></span>
+            <div class="name">
+              rt_rt
+            </div>
+            <div class="code-name">.icon-rt_rt
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-rt_st"></span>
+            <div class="name">
+              rt_st
+            </div>
+            <div class="code-name">.icon-rt_st
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fjdc_canjiren_p"></span>
+            <div class="name">
+              fjdc_canjiren_p
+            </div>
+            <div class="code-name">.icon-fjdc_canjiren_p
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fjdc_canjiren_s"></span>
+            <div class="name">
+              fjdc_canjiren_s
+            </div>
+            <div class="code-name">.icon-fjdc_canjiren_s
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fjdc_xuliche"></span>
+            <div class="name">
+              fjdc_xuliche
+            </div>
+            <div class="code-name">.icon-fjdc_xuliche
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fjdc_renliche"></span>
+            <div class="name">
+              fjdc_renliche
+            </div>
+            <div class="code-name">.icon-fjdc_renliche
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fjdc_zixingche"></span>
+            <div class="name">
+              fjdc_zixingche
+            </div>
+            <div class="code-name">.icon-fjdc_zixingche
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fjdc_sanlunche"></span>
+            <div class="name">
+              fjdc_sanlunche
+            </div>
+            <div class="code-name">.icon-fjdc_sanlunche
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_dzlk"></span>
+            <div class="name">
+              mb_dzlk
+            </div>
+            <div class="code-name">.icon-mb_dzlk
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_gdlj"></span>
+            <div class="name">
+              mb_gdlj
+            </div>
+            <div class="code-name">.icon-mb_gdlj
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_gssfz"></span>
+            <div class="name">
+              mb_gssfz
+            </div>
+            <div class="code-name">.icon-mb_gssfz
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_gsld"></span>
+            <div class="name">
+              mb_gsld
+            </div>
+            <div class="code-name">.icon-mb_gsld
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_gsgw"></span>
+            <div class="name">
+              mb_gsgw
+            </div>
+            <div class="code-name">.icon-mb_gsgw
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_kbzld"></span>
+            <div class="name">
+              mb_kbzld
+            </div>
+            <div class="code-name">.icon-mb_kbzld
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_szlk"></span>
+            <div class="name">
+              mb_szlk
+            </div>
+            <div class="code-name">.icon-mb_szlk
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_zjwd"></span>
+            <div class="name">
+              mb_zjwd
+            </div>
+            <div class="code-name">.icon-mb_zjwd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_jkzd"></span>
+            <div class="name">
+              mb_jkzd
+            </div>
+            <div class="code-name">.icon-mb_jkzd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_ckzd"></span>
+            <div class="name">
+              mb_ckzd
+            </div>
+            <div class="code-name">.icon-mb_ckzd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_wclk"></span>
+            <div class="name">
+              mb_wclk
+            </div>
+            <div class="code-name">.icon-mb_wclk
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_lclk"></span>
+            <div class="name">
+              mb_lclk
+            </div>
+            <div class="code-name">.icon-mb_lclk
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_snld"></span>
+            <div class="name">
+              mb_snld
+            </div>
+            <div class="code-name">.icon-mb_snld
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_sxwl"></span>
+            <div class="name">
+              mb_sxwl
+            </div>
+            <div class="code-name">.icon-mb_sxwl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_jzwd"></span>
+            <div class="name">
+              mb_jzwd
+            </div>
+            <div class="code-name">.icon-mb_jzwd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mb_wd"></span>
+            <div class="name">
+              mb_wd
+            </div>
+            <div class="code-name">.icon-mb_wd
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-jg_q"></span>
             <div class="name">
               jg_q
@@ -1779,6 +2199,230 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sc_sc"></use>
+                </svg>
+                <div class="name">sc_sc</div>
+                <div class="code-name">#icon-sc_sc</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sc_shangc"></use>
+                </svg>
+                <div class="name">sc_shangc</div>
+                <div class="code-name">#icon-sc_shangc</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sc_shic"></use>
+                </svg>
+                <div class="name">sc_shic</div>
+                <div class="code-name">#icon-sc_shic</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-rt_shit"></use>
+                </svg>
+                <div class="name">rt_shit</div>
+                <div class="code-name">#icon-rt_shit</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-rt_rt"></use>
+                </svg>
+                <div class="name">rt_rt</div>
+                <div class="code-name">#icon-rt_rt</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-rt_st"></use>
+                </svg>
+                <div class="name">rt_st</div>
+                <div class="code-name">#icon-rt_st</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fjdc_canjiren_p"></use>
+                </svg>
+                <div class="name">fjdc_canjiren_p</div>
+                <div class="code-name">#icon-fjdc_canjiren_p</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fjdc_canjiren_s"></use>
+                </svg>
+                <div class="name">fjdc_canjiren_s</div>
+                <div class="code-name">#icon-fjdc_canjiren_s</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fjdc_xuliche"></use>
+                </svg>
+                <div class="name">fjdc_xuliche</div>
+                <div class="code-name">#icon-fjdc_xuliche</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fjdc_renliche"></use>
+                </svg>
+                <div class="name">fjdc_renliche</div>
+                <div class="code-name">#icon-fjdc_renliche</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fjdc_zixingche"></use>
+                </svg>
+                <div class="name">fjdc_zixingche</div>
+                <div class="code-name">#icon-fjdc_zixingche</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fjdc_sanlunche"></use>
+                </svg>
+                <div class="name">fjdc_sanlunche</div>
+                <div class="code-name">#icon-fjdc_sanlunche</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_dzlk"></use>
+                </svg>
+                <div class="name">mb_dzlk</div>
+                <div class="code-name">#icon-mb_dzlk</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_gdlj"></use>
+                </svg>
+                <div class="name">mb_gdlj</div>
+                <div class="code-name">#icon-mb_gdlj</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_gssfz"></use>
+                </svg>
+                <div class="name">mb_gssfz</div>
+                <div class="code-name">#icon-mb_gssfz</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_gsld"></use>
+                </svg>
+                <div class="name">mb_gsld</div>
+                <div class="code-name">#icon-mb_gsld</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_gsgw"></use>
+                </svg>
+                <div class="name">mb_gsgw</div>
+                <div class="code-name">#icon-mb_gsgw</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_kbzld"></use>
+                </svg>
+                <div class="name">mb_kbzld</div>
+                <div class="code-name">#icon-mb_kbzld</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_szlk"></use>
+                </svg>
+                <div class="name">mb_szlk</div>
+                <div class="code-name">#icon-mb_szlk</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_zjwd"></use>
+                </svg>
+                <div class="name">mb_zjwd</div>
+                <div class="code-name">#icon-mb_zjwd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_jkzd"></use>
+                </svg>
+                <div class="name">mb_jkzd</div>
+                <div class="code-name">#icon-mb_jkzd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_ckzd"></use>
+                </svg>
+                <div class="name">mb_ckzd</div>
+                <div class="code-name">#icon-mb_ckzd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_wclk"></use>
+                </svg>
+                <div class="name">mb_wclk</div>
+                <div class="code-name">#icon-mb_wclk</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_lclk"></use>
+                </svg>
+                <div class="name">mb_lclk</div>
+                <div class="code-name">#icon-mb_lclk</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_snld"></use>
+                </svg>
+                <div class="name">mb_snld</div>
+                <div class="code-name">#icon-mb_snld</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_sxwl"></use>
+                </svg>
+                <div class="name">mb_sxwl</div>
+                <div class="code-name">#icon-mb_sxwl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_jzwd"></use>
+                </svg>
+                <div class="name">mb_jzwd</div>
+                <div class="code-name">#icon-mb_jzwd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mb_wd"></use>
+                </svg>
+                <div class="name">mb_wd</div>
+                <div class="code-name">#icon-mb_wd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jg_q"></use>
                 </svg>
                 <div class="name">jg_q</div>

src/components/base/components/icon/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4084834 */
-  src: url('iconfont.woff2?t=1686539943595') format('woff2'),
-       url('iconfont.woff?t=1686539943595') format('woff'),
-       url('iconfont.ttf?t=1686539943595') format('truetype');
+  src: url('iconfont.woff2?t=1686814186940') format('woff2'),
+       url('iconfont.woff?t=1686814186940') format('woff'),
+       url('iconfont.ttf?t=1686814186940') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,118 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-sc_sc:before {
+  content: "\e79d";
+}
+
+.icon-sc_shangc:before {
+  content: "\e79e";
+}
+
+.icon-sc_shic:before {
+  content: "\e79f";
+}
+
+.icon-rt_shit:before {
+  content: "\e79a";
+}
+
+.icon-rt_rt:before {
+  content: "\e79b";
+}
+
+.icon-rt_st:before {
+  content: "\e79c";
+}
+
+.icon-fjdc_canjiren_p:before {
+  content: "\e794";
+}
+
+.icon-fjdc_canjiren_s:before {
+  content: "\e795";
+}
+
+.icon-fjdc_xuliche:before {
+  content: "\e796";
+}
+
+.icon-fjdc_renliche:before {
+  content: "\e797";
+}
+
+.icon-fjdc_zixingche:before {
+  content: "\e798";
+}
+
+.icon-fjdc_sanlunche:before {
+  content: "\e799";
+}
+
+.icon-mb_dzlk:before {
+  content: "\e784";
+}
+
+.icon-mb_gdlj:before {
+  content: "\e785";
+}
+
+.icon-mb_gssfz:before {
+  content: "\e786";
+}
+
+.icon-mb_gsld:before {
+  content: "\e787";
+}
+
+.icon-mb_gsgw:before {
+  content: "\e788";
+}
+
+.icon-mb_kbzld:before {
+  content: "\e789";
+}
+
+.icon-mb_szlk:before {
+  content: "\e78a";
+}
+
+.icon-mb_zjwd:before {
+  content: "\e78b";
+}
+
+.icon-mb_jkzd:before {
+  content: "\e78c";
+}
+
+.icon-mb_ckzd:before {
+  content: "\e78d";
+}
+
+.icon-mb_wclk:before {
+  content: "\e78e";
+}
+
+.icon-mb_lclk:before {
+  content: "\e78f";
+}
+
+.icon-mb_snld:before {
+  content: "\e790";
+}
+
+.icon-mb_sxwl:before {
+  content: "\e791";
+}
+
+.icon-mb_jzwd:before {
+  content: "\e792";
+}
+
+.icon-mb_wd:before {
+  content: "\e793";
+}
+
 .icon-jg_q:before {
   content: "\e773";
 }

src/components/base/components/icon/iconfont/iconfont.json

@@ -6,6 +6,202 @@
   "description": "交通事故现场勘验系统",
   "glyphs": [
     {
+      "icon_id": "36016563",
+      "name": "sc_sc",
+      "font_class": "sc_sc",
+      "unicode": "e79d",
+      "unicode_decimal": 59293
+    },
+    {
+      "icon_id": "36016564",
+      "name": "sc_shangc",
+      "font_class": "sc_shangc",
+      "unicode": "e79e",
+      "unicode_decimal": 59294
+    },
+    {
+      "icon_id": "36016565",
+      "name": "sc_shic",
+      "font_class": "sc_shic",
+      "unicode": "e79f",
+      "unicode_decimal": 59295
+    },
+    {
+      "icon_id": "36016489",
+      "name": "rt_shit",
+      "font_class": "rt_shit",
+      "unicode": "e79a",
+      "unicode_decimal": 59290
+    },
+    {
+      "icon_id": "36016490",
+      "name": "rt_rt",
+      "font_class": "rt_rt",
+      "unicode": "e79b",
+      "unicode_decimal": 59291
+    },
+    {
+      "icon_id": "36016491",
+      "name": "rt_st",
+      "font_class": "rt_st",
+      "unicode": "e79c",
+      "unicode_decimal": 59292
+    },
+    {
+      "icon_id": "36016287",
+      "name": "fjdc_canjiren_p",
+      "font_class": "fjdc_canjiren_p",
+      "unicode": "e794",
+      "unicode_decimal": 59284
+    },
+    {
+      "icon_id": "36016288",
+      "name": "fjdc_canjiren_s",
+      "font_class": "fjdc_canjiren_s",
+      "unicode": "e795",
+      "unicode_decimal": 59285
+    },
+    {
+      "icon_id": "36016289",
+      "name": "fjdc_xuliche",
+      "font_class": "fjdc_xuliche",
+      "unicode": "e796",
+      "unicode_decimal": 59286
+    },
+    {
+      "icon_id": "36016290",
+      "name": "fjdc_renliche",
+      "font_class": "fjdc_renliche",
+      "unicode": "e797",
+      "unicode_decimal": 59287
+    },
+    {
+      "icon_id": "36016291",
+      "name": "fjdc_zixingche",
+      "font_class": "fjdc_zixingche",
+      "unicode": "e798",
+      "unicode_decimal": 59288
+    },
+    {
+      "icon_id": "36016292",
+      "name": "fjdc_sanlunche",
+      "font_class": "fjdc_sanlunche",
+      "unicode": "e799",
+      "unicode_decimal": 59289
+    },
+    {
+      "icon_id": "36002516",
+      "name": "mb_dzlk",
+      "font_class": "mb_dzlk",
+      "unicode": "e784",
+      "unicode_decimal": 59268
+    },
+    {
+      "icon_id": "36002517",
+      "name": "mb_gdlj",
+      "font_class": "mb_gdlj",
+      "unicode": "e785",
+      "unicode_decimal": 59269
+    },
+    {
+      "icon_id": "36002518",
+      "name": "mb_gssfz",
+      "font_class": "mb_gssfz",
+      "unicode": "e786",
+      "unicode_decimal": 59270
+    },
+    {
+      "icon_id": "36002519",
+      "name": "mb_gsld",
+      "font_class": "mb_gsld",
+      "unicode": "e787",
+      "unicode_decimal": 59271
+    },
+    {
+      "icon_id": "36002520",
+      "name": "mb_gsgw",
+      "font_class": "mb_gsgw",
+      "unicode": "e788",
+      "unicode_decimal": 59272
+    },
+    {
+      "icon_id": "36002521",
+      "name": "mb_kbzld",
+      "font_class": "mb_kbzld",
+      "unicode": "e789",
+      "unicode_decimal": 59273
+    },
+    {
+      "icon_id": "36002522",
+      "name": "mb_szlk",
+      "font_class": "mb_szlk",
+      "unicode": "e78a",
+      "unicode_decimal": 59274
+    },
+    {
+      "icon_id": "36002523",
+      "name": "mb_zjwd",
+      "font_class": "mb_zjwd",
+      "unicode": "e78b",
+      "unicode_decimal": 59275
+    },
+    {
+      "icon_id": "36002524",
+      "name": "mb_jkzd",
+      "font_class": "mb_jkzd",
+      "unicode": "e78c",
+      "unicode_decimal": 59276
+    },
+    {
+      "icon_id": "36002525",
+      "name": "mb_ckzd",
+      "font_class": "mb_ckzd",
+      "unicode": "e78d",
+      "unicode_decimal": 59277
+    },
+    {
+      "icon_id": "36002526",
+      "name": "mb_wclk",
+      "font_class": "mb_wclk",
+      "unicode": "e78e",
+      "unicode_decimal": 59278
+    },
+    {
+      "icon_id": "36002527",
+      "name": "mb_lclk",
+      "font_class": "mb_lclk",
+      "unicode": "e78f",
+      "unicode_decimal": 59279
+    },
+    {
+      "icon_id": "36002528",
+      "name": "mb_snld",
+      "font_class": "mb_snld",
+      "unicode": "e790",
+      "unicode_decimal": 59280
+    },
+    {
+      "icon_id": "36002529",
+      "name": "mb_sxwl",
+      "font_class": "mb_sxwl",
+      "unicode": "e791",
+      "unicode_decimal": 59281
+    },
+    {
+      "icon_id": "36002530",
+      "name": "mb_jzwd",
+      "font_class": "mb_jzwd",
+      "unicode": "e792",
+      "unicode_decimal": 59282
+    },
+    {
+      "icon_id": "36002531",
+      "name": "mb_wd",
+      "font_class": "mb_wd",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
+    {
       "icon_id": "35940165",
       "name": "jg_q",
       "font_class": "jg_q",

src/graphic/Controls/UIControl.js

@@ -120,6 +120,7 @@ export default class UIControl {
   }
 
   updateVectorForSelectUI(selectUI) {
+    console.log("selectUI", selectUI)
     const focusItem = stateService.getFocusItem();
     if (selectUI == VectorStyle.Bold || selectUI == VectorStyle.Thinning) {
       if (focusItem.type == VectorType.Line) {

src/graphic/Renderer/Draw.js

@@ -141,7 +141,7 @@ const help = {
   },
   getRealDistance(p1, p2) {
     return (
-      Math.round(mathUtil.getDistance(p1, p2) * coordinate.res * 100) / 100
+      Math.round((mathUtil.getDistance(p1, p2) * coordinate.res * 100) / coordinate.ratio) / 100
     );
   },
   getPerpendicularPoint(p1, p2, p3, d) {

src/views/graphic/geos/normalLine.vue

@@ -26,36 +26,36 @@ const clickHandlerFactory = (key) => {
 const lineTypeMenu = [
   {
     key: VectorStyle.SingleSolidLine,
-    icon: "line",
+    icon: "line_sf",
     text: "单实线",
     onClick: clickHandlerFactory(VectorStyle.SingleSolidLine)
   },
   {
     key: VectorStyle.SingleDashedLine,
-    icon: "line",
+    icon: "line_sd",
     text: "单虚线",
     onClick: clickHandlerFactory(VectorStyle.SingleDashedLine)
   },
   {
     key: VectorStyle.DoubleSolidLine,
-    icon: "line",
+    icon: "line_df",
     text: "双实线",
     onClick: clickHandlerFactory(VectorStyle.DoubleSolidLine)
   },
   {
     key: VectorStyle.DoubleDashedLine,
-    icon: "line",
+    icon: "line_dd",
     text: "双虚线",
     onClick: clickHandlerFactory(VectorStyle.DoubleDashedLine)
   },
-  {key: VectorStyle.BrokenLine, icon: "line", text: "折线", onClick: clickHandlerFactory(VectorStyle.BrokenLine)},
+  {key: VectorStyle.BrokenLine, icon: "line_broken", text: "折线", onClick: clickHandlerFactory(VectorStyle.BrokenLine)},
   {
     key: VectorStyle.PointDrawLine,
-    icon: "line",
+    icon: "line_dot",
     text: "点画线",
     onClick: clickHandlerFactory(VectorStyle.PointDrawLine)
   },
-  {key: VectorStyle.Greenbelt, icon: "line", text: "绿化带 ", onClick: clickHandlerFactory(VectorStyle.Greenbelt)},
+  {key: VectorStyle.Greenbelt, icon: "treelawn", text: "绿化带 ", onClick: clickHandlerFactory(VectorStyle.Greenbelt)},
 ]
 const lineWidthMenu = [
   {key: VectorStyle.Bold, icon: 'l_thick', text: "粗", onClick: clickHandlerFactory(VectorStyle.Bold)},

src/views/graphic/geos/roadEdge.vue

@@ -25,40 +25,56 @@ const clickHandlerFactory = (key) => {
 const lineTypeMenu = [
   {
     key: VectorStyle.SingleSolidLine,
-    icon: "line",
+    icon: "line_sf",
     text: "单实线",
     onClick: clickHandlerFactory(VectorStyle.SingleSolidLine)
   },
   {
     key: VectorStyle.SingleDashedLine,
-    icon: "line",
+    icon: "line_sd",
     text: "单虚线",
     onClick: clickHandlerFactory(VectorStyle.SingleDashedLine)
   },
   {
     key: VectorStyle.DoubleSolidLine,
-    icon: "line",
+    icon: "line_df",
     text: "双实线",
     onClick: clickHandlerFactory(VectorStyle.DoubleSolidLine)
   },
   {
     key: VectorStyle.DoubleDashedLine,
-    icon: "line",
+    icon: "line_dd",
     text: "双虚线",
     onClick: clickHandlerFactory(VectorStyle.DoubleDashedLine)
   },
-  {key: VectorStyle.BrokenLine, icon: "line", text: "折线", onClick: clickHandlerFactory(VectorStyle.BrokenLine)},
+  {key: VectorStyle.BrokenLine, icon: "line_broken", text: "折线", onClick: clickHandlerFactory(VectorStyle.BrokenLine)},
   {
     key: VectorStyle.PointDrawLine,
-    icon: "line",
+    icon: "line_dot",
     text: "点画线",
     onClick: clickHandlerFactory(VectorStyle.PointDrawLine)
   },
-  {key: VectorStyle.Greenbelt, icon: "line", text: "绿化带 ", onClick: clickHandlerFactory(VectorStyle.Greenbelt)},
+  {key: VectorStyle.Greenbelt, icon: "treelawn", text: "绿化带 ", onClick: clickHandlerFactory(VectorStyle.Greenbelt)},
 ]
 const lineWidthMenu = [
-  {key: VectorStyle.Bold, icon: 'l_thick', text: "粗", onClick: clickHandlerFactory(VectorStyle.Bold)},
-  {key: VectorStyle.Thinning, icon: 'l_thin', text: "细", onClick: clickHandlerFactory(VectorStyle.Thinning)},
+  {
+    key: VectorStyle.Bold,
+    icon: 'l_thick',
+    text: "宽度",
+    onClick: () => {
+      clickHandlerFactory(VectorStyle.Bold)()
+      menus.value[1] = lineWidthMenu[1]
+    }
+  },
+  {
+    key: VectorStyle.Thinning,
+    icon: 'l_thin',
+    text: "宽度",
+    onClick: () => {
+      clickHandlerFactory(VectorStyle.Thinning)()
+      menus.value[1] = lineWidthMenu[0]
+    }
+  },
 ]
 
 const appendMenus = props.geo.type === VectorType.CurveRoadEdge
@@ -87,14 +103,7 @@ const menus = ref([
       childMenus.value = toRaw(childMenus.value) === lineTypeMenu ? null : lineTypeMenu
     }
   },
-  {
-    key: UITypeExtend.width,
-    text: "宽度",
-    icon: 'l_thick',
-    onClick() {
-      childMenus.value = toRaw(childMenus.value) === lineWidthMenu ? null : lineWidthMenu
-    }
-  },
+  lineWidthMenu[0],
   ...appendMenus
 ])
 

src/views/graphic/menus.ts

@@ -63,22 +63,22 @@ export const structureMenusRaw = [
 ]
 
 export const templateMenusRaw = [
-  { key: RoadTemplate.SBend, text: "s型弯路" },
-  { key: RoadTemplate.TJunction, text: "丁字路口" },
-  { key: RoadTemplate.FiveForks, text: "五岔路口" },
-  { key: RoadTemplate.ExitRamp, text: "出口匝道" },
-  { key: RoadTemplate.Crossroads, text: "十字路口" },
-  { key: RoadTemplate.NationalHighwayShoulder, text: "国道（路肩）" },
-  { key: RoadTemplate.IndoorSection, text: "室内路段" },
-  { key: RoadTemplate.Bend, text: "弯道" },
-  { key: RoadTemplate.SharpCurve, text: "急转弯道" },
-  { key: RoadTemplate.SixForkIntersection, text: "六岔路口" },
-  { key: RoadTemplate.WideNarrowRoad, text: "宽变窄路段" },
-  { key: RoadTemplate.Corner, text: "直角弯道" },
-  { key: RoadTemplate.ImportSmashedRoad, text: "进口砸到" },
-  { key: RoadTemplate.HighSpeedTollBooth, text: "高速收费站" },
-  { key: RoadTemplate.HighSpeedHarbor, text: "高速港湾" },
-  { key: RoadTemplate.HighwaySection, text: "高速路段" }
+  { key: RoadTemplate.SBend, icon: "mb_sxwl", text: "s型弯路" },
+  { key: RoadTemplate.TJunction, icon: "mb_dzlk", text: "丁字路口" },
+  { key: RoadTemplate.FiveForks, icon: "mb_wclk", text: "五岔路口" },
+  { key: RoadTemplate.ExitRamp, icon: "mb_ckzd", text: "出口匝道" },
+  { key: RoadTemplate.Crossroads, icon: "mb_szlk", text: "十字路口" },
+  { key: RoadTemplate.NationalHighwayShoulder, icon: "mb_gdlj", text: "国道（路肩）" },
+  { key: RoadTemplate.IndoorSection, icon: "mb_snld", text: "室内路段" },
+  { key: RoadTemplate.Bend, icon: "mb_wd", text: "弯道" },
+  { key: RoadTemplate.SharpCurve, icon: "mb_jzwd", text: "急转弯道" },
+  { key: RoadTemplate.SixForkIntersection, icon: "mb_lclk", text: "六岔路口" },
+  { key: RoadTemplate.WideNarrowRoad, icon: "mb_kbzld", text: "宽变窄路段" },
+  { key: RoadTemplate.Corner, icon: "mb_zjwd", text: "直角弯道" },
+  { key: RoadTemplate.ImportSmashedRoad, icon: "mb_jkzd", text: "进口匝道" },
+  { key: RoadTemplate.HighSpeedTollBooth, icon: "mb_gssfz", text: "高速收费站" },
+  { key: RoadTemplate.HighSpeedHarbor, icon: "mb_gsgw", text: "高速港湾" },
+  { key: RoadTemplate.HighwaySection, icon: "mb_gsld", text: "高速路段" }
 ]
 
 export const measureMenusRaw = [

src/views/graphic/setting.vue

@@ -9,18 +9,19 @@
           </p>
           <ui-input v-model="data.singleRoadWidth" width="100%">
             <template v-slot:icon>
-              <ui-icon type="clear" ctrl @click="setSceneSingleRoadWidth" />
+              <ui-icon type="measure" ctrl @click="setSceneSingleRoadWidth" />
             </template>
           </ui-input>
         </div>
         <div>
+
           <p>
             <span>默认隔离带宽度</span>
             <span>单位： m</span>
           </p>
           <ui-input v-model="data.roadQuarantineWidth" width="100%">
             <template v-slot:icon>
-              <ui-icon type="clear" ctrl @click="setSceneRoadQuarantineWidth" />
+              <ui-icon type="measure" ctrl @click="setSceneRoadQuarantineWidth" />
             </template>
           </ui-input>
         </div>

src/views/sys/menu/item/item.vue

@@ -56,6 +56,7 @@ const emit = defineEmits<{
   transform: translateX(-100%);
   transform-origin: left center;
   transition: all 0.3s ease;
+  overflow-y: auto;
   height: calc(100% - var(--editor-head-height));
   top: var(--editor-head-height) !important;
   z-index: -3 !important;