From 3bf772ba52e7bf5047294b200d63f9ea9ef6cffc Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Sun, 27 Feb 2022 17:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 800 ++++++++++++++---------------
 1 file changed, 387 insertions(+), 413 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 4ec5765d..8696ce9d 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -472,52 +472,28 @@
           </div>
 
           <div style="padding: 10px 15px;">
-            <van-checkbox name="all" shape="square" @change="checkAll">全选</van-checkbox>
+            <van-checkbox name="all" v-model="CheckedAllArr"  shape="square" @click="checkAll">全选</van-checkbox>
             <div style="height: 15px;"></div>
             <van-checkbox-group v-model="checked">
-              <van-checkbox name="fsssSx" shape="square" style="margin-bottom: 5px;">
+              <van-checkbox name="fsssSx" shape="square" style="margin-bottom: 5px;" id="fsssSx">
                 <template #default>
                   附属设施<span style="display: inline-block;background: #00FFFF;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
-              <van-checkbox name="zrzSx" shape="square" style="margin-bottom: 5px;">
+              <van-checkbox name="zrzSx" shape="square" style="margin-bottom: 5px;" id="zrzSx">
                 <template #default>
                   自<i style="margin-right: 0.5em;"></i>然<i style="margin-right: 0.5em;"></i>幢<span style="display: inline-block;background: #FFD306;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
-              <van-checkbox name="zjdSx" shape="square" style="margin-bottom: 5px;">
+              <van-checkbox name="zjdSx" shape="square" style="margin-bottom: 5px;" id="zjdSx">
                 <template #default>
                   宅<i style="margin-right: 0.5em;"></i>基<i style="margin-right: 0.5em;"></i>地<span style="display: inline-block;background: #AE57A4;height: 5px;width: 20px;vertical-align: middle;margin-left: 10px;"></span>
                 </template>
               </van-checkbox>
             </van-checkbox-group>
           </div>
-          <!--          <div class="noInfo_data">-->
-          <!--            <div class="checkbox">-->
-          <!--              &lt;!&ndash; 全选与不全选模块 &ndash;&gt;-->
-          <!--              <div class="thead-checkbox" @click="checkClick">-->
-          <!--                <input type="checkbox" class="checkall">全选-->
-          <!--              </div>-->
-          <!--              &lt;!&ndash; 小复选框选 &ndash;&gt;-->
-          <!--              <div class="item-list-checkbox">-->
-          <!--                <div class="item-checkbox"><input type="checkbox" @click="checkClick('fsssMap')" class="checkitem">附属设施</div>-->
-          <!--                <div class="item-checkbox"  @click="checkClick('zrzMap')"><input type="checkbox" class="checkitem">自然幢</div>-->
-          <!--                <div class="item-checkbox"  @click="checkClick('zjdMap')"><input type="checkbox" class="checkitem">宅基地</div>-->
-          <!--              </div>-->
-          <!--            </div>-->
-          <!--          </div>-->
         </div>
       </div>
-      <!--      &lt;!&ndash;列表 定位&ndash;&gt;-->
-      <!--      <div class="rightIcon_wrap">-->
-      <!--        &lt;!&ndash; <div class="positioning_wrap">-->
-      <!--          <div class="icon"></div>-->
-      <!--        </div> &ndash;&gt;-->
-      <!--        <div class="selectionIcon_wrap" @click="selectionPush">-->
-      <!--          <div class="icon"></div>-->
-      <!--          <div class="text">列表</div>-->
-      <!--        </div>-->
-      <!--      </div>-->
       <van-overlay :show="selectionIconShow" @click="homesteadListShrink" />
     </div>
     <van-popup v-model="shownh" style="height:100%;width:100%;">
@@ -1080,7 +1056,7 @@
 
         <div style="text-align: center;margin-top: 30PX">
           <p style="font-size: 0.3rem;display: inline-block;background: #ccc;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 10%;" @click="showhzlx = true,showhzht = false">否</p>
-          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;">是</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;" @click="showhzht = false">是</p>
         </div>
       </div>
     </van-popup>
