@@ -448,7 +449,8 @@
- {{item.syqr}}{{item.houseDataConfirmStatus}}
+ {{item.syqr}}{{item.paceType}}
+ {{item.typeTc}}
查看详情
@@ -498,7 +500,7 @@
-
全选
+
全选
@@ -555,9 +557,8 @@
v-model="nhform.nhdm"
name="农户代码"
label="农户代码"
- placeholder="农户代码"
- required
- :rules="[{ required: true, message: '农户代码不能为空' }]"
+ placeholder="自动生成"
+ disabled
/>
是否完成绘制
@@ -1284,7 +1285,7 @@
selectionIconShow: false,
//搜索栏目-操作栏显隐
searchBarOperVisbile: false,
- mapDataAll: "",
+ mapDataAll: [],
showSearch:false,
bottomHeight:'0px',
//搜索---end
@@ -1302,9 +1303,8 @@
dataForm: {
imageUrl: []
},
- dataList: [["fsssSx"],["zjdSx"],["zrzSx"]],
- //地图使用 --end
- checkBoxAll:[]
+ dataList: [["fsssSx"],["zjdSx"],["zrzSx"]], //地图使用 --end
+ checkBoxAll:[],
};
},
mounted(){
@@ -1601,36 +1601,22 @@
);
}else{
this.nhform.deptId = this.item.deptId
- let params = {
- deptId:this.item.deptId,
- nhdm:this.nhform.nhdm
- }
- listNh(params).then(res => {
- if(res.total>0){
+ addNh(this.nhform).then(
+ response => {
+ this.totalR+=1
+ this.totalH+=1
+ let _this =this
this.$toast({
- icon: 'error', // 找到自己需要的图标
- message: '保存失败，系统中已存在此农户代码！',
- duration:"1000"
- })
- }else{
- addNh(this.nhform).then(
- response => {
- this.totalR+=1
- this.totalH+=1
- let _this =this
- this.$toast({
- icon: 'success', // 找到自己需要的图标
- message: '保存成功',
- duration:"1000",
- onClose:function(){
- _this.shownh = false
- _this.getNh()
- }
- })
+ icon: 'success', // 找到自己需要的图标
+ message: '保存成功',
+ duration:"1000",
+ onClose:function(){
+ _this.shownh = false
+ _this.getNh()
}
- );
+ })
}
- })
+ );
}
},
// 所有权人保存
@@ -1665,17 +1651,34 @@
let params = {
"deptId" : this.item.deptId
}
- this.qlrform={
+ this.qlrform ={
+ "deptId":this.item.deptId,
"suyqxz":'40',
"suyqxzName":'集体土地所有权',
"dbrzjlx":'01',
"dbrzjlxName":'身份证',
- "sfclncjtjjzz":'农村宅基地使用权确权登记发证',
+ "sfclncjtjjzz":'Y',
"sjly":'04',
+ "sjlyName":"农村宅基地使用权确权登记发证"
}
listSuyqr(params).then((response) => {
if(response.rows.length>0){
this.qlrform = response.rows[0]
+ if(this.qlrform.suyqxz==null||this.qlrform.suyqxz==""){
+ this.qlrform.suyqxz = "40"
+ this.qlrform.suyqxzName = "集体土地所有权"
+ }
+ if(this.qlrform.dbrzjlx==null||this.qlrform.dbrzjlx==""){
+ this.qlrform.dbrzjlx = "01"
+ this.qlrform.dbrzjlxName = "身份证"
+ }
+ if(this.qlrform.sfclncjtjjzz==null||this.qlrform.sfclncjtjjzz==""){
+ this.qlrform.sfclncjtjjzz = "Y"
+ }
+ if(this.qlrform.sjly==null||this.qlrform.sjly==""){
+ this.qlrform.sjly = "04"
+ this.qlrform.sjlyName = "农村宅基地使用权确权登记发证"
+ }
this.zjlxOptions.map(res => {
if(res.dictValue == this.qlrform.dbrzjlx){
this.qlrform.dbrzjlxName = res.dictLabel
@@ -1782,6 +1785,53 @@
}else{
let _this = this
this.form5 = item
+ if(this.form5.nhdm==null||this.form5.nhdm==""){
+ this.form5.nhdm = this.nhform.nhdm
+ }
+ if(this.form5.deptId==null||this.form5.deptId==""){
+ this.form5.deptId = this.nhform.deptId
+ }
+ if(this.form5.zjlx==null||this.form5.zjlx==""){
+ this.form5.zjlx = "01"
+ this.form5.zjlxName = "身份证"
+ }
+ if(this.form5.yhzgx==null||this.form5.yhzgx==""){
+ this.form5.yhzgx = "14"
+ this.form5.yhzgxName = "妻"
+ }
+ if(this.form5.hyzk==null||this.form5.hyzk==""){
+ this.form5.hyzk = "02"
+ }
+ if(this.form5.hklx==null||this.form5.hklx==""){
+ this.form5.hklx = "1"
+ }
+ if(this.form5.occupation==null||this.form5.occupation==""){
+ this.form5.occupation = "1"
+ this.form5.occupationName = "务农"
+ }
+ if(this.form5.jzqk==null||this.form5.jzqk==""){
+ this.form5.jzqk = "3"
+ this.form5.jzqkName = "常年居住"
+ }
+ if(this.form5.sfbjtjjzzcy==null||this.form5.sfbjtjjzzcy==""){
+ this.form5.sfbjtjjzzcy = "Y"
+ }
+ if(this.form5.xb==null||this.form5.xb==""){
+ this.form5.xb = "0"
+ }
+ if(this.form5.sfbccm==null||this.form5.sfbccm==""){
+ this.form5.sfbccm = "Y"
+ }
+ if(this.form5.sfpkh==null||this.form5.sfpkh==""){
+ this.form5.sfpkh = "N"
+ }
+ if(this.form5.sfwbh==null||this.form5.sfwbh==""){
+ this.form5.sfwbh = "N"
+ }
+ if(this.form5.sjly==null||this.form5.sjly==""){
+ this.form5.sjly = "07"
+ this.form5.sjlyName = "农村集体产权制度改革"
+ }
this.jzhcssfyzfOptions.map(res => {
if(res.dictValue == item.jzhcssfyzf){
this.form5.jzhcssfyzfName = res.dictLabel
@@ -2016,6 +2066,8 @@
//加载地图编辑
var that = this;
var map;
+ //点击事件添加样式
+ var hc_land_on;
// document.getElementById("mapAll").innerHTML = '';
var hc_land;
var projection = new ol.proj.Projection({
@@ -2055,7 +2107,9 @@
zoom: 10,
minZoom: 5, //地图缩小限制
maxZoom: 18.3, //地图放大限制
- pinchRotate: false, //禁止地图旋转
+ }),
+ interactions: ol.interaction.defaults({
+ pinchRotate: false // 移动端禁止地图旋转
}),
});
@@ -2531,9 +2585,9 @@
Zb =[115.452752, 31.789033];
}
//获取坐标点LocationManager
- geoGps().then(response => {
-
- });
+ // geoGps().then(response => {
+ //
+ // });
//矢量标注样式设置函数，设置image为图标ol.style.Icon
function createLabelStyle() {
return new ol.style.Style({
@@ -2654,7 +2708,8 @@
//删除之前绘制图层
$("#deleteHistory").on("click", function () {
console.log("否进入");
- map.removeInteraction(draw_map);
+ map.removeLayer(drawing);
+ that.showhzht = false;
});
//开始绘制图层- -----end
@@ -2673,7 +2728,7 @@
$("#query").on("click", function () {
//数据库查询数据------------------------------------------------------start
var val = that.seachText;
- that.mapDataAll ="";
+ that.mapDataAll =[];
if (val == "") {
that.$toast('请填写查询条件再查询');
} else {
@@ -2690,22 +2745,23 @@
"syqr" : val,
"pageSize":20,
}
+ console.log(params);
listZjdzd(params).then((response) => {
if(response.rows.length>=0){
that.mapDataAll = response.rows;
console.log(that.mapDataAll);
- for(var hg=0; hg < that.mapDataAll.length ; hg++){
- console.log(that.mapDataAll[hg].houseDataConfirmStatus)
+ for(var hg=0; hg < that.mapDataAll.length; hg++){
var mapNum = that.mapDataAll[hg].houseDataConfirmStatus;
if(mapNum == "UNCONFIRMED"){
- that.mapDataAll[hg].houseDataConfirmStatus = "未核查";
+ that.mapDataAll[hg].paceType = "未核查";
} else if (mapNum == "CONFIRMED"){
- that.mapDataAll[hg].houseDataConfirmStatus = "已核查";
+ that.mapDataAll[hg].paceType = "已核查";
}else{
- that.mapDataAll[hg].houseDataConfirmStatus = "";
+
}
+ that.mapDataAll[hg].typeTc="宅基地";
if (that.mapDataAll[hg] !=null && that.mapDataAll[hg].theGeom != null && that.mapDataAll[hg].theGeom != "") {
- that.mapDataAll[hg].createBy = 'mapTheGeomZjdId';
+ //that.mapDataAll[hg].createBy = 'mapTheGeomZjdId';
var hc_land = new ol.layer.Vector({
title: "add Layer",
source: new ol.source.Vector({
@@ -2731,7 +2787,27 @@
duration: 1000, // 缩放持续时间，默认不需要设置
});
}
+ console.log(that.mapDataAll[hg].zjddm);
+ // listFsss(paramsZrz).then((response) => {
+ // console.log(response);
+ // that.mapDataAll.push(response.rows);
+ // });
}
+ // var mapZrzFor = that.mapDataAll[0].length+1;
+ // console.log(mapZrzFor);
+ // for(var mapFor=0;mapZrzFor>mapFor;mapFor++){
+ // //查询自然幢
+ // let paramsZrz = {
+ // "deptId" : that.$cookies.get("item").deptId,
+ // "zjddm" : that.mapDataAll[0][mapFor].zjddm,
+ // "pageSize":20,
+ // }
+ // listZrz(paramsZrz).then((response) => {
+ // console.log(response);
+ // that.mapDataAll[0].
+ // that.mapDataAll[0].push(response.rows);
+ // });
+ // }
setTimeout(function () {
that.showSearch = true ;
$('.searchBox').css('display','block')
@@ -3008,30 +3084,38 @@
//按照查询 定位地图-----------------end
//筛选附属设施-----------------------------------start
- // $("#fsssSx").click(function () {
- // console.log(that.checked);
- // // if(!event.target.checked){
- // // map.addLayer(fsssTc);
- // // }else {
- // // map.removeLayer(fsssTc);
- // // }
- // });
- // $("#zrzSx").click(function () {
- // console.log(that.checked);
- // // if(!event.target.checked){
- // // map.addLayer(zrzTc);
- // // }else {
- // // map.removeLayer(zrzTc);
- // // }
- // });
- // $("#zjdSx").click(function () {
- // console.log(that.checked);
- // // if(!event.target.checked){
- // // map.addLayer(zjdTc);
- // // }else {
- // // map.removeLayer(zjdTc);
- // // }
- // });
+ $("#fsssSx").click(function () {
+ if(!that.fsssSx){
+ map.addLayer(fsssTc);
+ }else {
+ map.removeLayer(fsssTc);
+ }
+ });
+ $("#zrzSx").click(function () {
+ if(!that.zrzSx){
+ map.addLayer(zrzTc);
+ }else {
+ map.removeLayer(zrzTc);
+ }
+ });
+ $("#zjdSx").click(function () {
+ if(!that.zjdSx){
+ map.addLayer(zjdTc);
+ }else {
+ map.removeLayer(zjdTc);
+ }
+ });
+ $("#checkAll").click(function () {
+ if(!that.fsssSx && !that.zjdSx && !that.zrzSx){
+ map.addLayer(zjdTc);
+ map.addLayer(zrzTc);
+ map.addLayer(fsssTc);
+ }else {
+ map.removeLayer(zrzTc);
+ map.removeLayer(zjdTc);
+ map.removeLayer(fsssTc);
+ }
+ });
//筛选附属设施-----------------------------------end
// //获取类型开始 侧面-----------------------------------------------------------------start
//样式加载定义
@@ -3074,7 +3158,8 @@
//text: "标注点", //文本内容
fill: new ol.style.Fill({
//文本填充样式（即文字颜色)
- color: "#FF6666",
+ color: "#FFFFFF",
+ width: 10,
}),
overflow: false //超出面的部分不显示
}),
@@ -3485,13 +3570,18 @@
that.mapZjdData ="";
that.mapZrzData ="";
that.mapFsssData ="";
- that.mapZjdTeAll.active ="1";
+ //that.mapZjdTeAll.active ="1";
that.mapZjdTeAll.mapZjdAData ={};
that.mapZjdTeAll.mapZrzAData ={};
that.mapZjdTeAll.mapFsssAData ={};
that.mapZjdDataTure ="";
setTimeout(() => {
if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") {
+
+ // that.mapZjdDataTure ="";
+ // that.mapZjdTeAll.mapZrzAData ={};
+ // that.mapZjdTeAll.mapFsssAData ={};
+ map.removeLayer(hc_land_on);
that.mapHasDateStatus = 2;
let obj = {};
let trs = $("#info .featureInfo").find("tr:eq(1)");
@@ -3638,13 +3728,45 @@
// }
// }
// });
- getZjdzd(669).then((response) => {
+ console.log(obj.id);
+ getZjdzd(obj.id).then((response) => {
console.log(response);
that.mapZjdData = response.data;
that.mapZjdData.active = 1;
that.mapZjdTeAll.mapZjdAData =that.mapZjdData;
that.mapZjdDataTure = 1;
that.zjdHcDy = obj.zjddm;
+ var styleZjd = new ol.style.Style({
+ stroke: new ol.style.Stroke({
+ //边界样式
+ color: "#CCFF66",
+ width: 6,
+ }),
+ });
+ hc_land_on = new ol.layer.Vector({
+ title: "add Layer",
+ source: new ol.source.Vector({
+ projection: projection,
+ features: new ol.format.GeoJSON().readFeatures("{\n" +
+ " \"type\": \"Feature\",\n" +
+ " \"geometry\":" + that.mapZjdData.theGeom + ", \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
+ }),
+ style: styleZjd
+ });
+ map.addLayer(hc_land_on);
+ var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+ var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+ var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+ var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+ //定位查询位置
+ var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+ map.getView().animate({
+ // 只设置需要的属性即可
+ center: center, // 中心点
+ zoom: 17.8, // 缩放级别
+ rotation: undefined, // 缩放完成view视图旋转弧度
+ duration: 1000, // 缩放持续时间，默认不需要设置
+ });
});
//let cloneObj = JSON.parse(JSON.stringify(obj));
if(obj.zdmj != ""){
@@ -3654,6 +3776,9 @@
}
//that.mapZjdData = cloneObj;
} else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){
+ //that.mapZjdTeAll.mapZjdAData ={};
+ that.mapZjdTeAll.mapFsssAData ={};
+ map.removeLayer(hc_land_on);
let obj = {};
that.mapHasDateStatus = 1;
let trs = $("#info .featureInfo").find("tr:eq(1)");
@@ -3661,7 +3786,7 @@
let zrzIdNum = zrzXq.replace("t_house_survey_zrz.", "");
obj.id = zrzIdNum; // 主键id
obj.deptName = trs.find("td").eq(3).text();//行政区划名称
- obj.zjddm = trs.find("td").eq(5).text();//宅基地代码
+ obj.zjddm = trs.find("td").eq(4).text();//宅基地代码
// obj.nmfwzh = trs.find("td").eq(6).text();//农民房屋幢号
// obj.zrzh = trs.find("td").eq(7).text();//自然幢号
// obj.jgrq = trs.find("td").eq(8).text();//竣工日期
@@ -3704,15 +3829,55 @@
// });
//let cloneObj = JSON.parse(JSON.stringify(obj));
//that.mapZrzData = cloneObj;
- getZjdzd(669).then((response) => {
- that.mapZjdAData = response.data;
- that.mapZjdAData.active = 1;
- that.mapZjdTeAll.mapZjdAData = that.mapZjdAData;
- getZrz(8).then((response) => {
+ let params = {
+ "deptId" : that.$cookies.get("item").deptId,
+ "zjddm" : obj.zjddm,
+ }
+ console.log(obj.zjddm);
+ console.log(params);
+ listZjdzd(params).then((response) => {
+ console.log(response);
+ that.mapZjdData = response.rows[0];
+ //that.mapZjdAData.active = 1;
+ that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
+ console.log(that.mapZjdData);
+ getZrz(obj.id).then((response) => {
+ console.log(response);
that.mapZrzData = response.data;
that.mapZrzData.active = 3;
that.mapZjdTeAll.mapZrzAData =that.mapZrzData;
that.zjdHcDy = obj.zjddm;
+ var styleZjd = new ol.style.Style({
+ stroke: new ol.style.Stroke({
+ //边界样式
+ color: "#CCFF66",
+ width: 6,
+ }),
+ });
+ hc_land_on = new ol.layer.Vector({
+ title: "add Layer",
+ source: new ol.source.Vector({
+ projection: projection,
+ features: new ol.format.GeoJSON().readFeatures("{\n" +
+ " \"type\": \"Feature\",\n" +
+ " \"geometry\":" + that.mapZrzData.theGeom + ", \"properties\":" + JSON.stringify(that.mapZrzData) + "}"),
+ }),
+ style: styleZjd
+ });
+ map.addLayer(hc_land_on);
+ var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+ var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+ var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+ var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+ //定位查询位置
+ var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+ map.getView().animate({
+ // 只设置需要的属性即可
+ center: center, // 中心点
+ zoom: 17.8, // 缩放级别
+ rotation: undefined, // 缩放完成view视图旋转弧度
+ duration: 1000, // 缩放持续时间，默认不需要设置
+ });
});
});
if(obj.scjzmj != ""){
@@ -3721,6 +3886,9 @@
that.textMjAllNum = "1";
}
} else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss"){
+ that.mapZjdTeAll.mapZrzAData ={};
+ //that.mapZjdTeAll.mapZjdAData ={};
+ map.removeLayer(hc_land_on);
let obj = {};
that.mapHasDateStatus = 0;
let trs = $("#info .featureInfo").find("tr:eq(1)");
@@ -3728,7 +3896,7 @@
let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", "");
obj.id = fsssIdNum; // 主键id
obj.deptName = trs.find("td").eq(4).text();//行政区划名称
- obj.zjddm = trs.find("td").eq(2).text();//宅基地代码
+ obj.zjddm = trs.find("td").eq(1).text();//宅基地代码
// obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态
// obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型
obj.jzmj = trs.find("td").eq(8).text(); //建筑面积
@@ -3865,15 +4033,51 @@
// });
//let cloneObj = JSON.parse(JSON.stringify(obj));
//that.mapFsssData = cloneObj;
- getZjdzd(669).then((response) => {
- that.mapZjdData = response.data;
+ let params = {
+ "deptId" : that.$cookies.get("item").deptId,
+ "zjddm" : obj.zjddm,
+ "pageSize":20,
+ }
+ listZjdzd(params).then((response) => {
+ that.mapZjdData = response.rows[0];
that.mapZjdData.active = 1;
that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
- getfsss(12).then((response) => {
- that.mapfsssData.active = 4;
+ getfsss(obj.id).then((response) => {
+ //that.mapfsssData.active = 4;
that.mapfsssData = response.data;
that.mapZjdTeAll.mapFsssAData = that.mapfsssData;
that.zjdHcDy = obj.zjddm;
+ var styleZjd = new ol.style.Style({
+ stroke: new ol.style.Stroke({
+ //边界样式
+ color: "#CCFF66",
+ width: 6,
+ }),
+ });
+ hc_land_on = new ol.layer.Vector({
+ title: "add Layer",
+ source: new ol.source.Vector({
+ projection: projection,
+ features: new ol.format.GeoJSON().readFeatures("{\n" +
+ " \"type\": \"Feature\",\n" +
+ " \"geometry\":" + that.mapfsssData.theGeom + ", \"properties\":" + JSON.stringify(that.mapfsssData) + "}"),
+ }),
+ style: styleZjd
+ });
+ map.addLayer(hc_land_on);
+ var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+ var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+ var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+ var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+ //定位查询位置
+ var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+ map.getView().animate({
+ // 只设置需要的属性即可
+ center: center, // 中心点
+ zoom: 17.8, // 缩放级别
+ rotation: undefined, // 缩放完成view视图旋转弧度
+ duration: 1000, // 缩放持续时间，默认不需要设置
+ });
});
});
if(obj.jzmj != ""){
@@ -4320,6 +4524,8 @@
//宅基地点击地图核查
zjdHc(){
console.log(this.zjdHcDy);
+ console.log(this.mapZjdDataTure);
+ console.log(this.mapZjdData);
if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
this.mapZjdTeAll.active =1;
@@ -4327,19 +4533,27 @@
this.$router.push({path:'/homesteadSurvey/add'});
}
if(this.mapZrzData !=undefined && this.mapZrzData !=""){
- this.mapZjdTeAll.active =3;
- this.$cookies.set("search",this.mapZjdTeAll);
- this.$router.push({path:'/homesteadSurvey/add'});
+ if(this.mapZjdTeAll.mapZjdAData !=""){
+ this.mapZjdTeAll.active =3;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ this.$router.push({path:'/homesteadSurvey/add'});
+ } else {
+ this.$toast("必须有宅基地数据才能进入自然幢核查");
+ }
}
if(this.mapFsssData !=undefined && this.mapFsssData !=""){
- this.mapZjdTeAll.active =4;
- this.$cookies.set("search",this.mapZjdTeAll);
- this.$router.push({path:'/homesteadSurvey/add'});
+ if(this.mapZjdTeAll.mapZjdAData !="") {
+ this.mapZjdTeAll.active = 4;
+ this.$cookies.set("search", this.mapZjdTeAll);
+ this.$router.push({path: '/homesteadSurvey/add'});
+ } else {
+ this.$toast("必须有宅基地数据才能进入附属设施核查");
+ }
}
} else {
this.$dialog.alert({
title: '宅基地核查',
- message: "请从地图选择地图并点击核查",
+ message: "请从地图中选择图层并点击核查",
theme: 'round-button',
}).then(() => {
// on close
@@ -4353,13 +4567,43 @@
this.mapZjdTeAll.mapZrzAData ={};
this.mapZjdTeAll.mapFsssAData ={};
//this.mapZjdTeAll.active =1;
+ if(item.typeTc =="宅基地"){
getZjdzd(item.id).then((response) => {
this.mapZjdData = response.data;
- this.mapZjdData.active = 1;
+ console.log(this.mapZjdData);
+ this.mapZjdTeAll.active = 1;
this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
this.$cookies.set("search",this.mapZjdTeAll);
+ setTimeout(() => {
this.$router.push({path:'/homesteadSurvey/add'});
+ }, 500);
});
+ }else if(item.typeTc =="自然幢"){
+ //let =
+ getZjdzd(item.id).then((response) => {
+ this.mapZrzData = response.data;
+ console.log(this.mapZrzData);
+ this.mapZjdTeAll.active = 3;
+ this.mapZjdTeAll.mapZrzAData = this.mapZrzData;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ setTimeout(() => {
+ this.$router.push({path:'/homesteadSurvey/add'});
+ }, 500);
+ });
+ }else if(item.typeTc =="附属设施"){
+ getfsss(item.id).then((response) => {
+ this.mapFsssData = response.data;
+ console.log(this.mapZjdData);
+ this.mapZjdTeAll.active = 4;
+ this.mapZjdTeAll.mapFsssAData = this.mapFsssData;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ setTimeout(() => {
+ this.$router.push({path:'/homesteadSurvey/add'});
+ }, 500);
+ });
+ }else{
+ this.$toast("无数据请检查后进入核查页面");
+ }
},
//地图查询
toggleSearch() {
@@ -4395,6 +4639,7 @@
},
//单选
handleChecked(value) {
+ console.log(value);
// this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length;
if (value.length<3){
this.checkAllFlag = false;
@@ -4420,9 +4665,6 @@
)
$('.searchBar_wrap').css({'animation':'test2 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test2 0.5s ease-in-out 0s 1 alternate forwards'});
},
- deleteHistory(){
- console.log("进入aa");
- },
zjdTz(){
console.log(this.htZjdZrzFsss);
this.mapZjdTeAll.active =1;
@@ -4433,18 +4675,31 @@
console.log(this.mapZjdTeAll);
},
zrzTz(){
- this.mapZjdTeAll.active =3;
- this.mapZjdTeAll.mapZrzAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
- this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
- this.$cookies.set("search",this.mapZjdTeAll);
- this.$router.push({path:'/homesteadSurvey/add'});
+ if(this.mapZjdTeAll.mapZjdAData !=undefined && this.mapZjdTeAll.mapZjdAData !="" && this.mapZjdDataTure !=""){
+ this.mapZjdTeAll.active =3;
+ this.mapZjdTeAll.mapZrzAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
+ this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ this.$router.push({path:'/homesteadSurvey/add'});
+ }else {
+ this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮");
+ }
},
fsssTz(){
+ if(this.mapZjdTeAll.mapZjdAData !=undefined && this.mapZjdTeAll.mapZjdAData !="" && this.mapZjdDataTure !=""){
this.mapZjdTeAll.active =4;
this.mapZjdTeAll.mapFsssAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId;
this.$cookies.set("search",this.mapZjdTeAll);
this.$router.push({path:'/homesteadSurvey/add'});
+ }else {
+ this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮");
+ }
+ },
+ //绘图重置清除之前图层
+ deleteHistory(){
+ console.log("进入重置");
+ $("#deleteHistory").trigger("click");
}
},
diff --git a/src/views/homesteadSurvey/settle.vue b/src/views/homesteadSurvey/settle.vue
index 757d2283..e32f01f6 100644
--- a/src/views/homesteadSurvey/settle.vue
+++ b/src/views/homesteadSurvey/settle.vue
@@ -13,18 +13,18 @@