Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
67e63168 by 杨威
Options

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

2 parents 2c0aea17 abd57533
Inline Side-by-side
Showing 18 changed files with 195 additions and 127 deletions
......@@ -105,6 +105,17 @@
"XZQMC": "行政区名称",
"XZQMJ": "行政区面积"
}
},
{
"layerName":"JZD",
"layerLabel":"界址点",
"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":3
},
{
"layerName":"JZX",
"layerLabel":"界址线",
"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":4
}
]
\ No newline at end of file
......
......@@ -8,7 +8,7 @@
<el-row>
<el-col :span="14" class="fl" style="line-height:32px">
<el-radio-group v-model="gyfs" @change="updateGyfs">
<el-radio :label="item.bsm" :disabled="+qszt!==0" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
<el-radio :label="item.bsm" :disabled="+qszt!==0 || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
</el-radio-group>
</el-col>
<el-col :span="10" class="fr">
......@@ -75,7 +75,7 @@
<tr>
<td colspan="4" class="tdright"><i class="requisite">*</i>权利人名称</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.qlrmc" ref="qlrmc" @blur="inputBlur($event)"/>
<el-input v-model="formData.qlrmc" ref="qlrmc" @blur="inputBlur($event)"></el-input>
</td>
<td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td>
<td colspan="6">
......@@ -105,18 +105,18 @@
</td>
<td colspan="4" class="tdright"><i class="requisite">*</i>证件号</td>
<td colspan="6">
<input type="text" class="formInput" maxlength="18" v-model="formData.zjh" ref="zjh" @blur="inputBlur($event)"/>
<el-input maxlength="18" v-model="formData.zjh" ref="zjh" @blur="inputBlur($event)"></el-input>
</td>
</tr>
<tr>
<td colspan="4" class="tdright"><i class="requisite">*</i>电话</td>
<td colspan="6">
<!-- @blur="inputBlur($event)"-->
<input type="text" class="formInput" v-model="formData.dh" ref="dh" @blur="inputBlur($event)"/>
<el-input v-model="formData.dh" ref="dh" @blur="inputBlur($event)"></el-input>
</td>
<td colspan="4" class="tdright"><i class="requisite">*</i>地址</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.dz" ref="dz" @blur="inputBlur($event)"/>
<el-input v-model="formData.dz" ref="dz" @blur="inputBlur($event)"></el-input>
</td>
</tr>
<tr>
......@@ -160,7 +160,7 @@
</td>
<td colspan="4" class="tdright">邮编</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.yb" />
<el-input v-model="formData.yb" />
</td>
</tr>
<tr>
......@@ -178,7 +178,7 @@
</td>
<td colspan="4" class="tdright">电子邮件</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.dzyj" />
<el-input v-model="formData.dzyj" />
</td>
</tr>
<tr>
......@@ -187,9 +187,7 @@
<tr>
<td colspan="4" class="tdright">法定代表人或负责人姓名</td>
<td colspan="6">
<input
type="text"
class="formInput"
<el-input
v-model="formData.fr.dlrfrmc"
/>
</td>
......@@ -209,11 +207,11 @@
<tr>
<td colspan="4" class="tdright">证件号码</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.fr.zjh" />
<el-input v-model="formData.fr.zjh" />
</td>
<td colspan="4" class="tdright">电话</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.fr.dh" />
<el-input v-model="formData.fr.dh" />
</td>
</tr>
<tr>
......@@ -234,7 +232,7 @@
</td>
<td class="tdright" colspan="2">代理人姓名</td>
<td colspan="6">
<input type="text" class="formInput" v-model="item.dlrfrmc" />
<el-input v-model="item.dlrfrmc" />
</td>
<td colspan="4" class="tdright">证件类型</td>
<td colspan="6">
......@@ -253,11 +251,11 @@
<tr :key="'dh'+index">
<td class="tdright" colspan="2">证件号码</td>
<td colspan="6">
<input type="text" class="formInput" v-model="item.zjh" />
<el-input v-model="item.zjh" />
</td>
<td colspan="4" class="tdright">电话</td>
<td colspan="6">
<input type="text" class="formInput" v-model="item.dh" />
<el-input v-model="item.dh" />
</td>
</tr>
</template>
......@@ -280,23 +278,23 @@
</td>
<td colspan="4" class="tdright">权利比例(%)</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.qlbl" />
<el-input v-model="formData.qlbl" ></el-input>
</td>
</tr>
<tr>
<td colspan="4" class="tdright">房产证号</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.fczh" />
<el-input v-model="formData.fczh" ></el-input>
</td>
<td colspan="4" class="tdright">土地证号</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.tdzh" />
<el-input v-model="formData.tdzh" ></el-input>
</td>
</tr>
<tr>
<td colspan="4" class="tdright">共有情况</td>
<td colspan="8">
<input type="text" class="formInput" v-model="formData.gyqk" />
<el-input v-model="formData.gyqk" ></el-input>
</td>
</tr>
</table>
......@@ -487,6 +485,8 @@
flag = false;
return false
}
console.log(this.tableData,'权利人信息')
console.log(this.$store.state.gyfsList[0].bsm,'确定之后共有方式')
})
this.$nextTick(()=>{
if (flag) {
......@@ -519,8 +519,9 @@
if(res.code===200){
this.dialogVisible = false;
this.tableData.push(this.formData);
Object.assign(this.$data, this.$options.data())
this.getQlrInfo(this.bsm);
Object.assign(this.$data, this.$options.data())
}
})
}
......@@ -664,19 +665,18 @@
watch:{
tableData:{
handler:function (v) {
console.log(v,'权利人')
this.gyfsList[0].disabled = v.length() > 1;
this.gyfsList[0].disabled = v.length > 1;
} ,
deep:true
},
gyfsList:{
/* gyfsList:{
handler:function(v){
console.log(v,"共有方式")
//console.log(v,"共有方式")
},
deep:true
},
},*/
dialogVisible(n){
if(n == false){
if(n === false){
this.formData = {
addQjDlrFrRequest:[],
dlrList: [
......@@ -721,7 +721,7 @@
}
}
},
tableData(){
/* tableData(){
this.gyfsList = this.$store.state.gyfsList;
if(this.tableData.length>1){
for(let i = 0;i<this.gyfsList.length;i++){
......@@ -729,41 +729,41 @@
this.gyfsList[i].disabled = item.mc === "单独所有";
}
}
},
},*/
"formData.qlrlxbsm":function (val) {
console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
//console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
if (val != '') {
console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
// console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
this.$refs.qlrlxbsm.$el.style.border = '';
}
},
"formData.zjzlbsm":function (val) {
/* "formData.zjzlbsm":function (val) {
if (val != '') {
this.$refs.zjzlbsm.$el.style.border = '';
}
},
// "formData.gyfsbsm":function (val) {
// let ddsy = '';
// for(let i = 0;i<this.gyfsList.length;i++){
// if(this.gyfsList[i].mc === "单独所有"){
// ddsy = this.gyfsList[i].bsm
// }
// }
// if(ddsy === val){
// if(this.update){
// if(this.tableData.length > 1){
// this.$message.warning("权利人人数大于1，不能选择单独所有")
// }
// }else{
// if(this.tableData.length > 0){
// this.$message.warning("权利人人数大于1，不能选择单独所有")
// }
// }
//
// }
// }
"formData.gyfsbsm":function (val) {
let ddsy = '';
for(let i = 0;i<this.gyfsList.length;i++){
if(this.gyfsList[i].mc === "单独所有"){
ddsy = this.gyfsList[i].bsm
}
}
if(ddsy === val){
if(this.update){
if(this.tableData.length > 1){
this.$message.warning("权利人人数大于1，不能选择单独所有")
}
}else{
if(this.tableData.length > 0){
this.$message.warning("权利人人数大于1，不能选择单独所有")
}
}
}
}*/
}
};
</script>
......
......@@ -513,7 +513,6 @@ export default {
this.$message.warning("不是临时数据，不能导入图形!!!");
return;
}
//先这么写着 后面返回类型 根据类型判断
var type = this.zdData.type;
if(type == "zd"){
BSM = this.zdData.zdbsm;
......
......@@ -544,12 +544,15 @@ export default {
}
savePoints.push(obj);
}
//保存矢量数据表
addjzd(savePoints).then(res=>{
if(res.succcess){
//触发查询接口
console.log("界址点保存成成功！！！");
}
});
//保存空间数据
},
saveJzx(lines){
var jzxLines = [];
......@@ -568,12 +571,15 @@ export default {
}
jzxLines.push(obj);
}
//保存矢量数据表
addjzx(jzxLines).then(res=>{
if(res.success){
//触发查询界址线
console.log("界址线保存成功!!!!!");
}
});
//保存空间数据表
},
saveZRZ(graphic){
var self = this;
......
......@@ -3,11 +3,11 @@
<div :id="viewId" class="viewDiv">
</div>
<div class="mapViewPoint">
<span class="key">比例尺:</span>
<span class="value">{{ mapInfo.scale }}km</span>
<span class="key">经度:</span>
<!-- <span class="key">比例尺:</span> -->
<div class="viewScale"><span class="value">{{ mapInfo.scale }}公里</span></div>
<span class="key">X坐标</span>
<span class="value">{{ mapInfo.x }}</span>
<span class="key">纬度:</span>
<span class="key">Y坐标</span>
<span class="value">{{ mapInfo.y }}</span>
</div>
</div>
......@@ -70,7 +70,7 @@
var point = view.toMap({x: event.x, y: event.y});
self.mapInfo.x = point.longitude.toFixed(6);
self.mapInfo.y = point.latitude.toFixed(6);
self.mapInfo.scale = (view.scale/1000).toFixed(3);
self.mapInfo.scale = (view.scale/1000).toFixed(0);
});
}).catch(err => {
......@@ -90,22 +90,33 @@
width: 100%;
}
.mapViewPoint{
display: inline-flex;
position: absolute;
bottom: 10px;
left: 5px;
background-color: white;
line-height: 36px;
font-size: 12px;
border-radius: 4px;
box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.18);
.key{
font-weight: 600;
}
line-height: 12px;
.value{
margin-left: 0px;
}
span{
margin:0px 5px;
font-family: SFUIDisplay-Medium;
font-size: 12px;
color: #4A4A4A;
font-weight: bold;
letter-spacing: 0;
text-shadow: 0 -1px 0 #FFFFFF;
position: relative;
bottom: 9px;
}
.viewScale{
width: auto;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANIAAAAOCAYAAABaZUIWAAAABGdBTUEAALGPC/xhBQAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAA0qADAAQAAAABAAAADgAAAAD7u0TwAAAA4ElEQVRoBe3a4QnCMBCG4UQcpKPU39kpq8UFsoObxBzVH6WeNHBQ2nsDFYlH4j3lI1QMoY/WWumXNorUMBDwKtCDUbRwyGficvOKQ98IWAqsglRrfaWUglzy3nIj1kLg7AL/8rEK0tkb5fsjcJQAQTpKnn0vJXDf0c0sD1o76ihBwK0AJ5LbW0/jlgLqiZRzniw3Yi0ELiAwaT1wImkyzCMwIECQBrAoRUAT+BUkfljQtJhHYBHYZCTK/OdvDvNSwysCCAwIPGOMj++JtEnYwEKUIuBVQHJDdrzeffq2F3gDSn1fbXNQA8oAAAAASUVORK5CYII=) top no-repeat;
background-size: contain;
background-position-y: 6px;
span{
margin: 0px 21px;
}
}
}
}
......
......@@ -10,11 +10,11 @@
<div>
<table border="1">
<tr>
<td>层建筑面积(㎡)</td>
<td class="tdright">层建筑面积(㎡)</td>
<td>
<el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
<td class="tdright">
层套内建筑面积(㎡)
</td>
<td>
......@@ -22,11 +22,11 @@
</td>
</tr>
<tr>
<td>层阳台面积(㎡)</td>
<td class="tdright">层阳台面积(㎡)</td>
<td>
<el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
<td class="tdright">
层半墙面积(㎡)
</td>
<td>
......@@ -34,11 +34,11 @@
</td>
</tr>
<tr>
<td>层共有建筑面积(㎡)</td>
<td class="tdright">层共有建筑面积(㎡)</td>
<td>
<el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" ></el-input>
</td>
<td>
<td class="tdright">
层分摊建筑面积(㎡)
</td>
<td>
......@@ -46,11 +46,11 @@
</td>
</tr>
<tr>
<td>层高(m)</td>
<td class="tdright">层高(m)</td>
<td>
<el-input v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input>
</td>
<td>
<td class="tdright">
水平投影面积(㎡)
</td>
<td>
......
......@@ -10,25 +10,25 @@
<div>
<table border="1">
<tr>
<td colspan="2">建筑面积(㎡)</td>
<td colspan="2" class="tdright">建筑面积(㎡)</td>
<td colspan="4"><input type="text" v-model="form.jzmj" class="inputtitle"/></td>
<td colspan="2">套内建筑面积(㎡)</td>
<td colspan="2" class="tdright">套内建筑面积(㎡)</td>
<td colspan="4"><input type="text" v-model="form.tnjzmj" class="inputtitle"/></td>
</tr>
<tr>
<td colspan="2">分摊建筑面积(㎡)</td>
<td colspan="2" class="tdright">分摊建筑面积(㎡)</td>
<td colspan="4"><input type="text" v-model="form.ftjzmj" class="inputtitle"/></td>
<td colspan="2">地下部分建筑面积(㎡)</td>
<td colspan="2" class="tdright">地下部分建筑面积(㎡)</td>
<td colspan="4"><input type="text" v-model="form.dxbfjzmj" class="inputtitle"/></td>
</tr>
<tr>
<td colspan="2">其他建筑面积(㎡)</td>
<td colspan="2" class="tdright">其他建筑面积(㎡)</td>
<td colspan="4"><input type="text" v-model="form.qtjzmj" class="inputtitle"/></td>
<td colspan="2">分摊系数</td>
<td colspan="2" class="tdright">分摊系数</td>
<td colspan="4"><input type="number" @blur="inputBlur($event)" ref="ftxs" v-model="form.ftxs" class="inputtitle"/></td>
</tr>
<tr>
<td colspan="2">户型</td>
<td colspan="2" class="tdright">户型</td>
<td colspan="4">
<el-select class="selectTitle" v-model="form.hxbsm">
<el-option
......@@ -39,7 +39,7 @@
></el-option>
</el-select>
</td>
<td colspan="2">户型结构</td>
<td colspan="2" class="tdright">户型结构</td>
<td colspan="4">
<el-select class="selectTitle" v-model="form.hxjgbsm">
<el-option
......@@ -52,15 +52,15 @@
</td>
</tr>
<tr>
<td colspan="2">共有土地面积(㎡)</td>
<td colspan="2" class="tdright">共有土地面积(㎡)</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.gytdmj"/></td>
<td colspan="2">分摊土地面积(㎡)</td>
<td colspan="2" class="tdright">分摊土地面积(㎡)</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.fttdmj"/></td>
</tr>
<tr>
<td colspan="2">独有土地面积(㎡)</td>
<td colspan="2" class="tdright">独有土地面积(㎡)</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.dytdmj"/></td>
<td colspan="2">房屋类型</td>
<td colspan="2" class="tdright">房屋类型</td>
<td colspan="4">
<el-select class="selectTitle" v-model="form.fwlxbsm">
<el-option
......@@ -73,7 +73,7 @@
</td>
</tr>
<tr>
<td colspan="2">产别</td>
<td colspan="2" class="tdright">产别</td>
<td colspan="4">
<el-select class="selectTitle" v-model="form.fwcbbsm">
<el-option
......@@ -84,7 +84,7 @@
></el-option>
</el-select>
</td>
<td colspan="2">产权来源</td>
<td colspan="2" class="tdright">产权来源</td>
<td colspan="4">
<el-select class="selectTitle" v-model="form.fwcqlybsm">
<el-option
......@@ -97,7 +97,7 @@
</td>
</tr>
<tr>
<td colspan="2">房屋性质</td>
<td colspan="2" class="tdright">房屋性质</td>
<td colspan="4">
<el-select class="selectTitle" v-model="form.fwxzbsm">
<el-option
......@@ -112,7 +112,7 @@
<td colspan="4"></td>
</tr>
<tr>
<td colspan="2">房屋结构</td>
<td colspan="2" class="tdright">房屋结构</td>
<td colspan="5">
<el-select class="selectTitle" v-model="form.fwjgbsm">
<el-option
......@@ -125,12 +125,12 @@
</td>
</tr>
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle" class="tdright">
<i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
<span>用途</span>
</td>
<td width="30" colspan="1" align="center" >
<td width="30" colspan="1" align="center" class="tdright">
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
规划用途
</td>
......@@ -148,7 +148,7 @@
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="1" align="center" class="tdright">用途</td>
<td width="30" colspan="4" align="center" >
<el-select-tree
v-if="show"
......@@ -166,7 +166,7 @@
</tr>
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" class="tdright">
<i class="iconfont iconicon-test2" style="margin-right: 10px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
<span>房屋结构</span>
</td>
......@@ -193,15 +193,15 @@
</tr>
<tr>
<td colspan="2">东墙体归属</td>
<td colspan="2" class="tdright">东墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.dqtgs"/></td>
<td colspan="2">南墙体归属</td>
<td colspan="2" class="tdright">南墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.nqtgs"/></td>
</tr>
<tr>
<td colspan="2">西墙体归属</td>
<td colspan="2" class="tdright">西墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.xqtgs"/></td>
<td colspan="2">北墙体归属</td>
<td colspan="2" class="tdright">北墙体归属</td>
<td colspan="4"><input type="text" class="inputtitle" v-model="form.bqtgs"/></td>
</tr>
</table>
......
import {loadModules} from 'esri-loader'
import {loadModules} from 'esri-loader'
export default {
......@@ -19,6 +19,7 @@ export default {
findParameters.layerIds = layerIds;
findParameters.searchFields = searchFields;
findParameters.searchText = searchText;
findParameters.outSpatialReference = {wkid:3857};
findTask.execute(findParameters).then(function (result) {
if(callBackFunction){
callBackFunction(result);
......
......@@ -169,7 +169,9 @@ export default {
if(this.isMap){
this.isMap = false;
}
} else {
} else if(newPath == '/viewMap'){
this.isMap = true;
}else{
}
},
......
......@@ -636,7 +636,7 @@
if (res.success) {
this.getRightTree(res.result,'0,1,2');
this.$router.push({
path: '/dz',
path: '/zd',
query: {
bsm: res.result,
source: 3, //分割标识
......
......@@ -213,6 +213,7 @@
import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
import {getSearchList} from "@api/search";
import {getQjHDetailByBsm} from "@api/h";
export default {
name:"",
components:{lpbContent},
......@@ -227,7 +228,7 @@ export default {
queryData:{
bdcdyh: "",
bdcqzh: "",
dylxs: ['zrz'],
dylxs: ['zrz','h'],
qlrmc: "",
qszt: [],
xmmc: "",
......@@ -349,8 +350,16 @@ export default {
},
//办理
handleClick(row){
this.isSearch = false;
this.zrzbsm = row.glbsm;
if(row.dylx === 'zrz'){
this.isSearch = false;
this.zrzbsm = row.glbsm;
}else {
getQjHDetailByBsm(row.glbsm).then((res)=>{
this.isSearch = false;
this.zrzbsm = res.result.zrzbsm;
})
}
},
//分页
handleCurrentChange(val) {
......
......@@ -93,7 +93,7 @@
</div>
<!-- 底部数据展示区域 -->
<div class="bottomResult" v-if="bottomResultDialog">
<div class="closeButn" @click="closeBufferDialog">
<div class="closeButn" @click="closeBufferDialog(false)">
<i class="el-icon-close"></i>
</div>
<el-tabs v-model="activeName" >
......@@ -164,6 +164,8 @@ import ChangeMap from "@/components/map/ChangeMap";
import sideTools from "./mapWeight/sideTools.vue"
import mapTools from './mapWeight/js/mapTools.js'
export default {
inject:['getRightTree','getTreeByBsm'],
components:{
......@@ -190,7 +192,7 @@ export default {
bottomResultDialog:false
}
},
mixins:[mapLayerManager,findTask],
mixins:[mapLayerManager,findTask,mapTools],
mounted(){
var query = this.$route.query
......@@ -331,7 +333,7 @@ export default {
this.clearSearchLayer(this.viewId);
this.dialogVisible = false;
},
closeBufferDialog(){
closeBufferDialog(flag){
//关闭时清除查询结果 清除数据
this.results = [];
this.selectResLayerId =null;
......@@ -340,8 +342,10 @@ export default {
this.heighGraphic = null;
//清除查询图层
this.clearSearchLayer(this.viewId);
this.clearBufferLayer(this.viewId);
this.bottomResultDialog = false;
if(!flag){
this.clearBufferLayer(this.viewId);
}
},
//处理数据
delIdentifyData(data){
......@@ -472,8 +476,8 @@ export default {
color: #F39835;
}
.active{
border-bottom: 1.5px solid #409eff;
padding-bottom: 5px;
border-bottom: 2px solid #409eff;
padding-bottom: 10px;
}
}
.searchResult{
......@@ -571,11 +575,10 @@ export default {
background-color: #ffffff;
margin: 10px;
border-radius: 4px;
padding: 5px;
.closeButn{
position: relative;
float: right;
font-size: 20px;
font-size: 18px;
color: #9B9B9B;
z-index: 16;
}
......@@ -588,6 +591,14 @@ export default {
/deep/ .el-table td, .el-table th.is-leaf {
text-align: center;
}
/deep/ .el-tabs__nav :first{
margin-left: 33px;
}
/deep/ .el-tabs__item.is-active{
color: #505050;
background-color:#ffffff;
}
}
}
</style>
\ No newline at end of file
......
......@@ -249,10 +249,6 @@ export default {
geometry.spatialReference = {
wkt:wkt
}
var graphic = {
attributes:self.currentClickZd,
geometry:geometry
}
// self.checkGeo(graphic);
self.resultDialog = false;
self.$emit("setGeometry",geometry);
......
......@@ -50,6 +50,7 @@ export default {
symbol:graphicSymbol.fillSymbol.bufferGeoSymbol
})
layer.add(graphic);
view.center = graphic.geometry.extent.center;
if(callBackFunction && typeof callBackFunction == 'function'){
callBackFunction(bufferGeometry);
}
......@@ -119,7 +120,7 @@ export default {
layer.removeAll();
}else {
layer = new GraphicsLayer({
id:"overLayer"
id:"identifyLayer"
})
view.map.add(layer);
}
......
......@@ -150,7 +150,7 @@
</div>
<el-dialog title="图形导入" :visible.sync="importDialog"
width="30%">
<import-geometry @setGeometry="setGeometry"></import-geometry>
<import-geometry @setGeometry = "setBufferGeometry"></import-geometry>
</el-dialog>
</div>
</template>
......@@ -281,7 +281,6 @@
//缓冲区分析
bufferAnalysis(){
this.bufferDialog = true;
},
//缓冲区分析执行语句
toIdentity(){
......@@ -309,7 +308,7 @@
}else{
self.$message.success("暂无数据!!!");
//清除上次的结果 关闭上次的结果 清除地图数据
self.$parent.closeBufferDialog();
self.$parent.closeBufferDialog(true);
}
},true,'all',3,view.extent);
})
......@@ -351,6 +350,8 @@
self.$parent.bottomResultDialog = true;
}else{
self.$message.success("暂无数据!!!");
//清除上次的结果 关闭上次的结果 清除地图数据
self.$parent.closeBufferDialog(true);
}
},true,'all',3,view.extent);
})
......@@ -375,6 +376,7 @@
return;
}
}
//将那个导入图层清除
self.createBuffer(this.importGeo,self.bufferParams.distance,self.viewId,function (bufGeo) {
self.identify(self.layerUrl,self.bufferParams.layerId,bufGeo,function(res){
var resultes = res.results;
......@@ -383,6 +385,8 @@
self.$parent.bottomResultDialog = true;
}else{
self.$message.success("暂无数据!!!");
//清除上次的结果 关闭上次的结果 清除地图数据
self.$parent.closeBufferDialog(true);
}
},true,'all',3,view.extent);
})
......@@ -401,7 +405,7 @@
}
//清除结果图层和绘制图层
this.$parent.closeResultDialog();
this.clearBufferLayer();
this.clearBufferLayer(this.viewId);
},
//获取地籍区/地籍子区数据
getDjqList(){
......@@ -426,6 +430,7 @@
getDjzqList(){
var self = this,
djzqLayer= this.getLayerByName("DJZQ");
self.bufferParams.selectDjzq = "";
self.djzqList = [];
this.queryAttributes(this.layerUrl+"/"+djzqLayer.id,{"DJZQDM":this.bufferParams.selectDjq},function (features) {
if(features != null){
......@@ -449,7 +454,8 @@
}
},
//设置导入的空间数据
setGeometry(geo){
setBufferGeometry(geo){
debugger
this.importGeo = geo;
this.importDialog = false;
},
......
......@@ -125,11 +125,6 @@
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
<td colspan="4">
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
class="formInput" v-model="formData.zl"/>
</td>
<td colspan="2" class="tdright">项目名称</td>
<td colspan="4" class="psr">
<input :disabled="disabled"
......@@ -138,6 +133,14 @@
v-model="formData.xmmc"
/>
</td>
<td colspan="2" class="tdright">预编宗地代码</td>
<td colspan="4" class="psr">
<input :disabled="disabled"
type="text"
class="formInput "
v-model="formData.ybzddm"
/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">国民经济行业分类</td>
......@@ -281,6 +284,14 @@
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
<td colspan="10">
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
class="formInput" v-model="formData.zl"/>
</td>
</tr>
<tr>
<td colspan="2" rowspan="4" class="tdright">宗地四至</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
<td colspan="8" class="psr">
......
......@@ -678,6 +678,10 @@ export default {
} else if(res.code === 206){
let hasGenerateCount = res.result.hasGenerateCount;
let unGenerateCount = res.result.unGenerateCount;
if(+unGenerateCount === 0){
this.$message.warning("不存在未生成不动产单元号的户，无需生成不动产单元号！")
return
}
this.open(hasGenerateCount,unGenerateCount);
}else {
this.$message.warning(res.message)
......