Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
de8a85d6 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 3e6b5f15 ed87cd67
Expand all
Inline Side-by-side
Showing 15 changed files with 118 additions and 5 deletions
...@@ -32,3 +32,37 @@ export default { ...@@ -32,3 +32,37 @@ export default {
32 }, 32 },
33 }; 33 };
34 </script> 34 </script>
35
36 <style lang="less">
37 .popper-zxx{
38 padding: 0!important;
39 /deep/ .el-tabs__header{
40 margin-bottom: 10px;
41 }
42 ul{
43 margin-bottom: 10px;
44 li{
45 cursor: pointer;
46 padding: 8px 16px;
47 position: relative;
48 i{
49 position: absolute;
50 right: 20px;
51 top: 11px;
52 color: #4EB2FF;
53 display: none;
54 }
55 }
56 li:hover{
57 background: #eee;
58 }
59 .choosed{
60 color: #4EB2FF;
61 background-color: #F0F9FF!important;
62 i{
63 display: inline-block;
64 }
65 }
66 }
67 }
68 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -31,6 +31,18 @@ ...@@ -31,6 +31,18 @@
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">&#xe779;</span>
35 <div class="name">多幢</div>
36 <div class="code-name">&amp;#xe779;</div>
37 </li>
38
39 <li class="dib">
40 <span class="icon iconfont">&#xe77a;</span>
41 <div class="name">自然幢</div>
42 <div class="code-name">&amp;#xe77a;</div>
43 </li>
44
45 <li class="dib">
34 <span class="icon iconfont">&#xe778;</span> 46 <span class="icon iconfont">&#xe778;</span>
35 <div class="name">户重新落宗</div> 47 <div class="name">户重新落宗</div>
36 <div class="code-name">&amp;#xe778;</div> 48 <div class="code-name">&amp;#xe778;</div>
...@@ -285,6 +297,24 @@ ...@@ -285,6 +297,24 @@
285 <ul class="icon_lists dib-box"> 297 <ul class="icon_lists dib-box">
286 298
287 <li class="dib"> 299 <li class="dib">
300 <span class="icon iconfont iconduochuang"></span>
301 <div class="name">
302 多幢
303 </div>
304 <div class="code-name">.iconduochuang
305 </div>
306 </li>
307
308 <li class="dib">
309 <span class="icon iconfont iconziranchuang"></span>
310 <div class="name">
311 自然幢
312 </div>
313 <div class="code-name">.iconziranchuang
314 </div>
315 </li>
316
317 <li class="dib">
288 <span class="icon iconfont iconhuzhongxinlazong"></span> 318 <span class="icon iconfont iconhuzhongxinlazong"></span>
289 <div class="name"> 319 <div class="name">
290 户重新落宗 320 户重新落宗
...@@ -621,6 +651,22 @@ ...@@ -621,6 +651,22 @@
621 651
622 <li class="dib"> 652 <li class="dib">
623 <svg class="icon svg-icon" aria-hidden="true"> 653 <svg class="icon svg-icon" aria-hidden="true">
654 <use xlink:href="#iconduochuang"></use>
655 </svg>
656 <div class="name">多幢</div>
657 <div class="code-name">#iconduochuang</div>
658 </li>
659
660 <li class="dib">
661 <svg class="icon svg-icon" aria-hidden="true">
662 <use xlink:href="#iconziranchuang"></use>
663 </svg>
664 <div class="name">自然幢</div>
665 <div class="code-name">#iconziranchuang</div>
666 </li>
667
668 <li class="dib">
669 <svg class="icon svg-icon" aria-hidden="true">
624 <use xlink:href="#iconhuzhongxinlazong"></use> 670 <use xlink:href="#iconhuzhongxinlazong"></use>
625 </svg> 671 </svg>
626 <div class="name">户重新落宗</div> 672 <div class="name">户重新落宗</div>
......
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "18727148",
10 "name": "多幢",
11 "font_class": "duochuang",
12 "unicode": "e779",
13 "unicode_decimal": 59257
14 },
15 {
16 "icon_id": "18727149",
17 "name": "自然幢",
18 "font_class": "ziranchuang",
19 "unicode": "e77a",
20 "unicode_decimal": 59258
21 },
22 {
9 "icon_id": "18623953", 23 "icon_id": "18623953",
10 "name": "户重新落宗", 24 "name": "户重新落宗",
11 "font_class": "huzhongxinlazong", 25 "font_class": "huzhongxinlazong",
......
...@@ -20,6 +20,12 @@ Created by iconfont ...@@ -20,6 +20,12 @@ Created by iconfont
20 /> 20 />
21 <missing-glyph /> 21 <missing-glyph />
22 22
23 <glyph glyph-name="duochuang" unicode="&#59257;" d="M68.266667 793.6h546.133333v-819.2H68.266667v819.2z m68.266666-68.266667v-682.666666h409.6v682.666666H136.533333zM238.933333 622.933333h68.266667v-68.266666h-68.266667V622.933333z m136.533334 0h68.266666v-68.266666h-68.266666V622.933333zM238.933333 486.4h68.266667v-68.266667h-68.266667V486.4z m136.533334 0h68.266666v-68.266667h-68.266666V486.4zM238.933333 349.866667h68.266667v-68.266667h-68.266667V349.866667z m136.533334 0h68.266666v-68.266667h-68.266666V349.866667zM238.933333 213.333333h68.266667v-68.266666h-68.266667v68.266666z m136.533334 0h68.266666v-68.266666h-68.266666v68.266666zM546.133333 588.8h409.6v-614.4H546.133333v614.4z m68.266667-68.266667v-477.866666h273.066667v477.866666H614.4zM716.8 486.4h68.266667v-68.266667h-68.266667zM716.8 349.866667h68.266667v-68.266667h-68.266667zM716.8 213.333333h68.266667v-68.266666h-68.266667z" horiz-adv-x="1024" />
24
25
26 <glyph glyph-name="ziranchuang" unicode="&#59258;" d="M170.666667 793.6h682.666666v-819.2h-682.666666v819.2z m68.266666-68.266667v-682.666666h546.133334v682.666666h-546.133334zM341.333333 622.933333h68.266667v-68.266666H341.333333V622.933333z m136.533334 0h68.266666v-68.266666H477.866667V622.933333z m136.533333 0h68.266667v-68.266666H614.4V622.933333zM341.333333 486.4h68.266667v-68.266667H341.333333V486.4z m136.533334 0h68.266666v-68.266667H477.866667V486.4z m136.533333 0h68.266667v-68.266667H614.4V486.4zM341.333333 349.866667h68.266667v-68.266667H341.333333V349.866667z m136.533334 0h68.266666v-68.266667H477.866667V349.866667z m136.533333 0h68.266667v-68.266667H614.4V349.866667zM341.333333 213.333333h68.266667v-68.266666H341.333333v68.266666z m136.533334 0h68.266666v-68.266666H477.866667v68.266666z m136.533333 0h68.266667v-68.266666H614.4v68.266666z" horiz-adv-x="1024" />
27
28
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" /> 29 <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 30
25 31
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 </ul> 102 </ul>
103 103
104 <el-dialog title="导入图形" :visible.sync="improtDialog"> 104 <el-dialog title="导入图形" :visible.sync="improtDialog">
105 <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> 105 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
106 </el-dialog> 106 </el-dialog>
107 <!-- 添加定着物弹框 --> 107 <!-- 添加定着物弹框 -->
108 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%"> 108 <el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
......
...@@ -138,6 +138,10 @@ export default { ...@@ -138,6 +138,10 @@ export default {
138 geoInfo:{ 138 geoInfo:{
139 type:Object, 139 type:Object,
140 default:null 140 default:null
141 },
142 timeLine:{
143 type:Number,
144 default:null
141 } 145 }
142 }, 146 },
143 mixins:[geoUtils,featureUpdate], 147 mixins:[geoUtils,featureUpdate],
...@@ -156,6 +160,15 @@ export default { ...@@ -156,6 +160,15 @@ export default {
156 } 160 }
157 } 161 }
158 }, 162 },
163 mounted(){
164
165 },
166 watch:{
167 timeLine(newValue,oldValue){
168 this.resultDialog = false;
169 this.txtResultDialog = false;
170 }
171 },
159 methods:{ 172 methods:{
160 txtFileChange(file, fileList){ 173 txtFileChange(file, fileList){
161 var self = this; 174 var self = this;
......
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
76 }, 76 },
77 mixins:[mapLayerManager,findTask], 77 mixins:[mapLayerManager,findTask],
78 mounted(){ 78 mounted(){
79 var query = self.$route.query; 79 var query = this.$route.query;
80 if(query && JSON.stringify(query) != "{}"){ 80 if(query && JSON.stringify(query) != "{}"){
81 //self.addGeoByBsm(query.bsm,query.type,self.viewId); 81 //self.addGeoByBsm(query.bsm,query.type,self.viewId);
82 if(query.type == 'zd'){ 82 if(query.type == 'zd'){
...@@ -202,7 +202,7 @@ export default { ...@@ -202,7 +202,7 @@ export default {
202 delete feature.attributes[key] 202 delete feature.attributes[key]
203 } 203 }
204 } 204 }
205 layerResult.features.push(feature); 205 layerResult[0].features.push(feature);
206 }else{ 206 }else{
207 if(layer){ 207 if(layer){
208 this.resultLayers.push({ 208 this.resultLayers.push({
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
10 :on-error="uploadError" 10 :on-error="uploadError"
11 :show-file-list="false" 11 :show-file-list="false"
12 multiple 12 multiple
13 :limit="3"
14 :on-exceed="handleExceed" 13 :on-exceed="handleExceed"
15 > 14 >
16 <el-button size="small" type="primary">上传</el-button> 15 <el-button size="small" type="primary">上传</el-button>
...@@ -157,7 +156,8 @@ ...@@ -157,7 +156,8 @@
157 }, 156 },
158 handleExceed(files, fileList) { 157 handleExceed(files, fileList) {
159 console.log(fileList) 158 console.log(fileList)
160 this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); 159 // this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
160 this.$message.warning("上传失败")
161 }, 161 },
162 beforeRemove(file, fileList) { 162 beforeRemove(file, fileList) {
163 return this.$confirm(`确定移除 ${ file.name }？`); 163 return this.$confirm(`确定移除 ${ file.name }？`);
......