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