Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/homesteadSurvey/add.vue

@@ -21,7 +21,7 @@
     margin: 20px;margin-top:-70px;">
       <van-row>
         <van-col span="4" :offset="1" style="text-align:center;" @click="active=1">
-          <van-icon :name="require('../../assets/images/housesteadSurvey/zjd'+(active==1?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
+          <van-icon :name="require('../../assets/images/housesteadSurvey/zjd'+(active==1?'A':'D')+'.png')" size="1rem" @click="mapClickLoading" style="margin-top:0px;"/>
           <p :style="{color:(active==1?'rgb(34, 183, 242)':'#000')}">宅基地</p>
         </van-col>
         <van-col span="2">
@@ -35,14 +35,14 @@
           <div style=" height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
         <van-col span="4" style="text-align:center;" @click="active=3,getZrzList()">
-          <van-icon :name="require('../../assets/images/housesteadSurvey/fwxx'+(active==3?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
+          <van-icon :name="require('../../assets/images/housesteadSurvey/fwxx'+(active==3?'A':'D')+'.png')" size="1rem" @click="mapClickLoading" style="margin-top:0px;"/>
           <p  :style="{color:(active==3?'rgb(34, 183, 242)':'#000')}">房屋信息</p>
         </van-col>
         <van-col span="2">
           <div style=" height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
         <van-col span="4" style="text-align:center;" @click="active=4,getFsssList()">
-          <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
+          <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="1rem" @click="mapClickLoading" style="margin-top:0px;"/>
           <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属设施</p>
         </van-col>
       </van-row>
@@ -914,7 +914,7 @@
             label="备注"
             placeholder="备注"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
+          <MapGisDrawing ref="drewingClickLoading" :message="form3.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -1953,7 +1953,7 @@
             label="备注"
             placeholder="备注"
           />
-          <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
+          <MapGisDrawing ref="drewingClickLoading" :message="form4.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -3613,15 +3613,19 @@
       changeActive(){
         if(this.active<4){
           this.active+=1
+          this.mapClickLoading();
         }else{
           this.active=1
+          this.mapClickLoading();
         }
       },
       changeActiveBack(){
         if(this.active>1){
           this.active-=1
+          this.mapClickLoading();
         }else{
           this.active=1
+          this.mapClickLoading();
         }
       },
       // 清空画板