Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
b13121db by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 2f997794 565cf7bd
Expand all
Inline Side-by-side
Showing 15 changed files with 144 additions and 11 deletions
...@@ -31,6 +31,30 @@ ...@@ -31,6 +31,30 @@
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">&#xe6d7;</span>
35 <div class="name">绘制方式1</div>
36 <div class="code-name">&amp;#xe6d7;</div>
37 </li>
38
39 <li class="dib">
40 <span class="icon iconfont">&#xe6d8;</span>
41 <div class="name">绘制方式2</div>
42 <div class="code-name">&amp;#xe6d8;</div>
43 </li>
44
45 <li class="dib">
46 <span class="icon iconfont">&#xe6db;</span>
47 <div class="name">绘制方式3</div>
48 <div class="code-name">&amp;#xe6db;</div>
49 </li>
50
51 <li class="dib">
52 <span class="icon iconfont">&#xe6dd;</span>
53 <div class="name">绘制方式4</div>
54 <div class="code-name">&amp;#xe6dd;</div>
55 </li>
56
57 <li class="dib">
34 <span class="icon iconfont">&#xe793;</span> 58 <span class="icon iconfont">&#xe793;</span>
35 <div class="name">识别</div> 59 <div class="name">识别</div>
36 <div class="code-name">&amp;#xe793;</div> 60 <div class="code-name">&amp;#xe793;</div>
...@@ -453,6 +477,42 @@ ...@@ -453,6 +477,42 @@
453 <ul class="icon_lists dib-box"> 477 <ul class="icon_lists dib-box">
454 478
455 <li class="dib"> 479 <li class="dib">
480 <span class="icon iconfont iconhuizhifangshi1"></span>
481 <div class="name">
482 绘制方式1
483 </div>
484 <div class="code-name">.iconhuizhifangshi1
485 </div>
486 </li>
487
488 <li class="dib">
489 <span class="icon iconfont iconhuizhifangshi2"></span>
490 <div class="name">
491 绘制方式2
492 </div>
493 <div class="code-name">.iconhuizhifangshi2
494 </div>
495 </li>
496
497 <li class="dib">
498 <span class="icon iconfont iconhuizhifangshi3"></span>
499 <div class="name">
500 绘制方式3
501 </div>
502 <div class="code-name">.iconhuizhifangshi3
503 </div>
504 </li>
505
506 <li class="dib">
507 <span class="icon iconfont iconhuizhifangshi4"></span>
508 <div class="name">
509 绘制方式4
510 </div>
511 <div class="code-name">.iconhuizhifangshi4
512 </div>
513 </li>
514
515 <li class="dib">
456 <span class="icon iconfont iconshibie"></span> 516 <span class="icon iconfont iconshibie"></span>
457 <div class="name"> 517 <div class="name">
458 识别 518 识别
...@@ -1041,6 +1101,38 @@ ...@@ -1041,6 +1101,38 @@
1041 1101
1042 <li class="dib"> 1102 <li class="dib">
1043 <svg class="icon svg-icon" aria-hidden="true"> 1103 <svg class="icon svg-icon" aria-hidden="true">
1104 <use xlink:href="#iconhuizhifangshi1"></use>
1105 </svg>
1106 <div class="name">绘制方式1</div>
1107 <div class="code-name">#iconhuizhifangshi1</div>
1108 </li>
1109
1110 <li class="dib">
1111 <svg class="icon svg-icon" aria-hidden="true">
1112 <use xlink:href="#iconhuizhifangshi2"></use>
1113 </svg>
1114 <div class="name">绘制方式2</div>
1115 <div class="code-name">#iconhuizhifangshi2</div>
1116 </li>
1117
1118 <li class="dib">
1119 <svg class="icon svg-icon" aria-hidden="true">
1120 <use xlink:href="#iconhuizhifangshi3"></use>
1121 </svg>
1122 <div class="name">绘制方式3</div>
1123 <div class="code-name">#iconhuizhifangshi3</div>
1124 </li>
1125
1126 <li class="dib">
1127 <svg class="icon svg-icon" aria-hidden="true">
1128 <use xlink:href="#iconhuizhifangshi4"></use>
1129 </svg>
1130 <div class="name">绘制方式4</div>
1131 <div class="code-name">#iconhuizhifangshi4</div>
1132 </li>
1133
1134 <li class="dib">
1135 <svg class="icon svg-icon" aria-hidden="true">
1044 <use xlink:href="#iconshibie"></use> 1136 <use xlink:href="#iconshibie"></use>
1045 </svg> 1137 </svg>
1046 <div class="name">识别</div> 1138 <div class="name">识别</div>
......
This diff could not be displayed because it is too large.
...@@ -6,6 +6,34 @@ ...@@ -6,6 +6,34 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "15148386",
10 "name": "绘制方式1",
11 "font_class": "huizhifangshi1",
12 "unicode": "e6d7",
13 "unicode_decimal": 59095
14 },
15 {
16 "icon_id": "15148387",
17 "name": "绘制方式2",
18 "font_class": "huizhifangshi2",
19 "unicode": "e6d8",
20 "unicode_decimal": 59096
21 },
22 {
23 "icon_id": "15148390",
24 "name": "绘制方式3",
25 "font_class": "huizhifangshi3",
26 "unicode": "e6db",
27 "unicode_decimal": 59099
28 },
29 {
30 "icon_id": "15148392",
31 "name": "绘制方式4",
32 "font_class": "huizhifangshi4",
33 "unicode": "e6dd",
34 "unicode_decimal": 59101
35 },
36 {
9 "icon_id": "19153729", 37 "icon_id": "19153729",
10 "name": "识别", 38 "name": "识别",
11 "font_class": "shibie", 39 "font_class": "shibie",
......
...@@ -20,6 +20,18 @@ Created by iconfont ...@@ -20,6 +20,18 @@ Created by iconfont
20 /> 20 />
21 <missing-glyph /> 21 <missing-glyph />
22 22
23 <glyph glyph-name="huizhifangshi1" unicode="&#59095;" d="M153.6 742.4h716.8a102.4 102.4 0 0 0 102.4-102.4v-512a102.4 102.4 0 0 0-102.4-102.4H153.6a102.4 102.4 0 0 0-102.4 102.4V640a102.4 102.4 0 0 0 102.4 102.4z m0-51.2a51.2 51.2 0 0 1-51.2-51.2v-512a51.2 51.2 0 0 1 51.2-51.2h716.8a51.2 51.2 0 0 1 51.2 51.2V640a51.2 51.2 0 0 1-51.2 51.2H153.6z" horiz-adv-x="1024" />
24
25
26 <glyph glyph-name="huizhifangshi2" unicode="&#59096;" d="M512-51.2a435.2 435.2 0 1 1 0 870.4 435.2 435.2 0 0 1 0-870.4z m0 51.2a384 384 0 1 0 0 768 384 384 0 0 0 0-768z" horiz-adv-x="1024" />
27
28
29 <glyph glyph-name="huizhifangshi3" unicode="&#59099;" d="M885.3504 193.024c6.912-8.6528 10.6496-19.4048 10.6496-30.464V76.8a76.8 76.8 0 0 0-76.8-76.8H204.8A76.8 76.8 0 0 0 128 76.8V427.008c0 11.8784 4.352 23.4496 12.288 32.4096l257.1776 291.9424a49.0496 49.0496 0 0 0 36.864 16.64h365.7728a49.0496 49.0496 0 0 0 38.5536-79.4112l-172.6976-219.3408 219.392-276.1728zM179.2 426.1888V76.8a25.6 25.6 0 0 1 25.6-25.6h614.4a25.6 25.6 0 0 1 25.6 25.6v84.992l-244.1216 307.3024L795.6992 716.8H435.2L179.2 426.1376z" horiz-adv-x="1024" />
30
31
32 <glyph glyph-name="huizhifangshi4" unicode="&#59101;" d="M547.328 796.0064c-17.0496-11.3664-27.5456-22.784-48.5376-49.5616l-0.2048-0.256c-17.2032-21.9136-25.088-30.6176-35.7376-37.9904-20.5824-14.2336-46.7456-19.0976-88.6784-18.944-9.0112 0-18.432 0.5632-32.512 1.792l-7.6288 0.6656c-99.328 8.7552-143.0016-6.1952-161.1264-90.9824-7.68-36.352 1.1264-60.8256 28.5184-106.2912l4.096-6.8608c18.1248-30.3616 22.6816-45.4656 17.2032-63.0272-2.5088-8.0896-9.9328-16.7424-24.064-28.2112-2.6624-2.2016-4.9664-3.9936-10.1376-8.0384-49.7152-38.912-78.08-67.4304-107.008-110.8992C23.7568 190.6176 13.7216 141.824 37.9904 76.1344c28.2624-76.6464 125.5936-131.4304 201.984-100.1984 37.2736 15.2064 56.4224 33.4336 85.2992 72.6016l5.632 7.5776c23.04 30.976 39.424 45.7728 70.1952 58.2656 38.7072 15.7184 53.0432 3.7376 84.2752-58.112l1.536-3.0208c3.5328-6.9632 5.5808-11.008 7.8848-15.36 60.672-115.3536 185.6-117.504 268.9536-13.6192 38.6048 48.2304 67.584 108.544 59.3408 152.4224-4.864 25.4976-19.2 41.984-48.64 65.3312-9.5232 7.4752-13.7216 10.8032-17.5616 14.08a96.768 96.768 0 0 0-8.704 8.192c-17.5104 19.2-18.5344 28.16-10.752 37.5296 9.4208 11.3664 29.184 22.4256 63.7952 36.5568l24.576 9.8816c9.9328 3.9936 16.9472 6.912 23.552 9.8304l2.3552 1.0752c109.7728 50.176 170.752 116.736 139.1616 217.2928-15.2064 48.3328-106.8544 88.4736-152.6272 70.3488-8.3968-3.328-1.1776-0.1024-34.304-15.104l-10.0864-4.5056c-18.1248-7.936-30.976-12.4416-39.424-13.7216-5.3248 152.064-98.1504 255.1808-207.104 182.528z m207.1552-233.984c16.2816 1.024 34.0992 6.912 59.904 18.2784l10.6496 4.7616c31.4368 14.2336 24.9344 11.264 32.1024 14.1312 18.7392 7.424 78.848-18.8416 84.8896-38.0416 21.0432-66.9696-22.784-114.7904-111.616-155.392l-1.9968-0.9216c-5.8368-2.56-12.288-5.3248-21.6576-9.0624l-24.9344-9.984c-42.3424-17.408-67.1744-31.232-83.8144-51.2512-25.4976-30.72-21.248-67.9424 12.3904-104.8064 3.7888-4.1472 8.1408-8.192 13.312-12.6464 4.608-3.8912 9.5744-7.8336 18.8416-15.1552 20.1216-15.9744 28.4672-25.4976 30.208-34.816 4.608-24.1664-19.2-73.728-48.9984-110.7968-61.44-76.6464-141.2096-75.264-183.6544 5.376l-7.5264 14.6432-1.536 3.0208c-41.9328 83.0464-76.4928 112.0256-149.1968 82.432-40.96-16.5888-63.9488-37.3248-92.0576-75.1104l-5.7344-7.7312c-23.7568-32.256-36.9664-44.8-63.488-55.6032-47.2064-19.3024-115.6096 19.1488-134.5536 70.5024-17.92 48.64-11.264 80.896 38.144 155.1872 25.4464 38.3488 50.176 63.1296 95.8976 98.9696 5.2224 4.0448 7.8848 6.144 10.9056 8.6016 21.3504 17.408 34.3552 32.512 40.6528 52.736 11.0592 35.4816 2.8672 62.5664-22.1184 104.448l-4.1984 7.0656c-20.992 34.7648-26.4192 49.8688-22.3232 69.1712 10.8544 50.8928 30.0032 57.4464 106.5472 50.688L337.3056 640c15.36-1.28 25.9584-1.8944 36.7104-1.9456 51.5584-0.2048 86.528 6.2976 117.9648 28.0064 16.3328 11.3152 26.5216 22.528 46.8992 48.5888l0.2048 0.2048c17.5616 22.4256 25.7024 31.232 36.608 38.5536 64.8704 43.2128 124.4672-23.9616 127.6416-144.6912 0.8192-31.1808 22.016-48.4352 51.1488-46.6944z" horiz-adv-x="1024" />
33
34
23 <glyph glyph-name="shibie" unicode="&#59283;" d="M488.727273 11.636364a349.090909 349.090909 0 1 0 0 698.181818 349.090909 349.090909 0 0 0 0-698.181818z m24.948363 131.072a219.508364 219.508364 0 0 1 193.349819 195.584h31.045818a22.434909 22.434909 0 0 1 0 44.869818h-31.045818a219.508364 219.508364 0 0 1-193.349819 195.584v28.858182a22.434909 22.434909 0 0 1-44.916363 0v-28.346182a219.508364 219.508364 0 0 1-198.283637-196.096h-31.092363a22.434909 22.434909 0 0 1 0-44.869818h31.045818a219.508364 219.508364 0 0 1 198.330182-196.096v-33.326546a22.434909 22.434909 0 0 1 44.916363 0v33.838546z m-44.916363 39.563636a179.618909 179.618909 0 0 0-158.161455 156.020364h158.161455v-156.020364z m44.916363 0.651636v155.368728h153.181091a179.665455 179.665455 0 0 0-153.181091-155.368728z m-44.916363 356.258909v-156.020363H310.597818a179.618909 179.618909 0 0 0 158.161455 156.020363z m44.916363-0.651636a179.665455 179.665455 0 0 0 153.181091-155.368727h-153.181091V538.530909z" horiz-adv-x="1024" /> 35 <glyph glyph-name="shibie" unicode="&#59283;" d="M488.727273 11.636364a349.090909 349.090909 0 1 0 0 698.181818 349.090909 349.090909 0 0 0 0-698.181818z m24.948363 131.072a219.508364 219.508364 0 0 1 193.349819 195.584h31.045818a22.434909 22.434909 0 0 1 0 44.869818h-31.045818a219.508364 219.508364 0 0 1-193.349819 195.584v28.858182a22.434909 22.434909 0 0 1-44.916363 0v-28.346182a219.508364 219.508364 0 0 1-198.283637-196.096h-31.092363a22.434909 22.434909 0 0 1 0-44.869818h31.045818a219.508364 219.508364 0 0 1 198.330182-196.096v-33.326546a22.434909 22.434909 0 0 1 44.916363 0v33.838546z m-44.916363 39.563636a179.618909 179.618909 0 0 0-158.161455 156.020364h158.161455v-156.020364z m44.916363 0.651636v155.368728h153.181091a179.665455 179.665455 0 0 0-153.181091-155.368728z m-44.916363 356.258909v-156.020363H310.597818a179.618909 179.618909 0 0 0 158.161455 156.020363z m44.916363-0.651636a179.665455 179.665455 0 0 0 153.181091-155.368727h-153.181091V538.530909z" horiz-adv-x="1024" />
24 36
25 37
......

23.9 KB | W: | H:

8.28 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

84.2 KB | W: | H:

26.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <!--搜索弹出框--> 22 <!--搜索弹出框-->
23 <div class="searchResult" v-show="dialogVisible"> 23 <div class="searchResult" v-show="dialogVisible">
24 <div class="-header"> 24 <div class="-header">
25 <span class="title">地块信息</span> 25 <span class="title">共有搜索结果&nbsp;&nbsp;{{totalResults}}条</span>
26 <span class="closeButton"> 26 <span class="closeButton">
27 <i class="close el-icon-close" @click="closeResultDialog"></i> 27 <i class="close el-icon-close" @click="closeResultDialog"></i>
28 </span> 28 </span>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 <span class="title"><i class="iconfont iconxinxi"></i> 基本信息</span> 47 <span class="title"><i class="iconfont iconxinxi"></i> 基本信息</span>
48 <a href="#" @click="toMap(item)">缩放至</a> 48 <a href="#" @click="toMap(item)">缩放至</a>
49 </P> 49 </P>
50 <hr /> 50 <hr/>
51 <!-- <div class="contentItem" v-for="(value,key,index) in item.attributes" :key="index"> 51 <!-- <div class="contentItem" v-for="(value,key,index) in item.attributes" :key="index">
52 <span class="key">{{key}}：</span> 52 <span class="key">{{key}}：</span>
53 <span class="value" :title="value">{{value == 'Null' ?"":value}}</span> 53 <span class="value" :title="value">{{value == 'Null' ?"":value}}</span>
...@@ -121,7 +121,8 @@ export default { ...@@ -121,7 +121,8 @@ export default {
121 inputBsm:"", 121 inputBsm:"",
122 fieldName:"BDCDYH", 122 fieldName:"BDCDYH",
123 heighGraphic:null, 123 heighGraphic:null,
124 isShowCondition:false 124 isShowCondition:false,
125 totalResults:0
125 } 126 }
126 }, 127 },
127 mixins:[mapLayerManager,findTask], 128 mixins:[mapLayerManager,findTask],
...@@ -158,7 +159,8 @@ export default { ...@@ -158,7 +159,8 @@ export default {
158 url:self.layerUrl, 159 url:self.layerUrl,
159 id:"testLayer", 160 id:"testLayer",
160 spatialReference:view.spatialReference, 161 spatialReference:view.spatialReference,
161 sublayers:[{ 162 sublayers:[
163 {
162 id:19, 164 id:19,
163 visible:true 165 visible:true
164 }, 166 },
...@@ -169,7 +171,8 @@ export default { ...@@ -169,7 +171,8 @@ export default {
169 { 171 {
170 id:10, 172 id:10,
171 visible:true 173 visible:true
172 }] 174 }
175 ]
173 }); 176 });
174 view.map.add(mapImageLayer,1); 177 view.map.add(mapImageLayer,1);
175 var query = self.$route.query; 178 var query = self.$route.query;
...@@ -263,7 +266,7 @@ export default { ...@@ -263,7 +266,7 @@ export default {
263 this.heighGraphic = null; 266 this.heighGraphic = null;
264 //清除查询图层 267 //清除查询图层
265 this.clearSearchLayer(this.viewId); 268 this.clearSearchLayer(this.viewId);
266 269 this.totalResults = data.length;
267 for(var i = 0;i < data.length;i++){ 270 for(var i = 0;i < data.length;i++){
268 var layerId = data[i].layerId; 271 var layerId = data[i].layerId;
269 var layer = self.getLayerById(layerId); 272 var layer = self.getLayerById(layerId);
...@@ -342,7 +345,6 @@ export default { ...@@ -342,7 +345,6 @@ export default {
342 max-height: 100%; 345 max-height: 100%;
343 /deep/ .el-input-group__append{ 346 /deep/ .el-input-group__append{
344 background-color: #409eff; 347 background-color: #409eff;
345 border-color: #409eff;
346 color: white; 348 color: white;
347 } 349 }
348 .searchCondition{ 350 .searchCondition{
...@@ -387,13 +389,12 @@ export default { ...@@ -387,13 +389,12 @@ export default {
387 .-header{ 389 .-header{
388 line-height: 32px; 390 line-height: 32px;
389 padding: 3px 20px; 391 padding: 3px 20px;
390 background-color: #519eff; 392 background-color: #FFFFFF;
391 border-top-right-radius: 4px; 393 border-top-right-radius: 4px;
392 border-top-left-radius: 4px; 394 border-top-left-radius: 4px;
393 .title{ 395 .title{
394 font-size: 14px; 396 font-size: 14px;
395 color: white; 397 color: #6D7278;
396 font-weight: 600;
397 } 398 }
398 .closeButton{ 399 .closeButton{
399 float: right; 400 float: right;
......
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
113 } 113 }
114 feature.symbol = highlightSymbol; 114 feature.symbol = highlightSymbol;
115 var view = maps[viewId]; 115 var view = maps[viewId];
116 feature.geometry.type == 'point' ?view.center = feature.geometry :view.extent = feature.geometry.extent; 116 feature.geometry.type == 'point' ? view.center = feature.geometry :view.center = feature.geometry.extent.center;
117 if(callBackFunction && typeof callBackFunction == 'function'){ 117 if(callBackFunction && typeof callBackFunction == 'function'){
118 callBackFunction(); 118 callBackFunction();
119 } 119 }
......