diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index a3802439..2a03e6cd 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -3049,6 +3049,14 @@ // 自然幢号 zrzh:null, + + //返回地图页 + backMap:{ + activeBtn:"", + backMapZjdAData:"", + }, + //记录是否从地图进入 + enterMap: "", }; }, created(){ @@ -3158,6 +3166,11 @@ }); if(this.$cookies.get("search")){ if(this.$cookies.get("search").active!=null){ + //返回地图值记录----start + this.backMap.activeBtn = 4; + this.enterMap =1; + this.backMap.backMapZjdAData =this.$cookies.get("search").mapZjdAData; + //返回地图值记录----end this.active = this.$cookies.get("search").active this.item = this.$cookies.get("search").mapZjdAData let zrz = this.$cookies.get("search").mapZrzAData @@ -3809,7 +3822,12 @@ this.showPickerxzkssj= false }, goBack(){ - this.$router.push({name:'homesteadList'}); + if(this.enterMap ==1){ + this.$cookies.set("item",this.backMap); + this.$router.push({name:'homesteadList'}); + } else { + this.$router.push({name:'homesteadList'}); + } }, showPopupnh(){ this.shownh = true; diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 3c042cde..48df641f 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1337,6 +1337,14 @@ mounted(){ }, created(){ + if(this.$cookies.get("item")){ + if(this.$cookies.get("item").activeBtn !=null){ + this.activeBtn = this.$cookies.get("item").activeBtn; + this.item = this.$cookies.get("item").backMapZjdAData; + } + }else { + + } this.getDicts("zjlx").then(response => { this.zjlxOptions = response.data; });