diff --git a/src/components/Map/MapGisDrawing.vue b/src/components/Map/MapGisDrawing.vue index b72207b5..c559dda8 100644 --- a/src/components/Map/MapGisDrawing.vue +++ b/src/components/Map/MapGisDrawing.vue @@ -7,6 +7,7 @@ +       @@ -29,6 +30,10 @@ export default { uuidMap: this.guidProduct(), drawingPolygonMap: this.guidProduct(), drawingResetMap: this.guidProduct(), + positioningMap: this.guidProduct(), + newZb: null, + newGeom: null, + mapData: null, }; }, props: ['theGeom','message'], @@ -108,6 +113,7 @@ export default { maxZoom: 18.3, //地图放大限制 }), }); + that.mapData= that.message; //图层查询定位开始 ---------start if(this.message.substring(0,1) =="{"){ //that.newHt ="1"; @@ -199,6 +205,7 @@ export default { //图层查询定位结束 ---------end //开始绘制地图 $("#"+this.drawingPolygonMap).click(function () { + that.newGeom = 1; map.removeLayer(hc_land); map.removeLayer(vector_drawing); //that.closeMoule = null; @@ -238,6 +245,7 @@ export default { // }); //还原之前图层 $("#"+this.drawingResetMap).click(function () { + that.newGeom = 2; if(that.closeMoule !=null) { map.addLayer(hc_land); map.removeInteraction(draw); @@ -245,6 +253,189 @@ export default { that.formSubmit(); } }); + //定位当前绘制图层 + $("#"+this.positioningMap).click(function () { + //图层查询定位开始 ---------start + console.log(that.message); + console.log(that.closeMoule); + console.log(that.newGeom); + // var dwmap; + // if(that.closeMoule != null && that.closeMoule !=""){ + // dwmap = JSON.stringify(that.closeMoule); + // }else { + // console.log(that.newGeom); + // dwmap = JSON.stringify(that.newGeom); + // } + var deMap = JSON.stringify(that.closeMoule); + if(that.newGeom == 1){ + if(deMap.substring(0,1) =="{"){ + //that.newHt ="1"; + // var theGeomMap =this.message.replace("Point", "MultiPolygon"); + // var pointLeft = theGeomMap.replace("[", "[[[["); + // var pointRight = pointLeft.replace("]", "]]]]"); + hc_landFuther = new ol.layer.Vector({ + title: "add Layer", + source: new ol.source.Vector({ + projection: projection, + features: new ol.format.GeoJSON().readFeatures("{\n" + + " \"type\": \"Feature\",\n" + + " \"geometry\":" + deMap + "}"), + }), + style: new ol.style.Style({ + fill: new ol.style.Fill({ + //矢量图层填充颜色，以及透明度 + color: "rgba(204, 255, 204,0.3)", + }), + stroke: new ol.style.Stroke({ + //边界样式 + color: "#47c68f", + width: 3, + }), + }), + }); + //map.addLayer(hc_land); + var maxXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxX; + var maxYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxY; + var minXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minX; + var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; + //定位查询位置 + var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + map.getView().animate({ + // 只设置需要的属性即可 + center: center, // 中心点 + zoom: 17.9, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); + // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); + // map.getView().setResolution(resolution); + } else if(deMap.substring(0,1) =="[") { + //that.newHt ="1"; + var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [deMap.replaceAll("\"", "")]}); + var leftJoin = zbNew.replace("\"[", "["); + var rightJoin = leftJoin.replace("\"]", "]"); + hc_landFuther = new ol.layer.Vector({ + title: "add Layer", + source: new ol.source.Vector({ + projection: projection, + features: new ol.format.GeoJSON().readFeatures("{\n" + + " \"type\": \"Feature\",\n" + + " \"geometry\":" + rightJoin + "}"), + }), + style: new ol.style.Style({ + fill: new ol.style.Fill({ + //矢量图层填充颜色，以及透明度 + color: "rgba(204, 255, 204,0.3)", + }), + stroke: new ol.style.Stroke({ + //边界样式 + color: "#47c68f", + width: 3, + }), + }), + }); + //map.addLayer(hc_land); + var maxXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxX; + var maxYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxY; + var minXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minX; + var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; + //定位查询位置 + var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + map.getView().animate({ + // 只设置需要的属性即可 + center: center, // 中心点 + zoom: 16.9, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + } + } else { + console.log(that.mapData); + if(that.mapData.substring(0,1) =="{"){ + //that.newHt ="1"; + // var theGeomMap =this.message.replace("Point", "MultiPolygon"); + // var pointLeft = theGeomMap.replace("[", "[[[["); + // var pointRight = pointLeft.replace("]", "]]]]"); + hc_landFuther = new ol.layer.Vector({ + title: "add Layer", + source: new ol.source.Vector({ + projection: projection, + features: new ol.format.GeoJSON().readFeatures("{\n" + + " \"type\": \"Feature\",\n" + + " \"geometry\":" + that.mapData + "}"), + }), + style: new ol.style.Style({ + fill: new ol.style.Fill({ + //矢量图层填充颜色，以及透明度 + color: "rgba(204, 255, 204,0.3)", + }), + stroke: new ol.style.Stroke({ + //边界样式 + color: "#47c68f", + width: 3, + }), + }), + }); + //map.addLayer(hc_land); + var maxXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxX; + var maxYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxY; + var minXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minX; + var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; + //定位查询位置 + var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + map.getView().animate({ + // 只设置需要的属性即可 + center: center, // 中心点 + zoom: 17.9, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); + // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); + // map.getView().setResolution(resolution); + } else if(that.mapData.substring(0,1) =="[") { + //that.newHt ="1"; + var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [that.mapData.replaceAll("\"", "")]}); + var leftJoin = zbNew.replace("\"[", "["); + var rightJoin = leftJoin.replace("\"]", "]"); + hc_landFuther = new ol.layer.Vector({ + title: "add Layer", + source: new ol.source.Vector({ + projection: projection, + features: new ol.format.GeoJSON().readFeatures("{\n" + + " \"type\": \"Feature\",\n" + + " \"geometry\":" + rightJoin + "}"), + }), + style: new ol.style.Style({ + fill: new ol.style.Fill({ + //矢量图层填充颜色，以及透明度 + color: "rgba(204, 255, 204,0.3)", + }), + stroke: new ol.style.Stroke({ + //边界样式 + color: "#47c68f", + width: 3, + }), + }), + }); + //map.addLayer(hc_land); + var maxXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxX; + var maxYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxY; + var minXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minX; + var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; + //定位查询位置 + var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + map.getView().animate({ + // 只设置需要的属性即可 + center: center, // 中心点 + zoom: 16.9, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + } + } + }); } else{ //this.closeMoule = null; document.getElementById(that.uuidMap).innerHTML = ''; @@ -398,6 +589,7 @@ export default { var feature = evt.feature; var geometry = feature.getGeometry(); var coordinate = geometry.getCoordinates(); + that.newZb = JSON.stringify(coordinate); if(coordinate !="" && coordinate !=null){ //map.addLayer(vector_drawing); map.removeInteraction(draw); @@ -424,6 +616,101 @@ export default { //that.closeMoule = null; that.formSubmit(); }); + //定位当前绘制图层 + $("#"+this.positioningMap).click(function () { + console.log(that.newZb); + //图层查询定位开始 ---------start + //if(){} + //map.removeLayer(hc_landFuther); + if(that.newZb.substring(0,1) =="{"){ + //that.newHt ="1"; + // var theGeomMap =this.message.replace("Point", "MultiPolygon"); + // var pointLeft = theGeomMap.replace("[", "[[[["); + // var pointRight = pointLeft.replace("]", "]]]]"); + hc_landFuther = new ol.layer.Vector({ + title: "add Layer", + source: new ol.source.Vector({ + projection: projection, + features: new ol.format.GeoJSON().readFeatures("{\n" + + " \"type\": \"Feature\",\n" + + " \"geometry\":" + that.newZb + "}"), + }), + style: new ol.style.Style({ + fill: new ol.style.Fill({ + //矢量图层填充颜色，以及透明度 + color: "rgba(204, 255, 204,0.3)", + }), + stroke: new ol.style.Stroke({ + //边界样式 + color: "#47c68f", + width: 3, + }), + }), + }); + //map.addLayer(hc_landFuther); + var maxXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxX; + var maxYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxY; + var minXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minX; + var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; + //定位查询位置 + var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + map.getView().animate({ + // 只设置需要的属性即可 + center: center, // 中心点 + zoom: 17.9, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); + // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); + // map.getView().setResolution(resolution); + } else if(that.newZb.substring(0,1) =="["){ + //that.newHt ="1"; + var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [that.newZb.replaceAll("\"","")]}); + var leftJoin = zbNew.replace("\"[","["); + var rightJoin = leftJoin.replace("\"]","]"); + hc_landFuther = new ol.layer.Vector({ + title: "add Layer", + source: new ol.source.Vector({ + projection: projection, + features: new ol.format.GeoJSON().readFeatures("{\n" + + " \"type\": \"Feature\",\n" + + " \"geometry\":" + rightJoin + "}"), + }), + style: new ol.style.Style({ + fill: new ol.style.Fill({ + //矢量图层填充颜色，以及透明度 + color: "rgba(204, 255, 204,0.3)", + }), + stroke: new ol.style.Stroke({ + //边界样式 + color: "#47c68f", + width: 3, + }), + }), + }); + //map.addLayer(hc_landFuther); + var maxXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxX; + var maxYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.maxY; + var minXMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minX; + var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; + //定位查询位置 + var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + map.getView().animate({ + // 只设置需要的属性即可 + center: center, // 中心点 + zoom: 16.9, // 缩放级别 + rotation: undefined, // 缩放完成view视图旋转弧度 + duration: 1000, // 缩放持续时间，默认不需要设置 + }); + // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); + // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); + // map.getView().setResolution(resolution); + } else { + + } + //图层查询定位结束 ---------end + }); } }, }, diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 9fc25aea..94ff5564 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -674,7 +674,7 @@ name="不动产权证号" label="不动产权证号" placeholder="不动产权证号" - v-show="form1.bdcdyh!=null&&form1.bdcdyh==''" + v-show="form1.bdcdyh!=null&&form1.bdcdyh!=''" /> + @@ -2514,6 +2530,7 @@ resultImg: "", // 最终画布生成的base64图片 isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分 showdj:false, + showsyqrsshy:false, shownmfwnhdm:false, showsyqrnmfwdm:false, showhncysjly:false, @@ -2676,6 +2693,8 @@ jzqkOptions:[], // 土地等级字典 tddjOptions:[], + // 所属行业 + industryOptions:[], // 图片上传路径 baseUrl:"", @@ -2770,7 +2789,14 @@ this.zjlxOptions = response.data; }); this.getDicts("family_status").then(response => { - this.yhzgxOptions = response.data; + var arr = [];response.data.forEach(function (item) { + if (item.dictLabel !== '户主') { + arr.push(item) + } + }); + this.yhzgxOptions = arr; + + /*this.yhzgxOptions = response.data;*/ }); this.getDicts("rights_nature").then(response => { this.qlxzOptions = response.data; @@ -2802,6 +2828,9 @@ this.getDicts("tddj").then(response => { this.tddjOptions = response.data; }); + this.getDicts("Industry").then(response => { + this.industryOptions = response.data; + }); this.getnhdmlist(); this.getZjd(); this.getBaseUrl(); @@ -3073,6 +3102,12 @@ this.nmfwform.nhdm = value.nhdm this.shownmfwnhdm = false }, + // 使用权人所属行业弹出框 + onConfirmsyqrsshy(value){ + this.form1.sshyName = value.dictLabel + this.form1.sshy = value.dictValue + this.showsyqrsshy= false + }, // 户内成员数据来源弹出框 onConfirmhncysjly(value){ this.form5.sjlyName = value.dictLabel @@ -3505,16 +3540,15 @@ sjlyName:'农村宅基地使用权确权登记发证' } if(response.rows.length>0){ - console.log(response.rows[0].suyqrdm) this.form.suyqrdm = response.rows[0].suyqrdm } }); } }, getSyqrList() { - if(this.item.zjddm) { + if(this.item.zjddm!=null||this.form.zjddm!=null) { let params = { - "zjddm":this.item.zjddm, + "zjddm":this.item.zjddm?this.item.zjddm:this.form.zjddm, deptId:this.item.deptId } listShyqr(params).then(response => { @@ -3523,10 +3557,9 @@ } }, getZrzList() { - if(this.item.zjddm){ - /* let _this = this*/ + if(this.item.zjddm!=null||this.form.zjddm!=null) { let params = { - "zjddm":this.item.zjddm, + "zjddm":this.item.zjddm?this.item.zjddm:this.form.zjddm, deptId:this.item.deptId } listZrz(params).then(response => { @@ -3538,9 +3571,9 @@ } }, getFsssList() { - if(this.item.zjddm){ + if(this.item.zjddm!=null||this.form.zjddm!=null) { let params = { - "zjddm":this.item.zjddm, + "zjddm":this.item.zjddm?this.item.zjddm:this.form.zjddm, deptId:this.item.deptId } listFsss(params).then(response => { @@ -3559,7 +3592,8 @@ onClose:function(){ _this.showhncy = false let params = { - "nhdm":_this.form5.nhdm + "nhdm":_this.form5.nhdm, + deptId:this.item.deptId } listNhhncy(params).then((response) => { _this.hncylist = response.rows @@ -3577,7 +3611,8 @@ onClose:function(){ _this.showhncy = false let params = { - "nhdm":_this.form5.nhdm + "nhdm":_this.form5.nhdm, + deptId:this.item.deptId } listNhhncy(params).then((response) => { _this.hncylist = response.rows @@ -3792,6 +3827,11 @@ if(this.form1.qlbl==null||this.form1.qlbl==""){ this.form1.qlbl = '1' } + this.industryOptions.map(res => { + if(res.dictValue == this.form1.sshy){ + this.form1.sshyName = res.dictLabel + } + }) this.sjlyOptions.map(res => { if(res.dictValue == this.form1.sjly){ this.form1.sjlyName = res.dictLabel @@ -3933,8 +3973,8 @@ }else{ if(item==""){ this.form3={ - zjddm:this.item.zjddm, - deptId:this.item.deptId, + zjddm:this.item.zjddm?this.item.zjddm:this.form.zjddm, + deptId:this.item.deptId?this.item.deptId:this.form.deptId, zcs:"1", dscs:"1", dxcs:"0", @@ -3991,10 +4031,10 @@ this.showfw = true; if(item==""){ this.nmfwform={ - zrzh: this.item.zrzh, - deptId : this.item.deptId, - zjddm : this.item.zjddm, - nmfwzh : this.item.nmfwzh, + zrzh: null, + deptId : this.item.deptId?this.item.deptId:this.form.deptId, + zjddm : this.item.zjddm?this.item.zjddm:this.form.zjddm, + nmfwzh : null, ch:"1", sjc:"1", myc:"1", @@ -4206,8 +4246,8 @@ }else{ if(item==""){ this.form4={ - deptId:this.item.deptId, - zjddm:this.item.zjddm, + deptId:this.item.deptId?this.item.deptId:this.form.deptId, + zjddm:this.item.zjddm?this.item.zjddm:this.form.zjddm, fssslx:'11', fssslxName:'畜厩', qsly:'99', diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 8200732b..98db4075 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -55,7 +55,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -1199,7 +1199,7 @@ zjdvalue:"", // 使用权人搜索框 nhvalue:"", - active:null, + active:2, // 全部列表 list:[], // 已核查列表 @@ -1332,7 +1332,14 @@ this.jzhcssfyzfOptions = response.data; }); this.getDicts("family_status").then(response => { - this.yhzgxOptions = response.data; + var arr = [];response.data.forEach(function (item) { + if (item.dictLabel !== '户主') { + arr.push(item) + } + }); + this.yhzgxOptions = arr; + + /*this.yhzgxOptions = response.data;*/ }); this.getDicts("cybz").then(response => { this.cybzOptions = response.data; @@ -1727,7 +1734,7 @@ if(this.active==1){ let params = { "deptId" : this.item.deptId, - "houserDataConfirmStatus" : "CONFIRMED", + "houseDataConfirmStatus" : "CONFIRMED", "syqr" : this.zjdvalue } listZjdzd(params).then((response) => { @@ -1738,10 +1745,11 @@ }else if(this.active==2){ let params = { "deptId" : this.item.deptId, - "houserDataConfirmStatus" : "UNCONFIRMED", + "houseDataConfirmStatus" : "UNCONFIRMED", "syqr" : this.zjdvalue } listZjdzd(params).then((response) => { + console.log(response) if (response.code == 200) { this.list2 = response.rows } @@ -1872,17 +1880,25 @@ }, // 户内成员列表 showPopuphncylist(item){ - this.showhncylist = true - let params = { - "nhdm":item.nhdm, - "deptId":this.item.deptId - } - listNhhncy(params).then((response) => { - if (response.code == 200) { - this.hncylist = response.rows - console.log(this.hncylist) + if(item.nhdm==null||item.nhdm==""){ + this.$toast({ + icon: 'error', // 找到自己需要的图标 + message: '请先保存户主信息', + duration:"1000" + }) + }else{ + this.showhncylist = true + let params = { + "nhdm":item.nhdm, + "deptId":this.item.deptId } - }); + listNhhncy(params).then((response) => { + if (response.code == 200) { + this.hncylist = response.rows + } + }); + } + }, showPopupnh(item){ this.shownh = true @@ -1914,7 +1930,7 @@ }) }, getZjdList(){ - if(this.active==1){ + /*if(this.active==1){ let params = { "deptId" : this.item.deptId, "houseDataConfirmStatus" : "CONFIRMED", @@ -1940,8 +1956,7 @@ this.list2 = response.rows } }); - }else{ - console.log(1) + }else{*/ let params = { "deptId" : this.item.deptId, "pageNum": 1, @@ -1963,6 +1978,7 @@ listZjdzd(params1).then((response) => { if (response.code == 200) { this.yhcNums = response.total + this.list1 = response.rows } }); let params2 = { @@ -1974,9 +1990,10 @@ listZjdzd(params2).then((response) => { if (response.code == 200) { this.whcNums = response.total + this.list2 = response.rows } }); - } + /* }*/ }, onConfirm(){}, onSubmithncy(){ @@ -1990,7 +2007,8 @@ onClose:function(){ _this.showhncy = false let params = { - "nhdm":_this.form5.nhdm + "nhdm":_this.form5.nhdm, + deptId:_this.form5.deptId } listNhhncy(params).then((response) => { _this.hncylist = response.rows @@ -2007,12 +2025,11 @@ duration:"1000", onClose:function(){ _this.showhncy = false - console.log(_this.form5,this.form5) let params = { - "nhdm":_this.form5.nhdm + "nhdm":_this.form5.nhdm, + deptId:_this.form5.deptId } listNhhncy(params).then((response) => { - console.log(response.rows) _this.hncylist = response.rows }) }