@@ -1104,7 +1080,7 @@
 
 <script>
     import { currentLocation,} from "@/api/homestead/index";
-    import {listZjdzd,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
+    import {listZjdzd,getQueryLand,geoGps} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr} from "@/api/homesteadSurvey/shyqr";
@@ -1247,6 +1223,8 @@
           textMjAll:"",
           clickBbox:"",
           textMjAllNum:"",
+          //核查
+          zjdHcDy:"",
           //地图使用 --end
         };
       },
@@ -2036,6 +2014,7 @@
               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);
@@ -2069,7 +2048,7 @@
           //宅基地图层查询开始 ------------------start
 
           //自然幢图层查询开始 ------------------start
-          var zraTc= new ol.layer.Tile({
+          var zrzTc= new ol.layer.Tile({
             source: new ol.source.TileWMS({
               url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
               params: {
@@ -2080,7 +2059,7 @@
               },
             }),
           });
-          map.addLayer(zraTc);
+          map.addLayer(zrzTc);
           //自然幢图层查询开始 ------------------start
 
           //附属设施图层查询开始 ------------------start
@@ -2444,11 +2423,16 @@
               latitude = position.coords.latitude;// 获取纬度
               longitude = position.coords.longitude;// 获取经度
             });
-            if(latitude !=null && longitude !=null && latitude !="" && longitude !=""){
+            console.log(longitude,latitude);
+            if(latitude !=null && longitude !=null && latitude !="" && longitude !="" && latitude !=undefined && longitude !=undefined ){
               Zb = [longitude,latitude];
             }else {
               Zb =[115.452752, 31.789033];
             }
+            //获取坐标点LocationManager
+            geoGps().then(response => {
+
+            });
             //矢量标注样式设置函数，设置image为图标ol.style.Icon
             function createLabelStyle() {
               return new ol.style.Style({
@@ -2912,6 +2896,23 @@
           });
           //按照查询  定位地图-----------------end
 
+          //筛选附属设施-----------------------------------start
+          // $("#fsssSx").click(function () {
+          //     map.removeLayer(zrzTc);
+          //   map.removeLayer(zjdTc);
+          //   map.addLayer(fsssTc);
+          // });
+          // $("#zrzSx").click(function () {
+          //   map.addLayer(zrzTc);
+          //   map.removeLayer(zjdTc);
+          //   map.removeLayer(fsssTc);
+          // });
+          // $("#zjdSx").click(function () {
+          //   map.removeLayer(zrzTc);
+          //   map.addLayer(zjdTc);
+          //   map.removeLayer(fsssTc);
+          // });
+          //筛选附属设施-----------------------------------end
           // //获取类型开始  侧面-----------------------------------------------------------------start
           //样式加载定义
           var vector_drawing_delete;
@@ -3411,6 +3412,7 @@
                         obj.zjdxzyy = trs.find("td").eq(47).text();//宅基地闲置原因
                         obj.lzyx = trs.find("td").eq(48).text();//流转意向
                         obj.sysNormalDisable = trs.find("td").eq(49).text();//是否停用
+                        obj.active = 1;
                         //字典项转化
                         //是否发证字典项
                         that.getDicts("sys_yes_no").then((response) => {
@@ -3515,6 +3517,7 @@
                           that.textMjAllNum = "1";
                         }
                         that.mapZjdData = cloneObj;
+                        that.zjdHcDy = obj.zjddm;
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){
                         let obj = {};
                         that.mapHasDateStatus = 1;
@@ -3730,343 +3733,347 @@
                   }
                 });
             }
