Merge remote-tracking branch 'origin/master'

src/views/homesteadSurvey/list.vue

@@ -1896,8 +1896,7 @@
           // map.addLayer(zhenTc);
           //镇边界查询开始 ------------------------------end
           //村边界查询开始 ------------------------------start
-          console.log(that.$cookies.get("item").deptName);
-          var cql_filter = "ZLDWMC='" + that.$cookies.get("item").deptName + "'";
+          var cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'";
           var cunTc= new ol.layer.Tile({
             source: new ol.source.TileWMS({
               url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
@@ -1933,7 +1932,6 @@
             method: "POST", // *GET, POST, PUT, DELETE, etc.
           })
             .then((res) => {
-              console.log(res);
               var geojsonmap = res.json();
               return geojsonmap;
             })
@@ -1955,7 +1953,7 @@
           map.addLayer(cunTc);
           //村边界查询开始 ------------------------------end
           //宅基地图层查询开始 ------------------start
-          var cql_filter_all = "dept_name='" + that.$cookies.get("item").deptName + "'";
+          var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
           var zjdTc= new ol.layer.Tile({
             source: new ol.source.TileWMS({
               url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",