地图优化

src/views/homesteadSurvey/list.vue

@@ -3585,13 +3585,16 @@
                     that.mapZrzData ="";
                     that.mapFsssData ="";
                     that.mapZjdTeAll.active ="1";
-                    that.mapZjdTeAll.mapZjdAData ={};
-                    that.mapZjdTeAll.mapZrzAData ={};
-                    that.mapZjdTeAll.mapFsssAData ={};
-                    that.mapZjdDataTure ="";
-                    map.removeLayer(hc_land_on);
+                    // 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 ={};
+                        map.removeLayer(hc_land_on);
                         that.mapHasDateStatus = 2;
                         let obj = {};
                          let trs = $("#info .featureInfo").find("tr:eq(1)");
@@ -3743,6 +3746,7 @@
                           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;
@@ -3786,6 +3790,9 @@
                         }
                         //that.mapZjdData = cloneObj;
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){
+                        that.mapZjdTeAll.mapZjdAData ={};
+                        that.mapZjdTeAll.mapFsssAData ={};
+                        map.removeLayer(hc_land_on);
                         let obj = {};
                         that.mapHasDateStatus = 1;
                         let trs = $("#info .featureInfo").find("tr:eq(1)");
@@ -3889,6 +3896,9 @@
                           that.textMjAllNum = "1";
                         }
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss"){
+                        that.mapZjdTeAll.mapZrzAData ={};
+                        that.mapZjdTeAll.mapZjdAData ={};
+                        map.removeLayer(hc_land_on);
                         let obj = {};
                         that.mapHasDateStatus = 0;
                         let trs = $("#info .featureInfo").find("tr:eq(1)");
@@ -4665,18 +4675,26 @@
           console.log(this.mapZjdTeAll);
         },
         zrzTz(){
-          this.mapZjdTeAll.active =3;
-          this.mapZjdTeAll.mapZrzAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
-          this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
-          this.$cookies.set("search",this.mapZjdTeAll);
-          this.$router.push({path:'/homesteadSurvey/add'});
+          if(this.mapZjdTeAll.mapZjdAData !=undefined && this.mapZjdTeAll.mapZjdAData !="" && this.mapZjdDataTure !=""){
+            this.mapZjdTeAll.active =3;
+            this.mapZjdTeAll.mapZrzAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
+            this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
+            this.$cookies.set("search",this.mapZjdTeAll);
+            this.$router.push({path:'/homesteadSurvey/add'});
+          }else {
+            this.$toast("请先在地图上选择宅基地后，再添加自然幢选择");
+          }
         },
         fsssTz(){
+          if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
           this.mapZjdTeAll.active =4;
           this.mapZjdTeAll.mapFsssAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
           this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId;
           this.$cookies.set("search",this.mapZjdTeAll);
           this.$router.push({path:'/homesteadSurvey/add'});
+          }else {
+            this.$toast("请先在地图上选择宅基地后，再添加自然幢选择");
+          }
         },
         //绘图重置清除之前图层
         deleteHistory(){