From d6bec5fe5dc247c08a8f28908139b2c9b2d1f075 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Tue, 31 May 2022 14:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E5=9B=BD=E6=9C=89=E7=94=A8=E5=9C=B0=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Map/MapGisDrawing.vue | 40 +++++++++++++++++++++++++---
 src/views/homesteadSurvey/list.vue   | 19 +++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/components/Map/MapGisDrawing.vue b/src/components/Map/MapGisDrawing.vue
index b9cbc514..8ca80685 100644
--- a/src/components/Map/MapGisDrawing.vue
+++ b/src/components/Map/MapGisDrawing.vue
@@ -19,6 +19,7 @@
 <script>
   import {getQueryLand} from "@/api/homesteadSurvey/zjdzd";
   import {getGeoServerConfigKey} from "@/api/system/config";
+  import {deptGetId,} from "@/api/homestead/index";
 import $ from "jquery";
 
 export default {
@@ -138,11 +139,26 @@ export default {
         that.map.removeLayer(zrzTc);
         that.map.removeLayer(zjdTc);
         that.map.removeLayer(fsssTc);
+        //国有数据加载-----------------------------------start
+        deptGetId(that.$cookies.get("item").deptId).then((res) => {
+          var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
+          var guoyouTc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/geoserver/zjd_gydl/wms",
+              params: {
+                LAYERS: 'zjd_gydl:DLTB',
+                TILED: true,
+                cql_filter: cql_filter_guoyou,
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          that.map.addLayer(guoyouTc);
+        });
+        //国有数据加载----------------------------------end
         //宅基地图层查询开始 ------------------start
-
-        //村边界查询开始 ------------------------------end
         var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.$cookies.get("search").zjddm + "'";
-        console.log(cql_filter_all);
         zjdTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
             url: that.mapGeoServerUrl +"/geoserver/zjd_dc/wms",
@@ -627,6 +643,24 @@ export default {
           });
         that.map.addLayer(cunTc);
         //村边界查询开始 ------------------------------end
+        //国有数据加载-----------------------------------start
+        deptGetId(that.$cookies.get("item").deptId).then((res) => {
+          var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
+          var guoyouTc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/geoserver/zjd_gydl/wms",
+              params: {
+                LAYERS: 'zjd_gydl:DLTB',
+                TILED: true,
+                cql_filter: cql_filter_guoyou,
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          that.map.addLayer(guoyouTc);
+        });
+        //国有数据加载----------------------------------end
         //宅基地图层查询开始 ------------------start
         //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
         var zjdTc= new ol.layer.Image({
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 40a9592d..d245cca5 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1220,6 +1220,7 @@
     import {getGeoServerConfigKey} from "@/api/system/config";
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
+    import {deptGetId,} from "@/api/homestead/index";
     import $ from "jquery";
     import {Dialog} from "vant";
     import {ref} from "vue";
@@ -3283,6 +3284,24 @@
           //   });
           map.addLayer(cunTc);
           //村边界查询开始 ------------------------------end
+          //国有数据加载-----------------------------------start
+          deptGetId(that.$cookies.get("item").deptId).then((res) => {
+            var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
+            var guoyouTc = new ol.layer.Image({
+              source: new ol.source.ImageWMS({
+                url: that.mapGeoServerUrl + "/geoserver/zjd_gydl/wms",
+                params: {
+                  LAYERS: 'zjd_gydl:DLTB',
+                  TILED: true,
+                  cql_filter: cql_filter_guoyou,
+                  SRID: 3857,
+                  TIMESTAMP: new Date().getTime(),
+                },
+              }),
+            });
+            map.addLayer(guoyouTc);
+          });
+          //国有数据加载----------------------------------end
           //宅基地图层查询开始 ------------------start
           //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
           var zjdTc = new ol.layer.Image({