Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
a7009f64 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 5a5f9aa1 ffdc8e3b
Inline Side-by-side
Showing 6 changed files with 97 additions and 87 deletions
......@@ -73,7 +73,7 @@
<li @click="drsx" :class="zdQszt=='0'?'':'noEdit'">导入属性</li>
<li @click="dcsx">导出属性</li>
<li v-show="!isZD">导入楼盘</li>
<li>重叠分析</li>
<!-- <li>重叠分析</li> -->
<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog('dzw')">添加定着物</li>
<li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
<li @click="deleteByBsm()">删除</li>
......@@ -841,8 +841,8 @@ export default {
center;
background-size: contain;
}
/deep/ .importDialog{
margin-top: 120px!important;
margin-left: 291px;
}
/* /deep/ .importDialog{
margin-top: 120px!important;
margin-left: 291px;
} */
</style>
......
<template>
<div >
<div v-if="!resultDialog && !txtResultDialog && !dealDialog" class="importDiv">
<ul class="importDiv" v-if="!resultDialog && !txtResultDialog && !dealDialog">
<li>
<el-upload
class="avatar-uploader"
action="#"
accept=".txt"
:auto-upload="false"
:show-file-list="false"
:on-change="txtFileChange"
>
<!-- <el-button size="small" type="primary">点击上传</el-button>-->
<i class="iconfont iconshangchuan"></i>
<div class="title">TXT文本格式</div>
<div class="templateDowload">
<a href="#" @click.stop="downloadFile('./fileTemplate/txttemplet.txt','txttemplet.txt')">TXT模板下载</a>
</div>
</el-upload>
</li>
<li>
<el-upload
class="upload-demo"
action="#"
accept=".txt"
:auto-upload="false"
:show-file-list="false"
:on-change="txtFileChange"
>
<!-- <el-button size="small" type="primary">点击上传</el-button>-->
<div class="fileUpload">
<div slot="trigger" class="uploadLeft">
<i class="iconfont icontxt"></i>
</div>
<div solt="tip" class="uploadRight">
<div solt="tip" class="title">TXT文本格式</div>
<div class="el-upload__tip" slot="tip">支持TXT文本格式，点击查看详情<a class="down" href="#" @click.stop="downloadFile('./fileTemplate/txttemplet.txt','txttemplet.txt')" >文本详情</a></div>
</div>
</div>
</el-upload>
<el-upload
class="upload-demo"
class="avatar-uploader"
action="/api/tx/shpUtils/readShp"
accept=".zip"
:show-file-list="false"
:on-success="shpFileSuccess"
>
<!--<el-button size="small" type="primary">点击上传</el-button>-->
<div class="fileUpload">
<div slot="trigger" class="uploadLeft">
<i class="iconfont iconzip"></i>
</div>
<div solt="tip" class="uploadRight">
<div solt="tip" class="title">ESRI Shape文件格式</div>
<div slot="tip" class="el-upload__tip">文件包含.shp、.pdf、.shx、.prj等的压缩文件(.zip)</div>
</div>
</div>
<i class="iconfont iconshangchuan"></i>
<div class="title">ESRI Shape文件格式</div>
</el-upload>
</li>
<li>
<el-upload
class="upload-demo"
class="avatar-uploader"
action="https://jsonplaceholder.typicode.com/posts/"
accept=".dwg,.dxf"
:show-file-list="false"
:on-success="cadFileSuccess"
>
<!-- <el-button size="small" type="primary">点击上传</el-button>-->
<div solt="tip" class="fileUpload">
<div slot="trigger" class="uploadLeft">
<i class="iconfont icondaoruCAD"></i>
</div>
<div solt="tip" class="uploadRight">
<div solt="tip" class="title">CAD文件</div>
<div slot="tip" class="el-upload__tip">支持.dwg、.dxf文件格式</div>
</div>
</div>
<i class="iconfont iconshangchuan"></i>
<div class="title">CAD文件</div>
</el-upload>
</li>
<li>
<el-upload
class="upload-demo"
class="avatar-uploader"
action="/api/tx/excelGeo/readExcel"
accept=".xls,.xlsx"
:show-file-list="false"
:on-success="excelFileSuccess"
>
<!--<el-button size="small" type="primary">点击上传</el-button>-->
<div solt="tip" class="fileUpload">
<div slot="trigger" class="uploadLeft">
<i class="iconfont iconexcel"></i>
</div>
<div solt="tip" class="uploadRight">
<div slot="tip" class="title">Excel文件格式</div>
<div class="el-upload__tip" slot="tip">.xls、.xlsx版本,点击查看详情<a class="downloadFile" @click.stop="downloadFile('./fileTemplate/exceltemplet.xlsx','exceltemplet.xlsx')" href="#">Excel格式</a></div>
</div>
<i class="iconfont iconshangchuan"></i>
<div class="title">Excel文件格式</div>
<div class="templateDowload">
<a href="#" @click.stop="downloadFile('./fileTemplate/exceltemplet.xlsx','exceltemplet.xlsx')">Excel模板下载</a>
</div>
</el-upload>
</div>
</li>
</ul>
<div v-if="resultDialog">
<el-form :model="zdForm" ref="zdCheckForm" label-width="100px" size="small" @submit.native.prevent class="demo-ruleForm">
<el-form-item
......@@ -668,33 +654,45 @@ export default {
}
</script>
<style scoped lang="less">
.upload-demo{
line-height: 34px;
.importDiv{
display: flex;
justify-content:center;
align-content:center;
li{
margin: 5px;
width: 50%;
.title{
line-height: 1;
margin-top: -57px;
font-size: 14px;
}
.templateDowload{
line-height: 1;
margin-top: 7px;
a{
color: #409eff;
}
}
}
}
.fileUpload{
height: 100%;
width: 100%;
.uploadLeft{
float: left;
line-height: 61px;
.iconfont{
font-size: 42px;
}
/deep/ .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
width: 100%;
height: 178px;
line-height: 178px;
}
.uploadRight{
float: right;
margin-left: 5px;
.title{
text-align: initial;
font-weight: 600;
}
.el-upload__tip{
margin-top: 0px;
a{
color: cornflowerblue;
}
}
/deep/ .avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
/deep/ .iconfont {
font-size: 20px;
color: #8c939d;
width:100%;
text-align: center;
}
}
</style>
\ No newline at end of file
......
......@@ -170,7 +170,7 @@ export default {
view.zoom = 15;
}
}else {
this.$message.warning("暂无图形信息！！！");
this.$message.success("暂无图形信息！！！");
}
},
//导入空间图形是 先判断数据是否跨界
......
......@@ -74,7 +74,7 @@
</div>
<div class="contentItem">
<span class="key">权利人：</span>
<span class="value" :title="item.attributes['权利人']">{{item.attributes['权利人'] == 'Null'?"":item.attributes['权利人']}}</span>
<span class="value" :title="item.attributes['QLR']">{{item.attributes['QLR'] == 'Null'?"":item.attributes['QLR']}}</span>
</div>
<div class="contentItem">
<span class="key">坐落：</span>
......@@ -137,7 +137,7 @@
<el-table-column
label="权利人">
<template slot-scope="scope">
<span>{{ scope.row.attributes['权利人'] == 'Null'?'':scope.row.attributes['权利人'] }}</span>
<span>{{ scope.row.attributes['QLR'] == 'Null'?'':scope.row.attributes['QLR'] }}</span>
</template>
</el-table-column>
<el-table-column
......@@ -588,7 +588,7 @@ export default {
/deep/ .el-tabs__header{
margin: 0 0 0px;
}
/deep/ .el-table td, .el-table th.is-leaf {
/deep/ .el-table td, .el-table th{
text-align: center;
}
/deep/ .el-tabs__nav :first{
......
......@@ -232,6 +232,7 @@ export default {
type:"polygon"
}
//self.checkGeo(graphic);
this.addOverLayer(geometry);
self.$emit("setGeometry",geometry);
}else{
this.$message.warning(response.message);
......@@ -319,7 +320,7 @@ export default {
wkt:wkt
}
this.addOverLayer(graphic.geometry);
},
}
}
}
</script>
......
......@@ -805,14 +805,25 @@
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
} else {
} else if(key == 'QLR'){
var qlrTableData = this.$refs.qlrxxModule.tableData;
if(qlrTableData.length > 0){
for(var i = 0;i < qlrTableData.length;i++){
if(i = 0){
self.geoAttributes[key] = qlrTableData[i].qlrmc;
}else{
self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc;
}
}
}
} else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
}
self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
console.log("属性保存完成!!");
});
});
}
}
} else {
......