diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 679db70c..c566678e 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -3199,8 +3199,8 @@
this.industryOptions = this.dictTypeList.Industry;
})
this.baseUrl = this.$cookies.get("url")
- console.log(this.$route.query.res);
- console.log(this.$cookies.get("search"));
+ //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){
@@ -3208,9 +3208,13 @@
//this.$cookies.set("map",this.$cookies.get("search"));
this.numerical =this.$cookies.get("search");
}else {
- 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.$route.query.res !=null && this.$route.query.res !="" && this.$route.query.res != undefined){
+ this.numerical = this.$route.query.res;
+ if(this.numerical.active!=null){
+ this.ztMap =true;
+ }else{
+ this.ztMap =false;
+ }
}
}
if(this.numerical){
@@ -3260,14 +3264,13 @@
}, 500);
}
}else{
- this.cookiesInfo = this.$cookies.get("search")
- this.$cookies.set("search","")
+ this.cookiesInfo = this.$cookies.get("search")?this.$cookies.get("search"):this.$route.query.res
+/* this.$cookies.set("search","")*/
this.item = this.cookiesInfo
this.$cookies.set("search",this.cookiesInfo);
if(this.item.houseDataConfirmStatus!="CONFIRMED"){
this.isFinished = true
}
- /*this.getBaseUrl();*/
this.getnhdmlist();
this.getZjd();
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 81de1dbe..f4b13f13 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -88,11 +88,6 @@
无
-