diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 2a56ad26..b7efc52c 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1085,8 +1085,8 @@ import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy"; import {listShyqr} from "@/api/homesteadSurvey/shyqr"; import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr"; - import {listZrz,getZrzZjdDmList} from "@/api/homesteadSurvey/zrz"; - import {listFsss,getFsssZjdDmList} from "@/api/homesteadSurvey/fsss"; + import {listZrz,getZrzZjdDmList,getZrz} from "@/api/homesteadSurvey/zrz"; + import {listFsss,getFsssZjdDmList,getfsss} from "@/api/homesteadSurvey/fsss"; import { listTown, getTown } from "@/api/homesteadSurvey/town"; import { listVillage} from "@/api/homesteadSurvey/village"; import $ from "jquery"; @@ -3539,49 +3539,54 @@ let zrzIdNum = zrzXq.replace("t_house_survey_zrz.", ""); obj.id = zrzIdNum; // 主键id obj.deptName = trs.find("td").eq(3).text();//行政区划名称 - obj.zjddm = trs.find("td").eq(5).text();//宅基地代码 - obj.nmfwzh = trs.find("td").eq(6).text();//农民房屋幢号 - obj.zrzh = trs.find("td").eq(7).text();//自然幢号 - obj.jgrq = trs.find("td").eq(8).text();//竣工日期 - obj.jzwgd = trs.find("td").eq(9).text();//建筑物高度 - obj.zzdmj = trs.find("td").eq(10).text();//幢占地面积 - obj.zydmj = trs.find("td").eq(11).text();//幢用地面积 + // obj.zjddm = trs.find("td").eq(5).text();//宅基地代码 + // obj.nmfwzh = trs.find("td").eq(6).text();//农民房屋幢号 + // obj.zrzh = trs.find("td").eq(7).text();//自然幢号 + // obj.jgrq = trs.find("td").eq(8).text();//竣工日期 + // obj.jzwgd = trs.find("td").eq(9).text();//建筑物高度 + // obj.zzdmj = trs.find("td").eq(10).text();//幢占地面积 + // obj.zydmj = trs.find("td").eq(11).text();//幢用地面积 obj.scjzmj = trs.find("td").eq(12).text();//实测建筑面积 - obj.zcs = trs.find("td").eq(13).text();//总层数 - obj.dscs = trs.find("td").eq(14).text();//地上层数 - obj.dxcs = trs.find("td").eq(15).text();//地下层数 - obj.fwjg = trs.find("td").eq(16).text();//房屋结构 - obj.sjly = trs.find("td").eq(17).text();//数据来源 - obj.bz = trs.find("td").eq(18).text();//备注 - obj.status = trs.find("td").eq(19).text();//状态 - obj.houseDataConfirmStatus = trs.find("td").eq(24).text();//数据调查确认状态 + // obj.zcs = trs.find("td").eq(13).text();//总层数 + // obj.dscs = trs.find("td").eq(14).text();//地上层数 + // obj.dxcs = trs.find("td").eq(15).text();//地下层数 + // obj.fwjg = trs.find("td").eq(16).text();//房屋结构 + // obj.sjly = trs.find("td").eq(17).text();//数据来源 + // obj.bz = trs.find("td").eq(18).text();//备注 + // obj.status = trs.find("td").eq(19).text();//状态 + // obj.houseDataConfirmStatus = trs.find("td").eq(24).text();//数据调查确认状态 //字典项转化 - //房屋结构字典项 - that.getDicts("housing_structure").then((response) => { - var assetTypeOptions = response.data; - if(obj.fwjg !=null && obj.fwjg !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.fwjg == assetTypeOptions[i].dictValue) { - obj.fwjg = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //房屋结构字典项 - that.getDicts("sjly").then((response) => { - var assetTypeOptions = response.data; - if(obj.sjly !=null && obj.sjly !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.sjly == assetTypeOptions[i].dictValue) { - obj.sjly = assetTypeOptions[i].dictLabel; - break; - } - } - } + // //房屋结构字典项 + // that.getDicts("housing_structure").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.fwjg !=null && obj.fwjg !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.fwjg == assetTypeOptions[i].dictValue) { + // obj.fwjg = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //房屋结构字典项 + // that.getDicts("sjly").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.sjly !=null && obj.sjly !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.sjly == assetTypeOptions[i].dictValue) { + // obj.sjly = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + //let cloneObj = JSON.parse(JSON.stringify(obj)); + //that.mapZrzData = cloneObj; + getZrz(8).then((response) => { + that.mapZrzData.active = 3; + that.mapZrzData.data = response.data; + console.log(that.mapZrzData); }); - let cloneObj = JSON.parse(JSON.stringify(obj)); - that.mapZrzData = cloneObj; if(obj.scjzmj != ""){ that.textMjAll = obj.scjzmj; } else { @@ -3595,143 +3600,148 @@ let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", ""); obj.id = fsssIdNum; // 主键id obj.deptName = trs.find("td").eq(4).text();//行政区划名称 - obj.zjddm = trs.find("td").eq(2).text();//宅基地代码 - obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态 - obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型 + // obj.zjddm = trs.find("td").eq(2).text();//宅基地代码 + // obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态 + // obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型 obj.jzmj = trs.find("td").eq(8).text(); //建筑面积 - obj.qsly = trs.find("td").eq(9).text();//权属来源 - obj.fwzt = trs.find("td").eq(10).text(); //房屋状态 - obj.sfsp = trs.find("td").eq(11).text(); //是否审批 - obj.sffz = trs.find("td").eq(12).text(); //是否发证 - obj.jglx = trs.find("td").eq(13).text(); //结构类型 - obj.sfzzsy = trs.find("td").eq(14).text(); //是否正在使用 - obj.jzwqk = trs.find("td").eq(15).text(); //建筑物情况 - obj.tdzk = trs.find("td").eq(16).text(); //审批或建设前土地状况 - obj.sfsgcf = trs.find("td").eq(17).text(); //是否受过处罚 - obj.remark = trs.find("td").eq(18).text(); //备注 - obj.sysNormalDisable = trs.find("td").eq(19).text(); //是否停用 + // obj.qsly = trs.find("td").eq(9).text();//权属来源 + // obj.fwzt = trs.find("td").eq(10).text(); //房屋状态 + // obj.sfsp = trs.find("td").eq(11).text(); //是否审批 + // obj.sffz = trs.find("td").eq(12).text(); //是否发证 + // obj.jglx = trs.find("td").eq(13).text(); //结构类型 + // obj.sfzzsy = trs.find("td").eq(14).text(); //是否正在使用 + // obj.jzwqk = trs.find("td").eq(15).text(); //建筑物情况 + // obj.tdzk = trs.find("td").eq(16).text(); //审批或建设前土地状况 + // obj.sfsgcf = trs.find("td").eq(17).text(); //是否受过处罚 + // obj.remark = trs.find("td").eq(18).text(); //备注 + // obj.sysNormalDisable = trs.find("td").eq(19).text(); //是否停用 //附属设施类型字典项 - that.getDicts("fsss_type").then((response) => { - var assetTypeOptions = response.data; - if(obj.fssslx !=null && obj.fssslx !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.fssslx == assetTypeOptions[i].dictValue) { - obj.fssslx = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //权属类型字典项 - that.getDicts("acquisition_method").then((response) => { - var assetTypeOptions = response.data; - if(obj.qsly !=null && obj.qsly !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.qsly == assetTypeOptions[i].dictValue) { - obj.qsly = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //房屋状态字典项 - that.getDicts("fwzt").then((response) => { - var assetTypeOptions = response.data; - if(obj.fwzt !=null && obj.fwzt !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.fwzt == assetTypeOptions[i].dictValue) { - obj.fwzt = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //是否审批字典项 - that.getDicts("sys_yes_no").then((response) => { - var assetTypeOptions = response.data; - if(obj.sfsp !=null && obj.sfsp !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.sfsp == assetTypeOptions[i].dictValue) { - obj.sfsp = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //是否发证字典项 - that.getDicts("sys_yes_no").then((response) => { - var assetTypeOptions = response.data; - if(obj.sffz !=null && obj.sffz !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.sffz == assetTypeOptions[i].dictValue) { - obj.sffz = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //结构类型字典项 - that.getDicts("house_jglx").then((response) => { - var assetTypeOptions = response.data; - if(obj.jglx !=null && obj.jglx !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.jglx == assetTypeOptions[i].dictValue) { - obj.jglx = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //是否正在使用字典项 - that.getDicts("sys_yes_no").then((response) => { - var assetTypeOptions = response.data; - if(obj.sfzzsy !=null && obj.sfzzsy !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.sfzzsy == assetTypeOptions[i].dictValue) { - obj.sfzzsy = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //房屋状态字典项 - that.getDicts("fwzt").then((response) => { - var assetTypeOptions = response.data; - if(obj.fwzt !=null && obj.fwzt !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.fwzt == assetTypeOptions[i].dictValue) { - obj.fwzt = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //土地状况字典项 - that.getDicts("land_state").then((response) => { - var assetTypeOptions = response.data; - if(obj.tdzk !=null && obj.tdzk !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.tdzk == assetTypeOptions[i].dictValue) { - obj.tdzk = assetTypeOptions[i].dictLabel; - break; - } - } - } - }); - //是否受过处罚字典项 - that.getDicts("land_state").then((response) => { - var assetTypeOptions = response.data; - if(obj.sfsgcf !=null && obj.sfsgcf !=""){ - for(var i=0;assetTypeOptions.length >i; i++){ - if(obj.sfsgcf == assetTypeOptions[i].dictValue) { - obj.sfsgcf = assetTypeOptions[i].dictLabel; - break; - } - } - } + // that.getDicts("fsss_type").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.fssslx !=null && obj.fssslx !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.fssslx == assetTypeOptions[i].dictValue) { + // obj.fssslx = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //权属类型字典项 + // that.getDicts("acquisition_method").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.qsly !=null && obj.qsly !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.qsly == assetTypeOptions[i].dictValue) { + // obj.qsly = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //房屋状态字典项 + // that.getDicts("fwzt").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.fwzt !=null && obj.fwzt !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.fwzt == assetTypeOptions[i].dictValue) { + // obj.fwzt = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //是否审批字典项 + // that.getDicts("sys_yes_no").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.sfsp !=null && obj.sfsp !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.sfsp == assetTypeOptions[i].dictValue) { + // obj.sfsp = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //是否发证字典项 + // that.getDicts("sys_yes_no").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.sffz !=null && obj.sffz !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.sffz == assetTypeOptions[i].dictValue) { + // obj.sffz = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //结构类型字典项 + // that.getDicts("house_jglx").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.jglx !=null && obj.jglx !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.jglx == assetTypeOptions[i].dictValue) { + // obj.jglx = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //是否正在使用字典项 + // that.getDicts("sys_yes_no").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.sfzzsy !=null && obj.sfzzsy !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.sfzzsy == assetTypeOptions[i].dictValue) { + // obj.sfzzsy = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //房屋状态字典项 + // that.getDicts("fwzt").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.fwzt !=null && obj.fwzt !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.fwzt == assetTypeOptions[i].dictValue) { + // obj.fwzt = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //土地状况字典项 + // that.getDicts("land_state").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.tdzk !=null && obj.tdzk !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.tdzk == assetTypeOptions[i].dictValue) { + // obj.tdzk = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + // //是否受过处罚字典项 + // that.getDicts("land_state").then((response) => { + // var assetTypeOptions = response.data; + // if(obj.sfsgcf !=null && obj.sfsgcf !=""){ + // for(var i=0;assetTypeOptions.length >i; i++){ + // if(obj.sfsgcf == assetTypeOptions[i].dictValue) { + // obj.sfsgcf = assetTypeOptions[i].dictLabel; + // break; + // } + // } + // } + // }); + //let cloneObj = JSON.parse(JSON.stringify(obj)); + //that.mapFsssData = cloneObj; + getfsss(12).then((response) => { + console.log(response); + that.mapfsssData.active = 4; + that.mapfsssData.data = response.data; }); - let cloneObj = JSON.parse(JSON.stringify(obj)); - that.mapFsssData = cloneObj; if(obj.jzmj != ""){ that.textMjAll = obj.jzmj; } else { @@ -4178,10 +4188,14 @@ if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){ this.$cookies.set("search",this.mapZjdData); this.$router.push({path:'/homesteadSurvey/add'}); + this.$cookies.set("search",this.mapZrzData); + this.$router.push({path:'/homesteadSurvey/add'}); + this.$cookies.set("search",this.mapfsssData); + this.$router.push({path:'/homesteadSurvey/add'}); } else { this.$dialog.alert({ title: '宅基地核查', - message: "请从地图选择宅基地并点击核查", + message: "请从地图选择地图并点击核查", theme: 'round-button', }).then(() => { // on close