diff --git a/index.html b/index.html index d25baa43..57a611c9 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,8 @@ content="width=device-width,initial-scale=1,user-scalable=0,minimum-scale=1.0,maximum=scale=1.0" /> - + 农燊高科 @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/src/api/onlineHome/bankAgriculture/paymentAccount.js b/src/api/onlineHome/bankAgriculture/paymentAccount.js index 0400e5cd..65a7b53f 100644 --- a/src/api/onlineHome/bankAgriculture/paymentAccount.js +++ b/src/api/onlineHome/bankAgriculture/paymentAccount.js @@ -8,7 +8,22 @@ export function getList(data){ params:data }) } - +// 查询乡镇账户列表 +export function queryTaccount(query) { + return request({ + url: '/yinnong/taccount/query', + method: 'get', + params: query + }) +} +// 查询开户行信息列表 +export function listDeposit(query) { + return request({ + url: '/yinnong/deposit/list', + method: 'get', + params: query + }) +} // 查询出纳账户设置详细 export function getAccount(id) { return request({ @@ -51,3 +66,21 @@ export function delAccount(id) { method: 'get' }) } + +// 查询管控类型为中心账套时中心账套列表 +export function getCentralBooks(query) { + return request({ + url: '/cashier/account/centralBooks', + method: 'get', + params: query + }) +} + +// 查询管控类型为中心账套时会计科目列表 +export function getCentralSubjects(query) { + return request({ + url: '/cashier/account/centralSubjects', + method: 'get', + params: query + }) +} diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 9a9c9325..58e891bd 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -282,3 +282,12 @@ export function listAccount(query) { params: query }) } + +// 查询村虚拟出纳账户设置列表 +export function listAccount1(query) { + return request({ + url: '/cashier/account/list1', + method: 'get', + params: query + }) +} diff --git a/src/components/Map/MapGisDrawing.vue b/src/components/Map/MapGisDrawing.vue index 7e4656de..5ce4f4df 100644 --- a/src/components/Map/MapGisDrawing.vue +++ b/src/components/Map/MapGisDrawing.vue @@ -35,6 +35,7 @@ export default { newZb: null, newGeom: null, mapData: null, + map:this.guidProduct(), //地图服务地址 mapGeoServerUrl:"", }; @@ -68,7 +69,7 @@ export default { /* console.log(this.message);*/ //加载地图编辑 var that = this; - var map; + //var map; //var hc_land; var draw; // global so we can remove it later var vector_drawing; @@ -102,6 +103,7 @@ export default { }), isGroup: true, name: "卫星影像图", + resolution:Math.random() * 0.00000001 }); var yingxzi = new ol.layer.Tile({ @@ -110,9 +112,10 @@ export default { }), isGroup: true, name: "天地图文字标注--卫星影像图", + resolution:Math.random() * 0.00000001 }); //加载地图 - map = new ol.Map({ + that.map = new ol.Map({ controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮 layers: [aerial, yingxzi], projection: projection, @@ -122,30 +125,27 @@ export default { zoom: 15, minZoom: 5, //地图缩小限制 maxZoom: 18.3, //地图放大限制 + resolution:Math.random() * 0.00000001, }), + interactions: ol.interaction.defaults({ + pinchRotate: false // 移动端禁止地图旋转 + }), + //view: new ol.View({ol.view.getResolution() + Math.random() * 0.00000001)});//随机数缩放实现刷新 }); that.mapData= that.message; var zjdTc; var zrzTc; var fsssTc; - map.removeLayer(zrzTc); - map.removeLayer(zjdTc); - map.removeLayer(fsssTc); + that.map.removeLayer(zrzTc); + that.map.removeLayer(zjdTc); + that.map.removeLayer(fsssTc); //宅基地图层查询开始 ------------------start - // var zjddmNew; - // if(that.$cookies.get("search").zjddm !=undefined && that.$cookies.get("search").zjddm !=""){ - // zjddmNew = that.$cookies.get("search").zjddm; - // }else { - // if(that.$cookies.get("item").zjddm !=undefined && that.$cookies.get("item").zjddm !=""){ - // zjddmNew = that.$cookies.get("item").zjddm; - // } - // } - var cql_filter_all = "dept_id='" + that.$cookies.get("map").deptId + "'" + "and zjddm='" + that.$cookies.get("map").zjddm + "'"; + + //村边界查询开始 ------------------------------end + var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.$cookies.get("search").zjddm + "'"; console.log(cql_filter_all); - console.log(that.$cookies.get("item")); - console.log(that.$cookies.get("search")); - zjdTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ + zjdTc= new ol.layer.Image({ + source: new ol.source.ImageWMS({ url: that.mapGeoServerUrl +"/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_zjdzd', @@ -153,13 +153,14 @@ export default { cql_filter: cql_filter_all, SRID: 3857, }, + resolution:Math.random() * 0.00000001, }), }); - map.addLayer(zjdTc); + that.map.addLayer(zjdTc); //宅基地图层查询开始 ------------------start //自然幢图层查询开始 ------------------start - zrzTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ + zrzTc= new ol.layer.Image({ + source: new ol.source.ImageWMS({ url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_zrz', @@ -167,14 +168,15 @@ export default { cql_filter: cql_filter_all, SRID: 3857, }, + resolution:Math.random() * 0.00000001, }), }); - map.addLayer(zrzTc); + that.map.addLayer(zrzTc); //自然幢图层查询结束 ------------------end //附属设施图层查询开始 ------------------start - fsssTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ + fsssTc= new ol.layer.Image({ + source: new ol.source.ImageWMS({ url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_fsss', @@ -182,9 +184,10 @@ export default { cql_filter: cql_filter_all, SRID: 3857, }, + resolution:Math.random() * 0.00000001, }), }); - map.addLayer(fsssTc); + that.map.addLayer(fsssTc); //附属设施图层查询结束 ------------------end //图层查询定位开始 ---------start if(this.message.substring(0,1) =="{"){ @@ -200,6 +203,7 @@ export default { " \"type\": \"Feature\",\n" + " \"geometry\":" + this.message + "}"), }), + resolution:Math.random() * 0.00000001, style: new ol.style.Style({ fill: new ol.style.Fill({ //矢量图层填充颜色，以及透明度 @@ -212,19 +216,20 @@ export default { }), }), }); - map.addLayer(hc_land); + that.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({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 - zoom: 17.9, // 缩放级别 + zoom: 16.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); @@ -242,6 +247,7 @@ export default { " \"type\": \"Feature\",\n" + " \"geometry\":" + rightJoin + "}"), }), + resolution:Math.random() * 0.00000001, style: new ol.style.Style({ fill: new ol.style.Fill({ //矢量图层填充颜色，以及透明度 @@ -254,19 +260,20 @@ export default { }), }), }); - map.addLayer(hc_land); + that.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({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 16.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); @@ -278,15 +285,15 @@ export default { //开始绘制地图 $("#"+this.drawingPolygonMap).click(function () { that.newGeom = 1; - map.removeLayer(hc_land); - map.removeLayer(vector_drawing); + that.map.removeLayer(hc_land); + that.map.removeLayer(vector_drawing); //that.closeMoule = null; - map.removeInteraction(draw); + that.map.removeInteraction(draw); //var source = new ol.source.Vector({wrapX: false}); vector_drawing = new ol.layer.Vector({ source: new ol.source.Vector(), }); - map.addLayer(vector_drawing); + that.map.addLayer(vector_drawing); function addInteraction() { draw = new ol.interaction.Draw({ @@ -299,12 +306,12 @@ export default { var coordinate = geometry.getCoordinates(); if(coordinate !="" && coordinate !=null){ //map.addLayer(vector_drawing); - map.removeInteraction(draw); + that.map.removeInteraction(draw); } that.closeMoule = coordinate; that.formSubmit(); }); - map.addInteraction(draw); + that.map.addInteraction(draw); } addInteraction(); @@ -319,9 +326,9 @@ export default { $("#"+this.drawingResetMap).click(function () { that.newGeom = 2; if(that.closeMoule !=null) { - map.addLayer(hc_land); - map.removeInteraction(draw); - map.removeLayer(vector_drawing); + that.map.addLayer(hc_land); + that.map.removeInteraction(draw); + that.map.removeLayer(vector_drawing); that.formSubmit(); } }); @@ -372,7 +379,7 @@ export default { var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - map.getView().animate({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 17.9, // 缩放级别 @@ -414,7 +421,7 @@ export default { var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - map.getView().animate({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 16.9, // 缩放级别 @@ -456,12 +463,13 @@ export default { var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - map.getView().animate({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 17.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); @@ -498,12 +506,13 @@ export default { var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - map.getView().animate({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 16.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); } } @@ -537,7 +546,7 @@ export default { }); //加载地图 - map = new ol.Map({ + that.map = new ol.Map({ controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮 layers: [aerial, yingxzi], projection: projection, @@ -549,14 +558,20 @@ export default { zoom: 16.9, minZoom: 5, //地图缩小限制 maxZoom: 18, //地图放大限制 + resolution:Math.random() * 0.00000001, + }), + interactions: ol.interaction.defaults({ + pinchRotate: false // 移动端禁止地图旋转 }), }); + //view.setResolution(view.getResolution() + Math.random() * 0.00000001);//随机数缩放实现刷新 //获取坐标是否存在 //var Zb; //村边界查询开始 ------------------------------start var cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'"; - var cunTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ + console.log(cql_filter); + var cunTc= new ol.layer.Image({ + source: new ol.source.ImageWMS({ url: that.mapGeoServerUrl +"/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_border_village', @@ -595,9 +610,10 @@ export default { }) .then((data) => { console.log(data); - let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize()); - map.getView().fit(data.bbox); - map.getView().setResolution(resolution); + let resolution = that.map.getView().getResolutionForExtent(data.bbox,that.map.getSize()); + resolution:resolution + Math.random() * 0.00000001, + that.map.getView().fit(data.bbox); + that.map.getView().setResolution(resolution); // var datamap = data.bbox; // var center = ol.extent.getCenter(datamap); // map.getView().animate({ @@ -609,12 +625,12 @@ export default { .catch((error) => { console.log("【异常】", error); }); - map.addLayer(cunTc); + that.map.addLayer(cunTc); //村边界查询开始 ------------------------------end //宅基地图层查询开始 ------------------start //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'"; - var zjdTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ + var zjdTc= new ol.layer.Image({ + source: new ol.source.ImageWMS({ url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_zjdzd', @@ -624,7 +640,7 @@ export default { }, }), }); - map.addLayer(zjdTc); + that.map.addLayer(zjdTc); //宅基地图层查询开始 ------------------start // getQueryLand().then((response) => { // if (response.code == 200) { @@ -660,12 +676,12 @@ export default { //开始绘制地图 $("#"+this.drawingPolygonMap).click(function () { //that.closeMoule = null; - map.removeInteraction(draw); + that.map.removeInteraction(draw); //var source = new ol.source.Vector({wrapX: false}); vector_drawing = new ol.layer.Vector({ source: new ol.source.Vector(), }); - map.addLayer(vector_drawing); + that.map.addLayer(vector_drawing); function addInteraction() { draw = new ol.interaction.Draw({ @@ -679,12 +695,12 @@ export default { that.newZb = JSON.stringify(coordinate); if(coordinate !="" && coordinate !=null){ //map.addLayer(vector_drawing); - map.removeInteraction(draw); + that.map.removeInteraction(draw); } that.closeMoule = coordinate; that.formSubmit(); }); - map.addInteraction(draw); + that.map.addInteraction(draw); } addInteraction(); @@ -698,8 +714,8 @@ export default { // }); //还原之前图层 $("#"+this.drawingResetMap).click(function () { - map.removeInteraction(draw); - map.removeLayer(vector_drawing); + that.map.removeInteraction(draw); + that.map.removeLayer(vector_drawing); //that.closeMoule = null; that.formSubmit(); }); @@ -741,12 +757,13 @@ export default { var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - map.getView().animate({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 17.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); @@ -783,12 +800,13 @@ export default { var minYMap = hc_landFuther.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 - map.getView().animate({ + that.map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 16.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); // let resolution = map.getView().getResolutionForExtent([maxXMap, maxYMap, minXMap, minYMap],map.getSize()); // map.getView().fit([maxXMap, maxYMap, minXMap, minYMap]); diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index c22b9bf4..bdbb2b6c 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -20,9 +20,9 @@
- +
- +

