diff --git a/src/api/homesteadSurvey/shyqr.js b/src/api/homesteadSurvey/shyqr.js index fcadba84..21530062 100644 --- a/src/api/homesteadSurvey/shyqr.js +++ b/src/api/homesteadSurvey/shyqr.js @@ -67,7 +67,7 @@ export function updateShyqr(data) { // 删除数据调查-使用权人 export function delShyqr(id) { return request({ - url: '/houseSurvey/shyqr/remove/' + id, + url: '/home/homesteadshyqr/remove/' + id, method: 'get' }) } diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 08f704a6..5c6f7dc3 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -3,7 +3,7 @@
- +

空间信息

- 清空画板 - 保存提交 - +
+ + +
+ 清空画板 + 保存提交 + +
@@ -157,6 +161,8 @@ import {getZjdzd,updateZjdzd,zjddcSign} from "@/api/homesteadSurvey/zjdzd"; import MapGisDrawing from "@/components/Map/MapGisDrawing"; import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss"; import MultiImageUploadComp from "@/components/house/MultiImageUploadComp" +import {Dialog} from "vant"; +import $ from "jquery"; export default { name: "homesteadAdd", components: { MapGisDrawing,MultiImageUploadComp}, @@ -204,13 +210,13 @@ export default { } if(this.zjdzdxx.id !== undefined){ getZjdzd(this.zjdzdxx.id).then((response) => { - if(response.data.surveyStatus !== "1" && businessLevel === "2"){ + if(response.data.surveyStatus === "3" && businessLevel === "2"){ this.showDcsh = true; } }); this.getList(); } - + this.height = window.screen.height * 1.28 - 20; }, mounted(){ @@ -236,6 +242,9 @@ export default { fileUpdate(val){ this.$set(this.zjdzdxx, 'surveyBztp',val.path); }, + canvasTTdown() { + $('#canvasTT').css('display', 'none'); + }, onSurveyStatusChanged(val){ this.$set(this.zjdzdxx, 'surveyStatus', val.dictValue); if(val.dictValue === "5"){ @@ -285,6 +294,7 @@ export default { if(this.$refs.esign){ this.$refs.esign.reset(); } + $('#canvasTT').css('display', 'block') }, // 生成签字图 handleGenerate() { @@ -427,4 +437,15 @@ export default { /deep/ .van-nav-bar__text { color: #fff; } +.signature-footer { + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0px; + +} +.clearBtn { + margin-left: 15px; +} diff --git a/src/views/homesteadSurvey/fsssAdd.vue b/src/views/homesteadSurvey/fsssAdd.vue index 40134a42..ed8140e3 100644 --- a/src/views/homesteadSurvey/fsssAdd.vue +++ b/src/views/homesteadSurvey/fsssAdd.vue @@ -3,7 +3,7 @@
diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue index 7c7533ee..5f2c8b20 100644 --- a/src/views/homesteadSurvey/list2.vue +++ b/src/views/homesteadSurvey/list2.vue @@ -28,7 +28,7 @@
-
入户核查
+
入户
农户信息
所有权人
切换地图
@@ -116,7 +116,7 @@ qbNums:0, //已调查数量 yhcNums:0, - //未核查数量 + //未数量 whcNums:0, // 总户数 totalH:0, @@ -157,9 +157,9 @@ active:2, // 全部列表 list:[], - // 已核查列表 + // 已列表 list1:[], - // 未核查列表 + // 未列表 list2:[], // 户主列表 nhlist:[], diff --git a/src/views/homesteadSurvey/list4.vue b/src/views/homesteadSurvey/list4.vue index 597b7783..d59d9cab 100644 --- a/src/views/homesteadSurvey/list4.vue +++ b/src/views/homesteadSurvey/list4.vue @@ -567,22 +567,44 @@
全选
- + + + + + + + + + + + + + + + + + - - - +
@@ -1198,8 +1220,8 @@

宅基地

- - +

自然幢

+

附属设施

@@ -1243,9 +1265,13 @@ totalH:0, // 总人数 totalR:0, - zjdSx:true, - zrzSx :true, - fsssSx:true, + zjdDdc:true, + zjdDcyc:false, + zjdDcwc:false, + zjdDcbh:false, + zjdSptg:false, + zrzSx :false, + fsssSx:false, showhncysjly:false, showhzsjly:false, showhncycybz:false, @@ -1337,6 +1363,7 @@ mapZrzData:"", mapFsssData:"", mapZjdDataTure:"", + height: null, mapZjdTeAll:{ active:"", mapZjdAData:{}, @@ -1354,7 +1381,7 @@ mapTownList: null, mapVillageList: null, coordinate:"", - checked:['zjdSx', 'zrzSx', 'fsssSx'], + checked:['zjdDdc'], checkAllMap: false, sx:"", drawingClick:true, @@ -1375,12 +1402,12 @@ //绘图 htZjdZrzFsss:"", //筛选 - checkAllFlag: true, + checkAllFlag: false, CheckedAllArr: [],//全选数组 dataForm: { imageUrl: [] }, - dataList: [["fsssSx"],["zjdSx"],["zrzSx"]], //地图使用 --end + dataList: [["zjdDdc"],["zjdDcyc"],["zjdDcwc"],["zjdDcbh"],["zjdSptg"], ["fsssSx"],["zrzSx"]], //地图使用 --end checkBoxAll:[], //地图跳转存之 mapAddJump:"", @@ -1400,7 +1427,7 @@ uploadImgList:[], uploadImgList1:[], // 字典列表json - dictTypeList:null, + dictTypeList:null }; }, mounted(){ @@ -1447,7 +1474,6 @@ this.mapAddJumpNum =1; this.mapShow(); this.getZjdList(); - this.getTotalHR(); if(this.item.taskStatus=="FINISHED"){ this.isFinished = true }else{ @@ -1458,7 +1484,6 @@ }else { this.item = JSON.parse(localStorage.getItem("surveyItem")); this.getZjdList(); - this.getTotalHR(); } }, methods: { @@ -3288,13 +3313,61 @@ //国有数据加载----------------------------------end //宅基地图层查询开始 ------------------start //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'"; - var zjdTc = new ol.layer.Image({ + let zjdDdc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/wms", + params: { + LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey', + TILED: true, + cql_filter: cql_filter+" and survey_status = '1'", + SRID: 3857, + TIMESTAMP: new Date().getTime(), + }, + }), + }); + let zjdDcyc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/wms", + params: { + LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey', + TILED: true, + cql_filter: cql_filter+" and survey_status = '2'", + SRID: 3857, + TIMESTAMP: new Date().getTime(), + }, + }), + }); + let zjdDcwc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/wms", + params: { + LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey', + TILED: true, + cql_filter: cql_filter+" and survey_status = '3'", + SRID: 3857, + TIMESTAMP: new Date().getTime(), + }, + }), + }); + let zjdDcbh = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/wms", + params: { + LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey', + TILED: true, + cql_filter: cql_filter+" and survey_status = '4'", + SRID: 3857, + TIMESTAMP: new Date().getTime(), + }, + }), + }); + let zjdSptg = new ol.layer.Image({ source: new ol.source.ImageWMS({ url: that.mapGeoServerUrl + "/wms", params: { - LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx', + LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey', TILED: true, - cql_filter: cql_filter+"and survey_status = '1'", + cql_filter: cql_filter+" and survey_status = '5'", SRID: 3857, TIMESTAMP: new Date().getTime(), }, @@ -3306,9 +3379,9 @@ service: "WFS", version: "1.0.0", request: "GetFeature", - typename: "nsgk_wulanhaote:t_homestead_zjdzdxx", + typename: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey", //featureNS: 'nsgk_hc',//命名空间 URI - cql_filter: cql_filter+" and survey_status = '1'", + cql_filter: cql_filter, //featurePrefix: 'nationalwater',//工作区名称 //featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开 outputFormat: "application/json", @@ -3477,7 +3550,6 @@ }, }), }); - map.addLayer(zrzTc); //自然幢图层查询开始 ------------------start var fsssTc; @@ -3494,8 +3566,7 @@ }, }), }); - map.addLayer(fsssTc); - map.addLayer(zjdTc); + map.addLayer(zjdDdc); var Zb; var latitude; var longitude; @@ -4092,37 +4163,135 @@ //按照查询 定位地图-----------------end //筛选附属设施-----------------------------------start - $("#fsssSx").click(function () { - if(!that.fsssSx){ + $("#fsssSx").click(function (e) { + if(e.delegateTarget.ariaChecked === "false"){ map.addLayer(fsssTc); - }else { + that.fsssSx = true; + }else{ map.removeLayer(fsssTc); + that.fsssSx = false; } }); - $("#zrzSx").click(function () { - if(!that.zrzSx){ + $("#zrzSx").click(function (e) { + if(e.delegateTarget.ariaChecked === "false"){ map.addLayer(zrzTc); - }else { + that.zrzSx = true; + }else{ map.removeLayer(zrzTc); + that.zrzSx = false; + } + }); + $("#zjdDdc").click(function (e) { + if(e.delegateTarget.ariaChecked === "false"){ + map.addLayer(zjdDdc); + that.zjdDdc = true; + }else{ + map.removeLayer(zjdDdc); + that.zjdDdc = false; } }); - $("#zjdSx").click(function () { - if(!that.zjdSx){ - map.addLayer(zjdTc); + $("#zjdDcyc").click(function (e) { + if(e.delegateTarget.ariaChecked === "false"){ + map.addLayer(zjdDcyc); + that.zjdDcyc = true; + }else{ + map.removeLayer(zjdDcyc); + that.zjdDcyc = false; + } + }); + $("#zjdDcwc").click(function (e) { + if(e.delegateTarget.ariaChecked === "false"){ + map.addLayer(zjdDcwc); + that.zjdDcwc = true; + }else{ + map.removeLayer(zjdDcwc); + that.zjdDcwc = false; + } + }); + $("#zjdDcbh").click(function (e) { + if(e.delegateTarget.ariaChecked === "false"){ + map.addLayer(zjdDcbh); + that.zjdDcbh = true; + }else{ + map.removeLayer(zjdDcbh); + that.zjdDcbh = false; + } + }); + $("#zjdSptg").click(function (e) { + if(e.delegateTarget.ariaChecked === "false"){ + map.addLayer(zjdSptg); + that.zjdSptg = true; }else { - map.removeLayer(zjdTc); + map.removeLayer(zjdSptg); + that.zjdSptg = false; } }); $("#checkAll").click(function () { - if(!that.fsssSx && !that.zjdSx && !that.zrzSx){ - map.addLayer(zjdTc); - map.addLayer(zrzTc); - map.addLayer(fsssTc); - }else { + if(!that.checkAllFlag){ + + if(!that.fsssSx){ + map.addLayer(fsssTc); + } + if(!that.zrzSx){ + map.addLayer(zrzTc); + } + if(!that.zjdDdc){ + map.addLayer(zjdDdc); + } + if(!that.zjdDcyc){ + map.addLayer(zjdDcyc); + } + if(!that.zjdDcwc){ + map.addLayer(zjdDcwc); + } + if(!that.zjdDcbh){ + map.addLayer(zjdDcbh); + } + if(!that.zjdSptg){ + map.addLayer(zjdSptg); + } + }else{ + that.zjdDdc = false; map.removeLayer(zrzTc); - map.removeLayer(zjdTc); + map.removeLayer(zjdDdc); + map.removeLayer(zjdDcyc); + map.removeLayer(zjdDcwc); + map.removeLayer(zjdDcbh); + map.removeLayer(zjdSptg); map.removeLayer(fsssTc); } + // console.info(that.fsssSx); + // if(!that.fsssSx && !that.zjdDdc && !that.zjdDcyc && !that.zjdDcwc && !that.zjdDcbh && !that.zjdSptg && !that.zrzSx){ + // map.addLayer(zjdDdc); + // map.addLayer(zjdDcyc); + // map.addLayer(zjdDcwc); + // map.addLayer(zjdDcbh); + // map.addLayer(zjdSptg); + // map.addLayer(zrzTc); + // map.addLayer(fsssTc); + // that.fsssSx = true; + // that.zjdDdc = true; + // that.zjdDcyc = true; + // that.zjdDcwc = true; + // that.zjdDcbh = true; + // that.zjdSptg = true; + // that.zrzSx = true; + // }else { + // map.removeLayer(zrzTc); + // map.removeLayer(zjdDdc); + // map.removeLayer(zjdDcyc); + // map.removeLayer(zjdDcwc); + // map.removeLayer(zjdDcbh); + // map.removeLayer(zjdSptg); + // map.removeLayer(fsssTc); + // that.fsssSx = false; + // that.zjdDdc = false; + // that.zjdDcyc = false; + // that.zjdDcwc = false; + // that.zjdDcbh = false; + // that.zjdSptg = false; + // that.zrzSx = false; + // } }); //筛选附属设施-----------------------------------end // //获取类型开始 侧面-----------------------------------------------------------------start @@ -4495,7 +4664,7 @@ var wmsSource = new ol.source.TileWMS({ url: that.mapGeoServerUrl+"/wms", params: { - LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx", + LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey", TILED: true, SRID: 3857, serverType: "geoserver", @@ -4508,7 +4677,7 @@ var ZjdwmsSource = new ol.source.TileWMS({ url: that.mapGeoServerUrl+"/wms", params: { - LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx", + LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey", TILED: true, SRID: 3857, serverType: "geoserver", @@ -4689,14 +4858,14 @@ that.mapZjdTeAll.mapFsssAData = {}; that.mapZjdDataTure = ""; setTimeout(() => { - if ($("#info .featureInfo .featureInfo").text() == "t_homestead_zjdzdxx") { + if ($("#info .featureInfo .featureInfo").text() == "t_homestead_zjdzdxx_mobile_survey") { map.removeLayer(hc_land_on); that.mapHasDateStatus = 2; that.mapXs = true; let obj = {}; let trs = $("#info .featureInfo").find("tr:eq(1)"); let zjdXq = trs.find("td").eq(0).text(); - let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", ""); + let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx_mobile_survey.", ""); obj.id = zjdIdNum; // 主键id obj.deptName = trs.find("td").eq(3).text();//行政区划名称 @@ -4731,19 +4900,19 @@ //自然幢图层查询开始 ------------------start //附属设施图层查询开始 ------------------start //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'"; - fsssTc = new ol.layer.Image({ - source: new ol.source.ImageWMS({ - url: that.mapGeoServerUrl + "/wms", - params: { - LAYERS: 'nsgk_wulanhaote:t_homestead_fsss', - TILED: true, - cql_filter: cql_filter_map, - SRID: 3857, - TIMESTAMP: new Date().getTime(), - }, - }), - }); - map.addLayer(fsssTc); + // fsssTc = new ol.layer.Image({ + // source: new ol.source.ImageWMS({ + // url: that.mapGeoServerUrl + "/wms", + // params: { + // LAYERS: 'nsgk_wulanhaote:t_homestead_fsss', + // TILED: true, + // cql_filter: cql_filter_map, + // SRID: 3857, + // TIMESTAMP: new Date().getTime(), + // }, + // }), + // }); + // map.addLayer(fsssTc); //附属设施图层查询开始 ------------------end that.$cookies.set("search", "") //that.$cookies.set("map", "") @@ -5650,7 +5819,7 @@ this.$cookies.set("search","") let trs = $("#info .featureInfo").find("tr:eq(1)"); let zjdXq = trs.find("td").eq(0).text(); - let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", ""); + let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx_mobile_survey.", ""); getZjdzd(zjdIdNum).then((response) => { this.mapZjdData = response.data; this.mapZjdTeAll.active = 1; @@ -5744,7 +5913,7 @@ }, // checkAllArray(value){ - if(this.checked.length<3){ + if(this.checked.length<7){ this.$refs.checkboxGroup.toggleAll(true); }else{ this.$refs.checkboxGroup.toggleAll(false); @@ -5769,12 +5938,17 @@ //单选 handleChecked(value) { // this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length; - if (value.length<3){ + if (value.length<7){ this.checkAllFlag = false; }else{ this.checkAllFlag = true; } - value.indexOf('zjdSx') == -1 ? this.zjdSx = false : this.zjdSx = true; + console.info(value); + value.indexOf('zjdDdc') == -1 ? this.zjdDdc = false : this.zjdDdc = true; + value.indexOf('zjdDcyc') == -1 ? this.zjdDcyc = false : this.zjdDcyc = true; + value.indexOf('zjdDcwc') == -1 ? this.zjdDcwc = false : this.zjdDcwc = true; + value.indexOf('zjdDcbh') == -1 ? this.zjdDcbh = false : this.zjdDcbh = true; + value.indexOf('zjdSptg') == -1 ? this.zjdSptg = false : this.zjdSptg = true; value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true; value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true; }, @@ -5795,6 +5969,25 @@ this.mapZjdTeAll.active =1; this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId; this.mapZjdTeAll.mapZjdAData.theGeomJson =this.htZjdZrzFsss; + console.info(this.mapZjdTeAll.mapZjdAData.theGeomJson); + listSuyqr({deptId: this.item.deptId}).then((response) => { + this.$set(this.mapZjdTeAll.mapZjdAData, "suyqrdm",response.rows[0]); + }); + this.$set(this.mapZjdTeAll.mapZjdAData, "zjdlyzk","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "landStatus","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "houseOwnership","2"); + this.$set(this.mapZjdTeAll.mapZjdAData, "landPhms","10"); + this.$set(this.mapZjdTeAll.mapZjdAData, "isMore","0"); + this.$set(this.mapZjdTeAll.mapZjdAData, "sffz","0"); + this.$set(this.mapZjdTeAll.mapZjdAData, "sfcz","0"); + this.$set(this.mapZjdTeAll.mapZjdAData, "zjdqdfs","01"); + this.$set(this.mapZjdTeAll.mapZjdAData, "sjly","01"); + this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203"); + this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01"); + this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1"); + //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId; //this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search","") @@ -5807,28 +6000,33 @@ }, zrzTz(){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ + console.info(this.mapZjdData); this.mapZjdTeAll.active =3; - this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss; + this.mapZjdTeAll.mapZrzAData.theGeomJson =this.htZjdZrzFsss; + console.info(this.htZjdZrzFsss); this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId; + this.mapZjdTeAll.mapZrzAData.zjddm = this.mapZjdData.zjddm; + this.mapZjdTeAll.mapZrzAData.fwjg = "01"; //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId; //this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search","") - localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZrzAData)); - this.$router.push({path:'/homesteadSurvey/add3'}); + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdData)); + this.$router.push({name:'zrzAdd',query:this.mapZjdTeAll.mapZrzAData}); }else { this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮"); } }, fsssTz(){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ - this.mapZjdTeAll.active =4; - this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss; + this.mapZjdTeAll.active =4; + this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss; + this.mapZjdTeAll.mapFsssAData.zjddm = this.mapZjdData.zjddm; this.mapZjdTeAll.mapFsssAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId; //this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId; //this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search","") - localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapFsssAData)); - this.$router.push({path:'/homesteadSurvey/add4'}); + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdData)); + this.$router.push({name:'fsssAdd',query:this.mapZjdTeAll.mapFsssAData}); }else { this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮"); } diff --git a/src/views/homesteadSurvey/nhAdd.vue b/src/views/homesteadSurvey/nhAdd.vue index d9e49fc9..17ed5209 100644 --- a/src/views/homesteadSurvey/nhAdd.vue +++ b/src/views/homesteadSurvey/nhAdd.vue @@ -3,7 +3,7 @@