diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 0884f559..e43d5e8c 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -3223,8 +3223,8 @@ this.backMap.backMapZjdAData = this.cookiesInfo.mapZjdAData; this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId; this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm; - //this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom; - //this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm; + this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom; + this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm; //返回地图值记录----end this.active = this.cookiesInfo.active; this.item = this.cookiesInfo.mapZjdAData; diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 75218e42..93dd55ec 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1441,7 +1441,6 @@ }); this.yhzgxOptions = arr; }); - if(this.$cookies.get("search") != null && this.$cookies.get("search") !="" && this.$cookies.get("search")!=undefined){ if(this.$cookies.get("search").activeBtn !=null){ if(this.$cookies.get("search").activeBtn == 4){ @@ -3059,12 +3058,7 @@ // map.addLayer(zhenTc); //镇边界查询开始 ------------------------------end //村边界查询开始 ------------------------------start - var cql_filter - if (that.mapAddJumpNum == 1) { - cql_filter = "dept_id='" + that.mapAddJump + "'"; - } else { - cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'"; - } + var cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'"; var cunTc = new ol.layer.Image({ source: new ol.source.ImageWMS({ url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", @@ -5466,9 +5460,9 @@ this.mapZjdData = response.data; this.mapZjdTeAll.active = 1; this.mapZjdTeAll.mapZjdAData = this.mapZjdData; - this.$cookies.set("search",this.mapZjdTeAll); + //this.$cookies.set("search",this.mapZjdTeAll); setTimeout(() => { - this.$router.push({path:'/homesteadSurvey/add'}); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); }, 500); }); }else if(item.typeTc =="自然幢"){ @@ -5477,9 +5471,9 @@ this.mapZrzData = response.data; this.mapZjdTeAll.active = 3; this.mapZjdTeAll.mapZrzAData = this.mapZrzData; - this.$cookies.set("search",this.mapZjdTeAll); + //this.$cookies.set("search",this.mapZjdTeAll); setTimeout(() => { - this.$router.push({path:'/homesteadSurvey/add'}); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); }, 500); }); }else if(item.typeTc =="附属设施"){ @@ -5487,9 +5481,9 @@ this.mapFsssData = response.data; this.mapZjdTeAll.active = 4; this.mapZjdTeAll.mapFsssAData = this.mapFsssData; - this.$cookies.set("search",this.mapZjdTeAll); + //this.$cookies.set("search",this.mapZjdTeAll); setTimeout(() => { - this.$router.push({path:'/homesteadSurvey/add'}); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); }, 500); }); }else{ @@ -5552,9 +5546,9 @@ if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){ this.mapZjdTeAll.active =1; this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss; - this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId; - this.$cookies.set("search",this.mapZjdTeAll); - this.$router.push({path:'/homesteadSurvey/add'}); + //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId; + //this.$cookies.set("search",this.mapZjdTeAll); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); }else { this.$toast("已选择宅基地,请选择自然幢或附属设施按钮"); } @@ -5563,9 +5557,9 @@ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ this.mapZjdTeAll.active =3; this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss; - this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId; - this.$cookies.set("search",this.mapZjdTeAll); - this.$router.push({path:'/homesteadSurvey/add'}); + //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId; + //this.$cookies.set("search",this.mapZjdTeAll); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); }else { this.$toast("请先在地图上选择宅基地后,再选择自然幢按钮"); } @@ -5574,9 +5568,9 @@ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ this.mapZjdTeAll.active =4; this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss; - this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId; - this.$cookies.set("search",this.mapZjdTeAll); - this.$router.push({path:'/homesteadSurvey/add'}); + //this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId; + //this.$cookies.set("search",this.mapZjdTeAll); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); }else { this.$toast("请先在地图上选择宅基地后,再选择附属设施按钮"); }