From 4e4202956ca566466f63dd3386d2dd327706d881 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Wed, 2 Mar 2022 14:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 167 +++++++++++++++++++----------
 1 file changed, 110 insertions(+), 57 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 511748f1..90e0a7f5 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -471,7 +471,7 @@
           <van-cell center v-for="(item,index) in mapDataAll" :key="index">
             <template #title>
               <p><van-icon name="manager" /><span>{{item.syqr}}</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.paceType}}</span>
-                <span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.typeTc}}</span></p>
+                <!--<span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.typeTc}}</span>--></p>
             </template>
             <template #default>
               <p style="border: 1px solid #7ac943;color:#7ac943;" @click="zjdSs(item)">查看详情</p>
@@ -1505,7 +1505,6 @@
         },
         setCookies(item){
           this.$cookies.set("search",JSON.stringify(item));
-          console.log(JSON.stringify(item));
         },
         // 入户核查搜索框新增。
         onClickzjd(){
@@ -1759,7 +1758,6 @@
             "deptId" : this.item.deptId,
             "nhValue" : this.nhvalue
           }
-          console.log(params)
           listNh(params).then((response) => {
             this.nhlist = response.rows
           });
@@ -1784,7 +1782,6 @@
               "syqr" : this.zjdvalue
             }
             listZjdzd(params).then((response) => {
-              console.log(response)
               if (response.code == 200) {
                 this.list2 = response.rows
               }
@@ -1998,7 +1995,6 @@
                  "pageSize":10,
                }
                listZjdzd(params).then((response) => {
-                 console.log(response)
                  if (response.code == 200) {
                    this.qbNums = response.total
                    this.list = response.rows
@@ -2111,7 +2107,6 @@
           var that = this;
           setTimeout(function () {
             var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
-            console.log($('.searchBox').outerHeight(true)+'px')
             that.bottomHeight = -height+'px'
           },500)
         },
@@ -2224,7 +2219,6 @@
               return geojsonmap;
             })
             .then((data) => {
-              console.log(data);
               let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize());
               map.getView().fit(data.bbox);
               map.getView().setResolution(resolution);
@@ -2614,7 +2608,6 @@
           //地图操作定义------------end
           //定位当前位置 ------start
           $("#dwMapAll").on("click", function () {
-            console.log("进入定位图层")
             //删除测量记录操作--------start
             //将矢量图层从图中删除
             //map.removeLayer(helpTooltip);
@@ -2633,7 +2626,6 @@
               latitude = position.coords.latitude;// 获取纬度
               longitude = position.coords.longitude;// 获取经度
             });
-            console.log(longitude,latitude);
             if(latitude !=null && longitude !=null && latitude !="" && longitude !="" && latitude !=undefined && longitude !=undefined ){
               Zb = [longitude,latitude];
             }else {
@@ -2698,7 +2690,6 @@
 
           //开始绘制图层- -----start
           $("#htMapAll").on("click", function () {
-            console.log("进入绘制图层")
             //删除之前 测距操作添加map中的绘图  --------start
             //map.removeLayer(helpTooltip);
             map.removeLayer(vector);
@@ -2732,7 +2723,6 @@
                   that.htZjdZrzFsss =that.coordinate;
                   // htMapAllFu();
                 }else {
-                  console.log("6");
                   $("#htMapAll").trigger("click");
                 }
               });
@@ -2762,7 +2752,6 @@
           });
           //删除之前绘制图层
           $("#deleteHistory").on("click", function () {
-            console.log("否进入");
             map.removeLayer(drawing);
             that.showhzht = false;
           });
@@ -2800,11 +2789,9 @@
                 "syqr" : val,
                 "pageSize":20,
               }
