Merge remote-tracking branch 'origin/master'
Showing
17 changed files
with
150 additions
and
67 deletions
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
No preview for this file type
This diff could not be displayed because it is too large.
| ... | @@ -6,6 +6,69 @@ | ... | @@ -6,6 +6,69 @@ |
| 6 | "description": "", | 6 | "description": "", |
| 7 | "glyphs": [ | 7 | "glyphs": [ |
| 8 | { | 8 | { |
| 9 | "icon_id": "19791411", | ||
| 10 | "name": "首页", | ||
| 11 | "font_class": "shouye", | ||
| 12 | "unicode": "e7b2", | ||
| 13 | "unicode_decimal": 59314 | ||
| 14 | }, | ||
| 15 | { | ||
| 16 | "icon_id": "19791412", | ||
| 17 | "name": "更正", | ||
| 18 | "font_class": "gengzheng", | ||
| 19 | "unicode": "e7b3", | ||
| 20 | "unicode_decimal": 59315 | ||
| 21 | }, | ||
| 22 | { | ||
| 23 | "icon_id": "19791413", | ||
| 24 | "name": "变更", | ||
| 25 | "font_class": "biangeng", | ||
| 26 | "unicode": "e7b4", | ||
| 27 | "unicode_decimal": 59316 | ||
| 28 | }, | ||
| 29 | { | ||
| 30 | "icon_id": "19791414", | ||
| 31 | "name": "添加", | ||
| 32 | "font_class": "tianjia", | ||
| 33 | "unicode": "e7b5", | ||
| 34 | "unicode_decimal": 59317 | ||
| 35 | }, | ||
| 36 | { | ||
| 37 | "icon_id": "19791415", | ||
| 38 | "name": "综合查询", | ||
| 39 | "font_class": "zonghechaxun", | ||
| 40 | "unicode": "e7b6", | ||
| 41 | "unicode_decimal": 59318 | ||
| 42 | }, | ||
| 43 | { | ||
| 44 | "icon_id": "19791416", | ||
| 45 | "name": "系统管理", | ||
| 46 | "font_class": "xitongguanli", | ||
| 47 | "unicode": "e7b7", | ||
| 48 | "unicode_decimal": 59319 | ||
| 49 | }, | ||
| 50 | { | ||
| 51 | "icon_id": "19791417", | ||
| 52 | "name": "新建", | ||
| 53 | "font_class": "xinjian", | ||
| 54 | "unicode": "e7b8", | ||
| 55 | "unicode_decimal": 59320 | ||
| 56 | }, | ||
| 57 | { | ||
| 58 | "icon_id": "19728415", | ||
| 59 | "name": "上传", | ||
| 60 | "font_class": "shangchuan1", | ||
| 61 | "unicode": "e7b0", | ||
| 62 | "unicode_decimal": 59312 | ||
| 63 | }, | ||
| 64 | { | ||
| 65 | "icon_id": "19728416", | ||
| 66 | "name": "删除", | ||
| 67 | "font_class": "shanchu1", | ||
| 68 | "unicode": "e7b1", | ||
| 69 | "unicode_decimal": 59313 | ||
| 70 | }, | ||
| 71 | { | ||
| 9 | "icon_id": "19479731", | 72 | "icon_id": "19479731", |
| 10 | "name": "打印", | 73 | "name": "打印", |
| 11 | "font_class": "dayin", | 74 | "font_class": "dayin", |
| ... | @@ -356,13 +419,6 @@ | ... | @@ -356,13 +419,6 @@ |
| 356 | "unicode_decimal": 59267 | 419 | "unicode_decimal": 59267 |
| 357 | }, | 420 | }, |
| 358 | { | 421 | { |
| 359 | "icon_id": "19005628", | ||
| 360 | "name": "系统管理", | ||
| 361 | "font_class": "xitongguanli", | ||
| 362 | "unicode": "e782", | ||
| 363 | "unicode_decimal": 59266 | ||
| 364 | }, | ||
| 365 | { | ||
| 366 | "icon_id": "15090431", | 422 | "icon_id": "15090431", |
| 367 | "name": "下拉", | 423 | "name": "下拉", |
| 368 | "font_class": "xiala", | 424 | "font_class": "xiala", |
| ... | @@ -503,13 +559,6 @@ | ... | @@ -503,13 +559,6 @@ |
| 503 | "unicode_decimal": 59251 | 559 | "unicode_decimal": 59251 |
| 504 | }, | 560 | }, |
| 505 | { | 561 | { |
| 506 | "icon_id": "18618397", | ||
| 507 | "name": "添加", | ||
| 508 | "font_class": "tianjia", | ||
| 509 | "unicode": "e771", | ||
| 510 | "unicode_decimal": 59249 | ||
| 511 | }, | ||
| 512 | { | ||
| 513 | "icon_id": "18605314", | 562 | "icon_id": "18605314", |
| 514 | "name": "测距", | 563 | "name": "测距", |
| 515 | "font_class": "ceju", | 564 | "font_class": "ceju", |
| ... | @@ -608,13 +657,6 @@ | ... | @@ -608,13 +657,6 @@ |
| 608 | "unicode_decimal": 59235 | 657 | "unicode_decimal": 59235 |
| 609 | }, | 658 | }, |
| 610 | { | 659 | { |
| 611 | "icon_id": "18593370", | ||
| 612 | "name": "首页", | ||
| 613 | "font_class": "shouye", | ||
| 614 | "unicode": "e75c", | ||
| 615 | "unicode_decimal": 59228 | ||
| 616 | }, | ||
| 617 | { | ||
| 618 | "icon_id": "18590441", | 660 | "icon_id": "18590441", |
| 619 | "name": "办理", | 661 | "name": "办理", |
| 620 | "font_class": "banli", | 662 | "font_class": "banli", |
| ... | @@ -636,13 +678,6 @@ | ... | @@ -636,13 +678,6 @@ |
| 636 | "unicode_decimal": 59219 | 678 | "unicode_decimal": 59219 |
| 637 | }, | 679 | }, |
| 638 | { | 680 | { |
| 639 | "icon_id": "18587823", | ||
| 640 | "name": "变更", | ||
| 641 | "font_class": "biangeng", | ||
| 642 | "unicode": "e754", | ||
| 643 | "unicode_decimal": 59220 | ||
| 644 | }, | ||
| 645 | { | ||
| 646 | "icon_id": "18587824", | 681 | "icon_id": "18587824", |
| 647 | "name": "缩进", | 682 | "name": "缩进", |
| 648 | "font_class": "suojin", | 683 | "font_class": "suojin", |
| ... | @@ -655,27 +690,6 @@ | ... | @@ -655,27 +690,6 @@ |
| 655 | "font_class": "zhankai", | 690 | "font_class": "zhankai", |
| 656 | "unicode": "e756", | 691 | "unicode": "e756", |
| 657 | "unicode_decimal": 59222 | 692 | "unicode_decimal": 59222 |
| 658 | }, | ||
| 659 | { | ||
| 660 | "icon_id": "18587826", | ||
| 661 | "name": "更正", | ||
| 662 | "font_class": "gengzheng", | ||
| 663 | "unicode": "e757", | ||
| 664 | "unicode_decimal": 59223 | ||
| 665 | }, | ||
| 666 | { | ||
| 667 | "icon_id": "18587827", | ||
| 668 | "name": "新建", | ||
| 669 | "font_class": "xinjian", | ||
| 670 | "unicode": "e758", | ||
| 671 | "unicode_decimal": 59224 | ||
| 672 | }, | ||
| 673 | { | ||
| 674 | "icon_id": "18587828", | ||
| 675 | "name": "综合查询", | ||
| 676 | "font_class": "zonghechaxun", | ||
| 677 | "unicode": "e759", | ||
| 678 | "unicode_decimal": 59225 | ||
| 679 | } | 693 | } |
| 680 | ] | 694 | ] |
| 681 | } | 695 | } | ... | ... |
This diff is collapsed.
Click to expand it.
No preview for this file type
No preview for this file type
No preview for this file type
src/assets/images/map_default1.png
0 → 100644
20.2 KB
| ... | @@ -30,32 +30,38 @@ | ... | @@ -30,32 +30,38 @@ |
| 30 | <el-row> | 30 | <el-row> |
| 31 | <el-col :span="6"><div class="grid-left">不动产权证号</div></el-col> | 31 | <el-col :span="6"><div class="grid-left">不动产权证号</div></el-col> |
| 32 | <el-col :span="18" | 32 | <el-col :span="18" |
| 33 | ><div class="grid-right">{{ result.bdcdyh }}</div></el-col | 33 | ><div class="grid-right"></div></el-col |
| 34 | > | 34 | > |
| 35 | </el-row> | 35 | </el-row> |
| 36 | <el-row> | 36 | <!-- <el-row> |
| 37 | <el-col :span="6"><div class="grid-left">自然幢号</div></el-col> | 37 | <el-col :span="6"><div class="grid-left">自然幢号</div></el-col> |
| 38 | <el-col :span="18" | 38 | <el-col :span="18" |
| 39 | ><div class="grid-right">{{ result.zrzh }}</div></el-col | 39 | ><div class="grid-right">{{ result.zrzh }}</div></el-col |
| 40 | > | 40 | > |
| 41 | </el-row> | 41 | </el-row> --> |
| 42 | <el-row> | 42 | <el-row> |
| 43 | <el-col :span="6"><div class="grid-left">权利人</div></el-col> | 43 | <el-col :span="6"><div class="grid-left">权利人</div></el-col> |
| 44 | <el-col :span="18" | 44 | <el-col :span="18" |
| 45 | ><div class="grid-right">{{ result.qlr }}</div></el-col | 45 | ><div class="grid-right">{{ result.qlrmc }}</div></el-col |
| 46 | > | 46 | > |
| 47 | </el-row> | 47 | </el-row> |
| 48 | <el-row> | 48 | <el-row> |
| 49 | <el-col :span="6"><div class="grid-left">权利性质</div></el-col> | 49 | <el-col :span="6"><div class="grid-left">权利性质</div></el-col> |
| 50 | <el-col :span="18" | 50 | <el-col :span="18" |
| 51 | ><div class="grid-right">{{ result.qlxz }}</div></el-col | 51 | ><div class="grid-right">{{ result.qlxzmc }}</div></el-col |
| 52 | > | ||
| 53 | </el-row> | ||
| 54 | <el-row> | ||
| 55 | <el-col :span="6"><div class="grid-left">批准用途</div></el-col> | ||
| 56 | <el-col :span="18" | ||
| 57 | ><div class="grid-right">{{ result.pzytmc }}</div></el-col | ||
| 52 | > | 58 | > |
| 53 | </el-row> | 59 | </el-row> |
| 54 | 60 | ||
| 55 | <el-row> | 61 | <el-row> |
| 56 | <el-col :span="6"><div class="grid-left">土地用途</div></el-col> | 62 | <el-col :span="6"><div class="grid-left">实际用途</div></el-col> |
| 57 | <el-col :span="18" | 63 | <el-col :span="18" |
| 58 | ><div class="grid-right">{{ result.fwyt }}</div></el-col | 64 | ><div class="grid-right">{{ result.sjytmc }}</div></el-col |
| 59 | > | 65 | > |
| 60 | </el-row> | 66 | </el-row> |
| 61 | <el-row> | 67 | <el-row> |
| ... | @@ -287,7 +293,7 @@ export default { | ... | @@ -287,7 +293,7 @@ export default { |
| 287 | }, | 293 | }, |
| 288 | 294 | ||
| 289 | fitView: true, | 295 | fitView: true, |
| 290 | fitViewPadding: 160, | 296 | fitViewPadding: 100, |
| 291 | }); | 297 | }); |
| 292 | 298 | ||
| 293 | graph.data(data); | 299 | graph.data(data); |
| ... | @@ -306,6 +312,39 @@ export default { | ... | @@ -306,6 +312,39 @@ export default { |
| 306 | getQjZdjbxxDetailByIdBylshs(e.item._cfg.id).then((res) => { | 312 | getQjZdjbxxDetailByIdBylshs(e.item._cfg.id).then((res) => { |
| 307 | if (res.code === 200) { | 313 | if (res.code === 200) { |
| 308 | self.result = res.result; | 314 | self.result = res.result; |
| 315 | this.$store.state.qlxzList.forEach((item) => { | ||
| 316 | if(item.children!=null&&item.children.length!=0){ | ||
| 317 | item.children.forEach((childitem)=>{ | ||
| 318 | if (childitem.dm === res.result.qlxzdm) { | ||
| 319 | self.result.qlxzmc=childitem.mc; | ||
| 320 | } | ||
| 321 | }) | ||
| 322 | } | ||
| 323 | if (item.dm === res.result.qlxzdm) { | ||
| 324 | self.result.qlxzmc=item.mc; | ||
| 325 | } | ||
| 326 | }); | ||
| 327 | this.$store.state.tdytList.forEach((item) => { | ||
| 328 | if(item.children!=null&&item.children.length!=0){ | ||
| 329 | item.children.forEach((childitem)=>{ | ||
| 330 | if (childitem.dm === res.result.pzytdm) { | ||
| 331 | self.result.pzytmc=childitem.mc; | ||
| 332 | } | ||
| 333 | if (childitem.dm === res.result.sjytdm) { | ||
| 334 | self.result.sjytmc=childitem.mc; | ||
| 335 | } | ||
| 336 | }) | ||
| 337 | } | ||
| 338 | |||
| 339 | if (item.dm === res.result.pzytdm) { | ||
| 340 | self.result.pzytmc=item.mc; | ||
| 341 | } | ||
| 342 | if (item.dm === res.result.sjytdm) { | ||
| 343 | self.result.sjytmc=item.mc; | ||
| 344 | } | ||
| 345 | }); | ||
| 346 | |||
| 347 | |||
| 309 | } | 348 | } |
| 310 | }); | 349 | }); |
| 311 | break; | 350 | break; |
| ... | @@ -378,6 +417,36 @@ export default { | ... | @@ -378,6 +417,36 @@ export default { |
| 378 | getQjZdjbxxDetailByIdBylshs(this.bsm).then((res) => { | 417 | getQjZdjbxxDetailByIdBylshs(this.bsm).then((res) => { |
| 379 | if (res.code === 200) { | 418 | if (res.code === 200) { |
| 380 | this.result = res.result; | 419 | this.result = res.result; |
| 420 | this.$store.state.qlxzList.forEach((item) => { | ||
| 421 | if(item.children!=null&&item.children.length!=0){ | ||
| 422 | item.children.forEach((childitem)=>{ | ||
| 423 | if (childitem.dm === res.result.qlxzdm) { | ||
| 424 | this.result.qlxzmc=childitem.mc; | ||
| 425 | } | ||
| 426 | }) | ||
| 427 | } | ||
| 428 | if (item.dm === res.result.qlxzdm) { | ||
| 429 | this.result.qlxzmc=item.mc; | ||
| 430 | } | ||
| 431 | }); | ||
| 432 | this.$store.state.tdytList.forEach((item1) => { | ||
| 433 | if(item1.children!=null&&item1.children.length!=0){ | ||
| 434 | item1.children.forEach((childitem1)=>{ | ||
| 435 | if (childitem1.dm === res.result.pzytdm) { | ||
| 436 | this.result.pzytmc=childitem1.mc; | ||
| 437 | } | ||
| 438 | if (childitem1.dm === res.result.sjytdm) { | ||
| 439 | this.result.sjytmc=childitem1.mc; | ||
| 440 | } | ||
| 441 | }) | ||
| 442 | } | ||
| 443 | if (item1.dm === res.result.pzytdm) { | ||
| 444 | this.result.pzytmc=item1.mc; | ||
| 445 | } | ||
| 446 | if (item1.dm === res.result.sjytdm) { | ||
| 447 | this.result.sjytmc=item1.mc; | ||
| 448 | } | ||
| 449 | }); | ||
| 381 | } | 450 | } |
| 382 | }); | 451 | }); |
| 383 | break; | 452 | break; | ... | ... |
| ... | @@ -509,9 +509,9 @@ export default { | ... | @@ -509,9 +509,9 @@ export default { |
| 509 | /*border-right: 1px solid #EAEAEA;*/ | 509 | /*border-right: 1px solid #EAEAEA;*/ |
| 510 | i { | 510 | i { |
| 511 | margin-right: 6px; | 511 | margin-right: 6px; |
| 512 | font-size: 18px; | 512 | font-size: 24px; |
| 513 | position: relative; | 513 | position: relative; |
| 514 | top: 1px; | 514 | top: 2px; |
| 515 | } | 515 | } |
| 516 | .hamburger { | 516 | .hamburger { |
| 517 | font-size: 16px; | 517 | font-size: 16px; | ... | ... |
| 1 | <template> | 1 | <template> |
| 2 | <el-tabs v-model="activeName" class="tabs"> | 2 | <el-tabs v-model="activeName" class="tabs"> |
| 3 | <el-tab-pane label="林海调查表" name="lhdcb"><Lhdcb></Lhdcb></el-tab-pane> | 3 | <el-tab-pane label="林权调查表" name="lhdcb"><Lhdcb></Lhdcb></el-tab-pane> |
| 4 | </el-tabs> | 4 | </el-tabs> |
| 5 | </template> | 5 | </template> |
| 6 | 6 | ... | ... |
| ... | @@ -927,7 +927,7 @@ | ... | @@ -927,7 +927,7 @@ |
| 927 | /deep/ .el-tabs__header { | 927 | /deep/ .el-tabs__header { |
| 928 | position: -webkit-fixed; | 928 | position: -webkit-fixed; |
| 929 | position: fixed; | 929 | position: fixed; |
| 930 | top: 117px; | 930 | top: 115px; |
| 931 | z-index: 999; | 931 | z-index: 999; |
| 932 | width: 100%; | 932 | width: 100%; |
| 933 | margin-bottom: 0; | 933 | margin-bottom: 0; |
| ... | @@ -962,8 +962,8 @@ | ... | @@ -962,8 +962,8 @@ |
| 962 | 962 | ||
| 963 | /deep/ .el-card__header{ | 963 | /deep/ .el-card__header{ |
| 964 | padding: 16px 20px; | 964 | padding: 16px 20px; |
| 965 | background-color: #FAFAFA; | 965 | background-color: #FAFCFF; |
| 966 | border-bottom: 1px solid #E6E6E6; | 966 | border-bottom: 1px solid #E4EBF4; |
| 967 | -webkit-box-sizing: border-box; | 967 | -webkit-box-sizing: border-box; |
| 968 | box-sizing: border-box; | 968 | box-sizing: border-box; |
| 969 | } | 969 | } |
| ... | @@ -983,7 +983,7 @@ | ... | @@ -983,7 +983,7 @@ |
| 983 | width: 40%; | 983 | width: 40%; |
| 984 | } | 984 | } |
| 985 | .el-card { | 985 | .el-card { |
| 986 | border: 1px solid #E6E6E6; | 986 | border: 1px solid #E4EBF4; |
| 987 | background-color: white; | 987 | background-color: white; |
| 988 | overflow: auto; | 988 | overflow: auto; |
| 989 | .clearfix{ | 989 | .clearfix{ |
| ... | @@ -1133,7 +1133,7 @@ | ... | @@ -1133,7 +1133,7 @@ |
| 1133 | height: 44px; | 1133 | height: 44px; |
| 1134 | } | 1134 | } |
| 1135 | th{ | 1135 | th{ |
| 1136 | background: #FAFAFA; | 1136 | background: #FAFCFF; |
| 1137 | } | 1137 | } |
| 1138 | } | 1138 | } |
| 1139 | 1139 | ... | ... |
| ... | @@ -80,7 +80,7 @@ export default { | ... | @@ -80,7 +80,7 @@ export default { |
| 80 | /deep/ .el-tabs__header { | 80 | /deep/ .el-tabs__header { |
| 81 | position: -webkit-fixed; | 81 | position: -webkit-fixed; |
| 82 | position: fixed; | 82 | position: fixed; |
| 83 | top: 117px; | 83 | top: 115px; |
| 84 | z-index: 999; | 84 | z-index: 999; |
| 85 | width: 100%; | 85 | width: 100%; |
| 86 | margin-bottom: 0; | 86 | margin-bottom: 0; | ... | ... |
| ... | @@ -592,7 +592,7 @@ | ... | @@ -592,7 +592,7 @@ |
| 592 | /deep/ .el-tabs__header { | 592 | /deep/ .el-tabs__header { |
| 593 | position: -webkit-fixed; | 593 | position: -webkit-fixed; |
| 594 | position: fixed; | 594 | position: fixed; |
| 595 | top: 117px; | 595 | top: 115px; |
| 596 | z-index: 999; | 596 | z-index: 999; |
| 597 | width: 100%; | 597 | width: 100%; |
| 598 | margin-bottom: 0; | 598 | margin-bottom: 0; | ... | ... |
-
Please register or sign in to post a comment