宅基地

 @@ -295,7 +295,7 @@ - +
保存
@@ -1039,7 +1039,7 @@ label="备注" placeholder="备注" /> - +
保存
@@ -1830,7 +1830,7 @@ label="备注" placeholder="备注" /> - - + -->
保存
@@ -2418,7 +2418,7 @@ label="备注" placeholder="备注" /> - +
保存
@@ -3148,29 +3148,38 @@ enterMap: "", //记录从地图进入宅基地代码 enterMapZjddm:"", - + //地图状态保存 + numerical:"", //审核状态 isFinished:false, // cookies cookiesInfo:null, // 异常标记照片 fileListyc:[], + //刷新随机数 + zjdProductResh:this.guidProduct(), + zrzProductResh:this.guidProduct(), + fsssProductResh:this.guidProduct(), }; }, created(){ + console.log(this.$route.query.res); console.log(this.$cookies.get("search")); //this.itemBc = this.$cookies.get("map"); //this.$cookies.set("item",""); if(this.$cookies.get("search") !=null &&this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){ this.ztMap =false; - this.$cookies.set("map",this.$cookies.get("search")); - console.log(this.$cookies.get("map")); + //this.$cookies.set("map",this.$cookies.get("search")); + this.numerical =this.$cookies.get("search"); }else { - this.ztMap =true; + if(this.$route.query.res !=null && this.$route.query.res !="" && this.$route.query.res !=undefined){ + this.ztMap =true; + this.numerical =this.$route.query.res; + } } - if(this.$cookies.get("search")){ - if(this.$cookies.get("search").active!=null){ - this.cookiesInfo = this.$cookies.get("search") + if(this.numerical){ + if(this.numerical.active!=null){ + this.cookiesInfo = this.numerical this.$cookies.set("search","") //返回地图值记录----start this.backMap.activeBtn = 4; @@ -3178,10 +3187,7 @@ this.backMap.backMapZjdAData = this.cookiesInfo.mapZjdAData; this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId; this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm; - if(this.ztMap){ - this.$cookies.set("map",this.backMap); - } - this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom; + //this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom; //this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm; //返回地图值记录----end this.active = this.cookiesInfo.active; @@ -3193,7 +3199,9 @@ this.getnhdmlist(); this.getBaseUrl(); this.getZjd(); - //this.mapClickLoading(); + if(this.ztMap){ + this.$cookies.set("search",this.backMap); + } let zrz = this.cookiesInfo.mapZrzAData; let fsss = this.cookiesInfo.mapFsssAData; if(this.cookiesInfo.active=="3"){ @@ -3218,6 +3226,7 @@ this.cookiesInfo = this.$cookies.get("search") this.$cookies.set("search","") this.item = this.cookiesInfo + this.$cookies.set("search",this.cookiesInfo); if(this.item.houseDataConfirmStatus!="CONFIRMED"){ this.isFinished = true } @@ -3341,9 +3350,9 @@ }); }, mounted(){ - if(this.active ==1){ - this.mapClickLoading(); - } + // if(this.active ==1 && !this.ztMap){ + // this.mapClickLoading(); + // } }, methods: { showPic(){ @@ -3802,8 +3811,8 @@ d.push(blobBin.charCodeAt(i)) } const data2 = new FormData(); - console.log(d) data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'})); + this.saveBlobAsFile(new Blob([new Uint8Array(d)],{type:'image/jpeg'}),this.form.zjddm) uploadFile(data2).then(res => { if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){ this.form.zjdxctp = this.form.zjdxctp + "," + res.fileName @@ -3813,6 +3822,39 @@ }) } }, + blobToBase64(blob) { + return new Promise((resolve, reject) => { + const fileReader = new FileReader(); + fileReader.onload = (e) => { + resolve(e.target.result); + }; + // readAsDataURL + fileReader.readAsDataURL(blob); + fileReader.onerror = () => { + reject(new Error('blobToBase64 error')); + }; + }); + }, + saveBlobAsFile(blob, fileName) { + /* var reader = new FileReader(blob); + reader.onloadend = function () { + var base64 = reader.result ; + var link = document.createElement("a"); + link.setAttribute("href", base64); + link.setAttribute("download", fileName); + link.click(); + /!**!/ + }; + reader.readAsDataURL(blob);*/ + + let link = document.createElement("a"); + link.href = window.URL.createObjectURL(blob); + link.download = fileName; + link.click(); + window.URL.revokeObjectURL(link.href) + link.remove() + }, + // 图片删除 deleteFilezjd(file){ let url = ","+file.baseUrl @@ -4249,9 +4291,9 @@ //this.enterMap=""; //this.$cookies.set("item",""); if(this.ztMap && this.enterMap ==1){ - this.$cookies.set("map",this.backMap); + this.$cookies.set("search",this.backMap); } else { - this.$cookies.set("map",""); + this.$cookies.set("search",""); } this.$router.push({name:'homesteadList'}); // } @@ -4522,6 +4564,7 @@ this.form.djName = res.dictLabel } }) + this.zjdProduct(); }); }else{ let params = { @@ -4556,6 +4599,7 @@ this.form.suyqrdm = response.rows[0].suyqrdm this.form.zl = response.rows[0].suyqrmc } + this.zjdProduct(); }); } }, @@ -5440,6 +5484,7 @@ sjlyName:'农村宅基地使用权确权登记发证', theGeom:this.form.theGeom, } + this.zrzProduct(); }else{ this.form3 = item this.form3.theGeom = item.theGeom; @@ -5474,10 +5519,12 @@ } }) } - + if(this.form3.theGeom == null){ + this.form3.theGeom = this.form.theGeom; + } } this.showzrz = true; - this.mapClickLoading(); + this.zrzProduct(); this.active = 3; // if(){ // @@ -5735,6 +5782,7 @@ sfsgcf:'N', theGeom:this.form.theGeom, } + this.fsssProduct(); }else{ this.form4=item console.log(this.form4); @@ -5775,7 +5823,7 @@ this.form4.sfsgcf = "N" } if(this.form4.theGeom==null||this.form4.theGeom==""){ - this.form4.theGeom = this.form4.theGeom + this.form4.theGeom = this.form.theGeom } this.fssslxOptions.map(res => { if(res.dictValue == item.fssslx){ @@ -5810,7 +5858,7 @@ } this.showfsss = true; this.active = 4; - this.mapClickLoading(); + this.fsssProduct(); } }, showPopup3() { @@ -6005,15 +6053,13 @@ }, //地图加载js------start mapClickLoading(){ - //this.$cookies.set("item", this.form); - console.log(this.$cookies.get("item")); setTimeout(() => { if(this.active =="1"){ - this.$refs.drewingClickLoading1.drawingPaceCountryDarw(); + this.$refs[this.zjdProductResh].drawingPaceCountryDarw(); }else if(this.active=="3"){ - this.$refs.drewingClickLoading3.drawingPaceCountryDarw(); + this.$refs[this.zrzProductResh].drawingPaceCountryDarw(); }else if(this.active=="4"){ - this.$refs.drewingClickLoading4.drawingPaceCountryDarw(); + this.$refs[this.fsssProductResh].drawingPaceCountryDarw(); } else { } @@ -6031,6 +6077,25 @@ } }, + zjdProduct(){ + this.zjdProductResh = this.guidProduct(); + this.mapClickLoading(); + }, + zrzProduct(){ + this.zrzProductResh = this.guidProduct(); + this.mapClickLoading(); + }, + fsssProduct(){ + this.fsssProductResh = this.guidProduct(); + this.mapClickLoading(); + }, + guidProduct(){ + return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) { + var r = Math.random() * 16 | 0, + v = c == 'x' ? r : (r & 0x3 | 0x8); + return v.toString(16); + }); + }, //地图加载js------end } } diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 6d15a89c..f63bf7cf 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1382,6 +1382,7 @@ backTheGeom:"", //地图服务地址 mapGeoServerUrl:"", + backMap:"", // 任务完成标记 isFinished:false, @@ -1429,15 +1430,15 @@ this.getDicts("member_remark").then(response => { this.cybzOptions = response.data; }); - if(this.$cookies.get("map") != null && this.$cookies.get("map") !="" && this.$cookies.get("map")!=undefined){ - if(this.$cookies.get("map").activeBtn !=null){ - if(this.$cookies.get("map").activeBtn == 4){ - this.activeBtn = this.$cookies.get("map").activeBtn; + if(this.$cookies.get("search") != null && this.$cookies.get("search") !="" && this.$cookies.get("search")!=undefined){ + if(this.$cookies.get("search").activeBtn !=null){ + if(this.$cookies.get("search").activeBtn == 4){ + this.activeBtn = this.$cookies.get("search").activeBtn; this.item = this.$cookies.get("item"); - this.mapAddJump = this.$cookies.get("map").backMapZjdAData.deptId; - this.backTheGeom = this.$cookies.get("map").backMapZjdAData.theGeom; - this.mapZjdData = this.$cookies.get("map").backMapZjdAData; - this.mapZjdTeAll.mapZjdAData = this.$cookies.get("map").backMapZjdAData; + this.mapAddJump = this.$cookies.get("search").backMapZjdAData.deptId; + this.backTheGeom = this.$cookies.get("search").backMapZjdAData.theGeom; + this.mapZjdData = this.$cookies.get("search").backMapZjdAData; + this.mapZjdTeAll.mapZjdAData = this.$cookies.get("search").backMapZjdAData; this.zjdHcDy = 1; this.mapZjdDataTure = 1; this.mapAddJumpNum =1; @@ -1571,7 +1572,6 @@ }else{ this.list.splice(index,1); } - } }) }) @@ -1619,6 +1619,8 @@ delNh(item.id).then(res => { if(res.code=="200"){ this.nhlist.splice(index,1); + this.totalH-- + this.totalR-- } }) }) @@ -1643,6 +1645,7 @@ delNhhncy(item.id).then(res => { if(res.code=="200"){ this.hncylist.splice(index,1); + this.totalR-- } }) // 更新户主信息 @@ -1682,6 +1685,7 @@ delNhhncy(id).then(res => { if(res.code=="200"){ this.hncylist.splice(index,1); + this.totalR-- } }) }) @@ -1844,7 +1848,7 @@ }, // 返回 onClickLeft(){ - this.$cookies.set("map","") + this.$cookies.set("search","") this.$router.push('/homesteadSurvey/index'); }, onConfirmhncysjly(value){ @@ -2709,7 +2713,6 @@ duration:"1000", onClose:function(){ _this.totalR+=1 - _this.totalH+=1 _this.showhncy = false let params = { "nhdm":_this.form5.nhdm, @@ -2734,7 +2737,6 @@ duration:"1000", onClose:function(){ _this.totalR+=1 - _this.totalH+=1 _this.showhncy = false let params = { "nhdm":_this.form5.nhdm, @@ -2763,7 +2765,6 @@ duration:"1000", onClose:function(){ _this.totalR+=1 - _this.totalH+=1 _this.showhncy = false let params = { "nhdm":_this.form5.nhdm, @@ -2788,7 +2789,6 @@ duration:"1000", onClose:function(){ _this.totalR+=1 - _this.totalH+=1 _this.showhncy = false let params = { "nhdm":_this.form5.nhdm, @@ -2810,7 +2810,6 @@ duration:"1000", onClose:function(){ _this.totalR+=1 - _this.totalH+=1 _this.showhncy = false let params = { "nhdm":_this.form5.nhdm, @@ -2921,12 +2920,12 @@ zoom: 10, minZoom: 5, //地图缩小限制 maxZoom: 18.3, //地图放大限制 + resolution: Math.random() * 0.00000001, }), interactions: ol.interaction.defaults({ pinchRotate: false // 移动端禁止地图旋转 }), }); - //使用geoserver服务查询开始 -------------------start //镇边界查询开始 ------------------------------start // var zhenTc= new ol.layer.Tile({ @@ -2944,20 +2943,21 @@ //镇边界查询开始 ------------------------------end //村边界查询开始 ------------------------------start var cql_filter - if(that.mapAddJumpNum == 1){ + if (that.mapAddJumpNum == 1) { cql_filter = "dept_id='" + that.mapAddJump + "'"; } else { cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'"; } - var cunTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ - url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + var cunTc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_border_village', TILED: true, cql_filter: cql_filter, SRID: 3857, }, + resolution: Math.random() * 0.00000001, }), }); //定位查询位置 @@ -2974,7 +2974,7 @@ outputFormat: "application/json", //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值 }; - let url_dw = that.mapGeoServerUrl+"/geoserver/zjd_dc/wfs"; //wfsurl; + let url_dw = that.mapGeoServerUrl + "/geoserver/zjd_dc/wfs"; //wfsurl; url_dw = url_dw + "?"; for (let key in param_dw) { url_dw = url_dw + key + "=" + param_dw[key] + "&"; @@ -2988,7 +2988,7 @@ return geojsonmap; }) .then((data) => { - if(that.backTheGeom !="" && that.backTheGeom !=undefined && that.backTheGeom.substring(0,1) =="{"){ + if (that.backTheGeom != "" && that.backTheGeom != undefined && that.backTheGeom.substring(0, 1) == "{") { hc_land_on = new ol.layer.Vector({ title: "add Layer", source: new ol.source.Vector({ @@ -3010,18 +3010,26 @@ var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + that.clickBbox = center; + console.log(that.mapZjdData); + that.textMjAll = that.mapZjdData.zdmj; map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 17.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution: Math.random() * 0.00000001, }); - } else if(that.backTheGeom !="" && that.backTheGeom !=undefined && that.backTheGeom.substring(0,1) =="[") { + //this.backMap =1; + } else if (that.backTheGeom != "" && that.backTheGeom != undefined && that.backTheGeom.substring(0, 1) == "[") { //that.newHt ="1"; - var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [that.backTheGeom.replaceAll("\"","")]}); - var leftJoin = zbNew.replace("\"[","["); - var rightJoin = leftJoin.replace("\"]","]"); + var zbNew = JSON.stringify({ + "type": "MultiPolygon", + "coordinates": [that.backTheGeom.replaceAll("\"", "")] + }); + var leftJoin = zbNew.replace("\"[", "["); + var rightJoin = leftJoin.replace("\"]", "]"); hc_land_on = new ol.layer.Vector({ title: "add Layer", source: new ol.source.Vector({ @@ -3049,16 +3057,22 @@ var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 + that.clickBbox = center; + console.log(that.mapZjdData); + that.textMjAll = that.mapZjdData.zdmj; map.getView().animate({ // 只设置需要的属性即可 center: center, // 中心点 zoom: 16.9, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution: Math.random() * 0.00000001, }); - }else { - let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize()); - map.getView().fit(data.bbox); + //this.backMap =1; + } else { + let resolution = map.getView().getResolutionForExtent(data.bbox, map.getSize()); + resolution:resolution + Math.random() * 0.00000001, + map.getView().fit(data.bbox); map.getView().setResolution(resolution); } }) @@ -3069,52 +3083,69 @@ //村边界查询开始 ------------------------------end //宅基地图层查询开始 ------------------start //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'"; - var zjdTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ - url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + var zjdTc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_zjdzd', TILED: true, cql_filter: cql_filter, SRID: 3857, }, + resolution: Math.random() * 0.00000001, }), }); map.addLayer(zjdTc); //宅基地图层查询开始 ------------------start //自然幢图层查询开始 ------------------start - var zrzTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ - url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + var zrzTc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_zrz', TILED: true, cql_filter: cql_filter, SRID: 3857, }, + resolution: Math.random() * 0.00000001, }), }); map.addLayer(zrzTc); //自然幢图层查询开始 ------------------start //附属设施图层查询开始 ------------------start - var fsssTc= new ol.layer.Tile({ - source: new ol.source.TileWMS({ - url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms", + var fsssTc = new ol.layer.Image({ + source: new ol.source.ImageWMS({ + url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms", params: { LAYERS: 'zjd_dc:t_house_survey_fsss', TILED: true, cql_filter: cql_filter, SRID: 3857, }, + resolution: Math.random() * 0.00000001, }), }); 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 + "/geoserver/zjd_dc/wms", + // }); + // zjdTc.setSource(wmsSourceBack); + // ol.view.setResolution(ol.view.getResolution() + Math.random() * 0.00000001);//随机数缩放实现刷新 + // } //数据库直接加载数据渲染方式---------------------------------------------------start //判断当前账套是否有数据 // var mapTalkAbout = true; @@ -3516,6 +3547,7 @@ zoom: 17.8, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); }); //定位当前位置 ------end @@ -3627,7 +3659,6 @@ //地图定义 var delete_map = ["mapZjd", "mapZrz","mapFsss"]; - var hc_land_query; var hc_land_queryList =[]; var texiao_layer_zjd; var texiao_layer_zrz; @@ -3638,9 +3669,10 @@ $("#deleteHistoryMap").trigger("click"); var val = that.seachText; //删除之前查询图层 - //for(var i=0;hc_land_queryList>i;i++){ - map.removeLayer(hc_land_query); - //} + for(var i=0;hc_land_queryList.length>i;i++){ + map.removeLayer(hc_land_queryList[i]); + } + hc_land_queryList = []; that.mapDataAll =[]; if (val == "") { that.$toast('请填写查询条件再查询'); @@ -3678,9 +3710,8 @@ } that.mapDataAll[hg].typeTc="宅基地"; if (that.mapDataAll[hg] !=null && that.mapDataAll[hg].theGeom != null && that.mapDataAll[hg].theGeom != "") { - //that.mapDataAll[hg].createBy = 'mapTheGeomZjdId'; - hc_land_query = - new ol.layer.Vector({ + that.mapDataAll[hg].createBy = 'mapTheGeomZjdId'; + hc_land_queryList[hg] =new ol.layer.Vector({ title: "add Layer", source: new ol.source.Vector({ projection: projection, @@ -3690,12 +3721,11 @@ }), style: styleZjd }); - //hc_land_queryList.push(hc_land_query); - map.addLayer(hc_land_query); - var maxXMap = hc_land_query.values_.source.featuresRtree_.rbush_.data.maxX; - var maxYMap = hc_land_query.values_.source.featuresRtree_.rbush_.data.maxY; - var minXMap = hc_land_query.values_.source.featuresRtree_.rbush_.data.minX; - var minYMap = hc_land_query.values_.source.featuresRtree_.rbush_.data.minY; + map.addLayer(hc_land_queryList[hg]); + var maxXMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.maxX; + var maxYMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.maxY; + var minXMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.minX; + var minYMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.minY; //定位查询位置 var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置 map.getView().animate({ @@ -3704,13 +3734,16 @@ zoom: 15.8, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); } // listFsss(paramsZrz).then((response) => { // that.mapDataAll.push(response.rows); // }); } - // map.addLayer(hc_land_queryList); + // for(var queryFor=0; hc_land_queryList > queryFor; queryFor++ ){ + // map.addLayer(hc_land_queryList[queryFor]); + // } // var mapZrzFor = that.mapDataAll[0].length+1; // console.log(mapZrzFor); // for(var mapFor=0;mapZrzFor>mapFor;mapFor++){ @@ -4039,31 +4072,12 @@ //样式加载定义 var vector_drawing_delete; $("#area").click(function () { - if(that.textMjAll != "" && that.clickBbox !=""){ - // var styleFsss = new ol.style.Style({ - // text: new ol.style.Text({ - // text: that.textMjAll+"㎡", - // 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: "point", //point 则自动计算面的中心k点然后标注 line 则根据面要素的边进行标注 - // overflow: false //超出面的部分不显示 - // }), - // }); + console.log(that.textMjAll); + console.log(that.clickBbox); + if(that.textMjAll ==null || that.textMjAll ==""){ + that.textMjAll =0; + } + if((that.textMjAll != "" && that.clickBbox !="") || (that.textMjAll == 0 && that.clickBbox !="")){ map.removeLayer(vector_drawing_delete); function createLabelStyle() { return new ol.style.Style({ @@ -4094,8 +4108,6 @@ map.addLayer(vector_drawing_delete); newcenterFeature.setStyle(createLabelStyle()); //设置要素样式 sourceMapLook.addFeature(newcenterFeature); - that.clickBbox =""; - that.textMjAll = ""; //map.addLayer(styleFsss); } else if(that.textMjAllNum == "1"){ that.$toast("该图层面积暂无信息"); @@ -4396,6 +4408,7 @@ }) .then((data) => { let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize()); + resolution:resolution + Math.random() * 0.00000001, map.getView().fit(data.bbox); map.getView().setResolution(resolution); // var datamap = data.bbox; @@ -4431,6 +4444,7 @@ serverType: "geoserver", crossOrigin: "anonymous", }, + resolution:Math.random() * 0.00000001, }); //查询宅基地图层 @@ -4443,6 +4457,7 @@ serverType: "geoserver", crossOrigin: "anonymous", }, + resolution:Math.random() * 0.00000001, }); //查询自然幢图层 @@ -4455,6 +4470,7 @@ serverType: "geoserver", crossOrigin: "anonymous", }, + resolution:Math.random() * 0.00000001, }); //查询附属设施图层 @@ -4467,6 +4483,7 @@ serverType: "geoserver", crossOrigin: "anonymous", }, + resolution:Math.random() * 0.00000001, }); @@ -4483,6 +4500,7 @@ //属性查询结束 ------------------end //点击查询详细信息 map.on("singleclick", function (evt) { + console.log(evt); let feature = map.forEachFeatureAtPixel( evt.pixel, (feature) => feature @@ -4491,12 +4509,17 @@ var zb = evt.coordinate; var url; var url_bbox; + that.clickBbox =""; + that.textMjAll = ""; if(that.drawingClick) { //点击空白删除之前图层 map.removeLayer(hc_land_on); //map.removeLayer(hc_land_query); //for(var i=0;hc_land_query>i;i++){ - map.removeLayer(hc_land_query); + //map.removeLayer(hc_land_query); + for(var i=0;hc_land_queryList.length>i;i++){ + map.removeLayer(hc_land_queryList[i]); + } //}c if (that.fsssSx && that.zjdSx && that.zrzSx) { url = wmsSource.getFeatureInfoUrl( @@ -4619,7 +4642,7 @@ "zjddm": obj.zjddm, } that.$cookies.set("search", "") - that.$cookies.set("map", "") + //that.$cookies.set("map", "") console.log(document.cookie.split(';').length) console.log(params); listZjdzd(params).then((response) => { @@ -4663,6 +4686,7 @@ zoom: 17.8, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); function createLabelStyleMap() { @@ -4675,7 +4699,7 @@ //text: "标注点", //文本内容 fill: new ol.style.Fill({ //文本填充样式（即文字颜色) - color: "#0099FF", + color: "#FF0000", width: 10, }), overflow: false //超出面的部分不显示 @@ -4717,7 +4741,7 @@ "zjddm": obj.zjddm, } that.$cookies.set("search", "") - that.$cookies.set("map", "") + //that.$cookies.set("map", "") listZjdzd(params).then((response) => { that.mapZjdData = response.rows[0]; //that.mapZjdAData.active = 1; @@ -4762,6 +4786,7 @@ zoom: 17.8, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); }); }); @@ -4788,7 +4813,7 @@ "pageSize": 20, } that.$cookies.remove("search") - that.$cookies.set("map", "") + //that.$cookies.set("map", "") listZjdzd(params).then((response) => { that.mapZjdData = response.rows[0]; that.mapZjdData.active = 1; @@ -4801,6 +4826,7 @@ } //that.mapfsssData.active = 4; that.mapfsssData = response.data; + console.log(that.mapfsssData); that.mapZjdTeAll.mapFsssAData = that.mapfsssData; that.zjdHcDy = obj.zjddm; var styleZjd = new ol.style.Style({ @@ -4833,6 +4859,7 @@ zoom: 17.8, // 缩放级别 rotation: undefined, // 缩放完成view视图旋转弧度 duration: 1000, // 缩放持续时间，默认不需要设置 + resolution:Math.random() * 0.00000001, }); }); }); @@ -5278,28 +5305,27 @@ }, //宅基地点击地图核查 zjdHc(){ - console.log(this.mapZjdTeAll); if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ console.log("ggggggggg") this.mapZjdTeAll.active =1; - this.$cookies.set("search",this.mapZjdTeAll); - this.$router.push({path:'/homesteadSurvey/add'}); - } - if(this.mapZrzData !=undefined && this.mapZrzData !=""){ + // console.log(this.mapZjdTeAll); + // this.$cookies.set("search",cookMap); + // console.log(this.$cookies.get("search")); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); + }else if(this.mapZrzData !=undefined && this.mapZrzData !=""){ if(this.mapZjdTeAll.mapZjdAData !=""){ - this.mapZjdTeAll.active =3; - this.$cookies.set("search",this.mapZjdTeAll); - this.$router.push({path:'/homesteadSurvey/add'}); + this.mapZjdTeAll.active = 3; + // this.$cookies.set("search",this.mapZjdTeAll); + this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); } else { this.$toast("必须有宅基地数据才能进入自然幢核查"); } - } - if(this.mapFsssData !=undefined && this.mapFsssData !=""){ + }else { if(this.mapZjdTeAll.mapZjdAData !="") { this.mapZjdTeAll.active = 4; - this.$cookies.set("search", this.mapZjdTeAll); - this.$router.push({path: '/homesteadSurvey/add'}); + //this.$cookies.set("search", this.mapZjdTeAll); + this.$router.push({path: '/homesteadSurvey/add',query: {res: this.mapZjdTeAll}}); } else { this.$toast("必须有宅基地数据才能进入附属设施核查"); } diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue index ca0f6f61..a85b7712 100644 --- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue @@ -23,6 +23,7 @@ input-align="right" right-icon="arrow-down" label-width="auto" + required /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + - + + + + + - + +
+

账簿信息

+
+ + + + + + + + +
@@ -84,34 +256,68 @@