From 233957108c1672e37277fbf42228ed75250314c0 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Tue, 1 Mar 2022 10:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B8=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 40 +++++++++++++++++-------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index e6b79d1c..10e4bd82 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -3569,16 +3569,17 @@
                     that.mapZjdData ="";
                     that.mapZrzData ="";
                     that.mapFsssData ="";
-                    that.mapZjdTeAll.active ="1";
-                    // that.mapZjdTeAll.mapZjdAData ={};
-                    // that.mapZjdTeAll.mapZrzAData ={};
-                    // that.mapZjdTeAll.mapFsssAData ={};
-                    // that.mapZjdDataTure ="";
+                    //that.mapZjdTeAll.active ="1";
+                    that.mapZjdTeAll.mapZjdAData ={};
+                    that.mapZjdTeAll.mapZrzAData ={};
+                    that.mapZjdTeAll.mapFsssAData ={};
+                    that.mapZjdDataTure ="";
                     setTimeout(() => {
                       if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") {
-                        that.mapZjdDataTure ="";
-                        that.mapZjdTeAll.mapZrzAData ={};
-                        that.mapZjdTeAll.mapFsssAData ={};
+
+                        // that.mapZjdDataTure ="";
+                        // that.mapZjdTeAll.mapZrzAData ={};
+                        // that.mapZjdTeAll.mapFsssAData ={};
                         map.removeLayer(hc_land_on);
                         that.mapHasDateStatus = 2;
                         let obj = {};
@@ -3731,7 +3732,6 @@
                           console.log(response);
                           that.mapZjdData = response.data;
                           that.mapZjdData.active = 1;
-                          console.log(that.mapZjdData);
                           that.mapZjdTeAll.mapZjdAData =that.mapZjdData;
                           that.mapZjdDataTure = 1;
                           that.zjdHcDy = obj.zjddm;
@@ -3775,7 +3775,7 @@
                         }
                         //that.mapZjdData = cloneObj;
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){
-                        that.mapZjdTeAll.mapZjdAData ={};
+                        //that.mapZjdTeAll.mapZjdAData ={};
                         that.mapZjdTeAll.mapFsssAData ={};
                         map.removeLayer(hc_land_on);
                         let obj = {};
@@ -3785,7 +3785,7 @@
                         let zrzIdNum = zrzXq.replace("t_house_survey_zrz.", "");
                         obj.id = zrzIdNum; //	主键id
                         obj.deptName = trs.find("td").eq(3).text();//行政区划名称
-                        obj.zjddm = trs.find("td").eq(5).text();//宅基地代码
+                        obj.zjddm = trs.find("td").eq(4).text();//宅基地代码
                         // obj.nmfwzh = trs.find("td").eq(6).text();//农民房屋幢号
                         // obj.zrzh = trs.find("td").eq(7).text();//自然幢号
                         // obj.jgrq = trs.find("td").eq(8).text();//竣工日期
@@ -3831,13 +3831,17 @@
                         let params = {
                           "deptId" : that.$cookies.get("item").deptId,
                           "zjddm" : obj.zjddm,
-                          "pageSize":20,
                         }
+                        console.log(obj.zjddm);
+                        console.log(params);
                         listZjdzd(params).then((response) => {
-                          that.mapZjdAData = response.data;
+                          console.log(response);
+                          that.mapZjdData = response.rows[0];
                           //that.mapZjdAData.active = 1;
-                          that.mapZjdTeAll.mapZjdAData = that.mapZjdAData;
+                          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;
@@ -3882,7 +3886,7 @@
                         }
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss"){
                         that.mapZjdTeAll.mapZrzAData ={};
-                        that.mapZjdTeAll.mapZjdAData ={};
+                        //that.mapZjdTeAll.mapZjdAData ={};
                         map.removeLayer(hc_land_on);
                         let obj = {};
                         that.mapHasDateStatus = 0;
@@ -4034,7 +4038,7 @@
                           "pageSize":20,
                         }
                         listZjdzd(params).then((response) => {
-                          that.mapZjdData = response.data;
+                          that.mapZjdData = response.rows[0];
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
                           getfsss(obj.id).then((response) => {
@@ -4519,6 +4523,8 @@
         //宅基地点击地图核查
         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;
@@ -4538,7 +4544,7 @@
           } else {
             this.$dialog.alert({
               title: '宅基地核查',
-              message: "请从地图选择地图并点击核查",
+              message: "请从地图中选择图层并点击核查",
               theme: 'round-button',
             }).then(() => {
               // on close