From 8f4bc849f18d40a8fe3364ff95fa9ad83868c300 Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Thu, 8 Jun 2023 11:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/homesteadSurvey/fsss.js | 2 +- src/api/homesteadSurvey/zrz.js | 2 +- src/views/homesteadSurvey/add.vue | 18 +- src/views/homesteadSurvey/add2.vue | 2 +- src/views/homesteadSurvey/add3.vue | 28 +- src/views/homesteadSurvey/add4.vue | 19 +- src/views/homesteadSurvey/hncyList2.vue | 13 +- src/views/homesteadSurvey/list4.vue | 369 ++---------------- src/views/homesteadSurvey/nhDetails.vue | 10 +- src/views/homesteadSurvey/nhcyAdd.vue | 21 +- src/views/homesteadSurvey/nhcyList.vue | 4 +- src/views/homesteadSurvey/nmfwAdd.vue | 25 +- src/views/homesteadSurvey/nmfwList.vue | 17 +- src/views/homesteadSurvey/shyqrAdd.vue | 2 +- src/views/homesteadSurvey/zrzAdd.vue | 3 + .../arbitration/arbitrationDetail.vue | 2 +- 16 files changed, 157 insertions(+), 380 deletions(-) diff --git a/src/api/homesteadSurvey/fsss.js b/src/api/homesteadSurvey/fsss.js index 616cb45d..3b7569c4 100644 --- a/src/api/homesteadSurvey/fsss.js +++ b/src/api/homesteadSurvey/fsss.js @@ -47,7 +47,7 @@ export function updateFsss(data) { // 删除数据调查-附属设施 export function delFsss(id) { return request({ - url: '/houseSurvey/fsss/remove/' + id, + url: '/home/homesteadfsss/remove/' + id, method: 'get' }) } diff --git a/src/api/homesteadSurvey/zrz.js b/src/api/homesteadSurvey/zrz.js index 43dbb7f8..f3baeb88 100644 --- a/src/api/homesteadSurvey/zrz.js +++ b/src/api/homesteadSurvey/zrz.js @@ -56,7 +56,7 @@ export function zrzConnectTask(data) { // 删除数据调查-自然幢 export function delZrz(id) { return request({ - url: '/houseSurvey/zrz/remove/' + id, + url: '/home/homespacezrz/remove/' + id, method: 'get' }) } diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 1c80f83c..08f704a6 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -25,21 +25,21 @@
- +

农户
- +

房屋
- +

附属物

 @@ -812,7 +812,6 @@ export default { }; }, created(){ - let data = this.$route.query.res; this.form = JSON.parse(localStorage.getItem("zjdzdxxItem")); this.permission = localStorage.getItem("executePermission"); if(this.form.sfcz === "1"){ @@ -944,6 +943,14 @@ export default { this.showWbzyy = true; } }, + checkTz(val){ + console.info(val) + if(this.form.zjddm == null){ + Dialog({ type: 'danger', message: '请生成宅基地信息！' }); + }else{ + this.$router.push({path:val}); + } + }, /**宅基地利用状态处理*/ onZjdlyzkChanged(val){ console.info(val); @@ -959,6 +966,7 @@ export default { let map = this.$refs.pointDarwMap; if(data == null) data = this.form.theGeomJson; + console.info(data); this.setMapData(map, data); }); @@ -979,7 +987,7 @@ export default { }, // 当地图绘制完成时 onMapDrawFinished(data) { - console.info(data); + console.info(JSON.stringify(data)); this.drawInsert = data; this.form.theGeomJson = JSON.stringify(this.drawInsert); }, diff --git a/src/views/homesteadSurvey/add2.vue b/src/views/homesteadSurvey/add2.vue index d38b4468..88edbe49 100644 --- a/src/views/homesteadSurvey/add2.vue +++ b/src/views/homesteadSurvey/add2.vue @@ -208,7 +208,7 @@ export default { this.$router.push({name:'nhAdd',query:val}); }, showPopupnhcy(){ - this.$router.push({name:'nhcyAdd',query:{}}); + this.$router.push({name:'nhcyAdd',query:{yhzgxOperate:"true"}}); }, showPopuphncylist(val){ this.$router.push({name:'nhcyList',query:val}); diff --git a/src/views/homesteadSurvey/add3.vue b/src/views/homesteadSurvey/add3.vue index 8a2b78cf..a5264786 100644 --- a/src/views/homesteadSurvey/add3.vue +++ b/src/views/homesteadSurvey/add3.vue @@ -85,7 +85,7 @@ @@ -140,7 +140,7 @@ export default { getList(){ let params = { zjddm:this.zjdzdxx.zjddm, - pageNum: this.countyhc+1, + pageNum: 1, pageSize:10, } listZrz(params).then(response => { @@ -171,12 +171,12 @@ export default { onRefreshZrz(){ if(this.loading){ let params = { - zjddm:this.zjdzdxx.zjddm, - pageNum: this.countyhc+1, - pageSize:10, + "zjddm":this.zjdzdxx.zjddm, + "pageNum": this.countyhc+1, + "pageSize":10, } listZrz(params).then(response => { - if(response.rows.length>0&&response.rows.length0&&this.zrzlist.length { this.zrzlist.push(res) }) @@ -201,7 +201,21 @@ export default { shownmfwlist(val){ this.$router.push({name:'nmfwList',query:val}); }, - deletezrz(){}, + deletezrz(val){ + const ids = val.id || this.ids; + Dialog.confirm({ + title: '系统提示', + message: '是否确认删除自然幢标识为"' + val.id + '"的数据项?', + confirmButtonText: '确定', + cancelButtonText: '取消' + }) + .then(function() { + return delZrz(ids); + }).then(() => { + this.$notify({ type: 'success' , message: "删除成功" }); + location.reload(true); + }).catch(() => {}); + }, } } diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue index 9f1087fc..a8f13491 100644 --- a/src/views/homesteadSurvey/add4.vue +++ b/src/views/homesteadSurvey/add4.vue @@ -81,7 +81,7 @@ @@ -350,8 +350,21 @@ export default { showPopupAddzrz(){ this.$router.push({name:'fsssAdd',query:{zjddm:this.zjdzdxx.zjddm}}); }, - shownmfwlist(){}, - deletezrz(){}, + deletefsss(val){ + const ids = val.id || this.ids; + Dialog.confirm({ + title: '系统提示', + message: '是否确认删除附属物标识为"' + val.id + '"的数据项?', + confirmButtonText: '确定', + cancelButtonText: '取消' + }) + .then(function() { + return delFsss(ids); + }).then(() => { + this.$notify({ type: 'success' , message: "删除成功" }); + location.reload(true); + }).catch(() => {}); + }, qmqr(){ this.showesign = true; }, diff --git a/src/views/homesteadSurvey/hncyList2.vue b/src/views/homesteadSurvey/hncyList2.vue index 70d82b68..103708de 100644 --- a/src/views/homesteadSurvey/hncyList2.vue +++ b/src/views/homesteadSurvey/hncyList2.vue @@ -54,7 +54,7 @@ -
+

户内成员

@@ -4952,6 +4952,17 @@ /deep/ .van-swipe-cell__wrapper{ margin-right:-3px; } + .title:before + { + content:""; + width: 6px; + height: 20PX; + background: #7ac943; + border-radius: 3px; + position:absolute; + left:0; + bottom:0; + } .hzlxBtn{ font-size: 0.3rem; display: inline-block; diff --git a/src/views/homesteadSurvey/list4.vue b/src/views/homesteadSurvey/list4.vue index 1d3fabc4..ef7b23b7 100644 --- a/src/views/homesteadSurvey/list4.vue +++ b/src/views/homesteadSurvey/list4.vue @@ -51,7 +51,7 @@
宅基地数： - {{qbNums}} 户 + {{qbNums}} 宗
使用权人数： @@ -508,7 +508,7 @@ placeholder="请输入宗地或权利人信息" > -
- -

测量

-
+ + + +

核查

@@ -570,17 +570,17 @@ @@ -1198,8 +1198,8 @@

宅基地

-

自然幢

-

附属设施

+ +
@@ -2443,7 +2443,7 @@ }, getZjdList(){ let params = { - "surveyStatus":"1", + "surveyStatus":"1,2,3,4,5", "pageNum": 1, "pageSize":10, } @@ -3462,7 +3462,6 @@ .catch((error) => { console.log("【异常】", error); }); - map.addLayer(zjdTc); //宅基地图层查询开始 ------------------start var zrzTc; //自然幢图层查询开始 ------------------start @@ -3496,321 +3495,7 @@ }), }); map.addLayer(fsssTc); - // //附属设施图层查询开始 ------------------start - //使用geoserver服务查询开始 -------------------end - // if(this.backMap ==1){ - // var cql = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + this.mapZjdTeAll.mapZjdAData.zjddm + "'"; - // var wmsSourceBack = new ol.source.ImageWMS({ - // crossOrigin: 'anonymous', - // params: { - // LAYERS: 'zjd_dc:t_house_survey_all', - // 'VERSION': '1.1.0', - // 'FORMAT': "image/png", - // 'CQL_FILTER': cql - // }, - // serverType: 'geoserver', - // url: that.mapGeoServerUrl + "/wms", - // }); - // zjdTc.setSource(wmsSourceBack); - // ol.view.setResolution(ol.view.getResolution() + Math.random() * 0.00000001);//随机数缩放实现刷新 - // } - //数据库直接加载数据渲染方式---------------------------------------------------start - //判断当前账套是否有数据 - // var mapTalkAbout = true; - // //获取镇界线----start - // if(this.mapTownList.length >0){ - // for (var i = 0; this.mapTownList.length > i; i++) { - // if (this.mapTownList[i] != null && this.mapTownList[i].theGeom != null && this.mapTownList[i].theGeom != "") { - // mapTalkAbout =false; - // this.mapTownList[i].createBy = 'mapTownList'; - // var theGeomLine= this.mapTownList[i].theGeom.replaceAll("MultiPolygon","LineString"); - // theGeomLine = theGeomLine.replaceAll("[[[[","[["); - // theGeomLine = theGeomLine.replaceAll("]]]]","]]"); - // hc_land = 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\":" + theGeomLine + ", \"properties\":" + JSON.stringify(this.mapTownList[i]) + "}"), - // }), - // style: new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#AE57A4", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "#FF0000", - // width: 3, - // }), - // // text: new ol.style.Text({ - // // text: this.mapTownList[i].xzqmc, - // // font: '30px sans-serif', - // // textAlign: "center", - // // textBaseline: "middle", - // // //font: 'verdana', - // // fill: new ol.style.Fill({ - // // color: "#ff0000" - // // }), - // // // backgroundFill: new ol.style.Fill({ - // // // color: "#ff0000" - // // // }), - // // font: "30px sans-serif", - // // stroke: new ol.style.Stroke({ - // // color: "#ffffff" - // // // width: 3 - // // }), - // // offsetX: parseInt(0, 10), - // // offsetY: parseInt(0, 10), - // // placement: "line", //point 则自动计算面的中心k点然后标注 line 则根据面要素的边进行标注 - // // overflow: false //超出面的部分不显示 - // //}), - // }), - // }); - // map.addLayer(hc_land); - // //console.log(hc_land.values_.source.featuresRtree_.rbush_.data); - // var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX; - // var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY; - // var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX; - // var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY; - // // //定位查询位置 - // var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - // // console.log(center); - // map.getView().animate({ - // // 只设置需要的属性即可 - // center: center, // 中心点 - // zoom: 9.8, // 缩放级别 - // rotation: undefined, // 缩放完成view视图旋转弧度 - // duration: 1000, // 缩放持续时间，默认不需要设置 - // }); - // } - // } - // } - // //获取镇界线----end - // //获取村界线----start - // if(this.mapVillageList.length >0){ - // for (var i = 0; this.mapVillageList.length > i; i++) { - // if (this.mapVillageList[i] != null && this.mapVillageList[i].theGeom != null && this.mapVillageList[i].theGeom != "") { - // mapTalkAbout =false; - // this.mapVillageList[i].createBy = 'mapVillageList'; - // var theGeomLine= this.mapVillageList[i].theGeom.replaceAll("MultiPolygon","LineString"); - // theGeomLine = theGeomLine.replaceAll("[[[[","[["); - // theGeomLine = theGeomLine.replaceAll("]]]]","]]"); - // hc_land = 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\":" + theGeomLine + ", \"properties\":" + JSON.stringify(this.mapVillageList[i]) + "}"), - // }), - // style: new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#AE57A4", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "#ff00ff", - // width: 3, - // }), - // // text: new ol.style.Text({ - // // text: this.mapVillageList[i].dcmj, - // // font: '30px sans-serif', - // // textAlign: "center", - // // textBaseline: "middle", - // // //font: 'verdana', - // // fill: new ol.style.Fill({ - // // color: "#ff00ff" - // // }), - // // // backgroundFill: new ol.style.Fill({ - // // // color: "#ff0000" - // // // }), - // // font: "30px sans-serif", - // // stroke: new ol.style.Stroke({ - // // color: "#ffffff" - // // // width: 3 - // // }), - // // offsetX: parseInt(0, 10), - // // offsetY: parseInt(0, 10), - // // placement: "line", //point 则自动计算面的中心k点然后标注 line 则根据面要素的边进行标注 - // // overflow: false //超出面的部分不显示 - // // }), - // }), - // }); - // map.addLayer(hc_land); - // } - // } - // } - // // //获取村界线----end - // //宅基地定位开始 ---------start - // if(this.mapTheGeomZjdId.length >0) { - // for (var i = 0; this.mapTheGeomZjdId.length > i; i++) { - // if (this.mapTheGeomZjdId[i] !=null && this.mapTheGeomZjdId[i].theGeom != null && this.mapTheGeomZjdId[i].theGeom != "") { - // mapTalkAbout =false; - // this.mapTheGeomZjdId[i].createBy = 'mapTheGeomZjdId'; - // var styleYqr = ""; - // if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){ - // styleYqr = new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#AE57A4", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "#28FF28", - // width: 3, - // }), - // }); - // } else { - // styleYqr = new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#AE57A4", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "rgba(255, 45, 45,1)", - // width: 3, - // }), - // }); - // } - // hc_land = 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\":" + this.mapTheGeomZjdId[i].theGeom + ", \"properties\":" + JSON.stringify(this.mapTheGeomZjdId[i]) + "}"), - // }), - // style: styleYqr - // }); - // map.addLayer(hc_land); - // // var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX; - // // var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY; - // // var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX; - // // var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY; - // // //定位查询位置 - // // var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - // // map.getView().animate({ - // // // 只设置需要的属性即可 - // // center: center, // 中心点 - // // zoom: 15.8, // 缩放级别 - // // rotation: undefined, // 缩放完成view视图旋转弧度 - // // duration: 1000, // 缩放持续时间，默认不需要设置 - // // }); - // //自然幢定位开始 ---------start - // getZrzZjdDmList(this.mapTheGeomZjdId[i].zjddm).then((response) => { - // if (response.code == 200) { - // this.mapTheGeomZrzId = response.data; - // if(this.mapTheGeomZrzId.length >0) { - // for (var i = 0; this.mapTheGeomZrzId.length > i; i++) { - // if (this.mapTheGeomZrzId[i] !=null && this.mapTheGeomZrzId[i].theGeom != null && this.mapTheGeomZrzId[i].theGeom != "") { - // this.mapTheGeomZrzId[i].createBy = 'mapTheGeomZrzId'; - // var styleZrz = ""; - // if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){ - // styleZrz = new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#FFD306", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "#28FF28", - // width: 3, - // }), - // }); - // } else { - // styleZrz = new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#FFD306", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "rgba(255, 45, 45,1)", - // width: 3, - // }), - // }); - // } - // hc_land = 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\":" + this.mapTheGeomZrzId[i].theGeom + ", \"properties\":" + JSON.stringify(this.mapTheGeomZrzId[i]) + "}"), - // }), - // style: styleZrz - // }); - // map.addLayer(hc_land); - // } - // } - // } - // } - // }); - // //自然幢定位结束 ---------end - // - // //附属设施定位开始 ---------start - // getFsssZjdDmList(this.mapTheGeomZjdId[i].zjddm).then((response) => { - // if (response.code == 200) { - // this.mapTheGeomFsssId = response.data; - // if(this.mapTheGeomFsssId.length >0) { - // for (var i = 0; this.mapTheGeomFsssId.length > i; i++) { - // if (this.mapTheGeomFsssId[i] !=null && this.mapTheGeomFsssId[i].theGeom != null && this.mapTheGeomFsssId[i].theGeom != "") { - // this.mapTheGeomFsssId[i].createBy = 'mapTheGeomFsssId'; - // var styleFsss = ""; - // if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){ - // styleFsss = new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#00FFFF", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "#28FF28", - // width: 3, - // }), - // }); - // } else { - // styleFsss = new ol.style.Style({ - // fill: new ol.style.Fill({ - // //矢量图层填充颜色，以及透明度 - // color: "#00FFFF", - // }), - // stroke: new ol.style.Stroke({ - // //边界样式 - // color: "rgba(255, 45, 45,1)", - // width: 3, - // }), - // }); - // } - // hc_land = 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\":" + this.mapTheGeomFsssId[i].theGeom + ", \"properties\":" + JSON.stringify(this.mapTheGeomFsssId[i]) + "}"), - // }), - // style: styleFsss - // }); - // map.addLayer(hc_land); - // } - // } - // } - // } - // }); - // //附属设施定位结束 ---------end - // } - // } - // } - // //宅基地定位结束 ---------end - //数据库直接加载数据渲染方式---------------------------------------------------end - - //地图操作定义------------start - //定位定义------------start + map.addLayer(zjdTc); var Zb; var latitude; var longitude; @@ -3841,7 +3526,7 @@ $("#dwMapAll").on("click", function () { //删除测量记录操作--------start //将矢量图层从图中删除 - //map.removeLayer(helpTooltip); + map.removeLayer(helpTooltip); map.removeLayer(vector); map.removeInteraction(draw_cm); //map.removeOverlay(helpTooltipElement); @@ -3860,8 +3545,9 @@ if(latitude !=null && longitude !=null && latitude !="" && longitude !="" && latitude !=undefined && longitude !=undefined ){ Zb = [longitude,latitude]; }else { - Zb =[115.452752, 31.789033]; + Zb =[122.115038, 46.086317]; } + //获取坐标点LocationManager // geoGps().then(response => { // @@ -3898,6 +3584,7 @@ zIndex: 9999, }); } + console.info( Zb) var newcenterFeature = new ol.Feature({ geometry: new ol.geom.Point(ol.proj.fromLonLat(Zb)), //几何信息 name: "标注点", @@ -3954,8 +3641,10 @@ //提示当前坐标是否绘制完成 if (that.coordinate != "" && that.coordinate != null) { that.showhzht = true; - that.htZjdZrzFsss = JSON.stringify(that.coordinate); - console.log(that.mapZjdData); + let zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [JSON.stringify(that.coordinate).replaceAll("\"","")]}); + let leftJoin = zbNew.replace("\"[","["); + let rightJoin = leftJoin.replace("\"]","]"); + that.htZjdZrzFsss = rightJoin; // htMapAllFu(); } else { $("#htMapAll").trigger("click"); @@ -4753,7 +4442,7 @@ service: "WFS", version: "1.0.0", request: "GetFeature", - typename: "zjd_dc:t_house_survey_border_village", + typename: "nsgk_wulanhaote:t_homespace_cjqy", //featureNS: 'nsgk_hc',//命名空间 URI cql_filter: cql_filter, //featurePrefix: 'nationalwater',//工作区名称 @@ -6105,13 +5794,15 @@ if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){ this.mapZjdTeAll.active =1; this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId; - this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss; + this.mapZjdTeAll.mapZjdAData.theGeomJson =this.htZjdZrzFsss; //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId; //this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search","") - this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData)); + this.$router.push({path:'/homesteadSurvey/add'}); }else { this.$toast("已选择宅基地，请选择自然幢或附属设施按钮"); + } }, zrzTz(){ @@ -6122,7 +5813,8 @@ //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId; //this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search","") - this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZrzAData)); + this.$router.push({path:'/homesteadSurvey/add3'}); }else { this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮"); } @@ -6130,12 +5822,13 @@ fsssTz(){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ this.mapZjdTeAll.active =4; - this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss; + this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss; 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","") - this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapFsssAData)); + this.$router.push({path:'/homesteadSurvey/add4'}); }else { this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮"); } diff --git a/src/views/homesteadSurvey/nhDetails.vue b/src/views/homesteadSurvey/nhDetails.vue index dd819110..ab7f1b25 100644 --- a/src/views/homesteadSurvey/nhDetails.vue +++ b/src/views/homesteadSurvey/nhDetails.vue @@ -54,12 +54,12 @@
-
-

成员信息

-
+ -
-

农户信息

+
+

农户信息

+
+
- +
{{item.hzxm}}-{{item.nhdm}} diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue index eebbadc1..5c72b877 100644 --- a/src/views/homesteadSurvey/zrzAdd.vue +++ b/src/views/homesteadSurvey/zrzAdd.vue @@ -244,6 +244,9 @@ export default { if(this.form.shyqrdbzjhm != null){ this.getList(); } + if(this.form.jgrq != null){ + this.form.jgrq = this.form.jgrq.substr(0,10); + } this.$nextTick(() => { this.pointDarw(null); diff --git a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue index 75e0f60b..2daf7d56 100644 --- a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue +++ b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue @@ -27,7 +27,7 @@

基本信息

- +
{{item.sqrxm}}