diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index a51227d5..2775167d 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -3143,6 +3143,7 @@ zjddm:"", }, ztMap: true, + itemBc: "", //记录是否从地图进入 enterMap: "", //记录从地图进入宅基地代码 @@ -3158,6 +3159,8 @@ }, created(){ console.log(this.$cookies.get("search")); + this.itemBc = this.$cookies.get("item"); + this.$cookies.set("item",""); if(this.$cookies.get("search") !=null &&this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){ this.ztMap =false; this.$cookies.set("item",this.$cookies.get("search")); @@ -3174,9 +3177,9 @@ this.backMap.backMapZjdAData = this.cookiesInfo.mapZjdAData; this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId; this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm; - if(this.ztMap){ - this.$cookies.set("item",this.backMap); - } + // if(this.ztMap){ + // this.$cookies.set("item",this.backMap); + // } this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom; //this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm; //返回地图值记录----end @@ -4241,6 +4244,15 @@ // this.$router.push({name:'homesteadList'}); // } else { this.enterMap=""; + this.$cookies.set("item",""); + if(this.ztMap){ + this.itemBc.activeBtn = 4; + this.itemBc.backMapZjdAData = this.backMap.backMapZjdAData; + console.log(this.itemBc); + this.$cookies.set("item",this.itemBc); + } else { + this.$cookies.set("item",this.itemBc); + } this.$router.push({name:'homesteadList'}); // } }, @@ -5425,7 +5437,7 @@ fwjgName:'钢和钢筋混凝土结构', sjly:'04', sjlyName:'农村宅基地使用权确权登记发证', - theGeom:this.form3.theGeom, + theGeom:this.form.theGeom, } }else{ this.form3 = item @@ -5716,7 +5728,7 @@ tdzk:'3', tdzkName:'其他', sfsgcf:'N', - theGeom:this.form4.theGeom, + theGeom:this.form.theGeom, } }else{ this.form4=item @@ -5981,6 +5993,7 @@ }, //地图加载js------start mapClickLoading(){ + this.$cookies.set("item", this.form); setTimeout(() => { this.$refs.drewingClickLoading.drawingPaceCountryDarw(); }, 500); diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 7ec4f7fe..bcecb05a 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1428,7 +1428,7 @@ if(this.$cookies.get("item").activeBtn !=null){ if(this.$cookies.get("item").activeBtn == 4){ this.activeBtn = this.$cookies.get("item").activeBtn; - this.item = this.$cookies.get("item").backMapZjdAData; + this.item = this.$cookies.get("item"); this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId; this.backTheGeom = this.$cookies.get("item").backMapZjdAData.theGeom; this.mapZjdData = this.$cookies.get("item").backMapZjdAData;