From 3986a6696b22b7215e61d7550770be1a1b1d3537 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Mon, 2 Aug 2021 13:50:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/authenticRight/index.vue | 89 +++++++++++++----------------- 1 file changed, 37 insertions(+), 52 deletions(-) diff --git a/src/views/authenticRight/index.vue b/src/views/authenticRight/index.vue index 67465f0a..2669484a 100644 --- a/src/views/authenticRight/index.vue +++ b/src/views/authenticRight/index.vue @@ -554,24 +554,24 @@ fileTime: null, id: null, idcardCheckedBy: null, - item1: null, - item2: null, - item3: null, - item4: null, - item5: null, - item6: null, - item7: null, - item8: null, - item9: null, - item10: null, - item11: null, - item12: null, - item13: null, - item14: null, - item15: null, - item16: null, - item17: null, - item18:null, + item1: '', + item2: '', + item3: '', + item4: '', + item5: '', + item6: '', + item7: '', + item8: '', + item9: '', + item10: '', + item11: '', + item12: '', + item13: '', + item14: '', + item15: '', + item16: '', + item17: '', + item18: '', lackCount: null, originalNameCheckedBy: null, nameCheckedBy: null, @@ -735,24 +735,24 @@ fileTime: null, id: null, idcardCheckedBy: null, - item1: null, - item2: null, - item3: null, - item4: null, - item5: null, - item6: null, - item7: null, - item8: null, - item9: null, - item10: null, - item11: null, - item12: null, - item13: null, - item14: null, - item15: null, - item16: null, - item17: null, - item18:null, + item1: '', + item2: '', + item3: '', + item4: '', + item5: '', + item6: '', + item7: '', + item8: '', + item9: '', + item10: '', + item11: '', + item12: '', + item13: '', + item14: '', + item15: '', + item16: '', + item17: '', + item18: '', lackCount: null, originalNameCheckedBy: null, nameCheckedBy: null, @@ -844,13 +844,6 @@ this.xcdcform.item5 = 'N' this.xcdcform.item8 = 'N' this.xcdcform.item9 = 'N' - }else { - this.xcdcform.item2 = null - this.xcdcform.item3 = null - this.xcdcform.item4 = null - this.xcdcform.item5 = null - this.xcdcform.item8 = null - this.xcdcform.item9 = null } }if(id == "2") { if(this.xcdcform.item10=='N'){ @@ -862,15 +855,6 @@ this.xcdcform.item16 = 'N' this.xcdcform.item17 = 'N' this.xcdcform.item18 = 'N' - }else { - this.xcdcform.item11 = null - this.xcdcform.item12 = null - this.xcdcform.item13 = null - this.xcdcform.item14 = null - this.xcdcform.item15 = null - this.xcdcform.item16 = null - this.xcdcform.item17 = null - this.xcdcform.item18 = null } } }, @@ -994,6 +978,7 @@ i++ } this.xcdcform["lackCount"] = i + console.log(this.xcdcform) if(this.xcdcform.id){ updateInvestigate(this.xcdcform).then(res => { this.showXCDC = false From e590516174788fcd116694e44a3d54254a552b73 Mon Sep 17 00:00:00 2001 From: hbao Date: Mon, 2 Aug 2021 15:18:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=9F=A2=E9=87=8F?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homestead/index.vue | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/homestead/index.vue b/src/views/homestead/index.vue index 723c4390..b86326e3 100644 --- a/src/views/homestead/index.vue +++ b/src/views/homestead/index.vue @@ -2107,7 +2107,7 @@ export default { //属性查询结束 ------------------end //按照分类查询 村定位地图-----------------start - var nongZt; + var nongZt = ["house","land"]; var texiao_layer_fang; var texiao_layer_di; $("#cun").on("change", function () { @@ -2121,7 +2121,6 @@ export default { */ var cun = _this.villageDataObj.deptName; - console.log(cun); //定位个人地图 map.removeLayer(texiao_layer_fang); map.removeLayer(texiao_layer_di); @@ -2136,7 +2135,8 @@ export default { duration: 1000, // 缩放持续时间，默认不需要设置 }); - map.removeLayer(nongZt); + map.removeLayer(nongZt[0]); + map.removeLayer(nongZt[1]); //村的数据判断 map.removeLayer(villageVectorLayer); @@ -2147,27 +2147,26 @@ export default { //查询条件 var cql_filter; - //for(var i=0; i< difang.length; i++){ //图层加载 //地的数据判断 - var difang = "nsgk_hc:nsgk_hc_all"; + var difang = ["nsgk_hc:t_geo_hc_house","nsgk_hc:t_geo_hc_land"]; console.log("++++++++++++" + cun); //业务图层 wms服务 - //for (var i = 0; i < difang.length; i++) { - ///if (difang[i] == "nsgk_hc:t_geo_hc_house") { + for (var i = 0; i < difang.length; i++) { + if (difang[i] == "nsgk_hc:t_geo_hc_house") { cql_filter = "CM='" + cun + "'"; - //} else { - // cql_filter = "CM='" + cun + "'"; - //} - nongZt = new ol.layer.Tile({ + } else { + cql_filter = "CM='" + cun + "'"; + } + nongZt[i] = new ol.layer.Tile({ source: new ol.source.TileWMS({ //url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms', url: "http://116.255.135.38:8080/geoserver/nsgk_hc/wms", //url: 'http://localhost:8888/geoserver/mywork_mysql/wms', //url: 'http://localhost:8888/geoserver/new_shp/wms', params: { - LAYERS: difang, + LAYERS: difang[i], //'LAYERS': 'new_shp:new_shp_all', TILED: true, cql_filter: cql_filter, @@ -2182,7 +2181,7 @@ export default { service: "WFS", version: "1.0.0", request: "GetFeature", - typename: difang, + typename: difang[i], //featureNS: 'nsgk_hc',//命名空间 URI cql_filter: cql_filter, //featurePrefix: 'nationalwater',//工作区名称 @@ -2196,6 +2195,7 @@ export default { url_dw = url_dw + key + "=" + param_dw[key] + "&"; } url_dw = url_dw.substr(0, url_dw.length - 1); + console.log(url_dw); fetch(url_dw, { method: "POST", // *GET, POST, PUT, DELETE, etc. }) @@ -2217,9 +2217,9 @@ export default { .catch((error) => { console.log("【异常】", error); }); - map.addLayer(nongZt); + map.addLayer(nongZt[i]); - //} + } }); //村定位查询-------------------------------------end From 3f3689f96c634e36917934d3e6c9428a938a111e Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Mon, 2 Aug 2021 16:48:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/authenticRight/index.js | 8 ++++++++ src/views/authenticRight/index.vue | 22 ++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/api/authenticRight/index.js b/src/api/authenticRight/index.js index e4cce1b9..8f5f64c9 100644 --- a/src/api/authenticRight/index.js +++ b/src/api/authenticRight/index.js @@ -62,3 +62,11 @@ export function listSamplingDept(data){ params:data }) } +// 修改农户抽样 +export function uploadFile(data) { + return request({ + url: '/transaction/website/ocr/idcard', + method: 'post', + data: data + }) +} diff --git a/src/views/authenticRight/index.vue b/src/views/authenticRight/index.vue index 2669484a..c599738a 100644 --- a/src/views/authenticRight/index.vue +++ b/src/views/authenticRight/index.vue @@ -111,7 +111,13 @@ label-width="120px" placeholder="被核查人姓名" :rules="[{ required: true, message: '请填写被核查人姓名' }]" - /> + > + + { + if(res.code == 200){ + this.xcdcform.idcardCheckedBy = res.idcardCheckedBy + this.xcdcform.nameCheckedBy = res.nameCheckedBy + this.fileList=[] + } + }) + }, changeFn(val) { }, confirmFn(){