diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index f3d05388..bdbb2b6c 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -3148,7 +3148,8 @@ enterMap: "", //记录从地图进入宅基地代码 enterMapZjddm:"", - + //地图状态保存 + numerical:"", //审核状态 isFinished:false, // cookies @@ -3162,19 +3163,23 @@ }; }, created(){ + console.log(this.$route.query.res); console.log(this.$cookies.get("search")); //this.itemBc = this.$cookies.get("map"); //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("map",this.$cookies.get("search")); - console.log(this.$cookies.get("search")); + this.numerical =this.$cookies.get("search"); }else { - this.ztMap =true; + if(this.$route.query.res !=null && this.$route.query.res !="" && this.$route.query.res !=undefined){ + this.ztMap =true; + this.numerical =this.$route.query.res; + } } - if(this.$cookies.get("search")){ - if(this.$cookies.get("search").active!=null){ - this.cookiesInfo = this.$cookies.get("search") + if(this.numerical){ + if(this.numerical.active!=null){ + this.cookiesInfo = this.numerical this.$cookies.set("search","") //返回地图值记录----start this.backMap.activeBtn = 4; diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 00acf722..f63bf7cf 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -5305,26 +5305,27 @@ }, //宅基地点击地图核查 zjdHc(){ - console.log(this.mapZjdTeAll); if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ console.log("ggggggggg") this.mapZjdTeAll.active =1; - this.$cookies.set("search",this.mapZjdTeAll); - this.$router.push({path:'/homesteadSurvey/add'}); + // console.log(this.mapZjdTeAll); + // this.$cookies.set("search",cookMap); + // console.log(this.$cookies.get("search")); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); }else if(this.mapZrzData !=undefined && this.mapZrzData !=""){ if(this.mapZjdTeAll.mapZjdAData !=""){ this.mapZjdTeAll.active = 3; - this.$cookies.set("search",this.mapZjdTeAll); - this.$router.push({path:'/homesteadSurvey/add'}); + // this.$cookies.set("search",this.mapZjdTeAll); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); } else { this.$toast("必须有宅基地数据才能进入自然幢核查"); } }else { if(this.mapZjdTeAll.mapZjdAData !="") { this.mapZjdTeAll.active = 4; - this.$cookies.set("search", this.mapZjdTeAll); - this.$router.push({path: '/homesteadSurvey/add'}); + //this.$cookies.set("search", this.mapZjdTeAll); + this.$router.push({path: '/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); } else { this.$toast("必须有宅基地数据才能进入附属设施核查"); }