Skip to content

任超 / js.CadastralSystem

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

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

2 parents 98fe80fa b588a832
Inline Side-by-side
Showing 9 changed files with 252 additions and 59 deletions
......@@ -7,5 +7,20 @@
"layerName": "ZRZ",
"layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
"id": "10"
},
{
"layerName": "DJQ",
"layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
"id": "13"
},
{
"layerName": "DJZQ",
"layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
"id": "14"
},
{
"layerName": "XJZQ",
"layerUrl": "http://192.168.2.201:6080/arcgis/rest/services/%E4%BA%92%E8%81%94%E7%BD%91%E5%8A%A0%E4%B8%8D%E5%8A%A8%E4%BA%A7/XA_%E4%B8%8D%E5%8A%A8%E4%BA%A7/MapServer",
"id": "19"
}
]
\ No newline at end of file
......
......@@ -196,11 +196,19 @@ export default {
attributes:self.currentClickZd,
geometry:geometry
}
self.geoJoint(geometry,function (isJoint,message) {
if(isJoint){
self.$message.warning(message)
return;
}else {
if(self.propertyInfo.type == "zd"){
self.saveZd(graphic);
}else{
self.saveZRZ(graphic);
}
}
});
} else {
console.log('error submit!!');
return false;
......
......@@ -4,6 +4,7 @@
import layers from '@/assets/json/layers.json'
import queryUtils from "@libs/map/queryUtils";
import identifyUtils from '@/libs/map/IdentifyUtils'
import {loadModules} from "esri-loader"
import arcgisParser from 'terraformer-arcgis-parser'
import wktParse from 'terraformer-wkt-parser'
......@@ -155,6 +156,54 @@ export default {
primitive.type = "Polygon"
}*/
return arcgisParser.convert(primitive)
},
//导入空间图形是 先判断数据是否跨界
geoJoint(geometry,callBacFunction){
var self = this;
loadModules([
"esri/geometry/geometryEngine",
"esri/geometry/Polygon"
]).then(([
geometryEngine,
Polygon
]) => {
var djqLayer = null,djzqLayer = null,xjzqLayer = null;
djqLayer = self.getLayerByName("DJQ");
djzqLayer = self.getLayerByName("DJZQ");
xjzqLayer = self.getLayerByName("XJZQ");
var layerIds = [];
layerIds.push(djqLayer.id);
layerIds.push(djzqLayer.id);
layerIds.push(xjzqLayer.id);
var polygon = new Polygon(geometry);
identifyUtils.methods.identify(djqLayer.layerUrl,layerIds,polygon,function (res) {
var results = res.results;
var isJoint = false,layerName = "",message="";
if(!results || results.length == 0){
callBacFunction(true,"不在行政区内，请检查空间位置信息!!!");
}
for(var i = 0;i < results.length;i++){
var feature = results[i].feature;
var flag = geometryEngine.disjoint(polygon,feature.geometry);
if(flag){
isJoint = true;
layerName = results[i].layerName;
switch (layerName) {
case 'DJQ':message = "地块跨越地籍区，数据不合法!!!";break;
case 'DJZQ':message = "地块跨越地籍子区，数据不合法!!!";break;
case 'XJZQ':message = "地块跨越行政区，数据不合法!!!";break;
}
break
}
}
if(callBacFunction && typeof callBacFunction == "function"){
callBacFunction(isJoint,message);
}
})
}).catch(err => {
console.log(err);
throw (err);
})
}
}
......
......@@ -15,12 +15,15 @@ export default {
var identifyTask = new IdentifyTask({
url:url
}),
identifyParameters = new identifyParameters();
identifyParameters = new IdentifyParameters();
identifyParameters.geometry = geometry;
if(layerIds){
identifyParameters.layerIds = layerIds;
}
identifyParameters.layerOption = "all";
identifyParameters.tolerance = 3;
identifyParameters.mapExtent = geometry.extent;
identifyParameters.returnGeometry = true;
identifyParameters.spatialReference = geometry.spatialReference;
identifyTask.execute(identifyParameters).then(result => {
if(callBackFunction && typeof callBackFunction == 'function'){
......
......@@ -135,7 +135,13 @@
default:
break;
}
this.$router.push(path);
this.$router.push({
path: path,
query: {
bsm: row.glbsm,
source: 2
}
});
},
},
computed: {},
......
......@@ -16,29 +16,29 @@
<th class="qlr">权利人</th>
<th class="zl">坐落</th>
</tr>
<tr v-if="Object.keys(bgqData)==0">
<tr v-if="Object.keys(zdFgqData)==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else>
<td class="xh">1</td>
<td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm"
<td class="zddm"><input type="text" class="formInput" v-model="zdFgqData.zddm"
readonly="readonly"/>
</td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh"
<td class="bdcdyh"><input type="text" class="formInput" v-model="zdFgqData.bdcdyh"
readonly="readonly"/>
</td>
<td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc"
<td class="xmmc"><input type="text" class="formInput" v-model="zdFgqData.xmmc"
readonly="readonly"/>
</td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh"
<td class="bdcqzh"><input type="text" class="formInput" v-model="zdFgqData.bdcqzh"
readonly="readonly"/>
</td>
<td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr"
<td class="qlr"><input type="text" class="formInput" v-model="zdFgqData.qlr"
readonly="readonly"/>
</td>
<td class="zl"><input type="text" class="formInput" v-model="bgqData.zl"
<td class="zl"><input type="text" class="formInput" v-model="zdFgqData.zl"
readonly="readonly"/></td>
</tr>
</table>
......@@ -56,7 +56,7 @@
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
</tr>
<tr v-for="(item,index) in fghData.newZdlist" :key="index">
<tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
<td class="cz">
<el-button
type="primary"
......@@ -146,7 +146,7 @@
</div>
<el-dialog
v-if="fghData.newZdlist.length>0"
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
width="50%"
......@@ -159,7 +159,7 @@
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index">
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
......@@ -208,29 +208,29 @@
<th class="qlr">权利人</th>
<th class="zl">坐落</th>
</tr>
<tr v-if="Object.keys(bgqData)==0">
<tr v-if="Object.keys(dzFgqData)==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else>
<td class="xh">1</td>
<td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm"
<td class="zddm"><input type="text" class="formInput" v-model="dzFgqData.zddm"
readonly="readonly"/>
</td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh"
<td class="bdcdyh"><input type="text" class="formInput" v-model="dzFgqData.bdcdyh"
readonly="readonly"/>
</td>
<td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc"
<td class="xmmc"><input type="text" class="formInput" v-model="dzFgqData.xmmc"
readonly="readonly"/>
</td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh"
<td class="bdcqzh"><input type="text" class="formInput" v-model="dzFgqData.bdcqzh"
readonly="readonly"/>
</td>
<td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr"
<td class="qlr"><input type="text" class="formInput" v-model="dzFgqData.qlr"
readonly="readonly"/>
</td>
<td class="zl"><input type="text" class="formInput" v-model="bgqData.zl"
<td class="zl"><input type="text" class="formInput" v-model="dzFgqData.zl"
readonly="readonly"/></td>
</tr>
</table>
......@@ -248,7 +248,7 @@
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
</tr>
<tr v-for="(item,index) in fghData.newZdlist" :key="index">
<tr v-for="(item,index) in dzFghData.newZdlist" :key="index">
<td class="cz">
<el-button
type="primary"
......@@ -337,7 +337,7 @@
</div>
<el-dialog
v-if="fghData.newZdlist.length>0"
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
:modal-append-to-body="false"
......@@ -350,7 +350,7 @@
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index">
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
......@@ -399,29 +399,29 @@
<th class="qlr">权利人</th>
<th class="zl">坐落</th>
</tr>
<tr v-if="Object.keys(bgqData)==0">
<tr v-if="Object.keys(hFgqData)==0">
<td colspan="7">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else>
<td class="xh">1</td>
<td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm"
<td class="zddm"><input type="text" class="formInput" v-model="hFgqData.zddm"
readonly="readonly"/>
</td>
<td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh"
<td class="bdcdyh"><input type="text" class="formInput" v-model="hFgqData.bdcdyh"
readonly="readonly"/>
</td>
<td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc"
<td class="xmmc"><input type="text" class="formInput" v-model="hFgqData.xmmc"
readonly="readonly"/>
</td>
<td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh"
<td class="bdcqzh"><input type="text" class="formInput" v-model="hFgqData.bdcqzh"
readonly="readonly"/>
</td>
<td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr"
<td class="qlr"><input type="text" class="formInput" v-model="hFgqData.qlr"
readonly="readonly"/>
</td>
<td class="zl"><input type="text" class="formInput" v-model="bgqData.zl"
<td class="zl"><input type="text" class="formInput" v-model="hFgqData.zl"
readonly="readonly"/></td>
</tr>
</table>
......@@ -439,7 +439,7 @@
<th class="xmmc">项目名称</th>
<th class="zxx">幢信息</th>
</tr>
<tr v-for="(item,index) in fghData.newZdlist" :key="index">
<tr v-for="(item,index) in hFghData.newZdlist" :key="index">
<td class="cz">
<el-button
......@@ -529,7 +529,7 @@
</div>
<el-dialog
v-if="fghData.newZdlist.length>0"
v-if="zdFghData.newZdlist.length>0"
title="提示"
:visible.sync="isopenXz"
:modal-append-to-body="false"
......@@ -542,7 +542,7 @@
<td>幢类型</td>
<td>幢信息</td>
</tr>
<tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index">
<tr v-for="(item,index) in zdFghData.newZdlist[selectIndex].fwlist" :key="index">
<td>
<el-select v-model="item.ztype"
>
......@@ -595,7 +595,7 @@
export default {
name: "",
components: {QueryData,zdQueryData},
components: {QueryData, zdQueryData},
props: {},
data() {
return {
......@@ -603,7 +603,9 @@
isopenXz: false,
centerDialogVisible: false,
selectIndex: 0,// 当前选中序号
bgqData: {},
zdFgqData: {}, // 宗地分割前数据
dzFgqData: {}, //多幢分割前数据
hFgqData: {}, // 户分割前数据
xzq: [],
djq: [],
djzq: [],
......@@ -680,7 +682,15 @@
userbsm: "",
fwlist: []
},
fghData: {
zdFghData: {
oldZdbsm: "",
newZdlist: []
},
dzFghData: {
oldZdbsm: "",
newZdlist: []
},
hFghData: {
oldZdbsm: "",
newZdlist: []
},
......@@ -701,7 +711,7 @@
console.log(node, 'node');
console.log(node.parent, 'node.parent')
console.log(node.children, 'node.children')
this.fghData.newZdlist[this.selectIndex].fwlist.push({
this.zdFghData.newZdlist[this.selectIndex].fwlist.push({
zbsm: node.label,
ztype: '多幢'
}
......@@ -730,9 +740,23 @@
this.selectIndex = index
},
save() {
console.log("save........")
console.log(this.fghData)
zdfg(this.fghData).then(res => {
switch (this.tabName) {
case "zd":
this.saveZd();
break
case "dz":
// 多幢保存
this.saveDz();
break
case "h":
this.saveH();
break
default:
break;
}
},
saveZd() {
zdfg(this.zdFghData).then(res => {
console.log(res)
if (res.success) {
Message.success('保存成功')
......@@ -741,7 +765,14 @@
}
})
},
getJbxx(id) {
saveDz() {
},
saveH() {
},
// 获取宗地基本信息
getZdJbxx(id) {
getQjZdjbxxDetailById(id).then(res => {
this.checkedData = res.result
// 用户bsm暂时传空
......@@ -767,8 +798,8 @@
this.djq = [];
this.djzq = [];
if (index != undefined) {
this.fghData.newZdlist[index].djqbsm = ''
this.fghData.newZdlist[index].djzqbsm = ''
this.zdFghData.newZdlist[index].djqbsm = ''
this.zdFghData.newZdlist[index].djzqbsm = ''
}
getListByXzqbsm(id)
.then((res) => {
......@@ -784,7 +815,7 @@
changeDjq(item, index) {
this.djzq = [];
if (index != undefined) {
this.fghData.newZdlist[index].djzqbsm = ''
this.zdFghData.newZdlist[index].djzqbsm = ''
}
if (item == null) {
} else {
......@@ -801,7 +832,49 @@
}
},
addRow() {
this.fghData.newZdlist.push({
switch (this.tabName) {
case 'zd':
this.zdFghData.newZdlist.push({
xzqbsm: "",
djqbsm: "",
djzqbsm: "",
xmmc: "",
syqlxbsm: "",
zdtzmbsm: "",
userbsm: "",
fwlist: [
{
zbsm: "",
ztype: ""
}
]
});
this.changeXzq(this.checkedData.xzqbsm)
this.changeDjq(this.checkedData.djqbsm)
this.$set(this.zdFghData.newZdlist, this.zdFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
break
case 'dz':
this.dzFghData.newZdlist.push({
xzqbsm: "",
djqbsm: "",
djzqbsm: "",
xmmc: "",
syqlxbsm: "",
zdtzmbsm: "",
userbsm: "",
fwlist: [
{
zbsm: "",
ztype: ""
}
]
});
this.changeXzq(this.checkedData.xzqbsm)
this.changeDjq(this.checkedData.djqbsm)
this.$set(this.dzFghData.newZdlist, this.dzFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
break
case 'h':
this.hFghData.newZdlist.push({
xzqbsm: "",
djqbsm: "",
djzqbsm: "",
......@@ -818,10 +891,26 @@
});
this.changeXzq(this.checkedData.xzqbsm)
this.changeDjq(this.checkedData.djqbsm)
this.$set(this.fghData.newZdlist, this.fghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
this.$set(this.hFghData.newZdlist, this.hFghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
break
default:
break
}
},
delRow(index) {
this.fghData.newZdlist.splice(index, 1)
switch (this.tabName) {
case "zd":
this.zdFghData.newZdlist.splice(index, 1);
break;
case "dz":
this.dzFghData.newZdlist.splice(index, 1);
break;
case "h":
this.hFghData.newZdlist.splice(index, 1);
break;
default:
break
}
},
close: function () {
this.centerDialogVisible = false;
......@@ -829,20 +918,43 @@
newAdd: function () {
this.centerDialogVisible = true;
},
addData: function (val) {
this.centerDialogVisible = false;
this.bgqData = val
},
getData: function (data) {
this.bgqData = data
switch (this.tabName) {
case "zd":
this.zdFgqData = data;
break;
case "dz":
this.dzFgqData = data;
break;
case "h":
this.hFgqData = data;
break;
default:
break
}
},
},
computed: {},
watch: {
bgqData: {
zdFgqData: {
handler: function (item) {
this.fghData.oldZdbsm = item.zdbsm
this.getJbxx(item.zdbsm)
this.zdFghData.oldZdbsm = item.zdbsm;
this.getZdJbxx(item.zdbsm);
},
deep: true
},
dzFgqData: {
handler: function (item) {
this.dzFgqData.oldZdbsm = item.glbsm;
this.getZdJbxx(item.glbsm);
},
deep: true
},
hFgqData: {
handler: function (item) {
this.hFgqData.oldZdbsm = item.glbsm;
this.getZdJbxx(item.glbsm);
},
deep: true
},
......@@ -853,7 +965,7 @@
},
deep: true
}
},
}
}
</script>
<style scoped lang="less">
......
......@@ -372,7 +372,7 @@
return {
tabName: 'zd',
centerDialogVisible: false,
bgqData: [],
zdFgqData: [],
hbhData: {},
fgBoxWidth: 0,
xzq: [],
......@@ -462,10 +462,10 @@
},
addData: function (val) {
this.centerDialogVisible = false;
this.bgqData.push(val)
this.zdFgqData.push(val)
},
getData: function (data) {
this.bgqData.push(data)
this.zdFgqData.push(data)
},
},
computed: {},
......
......@@ -8,6 +8,7 @@
:before-remove="beforeRemove"
:on-success="uploadSuccess"
:on-error="uploadError"
:show-file-list="false"
multiple
:limit="3"
:on-exceed="handleExceed"
......@@ -107,7 +108,6 @@
},
uploadSuccess(res, file, fileList) {
this.filesData.list = res.result;
console.log(res, "res=========")
insertFile(this.filesData).then(res => {
if (res.success) {
Message.success("上传成功")
......