Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
111d9962 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents ce7a0e67 e9651a13
Expand all
Inline Side-by-side
Showing 11 changed files with 36 additions and 3 deletions
...@@ -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">&#xe778;</span>
35 <div class="name">户重新落宗</div>
36 <div class="code-name">&amp;#xe778;</div>
37 </li>
38
39 <li class="dib">
34 <span class="icon iconfont">&#xe770;</span> 40 <span class="icon iconfont">&#xe770;</span>
35 <div class="name">CAD</div> 41 <div class="name">CAD</div>
36 <div class="code-name">&amp;#xe770;</div> 42 <div class="code-name">&amp;#xe770;</div>
...@@ -279,6 +285,15 @@ ...@@ -279,6 +285,15 @@
279 <ul class="icon_lists dib-box"> 285 <ul class="icon_lists dib-box">
280 286
281 <li class="dib"> 287 <li class="dib">
288 <span class="icon iconfont iconhuzhongxinlazong"></span>
289 <div class="name">
290 户重新落宗
291 </div>
292 <div class="code-name">.iconhuzhongxinlazong
293 </div>
294 </li>
295
296 <li class="dib">
282 <span class="icon iconfont iconCAD"></span> 297 <span class="icon iconfont iconCAD"></span>
283 <div class="name"> 298 <div class="name">
284 CAD 299 CAD
...@@ -606,6 +621,14 @@ ...@@ -606,6 +621,14 @@
606 621
607 <li class="dib"> 622 <li class="dib">
608 <svg class="icon svg-icon" aria-hidden="true"> 623 <svg class="icon svg-icon" aria-hidden="true">
624 <use xlink:href="#iconhuzhongxinlazong"></use>
625 </svg>
626 <div class="name">户重新落宗</div>
627 <div class="code-name">#iconhuzhongxinlazong</div>
628 </li>
629
630 <li class="dib">
631 <svg class="icon svg-icon" aria-hidden="true">
609 <use xlink:href="#iconCAD"></use> 632 <use xlink:href="#iconCAD"></use>
610 </svg> 633 </svg>
611 <div class="name">CAD</div> 634 <div class="name">CAD</div>
......
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "18623953",
10 "name": "户重新落宗",
11 "font_class": "huzhongxinlazong",
12 "unicode": "e778",
13 "unicode_decimal": 59256
14 },
15 {
9 "icon_id": "18620628", 16 "icon_id": "18620628",
10 "name": "CAD", 17 "name": "CAD",
11 "font_class": "CAD", 18 "font_class": "CAD",
......
...@@ -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="huzhongxinlazong" unicode="&#59256;" d="M146.285714 896h731.428572a146.285714 146.285714 0 0 0 146.285714-146.285714v-731.428572a146.285714 146.285714 0 0 0-146.285714-146.285714H146.285714a146.285714 146.285714 0 0 0-146.285714 146.285714V749.714286a146.285714 146.285714 0 0 0 146.285714 146.285714z m0-73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857v-731.428572a73.142857 73.142857 0 0 1 73.142857-73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857V749.714286a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714zM512 214.674286l-152.137143-98.084572a36.571429 36.571429 0 0 0-55.222857 40.082286l46.299429 175.030857L210.651429 446.098286a36.571429 36.571429 0 0 0 21.065142 64.804571l180.736 10.093714 65.462858 168.813715a36.571429 36.571429 0 0 0 68.169142 0l65.462858-168.813715 180.736-10.093714a36.571429 36.571429 0 0 0 21.065142-64.804571L673.060571 331.702857l46.299429-175.030857a36.571429 36.571429 0 0 0-55.222857-40.082286L512 214.674286zM492.178286 288.914286a36.571429 36.571429 0 0 0 39.643428 0l92.672-59.757715-28.233143 106.642286a36.571429 36.571429 0 0 0 12.288 37.668572l85.430858 69.705142-110.08 6.070858a36.571429 36.571429 0 0 0-32.036572 23.332571L512 575.341714l-39.862857-102.765714a36.571429 36.571429 0 0 0-32.036572-23.332571l-110.08-6.070858 85.430858-69.705142a36.571429 36.571429 0 0 0 12.288-37.668572l-28.233143-106.642286L492.251429 288.914286z" horiz-adv-x="1024" />
24
25
23 <glyph glyph-name="CAD" unicode="&#59248;" d="M632.470588 805.647059H271.058824A90.352941 90.352941 0 0 1 180.705882 715.294118v-662.588236A90.352941 90.352941 0 0 1 271.058824-37.647059h481.460705a90.352941 90.352941 0 0 1 89.027765 91.617883l-7.228235 510.554352H662.588235a30.117647 30.117647 0 0 0-30.117647 30.117648V805.647059z m60.235294-52.585412v-128.301176h106.977883L692.705882 753.061647zM271.058824 865.882353h405.985882l216.847059-260.216471 7.890823-550.791529a150.588235 150.588235 0 0 0-148.419764-152.756706H271.058824A150.588235 150.588235 0 0 0 120.470588 52.705882V715.294118A150.588235 150.588235 0 0 0 271.058824 865.882353zM418.816 356.713412l-32.948706-10.360471c-4.999529 21.323294-15.962353 32.647529-32.948706 33.912471-23.792941-1.927529-36.382118-24.214588-37.647059-66.861177 1.264941-42.646588 13.854118-65.234824 37.647059-67.764706 19.456 0.602353 30.72 15.661176 33.912471 45.176471l33.852235-14.095059c-8.131765-45.778824-30.72-69.029647-67.764706-69.632-47.646118 3.132235-72.764235 38.851765-75.294117 107.218824 2.529882 67.162353 27.648 102.640941 75.294117 106.375529 33.912471-1.807059 55.838118-23.190588 65.897412-63.969882z m170.345412-145.889883h-38.550588l-11.324236 44.212706h-60.235294l-11.264-44.212706H430.08l58.307765 207.088942h42.405647l58.307764-207.088942z m-56.440471 79.992471l-19.757176 71.559529a86.317176 86.317176 0 0 0-3.794824 15.962353v1.867294h-0.963765a46.200471 46.200471 0 0 0-1.385411-9.878588 44.935529 44.935529 0 0 1-1.385412-8.914823l-17.889882-70.595765h45.17647z m123.301647-79.992471h-50.838588V417.912471h48.007529c56.440471-0.602353 84.992-34.514824 85.654589-101.677177 1.807059-72.764235-25.720471-107.941647-82.82353-105.411765z m-3.794823 168.478118h-11.264v-132.698353h12.227764c32.587294 0 48.911059 22.889412 48.911059 68.668235-0.602353 42.044235-17.227294 63.367529-49.874823 64.030118z" horiz-adv-x="1024" /> 26 <glyph glyph-name="CAD" unicode="&#59248;" d="M632.470588 805.647059H271.058824A90.352941 90.352941 0 0 1 180.705882 715.294118v-662.588236A90.352941 90.352941 0 0 1 271.058824-37.647059h481.460705a90.352941 90.352941 0 0 1 89.027765 91.617883l-7.228235 510.554352H662.588235a30.117647 30.117647 0 0 0-30.117647 30.117648V805.647059z m60.235294-52.585412v-128.301176h106.977883L692.705882 753.061647zM271.058824 865.882353h405.985882l216.847059-260.216471 7.890823-550.791529a150.588235 150.588235 0 0 0-148.419764-152.756706H271.058824A150.588235 150.588235 0 0 0 120.470588 52.705882V715.294118A150.588235 150.588235 0 0 0 271.058824 865.882353zM418.816 356.713412l-32.948706-10.360471c-4.999529 21.323294-15.962353 32.647529-32.948706 33.912471-23.792941-1.927529-36.382118-24.214588-37.647059-66.861177 1.264941-42.646588 13.854118-65.234824 37.647059-67.764706 19.456 0.602353 30.72 15.661176 33.912471 45.176471l33.852235-14.095059c-8.131765-45.778824-30.72-69.029647-67.764706-69.632-47.646118 3.132235-72.764235 38.851765-75.294117 107.218824 2.529882 67.162353 27.648 102.640941 75.294117 106.375529 33.912471-1.807059 55.838118-23.190588 65.897412-63.969882z m170.345412-145.889883h-38.550588l-11.324236 44.212706h-60.235294l-11.264-44.212706H430.08l58.307765 207.088942h42.405647l58.307764-207.088942z m-56.440471 79.992471l-19.757176 71.559529a86.317176 86.317176 0 0 0-3.794824 15.962353v1.867294h-0.963765a46.200471 46.200471 0 0 0-1.385411-9.878588 44.935529 44.935529 0 0 1-1.385412-8.914823l-17.889882-70.595765h45.17647z m123.301647-79.992471h-50.838588V417.912471h48.007529c56.440471-0.602353 84.992-34.514824 85.654589-101.677177 1.807059-72.764235-25.720471-107.941647-82.82353-105.411765z m-3.794823 168.478118h-11.264v-132.698353h12.227764c32.587294 0 48.911059 22.889412 48.911059 68.668235-0.602353 42.044235-17.227294 63.367529-49.874823 64.030118z" horiz-adv-x="1024" />
24 27
25 28
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
33 </div> 33 </div>
34 34
35 <div class="top-items tuOrShu" > 35 <div class="top-items tuOrShu" >
36 <i class="iconfont iconditu" title="图形管理" v-if="!isMap" @click="goMap"></i> 36 <i class="iconfont iconxinxi" style="color:#006CFF;" title="图形管理" v-if="!isMap" @click="goMap"></i>
37 <i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i> 37 <i class="iconfont iconditu" style="color:#006CFF;" title="属性管理" v-else @click="goBack"></i>
38 </div> 38 </div>
39 </div> 39 </div>
40 <!-- <div class="header-bottom"> 40 <!-- <div class="header-bottom">
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 label="7" 67 label="7"
68 border 68 border
69 @click="hcxlzVisible = true" 69 @click="hcxlzVisible = true"
70 ><i class="iconfont fa-building-o"></i>户重新落宗</el-button 70 ><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button
71 > 71 >
72 </div> 72 </div>
73 </el-col> 73 </el-col>
......