diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index f079acd0..903a4505 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1195,12 +1195,10 @@ mapZjdData:{}, mapZrzData:{}, mapFsssData:{}, - mapZjdZrzAll:{ + mapZjdDataTure:"", + mapZjdTeAll:{ mapZjdAData:"", mapZrzAData:"", - }, - mapZjdFsssAll:{ - mapZjdAData:"", mapFsssAData:"", }, mapHaDataValue:false, @@ -2601,6 +2599,7 @@ listZjdzd(params).then((response) => { if(response.rows.length>=0){ that.mapDataAll = response.rows; + console.log(that.mapDataAll); for(var hg=0; that.mapDataAll.length >0; hg++){ var mapNum = that.mapDataAll[hg].houseDataConfirmStatus; if(mapNum == "UNCONFIRMED"){ @@ -3381,8 +3380,8 @@ that.mapZjdData =""; that.mapZrzData =""; that.mapFsssData =""; - that.mapZjdZrzAll =""; - that.mapZjdFsssAll =""; + that.mapZjdTeAll =""; + that.mapZjdDataTure =1; setTimeout(() => { if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") { that.mapHasDateStatus = 2; @@ -3535,6 +3534,8 @@ console.log(response); that.mapZjdData = response.data; that.mapZjdData.active = 1; + that.mapZjdTeAll.mapZjdAData =that.mapZjdData; + that.mapZjdDataTure = 1; }); //let cloneObj = JSON.parse(JSON.stringify(obj)); if(obj.zdmj != ""){ @@ -3596,13 +3597,13 @@ //let cloneObj = JSON.parse(JSON.stringify(obj)); //that.mapZrzData = cloneObj; getZjdzd(669).then((response) => { - var zjdMapA = response.data; - zjdMapA.active = 1; - that.mapZjdZrzAll.mapZjdAData = zjdMapA; + that.mapZjdAData = response.data; + that.mapZjdAData.active = 1; + that.mapZjdTeAll.mapZjdAData = that.mapZjdAData; getZrz(8).then((response) => { that.mapZrzData = response.data; that.mapZrzData.active = 3; - that.mapZjdZrzAll.mapZrzAData =that.mapZrzData; + that.mapZjdTeAll.mapZrzAData =that.mapZrzData; }); }); if(obj.scjzmj != ""){ @@ -3756,13 +3757,13 @@ //let cloneObj = JSON.parse(JSON.stringify(obj)); //that.mapFsssData = cloneObj; getZjdzd(669).then((response) => { - var zjdMapA = response.data; - zjdMapA.active = 1; - that.mapZjdFsssAll.mapZjdAData = zjdMapA; + that.mapZjdData = response.data; + that.mapZjdData.active = 1; + that.mapZjdTeAll.mapZjdAData = that.mapZjdData; getfsss(12).then((response) => { that.mapfsssData.active = 4; that.mapfsssData = response.data; - that.mapZjdFsssAll.mapFsssAData = that.mapfsssData; + that.mapZjdTeAll.mapFsssAData = that.mapfsssData; }); }); if(obj.jzmj != ""){ @@ -4210,15 +4211,16 @@ console.log(this.zjdHcDy); if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){ if(this.mapZjdData !=undefined && this.mapZjdData !=""){ - this.$cookies.set("search",this.mapZjdData); + + this.$cookies.set("search",this.mapZjdTeAll); this.$router.push({path:'/homesteadSurvey/add'}); } if(this.mapZrzData !=undefined && this.mapZrzData !=""){ - this.$cookies.set("search",this.mapZjdZrzAll); + this.$cookies.set("search",this.mapZjdTeAll); this.$router.push({path:'/homesteadSurvey/add'}); } if(this.mapFsssData !=undefined && this.mapFsssData !=""){ - this.$cookies.set("search",this.mapZjdFsssAll); + this.$cookies.set("search",this.mapZjdTeAll); this.$router.push({path:'/homesteadSurvey/add'}); } } else {