Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

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
+  })
+}

src/views/authenticRight/index.vue

@@ -111,7 +111,13 @@
           label-width="120px"
           placeholder="被核查人姓名"
           :rules="[{ required: true, message: '请填写被核查人姓名' }]"
-        />
+        >
+          <template #button>
+           <van-uploader :after-read="afterRead" v-model="fileList" :preview-image="false" :max-count="1">
+              <van-button icon="photograph" type="primary" size="mini">扫描身份证</van-button>
+            </van-uploader>
+          </template>
+        </van-field>
         <van-field
           v-model="xcdcform.idcardCheckedBy"
           name="idcardCheckedBy"
@@ -474,7 +480,7 @@
     getInvestigate,
     listSampling, listSamplingDept,
     updateInvestigate,
-    updateSampling
+    updateSampling, uploadFile
   } from "../../api/authenticRight";
   import {getDeptList} from "../../api/biddingHall";
   import {Dialog} from "vant";
@@ -554,24 +560,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,
@@ -613,6 +619,7 @@
         userId :null,
         nickName:null,
         currentValue:null,
+        fileList:[]
       }
     },
     created(){
@@ -631,6 +638,17 @@
 
     },
     methods:{
+      afterRead(file) {
+        const data = new FormData();
+        data.append("file", this.fileList[0].file);
+        uploadFile(data).then(res => {
+          if(res.code == 200){
+            this.xcdcform.idcardCheckedBy = res.idcardCheckedBy
+            this.xcdcform.nameCheckedBy = res.nameCheckedBy
+            this.fileList=[]
+          }
+        })
+      },
       changeFn(val) {
       },
       confirmFn(){
@@ -735,24 +753,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 +862,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 +873,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 +996,7 @@
           i++
         }
         this.xcdcform["lackCount"] = i
+        console.log(this.xcdcform)
         if(this.xcdcform.id){
           updateInvestigate(this.xcdcform).then(res => {
             this.showXCDC = false

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