From 0b2a34d6c5c973bfffe32cfdf68aa1a26963ae32 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Sun, 27 Feb 2022 20:23:36 +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 | 59 ++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index b7efc52c..f079acd0 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1195,6 +1195,14 @@
           mapZjdData:{},
           mapZrzData:{},
           mapFsssData:{},
+          mapZjdZrzAll:{
+            mapZjdAData:"",
+            mapZrzAData:"",
+          },
+          mapZjdFsssAll:{
+            mapZjdAData:"",
+            mapFsssAData:"",
+          },
           mapHaDataValue:false,
           mapHasDateStatus: 0, //0附属设施  1自然幢  2宅基地
           selectionIconShow:false,
@@ -3370,6 +3378,11 @@
                 .then(function (html) {
                   document.getElementById("info").innerHTML = html;
                   if (html.indexOf("<table") != -1) {
+                    that.mapZjdData ="";
+                    that.mapZrzData ="";
+                    that.mapFsssData ="";
+                    that.mapZjdZrzAll ="";
+                    that.mapZjdFsssAll ="";
                     setTimeout(() => {
                       if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") {
                         that.mapHasDateStatus = 2;
@@ -3539,7 +3552,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(5).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();//竣工日期
@@ -3582,10 +3595,15 @@
                         // });
                         //let cloneObj = JSON.parse(JSON.stringify(obj));
                         //that.mapZrzData = cloneObj;
-                        getZrz(8).then((response) => {
-                          that.mapZrzData.active = 3;
-                          that.mapZrzData.data = response.data;
-                          console.log(that.mapZrzData);
+                        getZjdzd(669).then((response) => {
+                          var zjdMapA = response.data;
+                          zjdMapA.active = 1;
+                          that.mapZjdZrzAll.mapZjdAData = zjdMapA;
+                          getZrz(8).then((response) => {
+                            that.mapZrzData = response.data;
+                            that.mapZrzData.active = 3;
+                            that.mapZjdZrzAll.mapZrzAData =that.mapZrzData;
+                          });
                         });
                         if(obj.scjzmj != ""){
                           that.textMjAll = obj.scjzmj;
@@ -3737,10 +3755,15 @@
                         // });
                         //let cloneObj = JSON.parse(JSON.stringify(obj));
                         //that.mapFsssData = cloneObj;
-                        getfsss(12).then((response) => {
-                          console.log(response);
-                          that.mapfsssData.active = 4;
-                          that.mapfsssData.data = response.data;
+                        getZjdzd(669).then((response) => {
+                          var zjdMapA = response.data;
+                          zjdMapA.active = 1;
+                          that.mapZjdFsssAll.mapZjdAData = zjdMapA;
+                          getfsss(12).then((response) => {
+                            that.mapfsssData.active = 4;
+                            that.mapfsssData = response.data;
+                            that.mapZjdFsssAll.mapFsssAData = that.mapfsssData;
+                          });
                         });
                         if(obj.jzmj != ""){
                           that.textMjAll = obj.jzmj;
@@ -4186,12 +4209,18 @@
         zjdHc(){
           console.log(this.zjdHcDy);
           if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
-            this.$cookies.set("search",this.mapZjdData);
-            this.$router.push({path:'/homesteadSurvey/add'});
-            this.$cookies.set("search",this.mapZrzData);
-            this.$router.push({path:'/homesteadSurvey/add'});
-            this.$cookies.set("search",this.mapfsssData);
-            this.$router.push({path:'/homesteadSurvey/add'});
+            if(this.mapZjdData !=undefined && this.mapZjdData !=""){
+              this.$cookies.set("search",this.mapZjdData);
+              this.$router.push({path:'/homesteadSurvey/add'});
+            }
+            if(this.mapZrzData !=undefined && this.mapZrzData !=""){
+              this.$cookies.set("search",this.mapZjdZrzAll);
+              this.$router.push({path:'/homesteadSurvey/add'});
+            }
+            if(this.mapFsssData !=undefined && this.mapFsssData !=""){
+              this.$cookies.set("search",this.mapZjdFsssAll);
+              this.$router.push({path:'/homesteadSurvey/add'});
+            }
           } else {
             this.$dialog.alert({
               title: '宅基地核查',