Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
16 changed files
with
73 additions
and
59 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
... | @@ -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