-            if(feature) {
-              console.log(feature);
-              //document.getElementById("info").innerHTML = "";
-              that.mapHaDataValue = true;
-              var ifConsole = feature.values_.createBy;
-              if (ifConsole =="mapTheGeomFsssId") {
-                let obj = {};
-                that.mapHasDateStatus = 0;
-                obj.deptName = feature.values_.deptName;//行政区划名称
-                obj.zjddm = feature.values_.zjddm;//宅基地代码
-                obj.houseDataConfirmStatus = feature.values_.houseDataConfirmStatus; //状态
-                obj.fssslx = feature.values_.fssslx; //附属设施类型
-                obj.jzmj = feature.values_.jzmj; //建筑面积
-                obj.qsly = feature.values_.qsly;//权属来源
-                obj.fwzt = feature.values_.fwzt; //房屋状态
-                obj.sfsp = feature.values_.sfsp; //是否审批
-                obj.sffz = feature.values_.sffz; //是否发证
-                obj.jglx = feature.values_.jglx; //结构类型
-                obj.sfzzsy = feature.values_.sfzzsy; //是否正在使用
-                obj.jzwqk = feature.values_.jzwqk; //建筑物情况
-                obj.tdzk = feature.values_.tdzk; //审批或建设前土地状况
-                obj.sfsgcf = feature.values_.sfsgcf; //是否受过处罚
-                obj.sysNormalDisable = feature.values_.sysNormalDisable; //是否停用
-                //附属设施类型字典项
-                that.getDicts("fsss_type").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.fssslx !=null && obj.fssslx !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.fssslx == assetTypeOptions[i].dictValue) {
-                        obj.fssslx = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //权属类型字典项
-                that.getDicts("acquisition_method").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.qsly !=null && obj.qsly !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.qsly == assetTypeOptions[i].dictValue) {
-                        obj.qsly = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //房屋状态字典项
-                that.getDicts("fwzt").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.fwzt !=null && obj.fwzt !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.fwzt == assetTypeOptions[i].dictValue) {
-                        obj.fwzt = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //是否审批字典项
-                that.getDicts("sys_yes_no").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.sfsp !=null && obj.sfsp !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.sfsp == assetTypeOptions[i].dictValue) {
-                        obj.sfsp = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //是否发证字典项
-                that.getDicts("sys_yes_no").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.sffz !=null && obj.sffz !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.sffz == assetTypeOptions[i].dictValue) {
-                        obj.sffz = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //结构类型字典项
-                that.getDicts("house_jglx").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.jglx !=null && obj.jglx !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.jglx == assetTypeOptions[i].dictValue) {
-                        obj.jglx = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //是否正在使用字典项
-                that.getDicts("sys_yes_no").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.sfzzsy !=null && obj.sfzzsy !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.sfzzsy == assetTypeOptions[i].dictValue) {
-                        obj.sfzzsy = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //房屋状态字典项
-                that.getDicts("fwzt").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.fwzt !=null && obj.fwzt !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.fwzt == assetTypeOptions[i].dictValue) {
-                        obj.fwzt = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //土地状况字典项
-                that.getDicts("land_state").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.tdzk !=null && obj.tdzk !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.tdzk == assetTypeOptions[i].dictValue) {
-                        obj.tdzk = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //是否受过处罚字典项
-                that.getDicts("land_state").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.sfsgcf !=null && obj.sfsgcf !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.sfsgcf == assetTypeOptions[i].dictValue) {
-                        obj.sfsgcf = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                that.mapFsssData = obj;
-              } else if(ifConsole =="mapTheGeomZrzId"){
-                let obj = {};
-                that.mapHasDateStatus = 1;
-                obj.deptName = feature.values_.deptName;//部门名称
-                obj.zjddm = feature.values_.zjddm;//宅基地代码
-                obj.nmfwzh = feature.values_.nmfwzh;//农民房屋幢号
-                obj.zrzh = feature.values_.zrzh;//自然幢号
-                obj.jgrq = feature.values_.jgrq;//竣工日期
-                obj.jzwgd = feature.values_.jzwgd;//建筑物高度
-                obj.zzdmj = feature.values_.zzdmj;//幢占地面积
-                obj.zydmj = feature.values_.zydmj;//幢用地面积
-                obj.scjzmj = feature.values_.scjzmj;//实测建筑面积
-                obj.zcs = feature.values_.zcs;//总层数
-                obj.dscs = feature.values_.dscs;//地上层数
-                obj.dxcs = feature.values_.dxcs;//地下层数
-                obj.fwjg = feature.values_.fwjg;//房屋结构
-                obj.sjly = feature.values_.sjly;//数据来源
-                obj.status = feature.values_.status;//状态
-                obj.houseDataConfirmStatus = feature.values_.houseDataConfirmStatus;//数据调查确认状态
-                //字典项转化
-                //房屋结构字典项
-                that.getDicts("housing_structure").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.fwjg !=null && obj.fwjg !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.fwjg == assetTypeOptions[i].dictValue) {
-                        obj.fwjg = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //房屋结构字典项
-                that.getDicts("sjly").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.sjly !=null && obj.sjly !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.sjly == assetTypeOptions[i].dictValue) {
-                        obj.sjly = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                that.mapZrzData = obj;
-              } else if(ifConsole =="mapTheGeomZjdId"){
-                let obj = {};
-                that.mapHasDateStatus = 2;
-                obj.deptName = feature.values_.deptName;//行政区划名称
-                obj.suyqrdm = feature.values_.suyqrdm;//所有权人代码
-                obj.nhdm = feature.values_.nhdm;//农户代码
-                obj.zjddm = feature.values_.zjddm;//宅基地代码
-                obj.zdbh = feature.values_.zdbh;//宗地编号
-                obj.zddm = feature.values_.zddm;//宗地代码
-                obj.zl = feature.values_.zl;//坐落
-                obj.zldwdm = feature.values_.zldwdm;//坐落单位代码
-                obj.zdmj = feature.values_.zdmj;//宗地面积
-                obj.yt = feature.values_.yt;//用途
-                obj.ytmc = feature.values_.ytmc;//用途名称
-                obj.dj = feature.values_.dj;//宗地编号
-                obj.jg = feature.values_.jg;//价格万元
-                obj.qllx = feature.values_.qllx;//权利类型
-                obj.qlxz = feature.values_.qlxz;//权利性质
-                obj.qlsdfs = feature.values_.qlsdfs;//权利设定方式
-                obj.rjl = feature.values_.rjl;//容积率
-                obj.jzmd = feature.values_.jzmd;//建筑密度
-                obj.jzxg = feature.values_.jzxg;//建筑限高
-                obj.zdszd = feature.values_.zdszd;//宗地四至-东
-                obj.zdszn = feature.values_.zdszn;//宗地四至-南
-                obj.zdszx = feature.values_.zdszx;//宗地四至-西
-                obj.zdszb = feature.values_.zdszb;//宗地四至-北
-                obj.zdt = feature.values_.zdt;//宗地图
-                obj.tfh = feature.values_.tfh;//图幅号
-                obj.djh = feature.values_.djh;//地籍号
-                obj.sjly = feature.values_.sjly;//数据来源
-                obj.lyzk = feature.values_.lyzk;//当前利用状况
-                obj.xzkssj = feature.values_.xzkssj;//闲置开始时间
-                obj.sffz = feature.values_.sffz;//是否发证
-                obj.zjdzsh = feature.values_.zjdzsh;//宅基地证书号
-                obj.zjdxctp = feature.values_.zjdxctp;//宅基地现场图片
-                obj.zjdqdfs = feature.values_.zjdqdfs;//宅基地取得方式
-                obj.bccjl = feature.values_.bccjl;//被惩处经历
-                obj.bccbz = feature.values_.bccbz;//被惩处备注
-                obj.yctcyx = feature.values_.yctcyx;//有偿退出意向
-                obj.zjdpzmj = feature.values_.zjdpzmj;//宅基地批准面积
-                obj.zjdxzyy = feature.values_.zjdxzyy;//宅基地闲置原因
-                obj.lzyx = feature.values_.lzyx;//流转意向
-                obj.sysNormalDisable = feature.values_.sysNormalDisable;//是否停用
-                //字典项转化
-                //是否发证字典项
-                that.getDicts("sys_yes_no").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.sffz !=null && obj.sffz !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.sffz == assetTypeOptions[i].dictValue) {
-                        obj.sffz = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //利用状态字典项
-                that.getDicts("zjdlyzk").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.lyzk !=null && obj.lyzk !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.lyzk == assetTypeOptions[i].dictValue) {
-                        obj.lyzk = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //流转意向字典项
-                that.getDicts("is_have").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.lzyx !=null && obj.lzyx !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.lzyx == assetTypeOptions[i].dictValue) {
-                        obj.lzyx = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //有偿退出意向字典项
-                that.getDicts("is_have").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.yctcyx !=null && obj.yctcyx !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.yctcyx == assetTypeOptions[i].dictValue) {
-                        obj.yctcyx = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //被惩处经历字典项
-                that.getDicts("is_have").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.bccjl !=null && obj.bccjl !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.bccjl == assetTypeOptions[i].dictValue) {
-                        obj.bccjl = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //宅基地取得方式字典项
-                that.getDicts("acquisition_method").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.zjdqdfs !=null && obj.zjdqdfs !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.zjdqdfs == assetTypeOptions[i].dictValue) {
-                        obj.zjdqdfs = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //权利设定方式字典项
-                that.getDicts("right_setting_mode").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.qlsdfs !=null && obj.qlsdfs !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.qlsdfs == assetTypeOptions[i].dictValue) {
-                        obj.qlsdfs = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                //数据来源字典项
-                that.getDicts("sjly").then((response) => {
-                  var assetTypeOptions = response.data;
-                  if(obj.sjly !=null && obj.sjly !=""){
-                    for(var i=0;assetTypeOptions.length >i; i++){
-                      if(obj.sjly == assetTypeOptions[i].dictValue) {
-                        obj.sjly = assetTypeOptions[i].dictLabel;
-                        break;
-                      }
-                    }
-                  }
-                });
-                that.mapZjdData = obj;
-                that.zjdHcDy = obj.zjddm;
-              } else {
-                that.mapHaDataValue = false;
-              }
-            }else {
-              that.mapHaDataValue = false;
-            }
+            //数据库查询详情时使用----------------------------------------start
+            // if(feature) {
+            //   console.log(feature);
+            //   //document.getElementById("info").innerHTML = "";
+            //   that.mapHaDataValue = true;
+            //   var ifConsole = feature.values_.createBy;
+            //   if (ifConsole =="mapTheGeomFsssId") {
+            //     let obj = {};
+            //     that.mapHasDateStatus = 0;
+            //     obj.deptName = feature.values_.deptName;//行政区划名称
+            //     obj.zjddm = feature.values_.zjddm;//宅基地代码
+            //     obj.houseDataConfirmStatus = feature.values_.houseDataConfirmStatus; //状态
+            //     obj.fssslx = feature.values_.fssslx; //附属设施类型
+            //     obj.jzmj = feature.values_.jzmj; //建筑面积
+            //     obj.qsly = feature.values_.qsly;//权属来源
+            //     obj.fwzt = feature.values_.fwzt; //房屋状态
+            //     obj.sfsp = feature.values_.sfsp; //是否审批
+            //     obj.sffz = feature.values_.sffz; //是否发证
+            //     obj.jglx = feature.values_.jglx; //结构类型
+            //     obj.sfzzsy = feature.values_.sfzzsy; //是否正在使用
+            //     obj.jzwqk = feature.values_.jzwqk; //建筑物情况
+            //     obj.tdzk = feature.values_.tdzk; //审批或建设前土地状况
+            //     obj.sfsgcf = feature.values_.sfsgcf; //是否受过处罚
+            //     obj.sysNormalDisable = feature.values_.sysNormalDisable; //是否停用
+            //     //附属设施类型字典项
+            //     that.getDicts("fsss_type").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.fssslx !=null && obj.fssslx !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.fssslx == assetTypeOptions[i].dictValue) {
+            //             obj.fssslx = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //权属类型字典项
+            //     that.getDicts("acquisition_method").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.qsly !=null && obj.qsly !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.qsly == assetTypeOptions[i].dictValue) {
+            //             obj.qsly = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //房屋状态字典项
+            //     that.getDicts("fwzt").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.fwzt !=null && obj.fwzt !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.fwzt == assetTypeOptions[i].dictValue) {
+            //             obj.fwzt = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //是否审批字典项
+            //     that.getDicts("sys_yes_no").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.sfsp !=null && obj.sfsp !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.sfsp == assetTypeOptions[i].dictValue) {
+            //             obj.sfsp = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //是否发证字典项
+            //     that.getDicts("sys_yes_no").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.sffz !=null && obj.sffz !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.sffz == assetTypeOptions[i].dictValue) {
+            //             obj.sffz = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //结构类型字典项
+            //     that.getDicts("house_jglx").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.jglx !=null && obj.jglx !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.jglx == assetTypeOptions[i].dictValue) {
+            //             obj.jglx = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //是否正在使用字典项
+            //     that.getDicts("sys_yes_no").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.sfzzsy !=null && obj.sfzzsy !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.sfzzsy == assetTypeOptions[i].dictValue) {
+            //             obj.sfzzsy = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //房屋状态字典项
+            //     that.getDicts("fwzt").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.fwzt !=null && obj.fwzt !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.fwzt == assetTypeOptions[i].dictValue) {
+            //             obj.fwzt = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //土地状况字典项
+            //     that.getDicts("land_state").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.tdzk !=null && obj.tdzk !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.tdzk == assetTypeOptions[i].dictValue) {
+            //             obj.tdzk = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //是否受过处罚字典项
+            //     that.getDicts("land_state").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.sfsgcf !=null && obj.sfsgcf !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.sfsgcf == assetTypeOptions[i].dictValue) {
+            //             obj.sfsgcf = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     that.mapFsssData = obj;
+            //   } else if(ifConsole =="mapTheGeomZrzId"){
+            //     let obj = {};
+            //     that.mapHasDateStatus = 1;
+            //     obj.deptName = feature.values_.deptName;//部门名称
+            //     obj.zjddm = feature.values_.zjddm;//宅基地代码
+            //     obj.nmfwzh = feature.values_.nmfwzh;//农民房屋幢号
+            //     obj.zrzh = feature.values_.zrzh;//自然幢号
+            //     obj.jgrq = feature.values_.jgrq;//竣工日期
+            //     obj.jzwgd = feature.values_.jzwgd;//建筑物高度
+            //     obj.zzdmj = feature.values_.zzdmj;//幢占地面积
+            //     obj.zydmj = feature.values_.zydmj;//幢用地面积
+            //     obj.scjzmj = feature.values_.scjzmj;//实测建筑面积
+            //     obj.zcs = feature.values_.zcs;//总层数
+            //     obj.dscs = feature.values_.dscs;//地上层数
+            //     obj.dxcs = feature.values_.dxcs;//地下层数
+            //     obj.fwjg = feature.values_.fwjg;//房屋结构
+            //     obj.sjly = feature.values_.sjly;//数据来源
+            //     obj.status = feature.values_.status;//状态
+            //     obj.houseDataConfirmStatus = feature.values_.houseDataConfirmStatus;//数据调查确认状态
+            //     //字典项转化
+            //     //房屋结构字典项
+            //     that.getDicts("housing_structure").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.fwjg !=null && obj.fwjg !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.fwjg == assetTypeOptions[i].dictValue) {
+            //             obj.fwjg = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //房屋结构字典项
+            //     that.getDicts("sjly").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.sjly !=null && obj.sjly !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.sjly == assetTypeOptions[i].dictValue) {
+            //             obj.sjly = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     that.mapZrzData = obj;
+            //   } else if(ifConsole =="mapTheGeomZjdId"){
+            //     let obj = {};
+            //     that.mapHasDateStatus = 2;
+            //     obj.deptName = feature.values_.deptName;//行政区划名称
+            //     obj.suyqrdm = feature.values_.suyqrdm;//所有权人代码
+            //     obj.nhdm = feature.values_.nhdm;//农户代码
+            //     obj.zjddm = feature.values_.zjddm;//宅基地代码
+            //     obj.zdbh = feature.values_.zdbh;//宗地编号
+            //     obj.zddm = feature.values_.zddm;//宗地代码
+            //     obj.zl = feature.values_.zl;//坐落
+            //     obj.zldwdm = feature.values_.zldwdm;//坐落单位代码
+            //     obj.zdmj = feature.values_.zdmj;//宗地面积
+            //     obj.yt = feature.values_.yt;//用途
+            //     obj.ytmc = feature.values_.ytmc;//用途名称
+            //     obj.dj = feature.values_.dj;//宗地编号
+            //     obj.jg = feature.values_.jg;//价格万元
+            //     obj.qllx = feature.values_.qllx;//权利类型
+            //     obj.qlxz = feature.values_.qlxz;//权利性质
+            //     obj.qlsdfs = feature.values_.qlsdfs;//权利设定方式
+            //     obj.rjl = feature.values_.rjl;//容积率
+            //     obj.jzmd = feature.values_.jzmd;//建筑密度
+            //     obj.jzxg = feature.values_.jzxg;//建筑限高
+            //     obj.zdszd = feature.values_.zdszd;//宗地四至-东
+            //     obj.zdszn = feature.values_.zdszn;//宗地四至-南
+            //     obj.zdszx = feature.values_.zdszx;//宗地四至-西
+            //     obj.zdszb = feature.values_.zdszb;//宗地四至-北
+            //     obj.zdt = feature.values_.zdt;//宗地图
+            //     obj.tfh = feature.values_.tfh;//图幅号
+            //     obj.djh = feature.values_.djh;//地籍号
+            //     obj.sjly = feature.values_.sjly;//数据来源
+            //     obj.lyzk = feature.values_.lyzk;//当前利用状况
+            //     obj.xzkssj = feature.values_.xzkssj;//闲置开始时间
+            //     obj.sffz = feature.values_.sffz;//是否发证
+            //     obj.zjdzsh = feature.values_.zjdzsh;//宅基地证书号
+            //     obj.zjdxctp = feature.values_.zjdxctp;//宅基地现场图片
+            //     obj.zjdqdfs = feature.values_.zjdqdfs;//宅基地取得方式
+            //     obj.bccjl = feature.values_.bccjl;//被惩处经历
+            //     obj.bccbz = feature.values_.bccbz;//被惩处备注
+            //     obj.yctcyx = feature.values_.yctcyx;//有偿退出意向
+            //     obj.zjdpzmj = feature.values_.zjdpzmj;//宅基地批准面积
+            //     obj.zjdxzyy = feature.values_.zjdxzyy;//宅基地闲置原因
+            //     obj.lzyx = feature.values_.lzyx;//流转意向
+            //     obj.sysNormalDisable = feature.values_.sysNormalDisable;//是否停用
+            //     obj.active = 1;
+            //     //字典项转化
+            //     //是否发证字典项
+            //     that.getDicts("sys_yes_no").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.sffz !=null && obj.sffz !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.sffz == assetTypeOptions[i].dictValue) {
+            //             obj.sffz = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //利用状态字典项
+            //     that.getDicts("zjdlyzk").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.lyzk !=null && obj.lyzk !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.lyzk == assetTypeOptions[i].dictValue) {
+            //             obj.lyzk = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //流转意向字典项
+            //     that.getDicts("is_have").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.lzyx !=null && obj.lzyx !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.lzyx == assetTypeOptions[i].dictValue) {
+            //             obj.lzyx = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //有偿退出意向字典项
+            //     that.getDicts("is_have").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.yctcyx !=null && obj.yctcyx !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.yctcyx == assetTypeOptions[i].dictValue) {
+            //             obj.yctcyx = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //被惩处经历字典项
+            //     that.getDicts("is_have").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.bccjl !=null && obj.bccjl !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.bccjl == assetTypeOptions[i].dictValue) {
+            //             obj.bccjl = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //宅基地取得方式字典项
+            //     that.getDicts("acquisition_method").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.zjdqdfs !=null && obj.zjdqdfs !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.zjdqdfs == assetTypeOptions[i].dictValue) {
+            //             obj.zjdqdfs = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //权利设定方式字典项
+            //     that.getDicts("right_setting_mode").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.qlsdfs !=null && obj.qlsdfs !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.qlsdfs == assetTypeOptions[i].dictValue) {
+            //             obj.qlsdfs = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     //数据来源字典项
+            //     that.getDicts("sjly").then((response) => {
+            //       var assetTypeOptions = response.data;
+            //       if(obj.sjly !=null && obj.sjly !=""){
+            //         for(var i=0;assetTypeOptions.length >i; i++){
+            //           if(obj.sjly == assetTypeOptions[i].dictValue) {
+            //             obj.sjly = assetTypeOptions[i].dictLabel;
+            //             break;
+            //           }
+            //         }
+            //       }
+            //     });
+            //     that.mapZjdData = obj;
+            //     console.log(obj.zjddm);
+            //     that.zjdHcDy = obj.zjddm;
+            //   } else {
+            //     that.mapHaDataValue = false;
+            //   }
+            // }else {
+            //   that.mapHaDataValue = false;
+            // }
+            //数据库查询详情时使用----------------------------------------end
           });
           //数据库循环加载时使用 --------------------加载较慢 ------start
           //当前账套没有任何空间数据
