From cc40cc29693c48d6700f48717d3de7d711ea9c48 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Wed, 9 Mar 2022 11:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=87=8F=E9=9D=A2=E7=A7=AF=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 | 37 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index dfd56f48..1b525bf5 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1414,7 +1414,7 @@
           if(this.$cookies.get("item").activeBtn !=null){
             if(this.$cookies.get("item").activeBtn == 4){
               this.activeBtn = this.$cookies.get("item").activeBtn;
-              this.item = this.$cookies.get("item");
+              this.item = this.$cookies.get("item").backMapZjdAData;
               this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId;
               this.backTheGeom = this.$cookies.get("item").backMapZjdAData.theGeom;
               this.mapAddJumpNum =1;
@@ -4562,6 +4562,11 @@
                           "zjddm" : obj.zjddm,
                         }
                         listZjdzd(params).then((response) => {
+                          if(response.rows[0].zdmj != ""){
+                            that.textMjAll = response.rows[0].zdmj;
+                          } else {
+                            that.textMjAllNum = "1";
+                          }
                           that.mapZjdData = response.rows[0];
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData =that.mapZjdData;
@@ -4630,11 +4635,6 @@
                           sourceMapLookMap.addFeature(newcenterFeatureMap);
                         });
                         //let cloneObj = JSON.parse(JSON.stringify(obj));
-                        if(obj.zdmj != ""){
-                          that.textMjAll = obj.zdmj;
-                        } else {
-                          that.textMjAllNum = "1";
-                        }
                         //that.mapZjdData = cloneObj;
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){
                         //that.mapZjdTeAll.mapZjdAData ={};
@@ -4700,6 +4700,11 @@
                           //that.mapZjdAData.active = 1;
                           that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
                           getZrz(obj.id).then((response) => {
+                            if(response.data.scjzmj != ""){
+                              that.textMjAll = response.data.scjzmj;
+                            } else {
+                              that.textMjAllNum = "1";
+                            }
                             that.mapZrzData = response.data;
                             that.mapZrzData.active = 3;
                             that.mapZjdTeAll.mapZrzAData =that.mapZrzData;
@@ -4737,11 +4742,6 @@
                             });
                           });
                         });
-                        if(obj.scjzmj != ""){
-                          that.textMjAll = obj.scjzmj;
-                        } else {
-                          that.textMjAllNum = "1";
-                        }
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss"){
                         that.mapZjdTeAll.mapZrzAData ={};
                         that.mapZjdDataTure="";
@@ -4901,6 +4901,11 @@
                           that.mapZjdData.active = 1;
                           that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
                           getFsss(obj.id).then((response) => {
+                            if(response.data.jzmj != ""){
+                              that.textMjAll = response.data.jzmj;
+                            } else {
+                              that.textMjAllNum = "1";
+                            }
                             //that.mapfsssData.active = 4;
                             that.mapfsssData = response.data;
                             that.mapZjdTeAll.mapFsssAData = that.mapfsssData;
@@ -4938,11 +4943,11 @@
                             });
                           });
                         });
-                        if(obj.jzmj != ""){
-                          that.textMjAll = obj.jzmj;
-                        } else {
-                          that.textMjAllNum = "1";
-                        }
+                        // if(obj.jzmj != ""){
+                        //   that.textMjAll = obj.jzmj;
+                        // } else {
+                        //   that.textMjAllNum = "1";
+                        // }
                       } else {
 
                       }