From e590516174788fcd116694e44a3d54254a552b73 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Mon, 2 Aug 2021 15:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=9F=A2=E9=87=8F=E5=9B=BE?=
 =?UTF-8?q?=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