@@ -4154,9 +4161,10 @@
         },
         //宅基地点击地图核查
         zjdHc(){
-          //console.log(this.zjdHcDy);
-          if(this.zjdHcDy != ""){
-            this.$router.push('/homesteadSurvey/add');
+          console.log(this.zjdHcDy);
+          if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
+            this.$cookies.set("search",JSON.stringify(this.mapZjdData));
+            this.$router.push({path:'/homesteadSurvey/add'});
           } else {
             this.$dialog.alert({
               title: '宅基地核查',
@@ -4169,7 +4177,11 @@
         },
         //全选
         checkAll(val) {
-          let checkedCount = this.CheckedAllArr.length
+          console.log(val);
+          console.log(this.checked);
+          console.log(this.CheckedAllArr);
+          let checkedCount = this.CheckedAllArr.length;
+          console.log(checkedCount);
           if (val) {
             //全选
             this.CheckedAllArr = this.dataList.map(item => item.id)
@@ -4218,12 +4230,6 @@
           }
         },
 
-        //编辑农地信息
-        editnfdInfo(type) {
-          this.currentType = 1;
-          this.farmlandEditSwitchVisbuleFun("hide");
-          this.landHomesteadEditVisbileFun("show");
-        },
         closeSearchBox(){
           this.showSearch = false ;
           var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
@@ -4235,40 +4241,8 @@
             "}"
           )
           $('.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'});
-        } ,
-        //删除农地信息
-        deletefdInfo() {
-          this.$dialog
-            .confirm({
-              title: "确认执行删除操作？",
-              message: "删除后内容不可恢复",
-            })
-            .then(() => {
-              console.log(this.farmhouseStatus);
-              if (this.farmhouseStatus == 0) {
-                //农房
-                // houseRemove(this.houseInfoList.id).then((res) => {
-                //   if (res.code == 200) {
-                //     this.hideEditNav();
-                //     // this.tGeoOrganization.orgCode = this.houseInfoList.orgCode;
-                //     // coordinatesUpdateGeo(this.tGeoOrganization).then((res) => {});
-                //   }
-                // });
-              } else {
-                //农地
-                // landRemove(this.landInfoList.id).then((res) => {
-                //   if (res.code == 200) {
-                //     this.hideEditNav();
-                //     // this.tGeoOrganization.orgCode = this.landInfoList.orgCode;
-                //     // coordinatesUpdateGeo(this.tGeoOrganization).then((res) => {});
-                //   }
-                // });
-              }
-            })
-            .catch(() => {
-              // on cancel
-            });
         },
+
       }
     }
 </script>