| @@ -3895,7 +3895,7 @@ | |||||
| let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", ""); | let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", ""); | ||||
| obj.id = fsssIdNum; // 主键id | obj.id = fsssIdNum; // 主键id | ||||
| obj.deptName = trs.find("td").eq(4).text();//行政区划名称 | obj.deptName = trs.find("td").eq(4).text();//行政区划名称 | ||||
| obj.zjddm = trs.find("td").eq(2).text();//宅基地代码 | |||||
| obj.zjddm = trs.find("td").eq(1).text();//宅基地代码 | |||||
| // obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态 | // obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态 | ||||
| // obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型 | // obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型 | ||||
| obj.jzmj = trs.find("td").eq(8).text(); //建筑面积 | obj.jzmj = trs.find("td").eq(8).text(); //建筑面积 | ||||
| @@ -4532,14 +4532,22 @@ | |||||
| 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.mapZjdTeAll.active =3; | |||||
| this.$cookies.set("search",this.mapZjdTeAll); | |||||
| this.$router.push({path:'/homesteadSurvey/add'}); | |||||
| if(this.mapZjdTeAll.mapZjdAData !=""){ | |||||
| this.mapZjdTeAll.active =3; | |||||
| this.$cookies.set("search",this.mapZjdTeAll); | |||||
| this.$router.push({path:'/homesteadSurvey/add'}); | |||||
| } else { | |||||
| this.$toast("必须有宅基地数据才能进入自然幢核查"); | |||||
| } | |||||
| } | } | ||||
| if(this.mapFsssData !=undefined && this.mapFsssData !=""){ | if(this.mapFsssData !=undefined && this.mapFsssData !=""){ | ||||
| this.mapZjdTeAll.active =4; | |||||
| this.$cookies.set("search",this.mapZjdTeAll); | |||||
| this.$router.push({path:'/homesteadSurvey/add'}); | |||||
| if(this.mapZjdTeAll.mapZjdAData !="") { | |||||
| this.mapZjdTeAll.active = 4; | |||||
| this.$cookies.set("search", this.mapZjdTeAll); | |||||
| this.$router.push({path: '/homesteadSurvey/add'}); | |||||
| } else { | |||||
| this.$toast("必须有宅基地数据才能进入附属设施核查"); | |||||
| } | |||||
| } | } | ||||
| } else { | } else { | ||||
| this.$dialog.alert({ | this.$dialog.alert({ | ||||
| @@ -4673,7 +4681,7 @@ | |||||
| this.$cookies.set("search",this.mapZjdTeAll); | this.$cookies.set("search",this.mapZjdTeAll); | ||||
| this.$router.push({path:'/homesteadSurvey/add'}); | this.$router.push({path:'/homesteadSurvey/add'}); | ||||
| }else { | }else { | ||||
| this.$toast("请先在地图上选择宅基地后,再添加自然幢选择"); | |||||
| this.$toast("请先在地图上选择宅基地后,再选择自然幢按钮"); | |||||
| } | } | ||||
| }, | }, | ||||
| fsssTz(){ | fsssTz(){ | ||||
| @@ -4684,7 +4692,7 @@ | |||||
| this.$cookies.set("search",this.mapZjdTeAll); | this.$cookies.set("search",this.mapZjdTeAll); | ||||
| this.$router.push({path:'/homesteadSurvey/add'}); | this.$router.push({path:'/homesteadSurvey/add'}); | ||||
| }else { | }else { | ||||
| this.$toast("请先在地图上选择宅基地后,再添加自然幢选择"); | |||||
| this.$toast("请先在地图上选择宅基地后,再选择附属设施按钮"); | |||||
| } | } | ||||
| }, | }, | ||||
| //绘图重置清除之前图层 | //绘图重置清除之前图层 | ||||