-              console.log(params);
               listZjdzd(params).then((response) => {
                 if(response.rows.length>=0){
                   that.mapDataAll = response.rows;
-                  console.log(that.mapDataAll);
                   for(var hg=0; hg < that.mapDataAll.length; hg++){
                     var mapNum = that.mapDataAll[hg].houseDataConfirmStatus;
                     if(mapNum == "UNCONFIRMED"){
@@ -2842,9 +2829,7 @@
                         duration: 1000, // 缩放持续时间，默认不需要设置
                       });
                     }
-                    console.log(that.mapDataAll[hg].zjddm);
                     // listFsss(paramsZrz).then((response) => {
-                    //   console.log(response);
                     //   that.mapDataAll.push(response.rows);
                     // });
                   }
@@ -3176,7 +3161,6 @@
           //样式加载定义
           var vector_drawing_delete;
           $("#area").click(function () {
-            console.log("进入测面");
             if(that.textMjAll != "" && that.clickBbox !=""){
               // var styleFsss = new ol.style.Style({
               //   text: new ol.style.Text({
@@ -3559,6 +3543,7 @@
            * @param {option 可选} geometryField
            */
 
+          //查询全部图层  -------查询叠加图层出现覆盖问题
           var wmsSource = new ol.source.TileWMS({
             url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
             params: {
@@ -3570,6 +3555,43 @@
             },
           });
 
+          //查询宅基地图层
+          var ZjdwmsSource = new ol.source.TileWMS({
+            url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: "zjd_dc:t_house_survey_zjdzd",
+              TILED: true,
+              SRID: 3857,
+              serverType: "geoserver",
+              crossOrigin: "anonymous",
+            },
+          });
+
+          //查询自然幢图层
+          var ZrzwmsSource = new ol.source.TileWMS({
+            url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: "zjd_dc:t_house_survey_zrz",
+              TILED: true,
+              SRID: 3857,
+              serverType: "geoserver",
+              crossOrigin: "anonymous",
+            },
+          });
+
+          //查询附属设施图层
+          var FssswmsSource = new ol.source.TileWMS({
+            url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: "zjd_dc:t_house_survey_fsss",
+              TILED: true,
+              SRID: 3857,
+              serverType: "geoserver",
+              crossOrigin: "anonymous",
+            },
+          });
+
+
           map.on("pointermove", function (evt) {
             if (evt.dragging) {
               return;
@@ -3589,18 +3611,76 @@
             );
             var viewResolution = map.getView().getResolution(); ///** @type {number} */ (view.getResolution());
             var zb = evt.coordinate;
-            var url = wmsSource.getFeatureInfoUrl(
-              evt.coordinate,
-              viewResolution,
-              "EPSG:3857",
-              { INFO_FORMAT: "text/html" }
-            );
-            var url_bbox = wmsSource.getFeatureInfoUrl(
-              evt.coordinate,
-              viewResolution,
-              "EPSG:3857",
-              { INFO_FORMAT: "application/json" }
-            );
+            var url;
+            var url_bbox;
+            if(that.fsssSx && that.zjdSx && that.zrzSx){
+              url = wmsSource.getFeatureInfoUrl(
+                evt.coordinate,
+                viewResolution,
+                "EPSG:3857",
+                { INFO_FORMAT: "text/html" }
+              );
+              url_bbox = wmsSource.getFeatureInfoUrl(
+                evt.coordinate,
+                viewResolution,
+                "EPSG:3857",
+                { INFO_FORMAT: "application/json" }
+              );
+            }else {
+              if(that.zjdSx){
+                url = ZjdwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "text/html" }
+                );
+                url_bbox = ZjdwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "application/json" }
+                );
+              } else if (that.fsssSx){
+                url = FssswmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "text/html" }
+                );
+                url_bbox = FssswmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "application/json" }
+                );
+              } else if (that.zrzSx){
+                url = ZrzwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "text/html" }
+                );
+                url_bbox = ZrzwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "application/json" }
+                );
+              } else {
+                url = wmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "text/html" }
+                );
+                url_bbox = wmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  { INFO_FORMAT: "application/json" }
+                );
+              }
+            }
             if (url_bbox) {
               fetch(url_bbox).then((res) => {
                 var geojsonmap = res.json();
@@ -3608,6 +3688,7 @@
               })
                 .then((data) => {
                   var center = ol.extent.getCenter(data.bbox); //获取边界区域的中心位置
+                  center = [center[0],center[1]-16];
                   that.clickBbox = center;
                 })
                 .catch((error) => {
@@ -3632,7 +3713,6 @@
                     that.mapZjdDataTure ="";
                     setTimeout(() => {
                       if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") {
-
                         // that.mapZjdDataTure ="";
                         // that.mapZjdTeAll.mapZrzAData ={};
                         // that.mapZjdTeAll.mapFsssAData ={};
@@ -3783,14 +3863,12 @@
                         //     }
                         //   }
                         // });
-                        console.log(obj.id);
                         var vector_drawing_map;
                         let params = {
                           "deptId" : that.$cookies.get("item").deptId,
                           "zjddm" : obj.zjddm,
                         }
                         listZjdzd(params).then((response) => {
-                          console.log(response);
                           that.mapZjdData = response.rows[0];
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData =that.mapZjdData;
@@ -3923,16 +4001,11 @@
                           "deptId" : that.$cookies.get("item").deptId,
                           "zjddm" : obj.zjddm,
                         }
-                        console.log(obj.zjddm);
-                        console.log(params);
                         listZjdzd(params).then((response) => {
-                          console.log(response);
                           that.mapZjdData = response.rows[0];
                           //that.mapZjdAData.active = 1;
                           that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
-                          console.log(that.mapZjdData);
                           getZrz(obj.id).then((response) => {
-                            console.log(response);
                             that.mapZrzData = response.data;
                             that.mapZrzData.active = 3;
                             that.mapZjdTeAll.mapZrzAData =that.mapZrzData;
@@ -4186,7 +4259,6 @@
             }
             //数据库查询详情时使用----------------------------------------start
             // if(feature) {
-            //   console.log(feature);
             //   //document.getElementById("info").innerHTML = "";
             //   that.mapHaDataValue = true;
             //   var ifConsole = feature.values_.createBy;
@@ -4583,7 +4655,6 @@
         checkClick(res){
           // 1、全选与不全选模块
           $(".checkall").change(function() {
-            // console.log($(this).prop("checked"));输出全选按钮的选中状态
             $(".item-list-checkbox .checkitem").prop("checked", $(this).prop("checked"));
             if($(this).prop("checked")){
 
@@ -4613,9 +4684,6 @@
         },
         //宅基地点击地图核查
         zjdHc(){
-          console.log(this.zjdHcDy);
-          console.log(this.mapZjdDataTure);
-          console.log(this.mapZjdData);
           if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
             if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
               this.mapZjdTeAll.active =1;
@@ -4652,7 +4720,6 @@
         },
         //搜索详情跳转
         zjdSs(item){
-          console.log(item);
           this.mapZjdTeAll.mapZjdAData ={};
           this.mapZjdTeAll.mapZrzAData ={};
           this.mapZjdTeAll.mapFsssAData ={};
@@ -4660,7 +4727,6 @@
           if(item.typeTc =="宅基地"){
           getZjdzd(item.id).then((response) => {
             this.mapZjdData = response.data;
-            console.log(this.mapZjdData);
             this.mapZjdTeAll.active = 1;
             this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
             this.$cookies.set("search",this.mapZjdTeAll);
@@ -4672,7 +4738,6 @@
             //let =
             getZjdzd(item.id).then((response) => {
               this.mapZrzData = response.data;
-              console.log(this.mapZrzData);
               this.mapZjdTeAll.active = 3;
               this.mapZjdTeAll.mapZrzAData = this.mapZrzData;
               this.$cookies.set("search",this.mapZjdTeAll);
@@ -4683,7 +4748,6 @@
           }else if(item.typeTc =="附属设施"){
             getFsss(item.id).then((response) => {
               this.mapFsssData = response.data;
-              console.log(this.mapZjdData);
               this.mapZjdTeAll.active = 4;
               this.mapZjdTeAll.mapFsssAData = this.mapFsssData;
               this.$cookies.set("search",this.mapZjdTeAll);
@@ -4709,11 +4773,7 @@
         },
         //筛选//全选
         checkAll(val) {
-
           this.$refs.checkboxGroup.value.toggleAll(true);
-
-          console.log(this.checkAllFlag)
-
           return;
           let checkedCount = this.CheckedAllArr.length
           if (val) {
@@ -4729,7 +4789,6 @@
         },
         //单选
         handleChecked(value) {
-          console.log(value);
           // this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length;
           if (value.length<3){
             this.checkAllFlag = false;
@@ -4739,9 +4798,6 @@
           value.indexOf('zjdSx') == -1 ? this.zjdSx = false : this.zjdSx = true;
           value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true;
           value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true;
-          console.log(this.zjdSx)
-          console.log(this.zrzSx)
-          console.log(this.fsssSx)
         },
         closeSearchBox(){
           this.showSearch = false ;
@@ -4756,13 +4812,11 @@
           $('.searchBar_wrap').css({'animation':'test2 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test2 0.5s ease-in-out 0s 1 alternate forwards'});
         },
         zjdTz(){
-          console.log(this.htZjdZrzFsss);
           this.mapZjdTeAll.active =1;
           this.mapZjdTeAll.mapZjdAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
           this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
           this.$cookies.set("search",this.mapZjdTeAll);
           this.$router.push({path:'/homesteadSurvey/add'});
-          console.log(this.mapZjdTeAll);
         },
         zrzTz(){
           if(this.mapZjdTeAll.mapZjdAData !=undefined && this.mapZjdTeAll.mapZjdAData !="" && this.mapZjdDataTure !=""){
@@ -4788,7 +4842,6 @@
         },
         //绘图重置清除之前图层
         deleteHistory(){
-          console.log("进入重置");
           $("#deleteHistory").trigger("click");
         }