6648845c by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents e15fd10b 57fba144
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
31 <ul class="icon_lists dib-box"> 31 <ul class="icon_lists dib-box">
32 32
33 <li class="dib"> 33 <li class="dib">
34 <span class="icon iconfont">&#xe71a;</span>
35 <div class="name">地球</div>
36 <div class="code-name">&amp;#xe71a;</div>
37 </li>
38
39 <li class="dib">
34 <span class="icon iconfont">&#xe782;</span> 40 <span class="icon iconfont">&#xe782;</span>
35 <div class="name">系统管理</div> 41 <div class="name">系统管理</div>
36 <div class="code-name">&amp;#xe782;</div> 42 <div class="code-name">&amp;#xe782;</div>
...@@ -357,6 +363,15 @@ ...@@ -357,6 +363,15 @@
357 <ul class="icon_lists dib-box"> 363 <ul class="icon_lists dib-box">
358 364
359 <li class="dib"> 365 <li class="dib">
366 <span class="icon iconfont iconiconset0403"></span>
367 <div class="name">
368 地球
369 </div>
370 <div class="code-name">.iconiconset0403
371 </div>
372 </li>
373
374 <li class="dib">
360 <span class="icon iconfont iconxitongguanli"></span> 375 <span class="icon iconfont iconxitongguanli"></span>
361 <div class="name"> 376 <div class="name">
362 系统管理 377 系统管理
...@@ -801,6 +816,14 @@ ...@@ -801,6 +816,14 @@
801 816
802 <li class="dib"> 817 <li class="dib">
803 <svg class="icon svg-icon" aria-hidden="true"> 818 <svg class="icon svg-icon" aria-hidden="true">
819 <use xlink:href="#iconiconset0403"></use>
820 </svg>
821 <div class="name">地球</div>
822 <div class="code-name">#iconiconset0403</div>
823 </li>
824
825 <li class="dib">
826 <svg class="icon svg-icon" aria-hidden="true">
804 <use xlink:href="#iconxitongguanli"></use> 827 <use xlink:href="#iconxitongguanli"></use>
805 </svg> 828 </svg>
806 <div class="name">系统管理</div> 829 <div class="name">系统管理</div>
......
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "554437",
10 "name": "地球",
11 "font_class": "iconset0403",
12 "unicode": "e71a",
13 "unicode_decimal": 59162
14 },
15 {
9 "icon_id": "19005628", 16 "icon_id": "19005628",
10 "name": "系统管理", 17 "name": "系统管理",
11 "font_class": "xitongguanli", 18 "font_class": "xitongguanli",
......
...@@ -20,6 +20,9 @@ Created by iconfont ...@@ -20,6 +20,9 @@ Created by iconfont
20 /> 20 />
21 <missing-glyph /> 21 <missing-glyph />
22 22
23 <glyph glyph-name="iconset0403" unicode="&#59162;" d="M565.333333 290.133333c-44.8 38.4-40.533333 55.466667-98.133333 55.466667s-93.866667-12.8-78.933333-93.866667 57.6-44.8 53.333333-104.533333 10.666667-74.666667 19.2-89.6 38.4-57.6 49.066667 2.133333 29.866667 93.866667 53.333333 123.733333S610.133333 251.733333 565.333333 290.133333zM407.466667 430.933333c2.133333 29.866667 51.2 61.866667 85.333333 76.8s64 19.2 59.733333 44.8S539.733333 597.333333 488.533333 597.333333s-29.866667-70.4-72.533333-27.733333 8.533333 29.866667 29.866667 40.533333 42.666667 49.066667 6.4 51.2-29.866667-17.066667-59.733333-6.4-42.666667-38.4-61.866667-29.866667c-12.8 4.266667-44.8 29.866667-68.266667 53.333333-44.8-36.266667-78.933333-83.2-102.4-138.666667 6.4-72.533333 44.8-108.8 44.8-108.8s19.2-46.933333 140.8-104.533333c0 0 23.466667-2.133333-4.266667 25.6s-55.466667 59.733333-23.466667 76.8 42.666667 17.066667 51.2-17.066667S405.333333 398.933333 407.466667 430.933333zM893.866667 420.266667c0 4.266667 0 6.4-2.133333 10.666667 0 8.533333-2.133333 17.066667-4.266667 23.466667 0 4.266667-2.133333 8.533333-2.133333 12.8-2.133333 8.533333-4.266667 14.933333-6.4 23.466667 0 4.266667-2.133333 6.4-2.133333 10.666667-4.266667 10.666667-6.4 21.333333-10.666667 29.866667-2.133333 4.266667-4.266667 8.533333-6.4 12.8-2.133333 6.4-6.4 10.666667-8.533333 17.066667-2.133333 4.266667-6.4 10.666667-8.533333 14.933333-2.133333 4.266667-4.266667 8.533333-8.533333 12.8-4.266667 4.266667-6.4 10.666667-10.666667 14.933333-2.133333 2.133333-4.266667 6.4-6.4 8.533333-14.933333 19.2-32 38.4-51.2 55.466667-2.133333 0-2.133333 2.133333-4.266667 2.133333-6.4 6.4-12.8 10.666667-21.333333 17.066667 0 0 0 0-2.133333 0-29.866667 23.466667-64 42.666667-100.266667 55.466667-10.666667-17.066667-21.333333-38.4-34.133333-46.933333-19.2-10.666667-17.066667-53.333333 19.2-49.066667 0 0-10.666667-10.666667 0-49.066667s27.733333-46.933333 81.066667-25.6c23.466667 8.533333 40.533333 4.266667 38.4-19.2-6.4-49.066667-42.666667-46.933333-14.933333-125.866667 17.066667-49.066667 59.733333-66.133333 76.8-104.533333 8.533333-21.333333 42.666667-38.4 70.4-53.333333 2.133333 10.666667 6.4 21.333333 8.533333 29.866667 0 4.266667 2.133333 8.533333 2.133333 12.8 2.133333 8.533333 2.133333 14.933333 4.266667 23.466667 0 4.266667 0 6.4 2.133333 10.666667 0 10.666667 2.133333 23.466667 2.133333 34.133333C896 396.8 896 407.466667 893.866667 420.266667zM748.8 294.4c-14.933333-8.533333-14.933333-29.866667-2.133333-40.533333 12.8-10.666667 38.4-25.6 46.933333 0S763.733333 302.933333 748.8 294.4zM512 853.333333C251.733333 853.333333 42.666667 644.266667 42.666667 384s209.066667-469.333333 469.333333-469.333333 469.333333 209.066667 469.333333 469.333333S772.266667 853.333333 512 853.333333zM512-42.666667C277.333333-42.666667 85.333333 149.333333 85.333333 384S277.333333 810.666667 512 810.666667c234.666667 0 426.666667-192 426.666667-426.666667S746.666667-42.666667 512-42.666667z" horiz-adv-x="1024" />
24
25
23 <glyph glyph-name="xitongguanli" unicode="&#59266;" d="M402.318222 794.624A71.111111 71.111111 0 0 0 472.803556 856.291556h79.416888c35.726222 0 65.934222-26.567111 70.542223-62.008889l9.216-71.907556c40.789333-14.392889 78.506667-36.124444 111.502222-63.943111l66.844444 27.477333a71.111111 71.111111 0 0 0 88.576-30.264889l39.708445-68.721777a71.111111 71.111111 0 0 0-18.432-92.103111l-56.661334-43.235556a357.376 357.376 0 0 0-0.113777-129.649778l56.718222-43.804444a71.111111 71.111111 0 0 0 18.147555-91.818667l-39.708444-68.721778a71.111111 71.111111 0 0 0-88.974222-30.094222l-66.446222 27.704889c-32.938667-27.818667-70.712889-49.493333-111.502223-63.829333l-9.671111-72.135111a71.111111 71.111111 0 0 0-70.542222-61.610667H472.120889a71.111111 71.111111 0 0 0-70.542222 62.008889l-9.443556 73.159111a355.271111 355.271111 0 0 0-108.999111 63.601778l-69.12-28.444445a71.111111 71.111111 0 0 0-88.632889 30.264889l-39.708444 68.778667a71.111111 71.111111 0 0 0 18.488889 92.046222l59.619555 45.511111a357.489778 357.489778 0 0 0 0 125.155556l-59.562667 46.023111a71.111111 71.111111 0 0 0-18.204444 91.818666l39.765333 68.778667a71.111111 71.111111 0 0 0 88.917334 30.037333l68.721777-28.672a355.214222 355.214222 0 0 0 109.056 63.544889l9.898667 73.386667z m82.944-23.665778l-15.644444-115.882666-27.249778-7.395556a269.937778 269.937778 0 0 1-119.978667-69.973333l-20.195555-20.309334-108.828445 45.397334-27.249777-47.160889 93.582222-72.248889-7.224889-27.306667a270.677333 270.677333 0 0 1 0-138.069333l7.224889-27.534222-93.866667-71.68 27.192889-47.160889 109.169778 44.828444 20.081778-20.138666a269.937778 269.937778 0 0 1 119.921777-70.030223l27.420445-7.509333 14.961778-115.825778h54.442666l15.530667 115.256889 27.704889 7.224889a269.824 269.824 0 0 1 122.083555 69.916444l20.195556 20.081778 106.382222-44.373333 27.192889 47.160889-90.965333 70.257778 7.452444 27.477333a270.620444 270.620444 0 0 1 0.056889 141.767111l-7.452444 27.648 91.249777 69.688889-27.192889 47.160889-106.666666-43.804445-20.138667 20.024889a269.824 269.824 0 0 1-122.026667 69.973334l-27.875555 7.224888-14.848 115.313778H485.262222zM512 229.034667a156.444444 156.444444 0 1 1 0 312.888889 156.444444 156.444444 0 0 1 0-312.888889z m0 85.333333a71.111111 71.111111 0 1 0 0 142.222222 71.111111 71.111111 0 0 0 0-142.222222z" horiz-adv-x="1024" /> 26 <glyph glyph-name="xitongguanli" unicode="&#59266;" d="M402.318222 794.624A71.111111 71.111111 0 0 0 472.803556 856.291556h79.416888c35.726222 0 65.934222-26.567111 70.542223-62.008889l9.216-71.907556c40.789333-14.392889 78.506667-36.124444 111.502222-63.943111l66.844444 27.477333a71.111111 71.111111 0 0 0 88.576-30.264889l39.708445-68.721777a71.111111 71.111111 0 0 0-18.432-92.103111l-56.661334-43.235556a357.376 357.376 0 0 0-0.113777-129.649778l56.718222-43.804444a71.111111 71.111111 0 0 0 18.147555-91.818667l-39.708444-68.721778a71.111111 71.111111 0 0 0-88.974222-30.094222l-66.446222 27.704889c-32.938667-27.818667-70.712889-49.493333-111.502223-63.829333l-9.671111-72.135111a71.111111 71.111111 0 0 0-70.542222-61.610667H472.120889a71.111111 71.111111 0 0 0-70.542222 62.008889l-9.443556 73.159111a355.271111 355.271111 0 0 0-108.999111 63.601778l-69.12-28.444445a71.111111 71.111111 0 0 0-88.632889 30.264889l-39.708444 68.778667a71.111111 71.111111 0 0 0 18.488889 92.046222l59.619555 45.511111a357.489778 357.489778 0 0 0 0 125.155556l-59.562667 46.023111a71.111111 71.111111 0 0 0-18.204444 91.818666l39.765333 68.778667a71.111111 71.111111 0 0 0 88.917334 30.037333l68.721777-28.672a355.214222 355.214222 0 0 0 109.056 63.544889l9.898667 73.386667z m82.944-23.665778l-15.644444-115.882666-27.249778-7.395556a269.937778 269.937778 0 0 1-119.978667-69.973333l-20.195555-20.309334-108.828445 45.397334-27.249777-47.160889 93.582222-72.248889-7.224889-27.306667a270.677333 270.677333 0 0 1 0-138.069333l7.224889-27.534222-93.866667-71.68 27.192889-47.160889 109.169778 44.828444 20.081778-20.138666a269.937778 269.937778 0 0 1 119.921777-70.030223l27.420445-7.509333 14.961778-115.825778h54.442666l15.530667 115.256889 27.704889 7.224889a269.824 269.824 0 0 1 122.083555 69.916444l20.195556 20.081778 106.382222-44.373333 27.192889 47.160889-90.965333 70.257778 7.452444 27.477333a270.620444 270.620444 0 0 1 0.056889 141.767111l-7.452444 27.648 91.249777 69.688889-27.192889 47.160889-106.666666-43.804445-20.138667 20.024889a269.824 269.824 0 0 1-122.026667 69.973334l-27.875555 7.224888-14.848 115.313778H485.262222zM512 229.034667a156.444444 156.444444 0 1 1 0 312.888889 156.444444 156.444444 0 0 1 0-312.888889z m0 85.333333a71.111111 71.111111 0 1 0 0 142.222222 71.111111 71.111111 0 0 0 0-142.222222z" horiz-adv-x="1024" />
24 27
25 28
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
34 </div> 34 </div>
35 35
36 <div class="top-items tuOrShu" > 36 <div class="top-items tuOrShu" >
37 <i class="iconfont iconxinxi" style="color:#006CFF;" title="图形管理" v-if="!isMap" @click="goMap"></i> 37 <i class="iconfont iconiconset0403" style="color:#006CFF;" title="图形管理" v-if="!isMap" @click="goMap"></i>
38 <i class="iconfont iconditu" style="color:#006CFF;" title="属性管理" v-else @click="goBack"></i> 38 <i class="iconfont iconxinxi" style="color:#006CFF;" title="属性管理" v-else @click="goBack"></i>
39 </div> 39 </div>
40 </div> 40 </div>
41 <!-- <div class="header-bottom"> 41 <!-- <div class="header-bottom">
......