8970ccfe by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 35676eb2 76174cfc
......@@ -31,6 +31,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe7af;</span>
<div class="name">打印</div>
<div class="code-name">&amp;#xe7af;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe7a6;</span>
<div class="name">饼图</div>
<div class="code-name">&amp;#xe7a6;</div>
......@@ -651,6 +657,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icondayin"></span>
<div class="name">
打印
</div>
<div class="code-name">.icondayin
</div>
</li>
<li class="dib">
<span class="icon iconfont iconbingtu"></span>
<div class="name">
饼图
......@@ -1536,6 +1551,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icondayin"></use>
</svg>
<div class="name">打印</div>
<div class="code-name">#icondayin</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconbingtu"></use>
</svg>
<div class="name">饼图</div>
......
This diff could not be displayed because it is too large.
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "19479731",
"name": "打印",
"font_class": "dayin",
"unicode": "e7af",
"unicode_decimal": 59311
},
{
"icon_id": "19449217",
"name": "饼图",
"font_class": "bingtu",
......
......@@ -20,6 +20,9 @@ Created by iconfont
/>
<missing-glyph />
<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" />
<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" />
......
......@@ -11,7 +11,7 @@
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 18px 10px 0!important;
padding: 18px 18px 0!important;
}
.pagination {
padding: 18px;
......@@ -77,6 +77,9 @@ ol, ul { list-style:none; }
.top20{
top: 20px;
}
.top40{
top: 40px;
}
// 滚动条样式
::-webkit-scrollbar {
width: 6px;
......@@ -118,6 +121,7 @@ ol, ul { list-style:none; }
border-top: 1px solid #F4F9FF;
}
}
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
......@@ -130,15 +134,63 @@ ol, ul { list-style:none; }
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
height: 44px;
font-size: 16px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin-bottom: 0;
}
.el-tabs__header{
background-color: #ffffff;
}
/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){
padding: 0 20px;
}
/deep/.el-tabs__active-bar{
position: absolute;
bottom: 5px;
left: 0;
height: 2px;
background-color: #0091FF;
z-index: 1;
}
/deep/.el-tabs__nav-wrap{
background: #FFFFFF;
box-shadow: 0px 1px 2px 1px rgba(49, 132, 245, 0.1);
}
/deep/.el-tabs__nav .is-active{
background: #FFFFFF;
color: #0091FF;
}
/deep/.el-tabs__nav-wrap::after{
height: 0;
}
/deep/ .el-tabs__nav{
margin-left: 20px;
}
}
.el-tabs__item{
font-size: 16px;
}
// .el-tabs__header{
// background-color: #ffffff;
// }
// .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){
// padding: 0 20px;
// }
// .el-tabs__active-bar{
// position: absolute;
// bottom: 3px;
// left: 0;
// height: 2px;
// background-color: #409EFF;
// z-index: 1;
// }
// .el-tabs__nav-wrap{
// background: #FFFFFF;
// box-shadow: 0px 1px 2px 1px rgba(49, 132, 245, 0.1);
// }
// .el-tabs__nav .is-active{
// background: #FFFFFF;
// }
//弹框遮罩层样式
.v-modal{
opacity: .2;
......
<template>
<div class="hb-tabs top20">
<div class="hb-tabs top40">
<div class="hbq">
<span class="tips" style="margin-left:0;">合并前幢信息(已选择幢{{dzhbqData.length}}个)</span>
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
......
<template>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
<el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
</el-tabs>
......
<template>
<el-tabs v-model="activeName" type="border-card">
<el-tabs v-model="activeName" >
<el-tab-pane label="添加" name="tj">
<div class="main">
<!-- <p class="tips">查询条件</p> -->
......
......@@ -567,7 +567,7 @@ export default {
height: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 20px;
padding: 25px 20px;
}
.search{
......@@ -668,7 +668,7 @@ table:hover {
.page {
position: fixed;
bottom: 20px;
bottom: 15px;
width: auto;
height: auto;
}
......
......@@ -918,11 +918,10 @@
</script>
<style scoped lang="less">
.fg {
.menu {
/deep/ .el-tabs__content {
position: unset;
margin-top: 62px;
margin-top: 60px;
overflow: visible;
}
/deep/ .el-tabs__header {
......@@ -935,7 +934,7 @@
border: 0;
border-bottom: 1px solid #E4E7ED;
/deep/ .el-tabs__nav-scroll {
height: 50px;
height: 44px;
box-sizing: border-box;
padding-left: 20px;
.el-tabs__active-bar {
......@@ -943,12 +942,13 @@
}
> .el-tabs__nav {
border: 0;
margin-left: 0!important;
> .el-tabs__item {
border: 1px solid #DEDEDE;
height: 36px;
line-height: 32px;
height: 32px;
line-height: 30px;
padding: 0 20px;
margin: 9px 10px 9px 0;
margin: 6px 10px 9px 0;
background-color: #ffffff;
}
.is-active {
......
......@@ -71,7 +71,7 @@ export default {
height: 100%;
/deep/ .el-tabs__content {
position: unset;
margin-top: 40px;
margin-top: 45px;
overflow: visible;
/deep/.el-tab-pane{
height: calc(100% - 0px);
......@@ -87,7 +87,7 @@ export default {
border: 0;
border-bottom: 1px solid #E4E7ED;
/deep/ .el-tabs__nav-scroll {
height: 50px;
height: 44px;
box-sizing: border-box;
padding-left: 20px;
.el-tabs__active-bar {
......@@ -95,12 +95,13 @@ export default {
}
> .el-tabs__nav {
border: 0;
margin-left: 0!important;
> .el-tabs__item {
border: 1px solid #DEDEDE;
height: 36px;
line-height: 32px;
padding: 0 20px;
margin: 9px 10px 9px 0;
height: 32px;
line-height: 30px;
padding: 0 20px;
margin: 6px 10px 9px 0;
background-color: #ffffff;
}
.is-active {
......
......@@ -187,6 +187,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="户合并" name="h">
<div style="width:100%;height:25px"></div>
<div class="hb-tabs psn" v-if="hhbtabs">
<hfghb></hfghb>
</div>
......@@ -583,12 +584,9 @@
height: 100%;
.menu {
height: 100%;
.top40{
top: 40px;
}
/deep/ .el-tabs__content {
position: unset;
margin-top: 40px;
margin-top: 30px;
overflow: visible;
}
/deep/ .el-tabs__header {
......@@ -601,7 +599,7 @@
border: 0;
border-bottom: 1px solid #E4E7ED;
/deep/ .el-tabs__nav-scroll {
height: 50px;
height: 44px;
box-sizing: border-box;
padding-left: 20px;
.el-tabs__active-bar {
......@@ -609,12 +607,13 @@
}
> .el-tabs__nav {
border: 0;
margin-left: 0!important;
> .el-tabs__item {
border: 1px solid #DEDEDE;
height: 36px;
line-height: 32px;
height: 32px;
line-height: 30px;
padding: 0 20px;
margin: 9px 10px 9px 0;
margin: 6px 10px 9px 0;
background-color: #ffffff;
}
.is-active {
......
......@@ -313,7 +313,7 @@ export default {
created(){},
mounted(){
this.$nextTick(()=>{
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320;
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 310;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270;
})
this.search();
......@@ -556,7 +556,7 @@ export default {
height: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 20px;
padding: 20px 20px;
.el-row{
box-sizing: border-box;
padding-left: 2px;
......
<template>
<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
<el-tabs v-model="activeName" @tab-click="handleClick" >
<el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
......
......@@ -501,6 +501,12 @@ export default {
/deep/.el-tabs__content{
position: relative!important;
}
.el-tabs__item{
line-height: 44px!important;
}
.is-active{
background-color: #E5F4FF!important;
}
.eltabspane {
height: 100%;
width: 100%;
......@@ -514,6 +520,7 @@ export default {
width: calc(100% - 40px);
.el-form-item{
margin-bottom: 0!important;
.el-form-item__content{
width: 100%;
}
......
<template>
<el-tabs v-model="activeName" type="border-card">
<el-tabs v-model="activeName" >
<el-tab-pane label="更正" name="gz">
<div class="main">
<!-- <p class="tips">查询条件</p> -->
......
<template>
<el-tabs v-model="activeName" type="border-card">
<el-tabs v-model="activeName" >
<el-tab-pane label="综合查询" name="zhcx">
<div class="main">
<!-- <p class="tips">查询条件</p> -->
......
......@@ -176,6 +176,45 @@ export default {
clearPostionLayer(viewId){
var view = maps[viewId];
view.graphics.removeAll();
},
//打印地图
printMap(viewId,outSpatialReference,serverUrl,priTemParames,callBackFunction){
var self = this;
loadModules([
"esri/tasks/PrintTask",
"esri/tasks/support/PrintParameters",
"esri/tasks/support/PrintTemplate"
]).then(([
PrintTask,
PrintParameters,
PrintTemplate
]) => {
var view = maps[viewId],
printTask = new PrintTask({
url:serverUrl
}),
template = new PrintTemplate({
layout:priTemParames.layOut,
format:priTemParames.format,
layoutOptions: {
titleText:priTemParames.title,
scalebarUnit:'Meters',
authorText:priTemParames.author
}
}),
paramets = new PrintParameters({
view:view,
template:template
});
paramets.outSpatialReference = outSpatialReference ? outSpatialReference : view.spatialReference;
printTask.execute(paramets).then(res => {
if(callBackFunction && typeof callBackFunction == 'function'){
callBackFunction(res);
}
});
}).catch(err => {
console.log(err);
})
}
}
}
\ No newline at end of file
......
......@@ -38,9 +38,13 @@
<span>缩小</span>
</li>
<li @click="info">
<i class="iconfont iconxinxi"></i>
<i class="iconfont iconshibie"></i>
<span>识别</span>
</li>
<li @click="print">
<i class="iconfont icondayin"></i>
<span>打印</span>
</li>
<li @click="clear">
<i class="iconfont iconqingchu"></i>
<span>清除</span>
......@@ -59,6 +63,9 @@
</el-form-item>
</el-form>
</div>
<el-dialog title="地图打印" :visible.sync="printDialog" :close-on-click-modal="false" width="30%">
<print-template :viewId='viewId'></print-template>
</el-dialog>
</div>
</template>
<script>
......@@ -71,6 +78,8 @@ import mapTools from "./js/mapTools";
import {loadModules} from "esri-loader"
import printTemplate from './printTemplate.vue'
export default {
props:{
viewId:{
......@@ -90,9 +99,13 @@ export default {
x:"",
y:""
},
isPostion:false
isPostion:false,
printDialog:false
}
},
components:{
printTemplate
},
methods:{
fullMap(){
var view = maps[this.viewId];
......@@ -129,7 +142,9 @@ export default {
},true,'all',3,view.extent);
});
},
print(){
this.printDialog = true;
},
zoomOut(){
var view = maps[this.viewId];
this.initDraw("rectangle",this.viewId,null,function(geo){
......@@ -227,5 +242,8 @@ export default {
top: 58px;
}
}
/deep/ .v-modal{
z-index:10
}
</style>
\ No newline at end of file
......
<template>
<div class="printTemplate">
<el-form :rules="rules" :model="formData" ref="printForm" label-width="80px">
<el-form-item label="标题:" prop="title">
<el-input v-model="formData.title"></el-input>
</el-form-item>
<el-form-item label="格式:" prop="format">
<el-select v-model="formData.format" placeholder="请选择格式">
<el-option
v-for="(item,index) in formats"
:key="index"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="模板:" prop="layOut">
<el-select v-model="formData.layOut" placeholder="请选择格式">
<el-option
v-for="(item,index) in layouts"
:key="index"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="作者" prop="author">
<el-input v-model="formData.author"></el-input>
</el-form-item>
<el-form-item v-show="!isSuccess">
<el-button type="primary" @click="onSubmit('printForm')">确定</el-button>
<el-button @click="resetForm('printForm')">重置</el-button>
</el-form-item>
<el-form-item v-show="isSuccess">
<el-button type="primary" @click="showResult">预览</el-button>
</el-form-item>
</el-form>
</div>
</template>
<script>
import mapTools from './js/mapTools.js'
export default{
props:{
viewId:{
type:String,
default:""
}
},
mixins:[mapTools],
data(){
return{
formData:{
title:"地图",
author:"",
layOut:"map-only",
format:"png32"
},
formats:[
"pdf","png32","png8","jpg","gif","eps","svg","svgz"
],
layouts:[
{
label:"仅地图",
value:"map-only"
},
{
label:"A3横向",
value:"a3-landscape"
},
{
label:"A3纵向",
value:"a3-portrait"
},
{
label:"A4横向",
value:"a4-landscape"
},
{
label:"A4纵向",
value:"a4-portrait"
},
{
label:"letter横向",
value:"letter-ansi-a-landscape"
},
{
label:"letter纵向",
value:"letter-ansi-a-portrait"
},
{
label:"B开横向",
value:"tabloid-ansi-b-landscape"
},
{
label:"B纵向",
value:"tabloid-ansi-b-portrait"
}
],
rules:{
title: [
{ required: true, message: '请输入标题' },
{ min: 2, max: 10, message: '长度在 2 到 10 个字符' }
],
author:[
{ min: 2, max: 10, message: '长度在 2 到 10 个字符' }
],
layOut:[
{ required: true, message: '请选择模板' }
],
format:[
{ required: true, message: '请选择格式' }
]
},
serverUrl:"http://192.168.2.201:6080/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task",
isSuccess:false,
retrurnUrl:""
}
},
mounted(){
this.initData();
},
methods:{
initData(){
this.isSuccess = false;
this.retrurnUrl = "";
this.formData = {
title:"地图",
author:"",
layOut:"map-only",
format:"png32"
}
},
onSubmit(formName){
var self = this;
this.$refs[formName].validate((valid) => {
if (valid) {
this.printMap(this.viewId,null,this.serverUrl,this.formData,function(res){
if(res.url){
self.isSuccess = true;
self.retrurnUrl = res.url;
}
});
} else {
console.log('error submit!!');
return false;
}
});
},
showResult(){
window.open(this.retrurnUrl);
this.isSuccess = false;
},
resetForm(formName) {
this.formData = {
title:"地图",
author:"",
layOut:"map-only",
format:"png32"
}
}
}
}
</script>
<style scoped lang="less">
</style>
<template>
<!-- <div class="content_box"> -->
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
......
<template>
<div ref="lpb" class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="card" >
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
......