8970ccfe by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 35676eb2 76174cfc
...@@ -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">&#xe7af;</span>
35 <div class="name">打印</div>
36 <div class="code-name">&amp;#xe7af;</div>
37 </li>
38
39 <li class="dib">
34 <span class="icon iconfont">&#xe7a6;</span> 40 <span class="icon iconfont">&#xe7a6;</span>
35 <div class="name">饼图</div> 41 <div class="name">饼图</div>
36 <div class="code-name">&amp;#xe7a6;</div> 42 <div class="code-name">&amp;#xe7a6;</div>
...@@ -651,6 +657,15 @@ ...@@ -651,6 +657,15 @@
651 <ul class="icon_lists dib-box"> 657 <ul class="icon_lists dib-box">
652 658
653 <li class="dib"> 659 <li class="dib">
660 <span class="icon iconfont icondayin"></span>
661 <div class="name">
662 打印
663 </div>
664 <div class="code-name">.icondayin
665 </div>
666 </li>
667
668 <li class="dib">
654 <span class="icon iconfont iconbingtu"></span> 669 <span class="icon iconfont iconbingtu"></span>
655 <div class="name"> 670 <div class="name">
656 饼图 671 饼图
...@@ -1536,6 +1551,14 @@ ...@@ -1536,6 +1551,14 @@
1536 1551
1537 <li class="dib"> 1552 <li class="dib">
1538 <svg class="icon svg-icon" aria-hidden="true"> 1553 <svg class="icon svg-icon" aria-hidden="true">
1554 <use xlink:href="#icondayin"></use>
1555 </svg>
1556 <div class="name">打印</div>
1557 <div class="code-name">#icondayin</div>
1558 </li>
1559
1560 <li class="dib">
1561 <svg class="icon svg-icon" aria-hidden="true">
1539 <use xlink:href="#iconbingtu"></use> 1562 <use xlink:href="#iconbingtu"></use>
1540 </svg> 1563 </svg>
1541 <div class="name">饼图</div> 1564 <div class="name">饼图</div>
......
This diff could not be displayed because it is too large.
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "19479731",
10 "name": "打印",
11 "font_class": "dayin",
12 "unicode": "e7af",
13 "unicode_decimal": 59311
14 },
15 {
9 "icon_id": "19449217", 16 "icon_id": "19449217",
10 "name": "饼图", 17 "name": "饼图",
11 "font_class": "bingtu", 18 "font_class": "bingtu",
......
...@@ -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="dayin" unicode="&#59311;" d="M721.454545 523.636364H791.272727a46.545455 46.545455 0 0 0 46.545455-46.545455v-279.272727a46.545455 46.545455 0 0 0-46.545455-46.545455h-23.272727v23.272728a93.090909 93.090909 0 0 1-93.090909 93.090909h-372.363636a93.090909 93.090909 0 0 1-93.09091-93.090909v-23.272728H186.181818a46.545455 46.545455 0 0 0-46.545454 46.545455V477.090909a46.545455 46.545455 0 0 0 46.545454 46.545455h535.272727z m0 46.545454h-465.454545V663.272727a46.545455 46.545455 0 0 0 46.545455 46.545455h372.363636a46.545455 46.545455 0 0 0 46.545454-46.545455v-93.090909z m-418.90909-349.090909h372.363636a46.545455 46.545455 0 0 0 46.545454-46.545454V58.181818a46.545455 46.545455 0 0 0-46.545454-46.545454h-372.363636a46.545455 46.545455 0 0 0-46.545455 46.545454v116.363637a46.545455 46.545455 0 0 0 46.545455 46.545454z m-23.272728 232.727273a23.272727 23.272727 0 1 1 0-46.545455h93.090909a23.272727 23.272727 0 0 1 0 46.545455H279.272727z" horiz-adv-x="1024" />
24
25
23 <glyph glyph-name="bingtu" unicode="&#59302;" d="M512 864a480 480 0 1 0 0-960 480 480 0 0 0 0 960z m-60.032-64.256A420.096 420.096 0 0 1 512-36.032a420.096 420.096 0 0 1 415.744 360H481.92a30.016 30.016 0 0 0-29.44 24.64l-0.512 5.376V799.744zM512 804.032V384h420.032A419.968 419.968 0 0 1 512 804.032z" horiz-adv-x="1024" /> 26 <glyph glyph-name="bingtu" unicode="&#59302;" d="M512 864a480 480 0 1 0 0-960 480 480 0 0 0 0 960z m-60.032-64.256A420.096 420.096 0 0 1 512-36.032a420.096 420.096 0 0 1 415.744 360H481.92a30.016 30.016 0 0 0-29.44 24.64l-0.512 5.376V799.744zM512 804.032V384h420.032A419.968 419.968 0 0 1 512 804.032z" horiz-adv-x="1024" />
24 27
25 28
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 width: 100%; 11 width: 100%;
12 height: 100%; 12 height: 100%;
13 box-sizing: border-box; 13 box-sizing: border-box;
14 padding: 18px 10px 0!important; 14 padding: 18px 18px 0!important;
15 } 15 }
16 .pagination { 16 .pagination {
17 padding: 18px; 17 padding: 18px;
...@@ -77,6 +77,9 @@ ol, ul { list-style:none; } ...@@ -77,6 +77,9 @@ ol, ul { list-style:none; }
77 .top20{ 77 .top20{
78 top: 20px; 78 top: 20px;
79 } 79 }
80 .top40{
81 top: 40px;
82 }
80 // 滚动条样式 83 // 滚动条样式
81 ::-webkit-scrollbar { 84 ::-webkit-scrollbar {
82 width: 6px; 85 width: 6px;
...@@ -118,6 +121,7 @@ ol, ul { list-style:none; } ...@@ -118,6 +121,7 @@ ol, ul { list-style:none; }
118 border-top: 1px solid #F4F9FF; 121 border-top: 1px solid #F4F9FF;
119 } 122 }
120 } 123 }
124
121 .el-tabs{ 125 .el-tabs{
122 height: calc(100% - 50px); 126 height: calc(100% - 50px);
123 /deep/.el-tabs__content{ 127 /deep/.el-tabs__content{
...@@ -130,15 +134,63 @@ ol, ul { list-style:none; } ...@@ -130,15 +134,63 @@ ol, ul { list-style:none; }
130 padding: 0; 134 padding: 0;
131 } 135 }
132 /deep/ .el-tabs__item { 136 /deep/ .el-tabs__item {
133 height: 48px; 137 height: 44px;
138 font-size: 16px;
134 } 139 }
135 /deep/ .el-tabs__header{ 140 /deep/ .el-tabs__header{
136 background-color: #ffffff; 141 background-color: #ffffff;
142 margin-bottom: 0;
143 }
144 .el-tabs__header{
145 background-color: #ffffff;
146 }
147 /deep/ .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2), .el-tabs--bottom .el-tabs__item.is-top:nth-child(2), .el-tabs--top .el-tabs__item.is-bottom:nth-child(2), .el-tabs--top .el-tabs__item.is-top:nth-child(2){
148 padding: 0 20px;
149 }
150 /deep/.el-tabs__active-bar{
151 position: absolute;
152 bottom: 5px;
153 left: 0;
154 height: 2px;
155 background-color: #0091FF;
156 z-index: 1;
157 }
158 /deep/.el-tabs__nav-wrap{
159 background: #FFFFFF;
160 box-shadow: 0px 1px 2px 1px rgba(49, 132, 245, 0.1);
161 }
162 /deep/.el-tabs__nav .is-active{
163 background: #FFFFFF;
164 color: #0091FF;
165 }
166 /deep/.el-tabs__nav-wrap::after{
167 height: 0;
168 }
169 /deep/ .el-tabs__nav{
170 margin-left: 20px;
137 } 171 }
138 } 172 }
139 .el-tabs__item{ 173 // .el-tabs__header{
140 font-size: 16px; 174 // background-color: #ffffff;
141 } 175 // }
176 // .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2), .el-tabs--bottom .el-tabs__item.is-top:nth-child(2), .el-tabs--top .el-tabs__item.is-bottom:nth-child(2), .el-tabs--top .el-tabs__item.is-top:nth-child(2){
177 // padding: 0 20px;
178 // }
179 // .el-tabs__active-bar{
180 // position: absolute;
181 // bottom: 3px;
182 // left: 0;
183 // height: 2px;
184 // background-color: #409EFF;
185 // z-index: 1;
186 // }
187 // .el-tabs__nav-wrap{
188 // background: #FFFFFF;
189 // box-shadow: 0px 1px 2px 1px rgba(49, 132, 245, 0.1);
190 // }
191 // .el-tabs__nav .is-active{
192 // background: #FFFFFF;
193 // }
142 //弹框遮罩层样式 194 //弹框遮罩层样式
143 .v-modal{ 195 .v-modal{
144 opacity: .2; 196 opacity: .2;
......
1 <template> 1 <template>
2 <div class="hb-tabs top20"> 2 <div class="hb-tabs top40">
3 <div class="hbq"> 3 <div class="hbq">
4 <span class="tips" style="margin-left:0;">合并前幢信息(已选择幢{{dzhbqData.length}}个)</span> 4 <span class="tips" style="margin-left:0;">合并前幢信息(已选择幢{{dzhbqData.length}}个)</span>
5 5
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> 6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> 2 <el-tabs v-model="activeName" @tab-click="handleClick">
3 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane> 3 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
4 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane> 4 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
5 </el-tabs> 5 </el-tabs>
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card"> 2 <el-tabs v-model="activeName" >
3 <el-tab-pane label="添加" name="tj"> 3 <el-tab-pane label="添加" name="tj">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
......
...@@ -567,7 +567,7 @@ export default { ...@@ -567,7 +567,7 @@ export default {
567 height: 100%; 567 height: 100%;
568 -webkit-box-sizing: border-box; 568 -webkit-box-sizing: border-box;
569 box-sizing: border-box; 569 box-sizing: border-box;
570 padding: 20px; 570 padding: 25px 20px;
571 } 571 }
572 .search{ 572 .search{
573 573
...@@ -668,7 +668,7 @@ table:hover { ...@@ -668,7 +668,7 @@ table:hover {
668 668
669 .page { 669 .page {
670 position: fixed; 670 position: fixed;
671 bottom: 20px; 671 bottom: 15px;
672 width: auto; 672 width: auto;
673 height: auto; 673 height: auto;
674 } 674 }
......
...@@ -918,11 +918,10 @@ ...@@ -918,11 +918,10 @@
918 </script> 918 </script>
919 <style scoped lang="less"> 919 <style scoped lang="less">
920 .fg { 920 .fg {
921
922 .menu { 921 .menu {
923 /deep/ .el-tabs__content { 922 /deep/ .el-tabs__content {
924 position: unset; 923 position: unset;
925 margin-top: 62px; 924 margin-top: 60px;
926 overflow: visible; 925 overflow: visible;
927 } 926 }
928 /deep/ .el-tabs__header { 927 /deep/ .el-tabs__header {
...@@ -935,7 +934,7 @@ ...@@ -935,7 +934,7 @@
935 border: 0; 934 border: 0;
936 border-bottom: 1px solid #E4E7ED; 935 border-bottom: 1px solid #E4E7ED;
937 /deep/ .el-tabs__nav-scroll { 936 /deep/ .el-tabs__nav-scroll {
938 height: 50px; 937 height: 44px;
939 box-sizing: border-box; 938 box-sizing: border-box;
940 padding-left: 20px; 939 padding-left: 20px;
941 .el-tabs__active-bar { 940 .el-tabs__active-bar {
...@@ -943,12 +942,13 @@ ...@@ -943,12 +942,13 @@
943 } 942 }
944 > .el-tabs__nav { 943 > .el-tabs__nav {
945 border: 0; 944 border: 0;
945 margin-left: 0!important;
946 > .el-tabs__item { 946 > .el-tabs__item {
947 border: 1px solid #DEDEDE; 947 border: 1px solid #DEDEDE;
948 height: 36px; 948 height: 32px;
949 line-height: 32px; 949 line-height: 30px;
950 padding: 0 20px; 950 padding: 0 20px;
951 margin: 9px 10px 9px 0; 951 margin: 6px 10px 9px 0;
952 background-color: #ffffff; 952 background-color: #ffffff;
953 } 953 }
954 .is-active { 954 .is-active {
......
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
71 height: 100%; 71 height: 100%;
72 /deep/ .el-tabs__content { 72 /deep/ .el-tabs__content {
73 position: unset; 73 position: unset;
74 margin-top: 40px; 74 margin-top: 45px;
75 overflow: visible; 75 overflow: visible;
76 /deep/.el-tab-pane{ 76 /deep/.el-tab-pane{
77 height: calc(100% - 0px); 77 height: calc(100% - 0px);
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
87 border: 0; 87 border: 0;
88 border-bottom: 1px solid #E4E7ED; 88 border-bottom: 1px solid #E4E7ED;
89 /deep/ .el-tabs__nav-scroll { 89 /deep/ .el-tabs__nav-scroll {
90 height: 50px; 90 height: 44px;
91 box-sizing: border-box; 91 box-sizing: border-box;
92 padding-left: 20px; 92 padding-left: 20px;
93 .el-tabs__active-bar { 93 .el-tabs__active-bar {
...@@ -95,12 +95,13 @@ export default { ...@@ -95,12 +95,13 @@ export default {
95 } 95 }
96 > .el-tabs__nav { 96 > .el-tabs__nav {
97 border: 0; 97 border: 0;
98 margin-left: 0!important;
98 > .el-tabs__item { 99 > .el-tabs__item {
99 border: 1px solid #DEDEDE; 100 border: 1px solid #DEDEDE;
100 height: 36px; 101 height: 32px;
101 line-height: 32px; 102 line-height: 30px;
102 padding: 0 20px; 103 padding: 0 20px;
103 margin: 9px 10px 9px 0; 104 margin: 6px 10px 9px 0;
104 background-color: #ffffff; 105 background-color: #ffffff;
105 } 106 }
106 .is-active { 107 .is-active {
......
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
187 </div> 187 </div>
188 </el-tab-pane> 188 </el-tab-pane>
189 <el-tab-pane label="户合并" name="h"> 189 <el-tab-pane label="户合并" name="h">
190 <div style="width:100%;height:25px"></div>
190 <div class="hb-tabs psn" v-if="hhbtabs"> 191 <div class="hb-tabs psn" v-if="hhbtabs">
191 <hfghb></hfghb> 192 <hfghb></hfghb>
192 </div> 193 </div>
...@@ -583,12 +584,9 @@ ...@@ -583,12 +584,9 @@
583 height: 100%; 584 height: 100%;
584 .menu { 585 .menu {
585 height: 100%; 586 height: 100%;
586 .top40{
587 top: 40px;
588 }
589 /deep/ .el-tabs__content { 587 /deep/ .el-tabs__content {
590 position: unset; 588 position: unset;
591 margin-top: 40px; 589 margin-top: 30px;
592 overflow: visible; 590 overflow: visible;
593 } 591 }
594 /deep/ .el-tabs__header { 592 /deep/ .el-tabs__header {
...@@ -601,7 +599,7 @@ ...@@ -601,7 +599,7 @@
601 border: 0; 599 border: 0;
602 border-bottom: 1px solid #E4E7ED; 600 border-bottom: 1px solid #E4E7ED;
603 /deep/ .el-tabs__nav-scroll { 601 /deep/ .el-tabs__nav-scroll {
604 height: 50px; 602 height: 44px;
605 box-sizing: border-box; 603 box-sizing: border-box;
606 padding-left: 20px; 604 padding-left: 20px;
607 .el-tabs__active-bar { 605 .el-tabs__active-bar {
...@@ -609,12 +607,13 @@ ...@@ -609,12 +607,13 @@
609 } 607 }
610 > .el-tabs__nav { 608 > .el-tabs__nav {
611 border: 0; 609 border: 0;
610 margin-left: 0!important;
612 > .el-tabs__item { 611 > .el-tabs__item {
613 border: 1px solid #DEDEDE; 612 border: 1px solid #DEDEDE;
614 height: 36px; 613 height: 32px;
615 line-height: 32px; 614 line-height: 30px;
616 padding: 0 20px; 615 padding: 0 20px;
617 margin: 9px 10px 9px 0; 616 margin: 6px 10px 9px 0;
618 background-color: #ffffff; 617 background-color: #ffffff;
619 } 618 }
620 .is-active { 619 .is-active {
......
...@@ -313,7 +313,7 @@ export default { ...@@ -313,7 +313,7 @@ export default {
313 created(){}, 313 created(){},
314 mounted(){ 314 mounted(){
315 this.$nextTick(()=>{ 315 this.$nextTick(()=>{
316 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320; 316 this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 310;
317 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270; 317 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270;
318 }) 318 })
319 this.search(); 319 this.search();
...@@ -556,7 +556,7 @@ export default { ...@@ -556,7 +556,7 @@ export default {
556 height: 100%; 556 height: 100%;
557 -webkit-box-sizing: border-box; 557 -webkit-box-sizing: border-box;
558 box-sizing: border-box; 558 box-sizing: border-box;
559 padding: 20px; 559 padding: 20px 20px;
560 .el-row{ 560 .el-row{
561 box-sizing: border-box; 561 box-sizing: border-box;
562 padding-left: 2px; 562 padding-left: 2px;
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card"> 2 <el-tabs v-model="activeName" @tab-click="handleClick" >
3 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane> 3 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
4 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane> 4 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
5 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 5 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
......
...@@ -501,6 +501,12 @@ export default { ...@@ -501,6 +501,12 @@ export default {
501 /deep/.el-tabs__content{ 501 /deep/.el-tabs__content{
502 position: relative!important; 502 position: relative!important;
503 } 503 }
504 .el-tabs__item{
505 line-height: 44px!important;
506 }
507 .is-active{
508 background-color: #E5F4FF!important;
509 }
504 .eltabspane { 510 .eltabspane {
505 height: 100%; 511 height: 100%;
506 width: 100%; 512 width: 100%;
...@@ -514,6 +520,7 @@ export default { ...@@ -514,6 +520,7 @@ export default {
514 width: calc(100% - 40px); 520 width: calc(100% - 40px);
515 .el-form-item{ 521 .el-form-item{
516 margin-bottom: 0!important; 522 margin-bottom: 0!important;
523
517 .el-form-item__content{ 524 .el-form-item__content{
518 width: 100%; 525 width: 100%;
519 } 526 }
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card"> 2 <el-tabs v-model="activeName" >
3 <el-tab-pane label="更正" name="gz"> 3 <el-tab-pane label="更正" name="gz">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card"> 2 <el-tabs v-model="activeName" >
3 <el-tab-pane label="综合查询" name="zhcx"> 3 <el-tab-pane label="综合查询" name="zhcx">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
......
...@@ -176,6 +176,45 @@ export default { ...@@ -176,6 +176,45 @@ export default {
176 clearPostionLayer(viewId){ 176 clearPostionLayer(viewId){
177 var view = maps[viewId]; 177 var view = maps[viewId];
178 view.graphics.removeAll(); 178 view.graphics.removeAll();
179 },
180 //打印地图
181 printMap(viewId,outSpatialReference,serverUrl,priTemParames,callBackFunction){
182 var self = this;
183 loadModules([
184 "esri/tasks/PrintTask",
185 "esri/tasks/support/PrintParameters",
186 "esri/tasks/support/PrintTemplate"
187 ]).then(([
188 PrintTask,
189 PrintParameters,
190 PrintTemplate
191 ]) => {
192 var view = maps[viewId],
193 printTask = new PrintTask({
194 url:serverUrl
195 }),
196 template = new PrintTemplate({
197 layout:priTemParames.layOut,
198 format:priTemParames.format,
199 layoutOptions: {
200 titleText:priTemParames.title,
201 scalebarUnit:'Meters',
202 authorText:priTemParames.author
203 }
204 }),
205 paramets = new PrintParameters({
206 view:view,
207 template:template
208 });
209 paramets.outSpatialReference = outSpatialReference ? outSpatialReference : view.spatialReference;
210 printTask.execute(paramets).then(res => {
211 if(callBackFunction && typeof callBackFunction == 'function'){
212 callBackFunction(res);
213 }
214 });
215 }).catch(err => {
216 console.log(err);
217 })
179 } 218 }
180 } 219 }
181 } 220 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -38,9 +38,13 @@ ...@@ -38,9 +38,13 @@
38 <span>缩小</span> 38 <span>缩小</span>
39 </li> 39 </li>
40 <li @click="info"> 40 <li @click="info">
41 <i class="iconfont iconxinxi"></i> 41 <i class="iconfont iconshibie"></i>
42 <span>识别</span> 42 <span>识别</span>
43 </li> 43 </li>
44 <li @click="print">
45 <i class="iconfont icondayin"></i>
46 <span>打印</span>
47 </li>
44 <li @click="clear"> 48 <li @click="clear">
45 <i class="iconfont iconqingchu"></i> 49 <i class="iconfont iconqingchu"></i>
46 <span>清除</span> 50 <span>清除</span>
...@@ -59,6 +63,9 @@ ...@@ -59,6 +63,9 @@
59 </el-form-item> 63 </el-form-item>
60 </el-form> 64 </el-form>
61 </div> 65 </div>
66 <el-dialog title="地图打印" :visible.sync="printDialog" :close-on-click-modal="false" width="30%">
67 <print-template :viewId='viewId'></print-template>
68 </el-dialog>
62 </div> 69 </div>
63 </template> 70 </template>
64 <script> 71 <script>
...@@ -71,6 +78,8 @@ import mapTools from "./js/mapTools"; ...@@ -71,6 +78,8 @@ import mapTools from "./js/mapTools";
71 78
72 import {loadModules} from "esri-loader" 79 import {loadModules} from "esri-loader"
73 80
81 import printTemplate from './printTemplate.vue'
82
74 export default { 83 export default {
75 props:{ 84 props:{
76 viewId:{ 85 viewId:{
...@@ -90,9 +99,13 @@ export default { ...@@ -90,9 +99,13 @@ export default {
90 x:"", 99 x:"",
91 y:"" 100 y:""
92 }, 101 },
93 isPostion:false 102 isPostion:false,
103 printDialog:false
94 } 104 }
95 }, 105 },
106 components:{
107 printTemplate
108 },
96 methods:{ 109 methods:{
97 fullMap(){ 110 fullMap(){
98 var view = maps[this.viewId]; 111 var view = maps[this.viewId];
...@@ -129,7 +142,9 @@ export default { ...@@ -129,7 +142,9 @@ export default {
129 },true,'all',3,view.extent); 142 },true,'all',3,view.extent);
130 }); 143 });
131 }, 144 },
132 145 print(){
146 this.printDialog = true;
147 },
133 zoomOut(){ 148 zoomOut(){
134 var view = maps[this.viewId]; 149 var view = maps[this.viewId];
135 this.initDraw("rectangle",this.viewId,null,function(geo){ 150 this.initDraw("rectangle",this.viewId,null,function(geo){
...@@ -227,5 +242,8 @@ export default { ...@@ -227,5 +242,8 @@ export default {
227 top: 58px; 242 top: 58px;
228 } 243 }
229 } 244 }
245 /deep/ .v-modal{
246 z-index:10
247 }
230 248
231 </style> 249 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template>
2 <div class="printTemplate">
3 <el-form :rules="rules" :model="formData" ref="printForm" label-width="80px">
4 <el-form-item label="标题:" prop="title">
5 <el-input v-model="formData.title"></el-input>
6 </el-form-item>
7 <el-form-item label="格式:" prop="format">
8 <el-select v-model="formData.format" placeholder="请选择格式">
9 <el-option
10 v-for="(item,index) in formats"
11 :key="index"
12 :label="item"
13 :value="item">
14 </el-option>
15 </el-select>
16 </el-form-item>
17 <el-form-item label="模板:" prop="layOut">
18 <el-select v-model="formData.layOut" placeholder="请选择格式">
19 <el-option
20 v-for="(item,index) in layouts"
21 :key="index"
22 :label="item.label"
23 :value="item.value">
24 </el-option>
25 </el-select>
26 </el-form-item>
27 <el-form-item label="作者" prop="author">
28 <el-input v-model="formData.author"></el-input>
29 </el-form-item>
30 <el-form-item v-show="!isSuccess">
31 <el-button type="primary" @click="onSubmit('printForm')">确定</el-button>
32 <el-button @click="resetForm('printForm')">重置</el-button>
33 </el-form-item>
34 <el-form-item v-show="isSuccess">
35 <el-button type="primary" @click="showResult">预览</el-button>
36 </el-form-item>
37 </el-form>
38 </div>
39 </template>
40
41 <script>
42 import mapTools from './js/mapTools.js'
43 export default{
44 props:{
45 viewId:{
46 type:String,
47 default:""
48 }
49 },
50 mixins:[mapTools],
51 data(){
52 return{
53 formData:{
54 title:"地图",
55 author:"",
56 layOut:"map-only",
57 format:"png32"
58 },
59 formats:[
60 "pdf","png32","png8","jpg","gif","eps","svg","svgz"
61 ],
62 layouts:[
63 {
64 label:"仅地图",
65 value:"map-only"
66 },
67 {
68 label:"A3横向",
69 value:"a3-landscape"
70 },
71 {
72 label:"A3纵向",
73 value:"a3-portrait"
74 },
75 {
76 label:"A4横向",
77 value:"a4-landscape"
78 },
79 {
80 label:"A4纵向",
81 value:"a4-portrait"
82 },
83 {
84 label:"letter横向",
85 value:"letter-ansi-a-landscape"
86 },
87 {
88 label:"letter纵向",
89 value:"letter-ansi-a-portrait"
90 },
91 {
92 label:"B开横向",
93 value:"tabloid-ansi-b-landscape"
94 },
95 {
96 label:"B纵向",
97 value:"tabloid-ansi-b-portrait"
98 }
99 ],
100 rules:{
101 title: [
102 { required: true, message: '请输入标题' },
103 { min: 2, max: 10, message: '长度在 2 到 10 个字符' }
104 ],
105 author:[
106 { min: 2, max: 10, message: '长度在 2 到 10 个字符' }
107 ],
108 layOut:[
109 { required: true, message: '请选择模板' }
110 ],
111 format:[
112 { required: true, message: '请选择格式' }
113 ]
114 },
115 serverUrl:"http://192.168.2.201:6080/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task",
116 isSuccess:false,
117 retrurnUrl:""
118 }
119 },
120 mounted(){
121 this.initData();
122 },
123 methods:{
124 initData(){
125 this.isSuccess = false;
126 this.retrurnUrl = "";
127 this.formData = {
128 title:"地图",
129 author:"",
130 layOut:"map-only",
131 format:"png32"
132 }
133 },
134 onSubmit(formName){
135 var self = this;
136 this.$refs[formName].validate((valid) => {
137 if (valid) {
138 this.printMap(this.viewId,null,this.serverUrl,this.formData,function(res){
139 if(res.url){
140 self.isSuccess = true;
141 self.retrurnUrl = res.url;
142 }
143 });
144 } else {
145 console.log('error submit!!');
146 return false;
147 }
148 });
149 },
150 showResult(){
151 window.open(this.retrurnUrl);
152 this.isSuccess = false;
153 },
154 resetForm(formName) {
155 this.formData = {
156 title:"地图",
157 author:"",
158 layOut:"map-only",
159 format:"png32"
160 }
161 }
162 }
163 }
164 </script>
165
166 <style scoped lang="less">
167 </style>
1 <template> 1 <template>
2 <!-- <div class="content_box"> --> 2 <!-- <div class="content_box"> -->
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane> 5 <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane>
6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane> 6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
......
1 <template> 1 <template>
2 <div ref="lpb" class="content_box"> 2 <div ref="lpb" class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane> 4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane> 5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
......